diff --git a/doc/functions.xml b/doc/functions.xml
index 908e9571ed6..3850e58c016 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -52,6 +52,20 @@ in ...
It's equivalent to pkgs in the above example.
+
+ Note that in previous versions of nixpkgs, this method replaced any changes from config.packageOverrides,
+ along with that from previous calls if this function was called repeatedly.
+ Now those previous changes will be preserved so this function can be "chained" meaningfully.
+ To recover the old behavior, make sure config.packageOverrides is unset,
+ and call this only once off a "freshly" imported nixpkgs:
+
+ let
+ pkgs = import <nixpkgs> { config: {}; };
+ newpkgs = pkgs.overridePackages ...;
+in ...
+
+
@@ -85,9 +99,70 @@ in ...
+
+ <pkg>.overrideAttrs
+
+
+ The function overrideAttrs allows overriding the
+ attribute set passed to a stdenv.mkDerivation call,
+ producing a new derivation based on the original one.
+ This function is available on all derivations produced by the
+ stdenv.mkDerivation function, which is most packages
+ in the nixpkgs expression pkgs.
+
+
+
+ Example usage:
+
+ helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec {
+ separateDebugInfo = true;
+});
+
+
+
+ In the above example, the separateDebugInfo attribute is
+ overriden to be true, thus building debug info for
+ helloWithDebug, while all other attributes will be
+ retained from the original hello package.
+
+
+
+ The argument oldAttrs is conventionally used to refer to
+ the attr set originally passed to stdenv.mkDerivation.
+
+
+
+
+ Note that separateDebugInfo is processed only by the
+ stdenv.mkDerivation function, not the generated, raw
+ Nix derivation. Thus, using overrideDerivation will
+ not work in this case, as it overrides only the attributes of the final
+ derivation. It is for this reason that overrideAttrs
+ should be preferred in (almost) all cases to
+ overrideDerivation, i.e. to allow using
+ sdenv.mkDerivation to process input arguments, as well
+ as the fact that it is easier to use (you can use the same attribute
+ names you see in your Nix code, instead of the ones generated (e.g.
+ buildInputs vs nativeBuildInputs,
+ and involves less typing.
+
+
+
+
+
+
<pkg>.overrideDerivation
+
+ You should prefer overrideAttrs in almost all
+ cases, see its documentation for the reasons why.
+ overrideDerivation is not deprecated and will continue
+ to work, but is less nice to use and does not have as many abilities as
+ overrideAttrs.
+
+
+
Do not use this function in Nixpkgs as it evaluates a Derivation
before modifying it, which breaks package abstraction and removes
diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index e7dbe3bd7db..127614a71b7 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -3,7 +3,7 @@
## User Guide
Several versions of Python are available on Nix as well as a high amount of
-packages. The default interpreter is CPython 2.7.
+packages. The default interpreter is CPython 3.5.
### Using Python
@@ -409,36 +409,21 @@ and in this case the `python35` interpreter is automatically used.
### Interpreters
-Versions 2.6, 2.7, 3.3, 3.4 and 3.5 of the CPython interpreter are available on
-Nix and are available as `python26`, `python27`, `python33`, `python34` and
-`python35`. The PyPy interpreter is also available as `pypy`. Currently, the
-aliases `python` and `python3` correspond to respectively `python27` and
-`python35`. The Nix expressions for the interpreters can be found in
+Versions 2.6, 2.7, 3.3, 3.4 and 3.5 of the CPython interpreter are as respectively
+`python26`, `python27`, `python33`, `python34` and `python35`. The PyPy interpreter
+is available as `pypy`. The aliases `python2` and `python3` correspond to respectively `python27` and
+`python35`. The default interpreter, `python`, maps to `python3`.
+The Nix expressions for the interpreters can be found in
`pkgs/development/interpreters/python`.
-
-#### Missing modules standard library
-
-The interpreters `python26` and `python27` do not include modules that
-require external dependencies. This is done in order to reduce the closure size.
-The following modules need to be added as `buildInput` explicitly:
-
-* `python.modules.bsddb`
-* `python.modules.curses`
-* `python.modules.curses_panel`
-* `python.modules.crypt`
-* `python.modules.gdbm`
-* `python.modules.sqlite3`
-* `python.modules.tkinter`
-* `python.modules.readline`
-
-For convenience `python27Full` and `python26Full` are provided with all
-modules included.
-
All packages depending on any Python interpreter get appended
`out/{python.sitePackages}` to `$PYTHONPATH` if such directory
exists.
+#### Missing `tkinter` module standard library
+
+To reduce closure size the `Tkinter`/`tkinter` is available as a separate package, `pythonPackages.tkinter`.
+
#### Attributes on interpreters packages
Each interpreter has the following attributes:
@@ -448,7 +433,7 @@ Each interpreter has the following attributes:
- `buildEnv`. Function to build python interpreter environments with extra packages bundled together. See section *python.buildEnv function* for usage and documentation.
- `withPackages`. Simpler interface to `buildEnv`. See section *python.withPackages function* for usage and documentation.
- `sitePackages`. Alias for `lib/${libPrefix}/site-packages`.
-- `executable`. Name of the interpreter executable, ie `python3.4`.
+- `executable`. Name of the interpreter executable, e.g. `python3.4`.
### Building packages and applications
@@ -475,8 +460,9 @@ sets are
and the aliases
-* `pkgs.pythonPackages` pointing to `pkgs.python27Packages`
+* `pkgs.python2Packages` pointing to `pkgs.python27Packages`
* `pkgs.python3Packages` pointing to `pkgs.python35Packages`
+* `pkgs.pythonPackages` pointing to `pkgs.python3Packages`
#### `buildPythonPackage` function
diff --git a/doc/languages-frameworks/texlive.xml b/doc/languages-frameworks/texlive.xml
index 0e3c1dd13d7..fdee1e405ec 100644
--- a/doc/languages-frameworks/texlive.xml
+++ b/doc/languages-frameworks/texlive.xml
@@ -35,6 +35,7 @@ texlive.combine {
You can list packages e.g. by nix-repl.
$ nix-repl
+nix-repl> :l <nixpkgs>
nix-repl> texlive.collection-<TAB>
diff --git a/lib/customisation.nix b/lib/customisation.nix
index efe82d78660..3e6e279824b 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -56,16 +56,18 @@ rec {
ff = f origArgs;
overrideWith = newArgs: origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs);
in
- if builtins.isAttrs ff then (ff //
- { override = newArgs: makeOverridable f (overrideWith newArgs);
- overrideDerivation = fdrv:
- makeOverridable (args: overrideDerivation (f args) fdrv) origArgs;
- })
- else if builtins.isFunction ff then
- { override = newArgs: makeOverridable f (overrideWith newArgs);
- __functor = self: ff;
- overrideDerivation = throw "overrideDerivation not yet supported for functors";
- }
+ if builtins.isAttrs ff then (ff // {
+ override = newArgs: makeOverridable f (overrideWith newArgs);
+ overrideDerivation = fdrv:
+ makeOverridable (args: overrideDerivation (f args) fdrv) origArgs;
+ ${if ff ? overrideAttrs then "overrideAttrs" else null} = fdrv:
+ makeOverridable (args: (f args).overrideAttrs fdrv) origArgs;
+ })
+ else if builtins.isFunction ff then {
+ override = newArgs: makeOverridable f (overrideWith newArgs);
+ __functor = self: ff;
+ overrideDerivation = throw "overrideDerivation not yet supported for functors";
+ }
else ff;
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 79f50a94a07..6ff64599540 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -10,6 +10,7 @@
aaronschif = "Aaron Schif ";
abaldeau = "Andreas Baldeau ";
abbradar = "Nikolay Amiantov ";
+ abigailbuccaneer = "Abigail Bunyan ";
aboseley = "Adam Boseley ";
abuibrahim = "Ruslan Babayev ";
acowley = "Anthony Cowley ";
@@ -29,6 +30,7 @@
all = "Nix Committers ";
ambrop72 = "Ambroz Bizjak ";
amiddelk = "Arie Middelkoop ";
+ amiloradovsky = "Andrew Miloradovsky ";
amorsillo = "Andrew Morsillo ";
AndersonTorres = "Anderson Torres ";
anderspapitto = "Anders Papitto ";
@@ -104,8 +106,8 @@
cstrahan = "Charles Strahan ";
cwoac = "Oliver Matthews ";
DamienCassou = "Damien Cassou ";
- dasuxullebt = "Christoph-Simon Senjak ";
danbst = "Danylo Hlynskyi ";
+ dasuxullebt = "Christoph-Simon Senjak ";
davidak = "David Kleuker ";
davidrusu = "David Rusu ";
davorb = "Davor Babic ";
@@ -122,6 +124,7 @@
dipinhora = "Dipin Hora ";
dmalikov = "Dmitry Malikov ";
dochang = "Desmond O. Chang ";
+ domenkozar = "Domen Kozar ";
doublec = "Chris Double ";
drets = "Dmytro Rets ";
drewkett = "Andrew Burkett ";
@@ -172,12 +175,13 @@
globin = "Robin Gloster ";
gnidorah = "Alex Ivanov ";
goibhniu = "Cillian de Róiste ";
- goodrone = "Andrew Trachenko ";
Gonzih = "Max Gonzih ";
+ goodrone = "Andrew Trachenko ";
gpyh = "Yacine Hmito ";
grahamc = "Graham Christensen ";
gridaphobe = "Eric Seidel ";
guibert = "David Guibert ";
+ guillaumekoenig = "Guillaume Koenig ";
hakuch = "Jesse Haber-Kucharsky ";
havvy = "Ryan Scheel ";
hbunke = "Hendrik Bunke ";
@@ -188,7 +192,6 @@
hrdinka = "Christoph Hrdinka ";
iand675 = "Ian Duncan ";
ianwookim = "Ian-Woo Kim ";
- domenkozar = "Domen Kozar ";
igsha = "Igor Sharonov ";
ikervagyok = "Balázs Lengyel ";
j-keck = "Jürgen Keck ";
@@ -213,11 +216,13 @@
jwiegley = "John Wiegley ";
jwilberding = "Jordan Wilberding ";
jzellner = "Jeff Zellner ";
+ kaiha = "Kai Harries ";
kamilchm = "Kamil Chmielewski ";
kampfschlaefer = "Arnold Krille ";
kevincox = "Kevin Cox ";
khumba = "Bryan Gardiner ";
KibaFox = "Kiba Fox ";
+ kierdavis = "Kier Davis ";
kkallio = "Karn Kallio ";
koral = "Koral ";
kovirobi = "Kovacsics Robert ";
@@ -243,7 +248,6 @@
lucas8 = "Luc Chabassier ";
ludo = "Ludovic Courtès ";
luispedro = "Luis Pedro Coelho ";
- sternenseemann = "Lukas Epple ";
lukego = "Luke Gorrie ";
lw = "Sergey Sofeychuk ";
madjar = "Georges Dubus ";
@@ -259,10 +263,10 @@
martingms = "Martin Gammelsæter ";
matejc = "Matej Cotman ";
mathnerd314 = "Mathnerd314 ";
+ matthewbauer = "Matthew Bauer ";
matthiasbeyer = "Matthias Beyer ";
maurer = "Matthew Maurer ";
mbakke = "Marius Bakke ";
- matthewbauer = "Matthew Bauer ";
mbe = "Brandon Edens ";
mboes = "Mathieu Boespflug ";
mcmtroffaes = "Matthias C. M. Troffaes ";
@@ -295,15 +299,16 @@
muflax = "Stefan Dorn ";
myrl = "Myrl Hex ";
nand0p = "Fernando Jose Pando ";
- nathan-gs = "Nathan Bijnens ";
Nate-Devv = "Nathan Moore ";
+ nathan-gs = "Nathan Bijnens ";
nckx = "Tobias Geerinckx-Rice ";
nequissimus = "Tim Steinbach ";
nfjinjing = "Jinjing Wang ";
nhooyr = "Anmol Sethi ";
+ nicknovitski = "Nick Novitski ";
nico202 = "Nicolò Balzarotti ";
- notthemessiah = "Brian Cohen ";
NikolaMandic = "Ratko Mladic ";
+ notthemessiah = "Brian Cohen ";
np = "Nicolas Pouillard ";
nslqqq = "Nikita Mikhailov ";
obadz = "obadz ";
@@ -344,6 +349,7 @@
proglodyte = "Proglodyte ";
pshendry = "Paul Hendry ";
psibi = "Sibi ";
+ pstn = "Philipp Steinpaß ";
pSub = "Pascal Wittmann ";
puffnfresh = "Brian McKenna ";
pxc = "Patrick Callahan ";
@@ -377,8 +383,8 @@
rvl = "Rodney Lorrimar ";
rvlander = "Gaëtan André ";
ryanartecona = "Ryan Artecona ";
- ryantm = "Ryan Mulligan ";
ryansydnor = "Ryan Sydnor ";
+ ryantm = "Ryan Mulligan ";
rycee = "Robert Helgesson ";
ryneeverett = "Ryne Everett ";
s1lvester = "Markus Silvester ";
@@ -402,8 +408,8 @@
skeidel = "Sven Keidel ";
skrzyp = "Jakub Skrzypnik ";
sleexyz = "Sean Lee ";
- solson = "Scott Olson ";
smironov = "Sergey Mironov ";
+ solson = "Scott Olson ";
spacefrogg = "Michael Raitza ";
spencerjanssen = "Spencer Janssen ";
spinus = "Tomasz Czyż ";
@@ -411,6 +417,7 @@
spwhitt = "Spencer Whitt ";
SShrike = "Severen Redwood ";
stephenmw = "Stephen Weinberg ";
+ sternenseemann = "Lukas Epple ";
steveej = "Stefan Junker ";
swarren83 = "Shawn Warren ";
swistak35 = "Rafał Łasocha ";
@@ -442,15 +449,19 @@
twey = "James ‘Twey’ Kay ";
uralbash = "Svintsov Dmitry ";
urkud = "Yury G. Kudryashov ";
+ uwap = "uwap ";
vandenoever = "Jos van den Oever ";
vanzef = "Ivan Solyankin ";
vbgl = "Vincent Laporte ";
vbmithr = "Vincent Bernardoff ";
vcunat = "Vladimír Čunát ";
+ veprbl = "Dmitry Kalinkin ";
viric = "Lluís Batlle i Rossell ";
vizanto = "Danny Wilson ";
+ vklquevs = "vklquevs ";
vlstill = "Vladimír Štill ";
vmandela = "Venkateswara Rao Mandela ";
+ volhovm = "Mikhail Volkhov ";
vozz = "Oliver Hunt ";
vrthra = "Rahul Gopinath ";
wedens = "wedens ";
@@ -464,6 +475,7 @@
wscott = "Wayne Scott ";
wyvie = "Elijah Rum ";
yarr = "Dmitry V. ";
+ yochai = "Yochai ";
yurrriq = "Eric Bailey ";
z77z = "Marco Maggesi ";
zagy = "Christian Zagrodnick ";
@@ -471,6 +483,4 @@
zimbatm = "zimbatm ";
zohl = "Al Zohali ";
zoomulator = "Kim Simmons ";
- amiloradovsky = "Andrew Miloradovsky ";
- yochai = "Yochai ";
}
diff --git a/lib/trivial.nix b/lib/trivial.nix
index dac8b8d0106..39cbd67fba3 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -69,9 +69,13 @@ rec {
#
# nix-repl> obj
# { __unfix__ = «lambda»; bar = "bar"; extend = «lambda»; foo = "foo + "; foobar = "foo + bar"; }
- makeExtensible = rattrs:
+ makeExtensible = makeExtensibleWithCustomName "extend";
+
+ # Same as `makeExtensible` but the name of the extending attribute is
+ # customized.
+ makeExtensibleWithCustomName = extenderName: rattrs:
fix' rattrs // {
- extend = f: makeExtensible (extends f rattrs);
+ ${extenderName} = f: makeExtensibleWithCustomName extenderName (extends f rattrs);
};
# Flip the order of the arguments of a binary function.
diff --git a/nixos/doc/manual/release-notes/rl-1609.xml b/nixos/doc/manual/release-notes/rl-1609.xml
index 18b9a333e23..ade7d5581ce 100644
--- a/nixos/doc/manual/release-notes/rl-1609.xml
+++ b/nixos/doc/manual/release-notes/rl-1609.xml
@@ -164,14 +164,6 @@ following incompatible changes:
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.
-
-
-
diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 21cea77f876..efff8b895a1 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -61,6 +61,13 @@ following incompatible changes:
strippedName.
+
+
+ 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.
+
+
diff --git a/nixos/modules/installer/tools/auto-upgrade.nix b/nixos/modules/installer/tools/auto-upgrade.nix
index b21b80c666a..dfb43d1a1db 100644
--- a/nixos/modules/installer/tools/auto-upgrade.nix
+++ b/nixos/modules/installer/tools/auto-upgrade.nix
@@ -84,7 +84,7 @@ let cfg = config.system.autoUpgrade; in
${config.system.build.nixos-rebuild}/bin/nixos-rebuild switch ${toString cfg.flags}
'';
- startAt = optionalString cfg.enable cfg.dates;
+ startAt = optional cfg.enable cfg.dates;
};
};
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 2881d843760..8c0f0c2624b 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -276,6 +276,7 @@
telegraf = 256;
gitlab-runner = 257;
postgrey = 258;
+ hound = 259;
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
@@ -522,6 +523,7 @@
#telegraf = 256; # unused
gitlab-runner = 257;
postgrey = 258;
+ hound = 259;
# 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 403f326df3d..61596265124 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -77,6 +77,7 @@
./programs/man.nix
./programs/mosh.nix
./programs/nano.nix
+ ./programs/oblogout.nix
./programs/screen.nix
./programs/shadow.nix
./programs/shell.nix
@@ -166,6 +167,7 @@
./services/desktops/gnome3/gnome-keyring.nix
./services/desktops/gnome3/gnome-online-accounts.nix
./services/desktops/gnome3/gnome-online-miners.nix
+ ./services/desktops/gnome3/gnome-terminal-server.nix
./services/desktops/gnome3/gnome-user-share.nix
./services/desktops/gnome3/gvfs.nix
./services/desktops/gnome3/seahorse.nix
@@ -312,6 +314,7 @@
./services/monitoring/uptime.nix
./services/monitoring/zabbix-agent.nix
./services/monitoring/zabbix-server.nix
+ ./services/network-filesystems/cachefilesd.nix
./services/network-filesystems/drbd.nix
./services/network-filesystems/netatalk.nix
./services/network-filesystems/nfsd.nix
@@ -455,6 +458,7 @@
./services/scheduling/fcron.nix
./services/scheduling/marathon.nix
./services/search/elasticsearch.nix
+ ./services/search/hound.nix
./services/search/kibana.nix
./services/search/solr.nix
./services/security/clamav.nix
@@ -492,6 +496,7 @@
./services/web-apps/pump.io.nix
./services/web-apps/tt-rss.nix
./services/web-apps/selfoss.nix
+ ./services/web-apps/quassel-webserver.nix
./services/web-servers/apache-httpd/default.nix
./services/web-servers/caddy.nix
./services/web-servers/fcgiwrap.nix
@@ -531,6 +536,7 @@
./services/x11/window-managers/fluxbox.nix
./services/x11/window-managers/icewm.nix
./services/x11/window-managers/bspwm.nix
+ ./services/x11/window-managers/bspwm-unstable.nix
./services/x11/window-managers/metacity.nix
./services/x11/window-managers/none.nix
./services/x11/window-managers/twm.nix
diff --git a/nixos/modules/programs/oblogout.nix b/nixos/modules/programs/oblogout.nix
new file mode 100644
index 00000000000..79a8ddb7ce3
--- /dev/null
+++ b/nixos/modules/programs/oblogout.nix
@@ -0,0 +1,160 @@
+# Global configuration for oblogout.
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let cfg = config.programs.oblogout;
+
+in
+{
+ ###### interface
+
+ options = {
+
+ programs.oblogout = {
+
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to install OBLogout and create /etc/oblogout.conf.
+ See ${pkgs.oblogout}/share/doc/README.
+ '';
+ };
+
+ opacity = mkOption {
+ type = types.int;
+ default = 70;
+ description = ''
+ '';
+ };
+
+ bgcolor = mkOption {
+ type = types.str;
+ default = "black";
+ description = ''
+ '';
+ };
+
+ buttontheme = mkOption {
+ type = types.str;
+ default = "simplistic";
+ description = ''
+ '';
+ };
+
+ buttons = mkOption {
+ type = types.str;
+ default = "cancel, logout, restart, shutdown, suspend, hibernate";
+ description = ''
+ '';
+ };
+
+ cancel = mkOption {
+ type = types.str;
+ default = "Escape";
+ description = ''
+ '';
+ };
+
+ shutdown = mkOption {
+ type = types.str;
+ default = "S";
+ description = ''
+ '';
+ };
+
+ restart = mkOption {
+ type = types.str;
+ default = "R";
+ description = ''
+ '';
+ };
+
+ suspend = mkOption {
+ type = types.str;
+ default = "U";
+ description = ''
+ '';
+ };
+
+ logout = mkOption {
+ type = types.str;
+ default = "L";
+ description = ''
+ '';
+ };
+
+ lock = mkOption {
+ type = types.str;
+ default = "K";
+ description = ''
+ '';
+ };
+
+ hibernate = mkOption {
+ type = types.str;
+ default = "H";
+ description = ''
+ '';
+ };
+
+ clogout = mkOption {
+ type = types.str;
+ default = "openbox --exit";
+ description = ''
+ '';
+ };
+
+ clock = mkOption {
+ type = types.str;
+ default = "";
+ description = ''
+ '';
+ };
+
+ cswitchuser = mkOption {
+ type = types.str;
+ default = "";
+ description = ''
+ '';
+ };
+ };
+ };
+
+ ###### implementation
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = [ pkgs.oblogout ];
+
+ environment.etc."oblogout.conf".text = ''
+ [settings]
+ usehal = false
+
+ [looks]
+ opacity = ${toString cfg.opacity}
+ bgcolor = ${cfg.bgcolor}
+ buttontheme = ${cfg.buttontheme}
+ buttons = ${cfg.buttons}
+
+ [shortcuts]
+ cancel = ${cfg.cancel}
+ shutdown = ${cfg.shutdown}
+ restart = ${cfg.restart}
+ suspend = ${cfg.suspend}
+ logout = ${cfg.logout}
+ lock = ${cfg.lock}
+ hibernate = ${cfg.hibernate}
+
+ [commands]
+ shutdown = systemctl poweroff
+ restart = systemctl reboot
+ suspend = systemctl suspend
+ hibernate = systemctl hibernate
+ logout = ${cfg.clogout}
+ lock = ${cfg.clock}
+ switchuser = ${cfg.cswitchuser}
+ '';
+ };
+}
diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml
index 15ed4c04a23..226cf0382da 100644
--- a/nixos/modules/security/acme.xml
+++ b/nixos/modules/security/acme.xml
@@ -74,7 +74,28 @@ options for the security.acme module.
+security.acme.certs."foo.example.com" = {
+ webroot = "/var/www/challenges";
+ email = "foo@example.com";
+ user = "nginx";
+ group = "nginx";
+ postRun = "systemctl restart nginx.service";
+};
services.nginx.httpConfig = ''
+ server {
+ server_name foo.example.com;
+ listen 80;
+ listen [::]:80;
+
+ location /.well-known/acme-challenge {
+ root /var/www/challenges;
+ }
+
+ location / {
+ return 301 https://$host$request_uri;
+ }
+ }
+
server {
server_name foo.example.com;
listen 443 ssl;
diff --git a/nixos/modules/security/audit.nix b/nixos/modules/security/audit.nix
index ebfe594d0c7..7ac21fd9650 100644
--- a/nixos/modules/security/audit.nix
+++ b/nixos/modules/security/audit.nix
@@ -104,7 +104,11 @@ in {
description = "Kernel Auditing";
wantedBy = [ "basic.target" ];
- unitConfig.ConditionVirtualization = "!container";
+ unitConfig = {
+ ConditionVirtualization = "!container";
+ ConditionSecurity = [ "audit" ];
+ };
+
path = [ pkgs.audit ];
diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix
index 7ba25f866f2..53c2ace784e 100644
--- a/nixos/modules/security/grsecurity.nix
+++ b/nixos/modules/security/grsecurity.nix
@@ -67,9 +67,9 @@ in
system.requiredKernelConfig = with config.lib.kernelConfig;
[ (isEnabled "GRKERNSEC")
(isEnabled "PAX")
- (isYES "GRKERNSEC_SYSCTL")
- (isYES "GRKERNSEC_SYSCTL_DISTRO")
- (isNO "GRKERNSEC_NO_RBAC")
+ (isYes "GRKERNSEC_SYSCTL")
+ (isYes "GRKERNSEC_SYSCTL_DISTRO")
+ (isNo "GRKERNSEC_NO_RBAC")
];
nixpkgs.config.grsecurity = true;
diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix
index 85e0a7d2ac4..5ec2e2c2623 100644
--- a/nixos/modules/services/audio/mpd.nix
+++ b/nixos/modules/services/audio/mpd.nix
@@ -49,7 +49,7 @@ in {
};
extraConfig = mkOption {
- type = types.str;
+ type = types.lines;
default = "";
description = ''
Extra directives added to to the end of MPD's configuration file,
diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix
index ef8e5e55ede..340b0cf0723 100644
--- a/nixos/modules/services/backup/bacula.nix
+++ b/nixos/modules/services/backup/bacula.nix
@@ -340,6 +340,7 @@ in {
extraConfig = mkOption {
default = "";
+ type = types.lines;
description = ''
Extra configuration for Bacula Director Daemon.
'';
diff --git a/nixos/modules/services/databases/neo4j.nix b/nixos/modules/services/databases/neo4j.nix
index 146a604adb2..7b51f1af689 100644
--- a/nixos/modules/services/databases/neo4j.nix
+++ b/nixos/modules/services/databases/neo4j.nix
@@ -5,34 +5,34 @@ with lib;
let
cfg = config.services.neo4j;
- serverConfig = pkgs.writeText "neo4j-server.properties" ''
- org.neo4j.server.database.location=${cfg.dataDir}/data/graph.db
- org.neo4j.server.webserver.address=${cfg.listenAddress}
- org.neo4j.server.webserver.port=${toString cfg.port}
- ${optionalString cfg.enableHttps ''
- org.neo4j.server.webserver.https.enabled=true
- org.neo4j.server.webserver.https.port=${toString cfg.httpsPort}
- org.neo4j.server.webserver.https.cert.location=${cfg.cert}
- org.neo4j.server.webserver.https.key.location=${cfg.key}
- org.neo4j.server.webserver.https.keystore.location=${cfg.dataDir}/data/keystore
+ serverConfig = pkgs.writeText "neo4j.conf" ''
+ dbms.directories.data=${cfg.dataDir}/data
+ dbms.directories.certificates=${cfg.certDir}
+ dbms.directories.logs=${cfg.dataDir}/logs
+ dbms.directories.plugins=${cfg.dataDir}/plugins
+ dbms.connector.http.type=HTTP
+ dbms.connector.http.enabled=true
+ dbms.connector.http.address=${cfg.listenAddress}:${toString cfg.port}
+ ${optionalString cfg.enableBolt ''
+ dbms.connector.bolt.type=BOLT
+ dbms.connector.bolt.enabled=true
+ dbms.connector.bolt.tls_level=OPTIONAL
+ dbms.connector.bolt.address=${cfg.listenAddress}:${toString cfg.boltPort}
''}
- org.neo4j.server.webadmin.rrdb.location=${cfg.dataDir}/data/rrd
- org.neo4j.server.webadmin.data.uri=/db/data/
- org.neo4j.server.webadmin.management.uri=/db/manage/
- org.neo4j.server.db.tuning.properties=${cfg.package}/share/neo4j/conf/neo4j.properties
- org.neo4j.server.manage.console_engines=shell
+ ${optionalString cfg.enableHttps ''
+ dbms.connector.https.type=HTTP
+ dbms.connector.https.enabled=true
+ dbms.connector.https.encryption=TLS
+ dbms.connector.https.address=${cfg.listenAddress}:${toString cfg.httpsPort}
+ ''}
+ dbms.shell.enabled=true
${cfg.extraServerConfig}
'';
- loggingConfig = pkgs.writeText "logging.properties" cfg.loggingConfig;
-
wrapperConfig = pkgs.writeText "neo4j-wrapper.conf" ''
- wrapper.java.additional=-Dorg.neo4j.server.properties=${serverConfig}
- wrapper.java.additional=-Djava.util.logging.config.file=${loggingConfig}
- wrapper.java.additional=-XX:+UseConcMarkSweepGC
- wrapper.java.additional=-XX:+CMSClassUnloadingEnabled
- wrapper.pidfile=${cfg.dataDir}/neo4j-server.pid
- wrapper.name=neo4j
+ dbms.jvm.additional=-Dunsupported.dbms.udc.source=tarball
+ dbms.jvm.additional=-XX:+UseConcMarkSweepGC
+ dbms.jvm.additional=-XX:+CMSClassUnloadingEnabled
'';
in {
@@ -65,6 +65,18 @@ in {
type = types.int;
};
+ enableBolt = mkOption {
+ description = "Enable bolt for Neo4j.";
+ default = true;
+ type = types.bool;
+ };
+
+ boltPort = mkOption {
+ description = "Neo4j port to listen for BOLT traffic.";
+ default = 7687;
+ type = types.int;
+ };
+
enableHttps = mkOption {
description = "Enable https for Neo4j.";
default = false;
@@ -77,15 +89,9 @@ in {
type = types.int;
};
- cert = mkOption {
- description = "Neo4j https certificate.";
- default = "${cfg.dataDir}/conf/ssl/neo4j.cert";
- type = types.path;
- };
-
- key = mkOption {
- description = "Neo4j https certificate key.";
- default = "${cfg.dataDir}/conf/ssl/neo4j.key";
+ certDir = mkOption {
+ description = "Neo4j TLS certificates directory.";
+ default = "${cfg.dataDir}/certificates";
type = types.path;
};
@@ -95,26 +101,11 @@ in {
type = types.path;
};
- loggingConfig = mkOption {
- description = "Neo4j logging configuration.";
- default = ''
- handlers=java.util.logging.ConsoleHandler
- .level=INFO
- org.neo4j.server.level=INFO
-
- java.util.logging.ConsoleHandler.level=INFO
- java.util.logging.ConsoleHandler.formatter=org.neo4j.server.logging.SimpleConsoleFormatter
- java.util.logging.ConsoleHandler.filter=org.neo4j.server.logging.NeoLogFilter
- '';
- type = types.lines;
- };
-
extraServerConfig = mkOption {
description = "Extra configuration for neo4j server.";
default = "";
type = types.lines;
};
-
};
###### implementation
@@ -124,14 +115,18 @@ in {
description = "Neo4j Daemon";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
- environment = { NEO4J_INSTANCE = cfg.dataDir; };
+ environment = {
+ NEO4J_HOME = "${cfg.package}/share/neo4j";
+ NEO4J_CONF = "${cfg.dataDir}/conf";
+ };
serviceConfig = {
ExecStart = "${cfg.package}/bin/neo4j console";
User = "neo4j";
PermissionsStartOnly = true;
};
preStart = ''
- mkdir -m 0700 -p ${cfg.dataDir}/{data/graph.db,conf}
+ mkdir -m 0700 -p ${cfg.dataDir}/{data/graph.db,conf,logs}
+ ln -fs ${serverConfig} ${cfg.dataDir}/conf/neo4j.conf
ln -fs ${wrapperConfig} ${cfg.dataDir}/conf/neo4j-wrapper.conf
if [ "$(id -u)" = 0 ]; then chown -R neo4j ${cfg.dataDir}; fi
'';
@@ -146,5 +141,4 @@ in {
home = cfg.dataDir;
};
};
-
}
diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index 9f22aa7c92b..b8e6c0cec3d 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -53,6 +53,13 @@ in
description = "The database directory.";
};
+ configDir = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ description = "Use this optional config directory instead of using slapd.conf";
+ example = "/var/db/slapd.d";
+ };
+
extraConfig = mkOption {
type = types.lines;
default = "";
@@ -96,7 +103,7 @@ in
mkdir -p ${cfg.dataDir}
chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}
'';
- serviceConfig.ExecStart = "${openldap.out}/libexec/slapd -u ${cfg.user} -g ${cfg.group} -d 0 -h \"${concatStringsSep " " cfg.urlList}\" -f ${configFile}";
+ serviceConfig.ExecStart = "${openldap.out}/libexec/slapd -u ${cfg.user} -g ${cfg.group} -d 0 -h \"${concatStringsSep " " cfg.urlList}\" ${if cfg.configDir == null then "-f "+configFile else "-F "+cfg.configDir}";
};
users.extraUsers.openldap =
diff --git a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
index a8f8da0eed5..2db2e2fe1c3 100644
--- a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
+++ b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
@@ -37,6 +37,8 @@ in
services.dbus.packages = [ gnome3.evolution_data_server ];
+ systemd.packages = [ gnome3.evolution_data_server ];
+
};
}
diff --git a/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix b/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix
new file mode 100644
index 00000000000..384cede679c
--- /dev/null
+++ b/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix
@@ -0,0 +1,44 @@
+# GNOME Documents daemon.
+
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+ gnome3 = config.environment.gnome3.packageSet;
+in
+{
+
+ ###### interface
+
+ options = {
+
+ services.gnome3.gnome-terminal-server = {
+
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to enable GNOME Terminal server service,
+ needed for gnome-terminal.
+ '';
+ };
+
+ };
+
+ };
+
+
+ ###### implementation
+
+ config = mkIf config.services.gnome3.gnome-terminal-server.enable {
+
+ environment.systemPackages = [ gnome3.gnome_terminal ];
+
+ services.dbus.packages = [ gnome3.gnome_terminal ];
+
+ systemd.packages = [ gnome3.gnome_terminal ];
+
+ };
+
+}
diff --git a/nixos/modules/services/desktops/gnome3/gvfs.nix b/nixos/modules/services/desktops/gnome3/gvfs.nix
index a07cdadbb12..6bbabe8d3c5 100644
--- a/nixos/modules/services/desktops/gnome3/gvfs.nix
+++ b/nixos/modules/services/desktops/gnome3/gvfs.nix
@@ -37,6 +37,8 @@ in
services.dbus.packages = [ gnome3.gvfs ];
+ systemd.packages = [ gnome3.gvfs ];
+
services.udev.packages = [ pkgs.libmtp.bin ];
};
diff --git a/nixos/modules/services/desktops/gnome3/tracker.nix b/nixos/modules/services/desktops/gnome3/tracker.nix
index 8c5935a5ee3..dcaa60103a3 100644
--- a/nixos/modules/services/desktops/gnome3/tracker.nix
+++ b/nixos/modules/services/desktops/gnome3/tracker.nix
@@ -37,6 +37,8 @@ in
services.dbus.packages = [ gnome3.tracker ];
+ systemd.packages = [ gnome3.tracker ];
+
};
}
diff --git a/nixos/modules/services/hardware/brltty.nix b/nixos/modules/services/hardware/brltty.nix
index 03e530b2c96..b416ba33222 100644
--- a/nixos/modules/services/hardware/brltty.nix
+++ b/nixos/modules/services/hardware/brltty.nix
@@ -28,7 +28,7 @@ in {
};
serviceConfig = {
ExecStart = "${pkgs.brltty}/bin/brltty --no-daemon";
- Type = "simple"; # Change to notidy after next releae
+ Type = "notify";
TimeoutStartSec = 5;
TimeoutStopSec = 10;
Restart = "always";
diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix
index 281d02a8c65..f36a9e7b459 100644
--- a/nixos/modules/services/hardware/tlp.nix
+++ b/nixos/modules/services/hardware/tlp.nix
@@ -40,7 +40,7 @@ in
};
extraConfig = mkOption {
- type = types.str;
+ type = types.lines;
default = "";
description = "Additional configuration variables for TLP";
};
diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index e79d5dadd82..4c9df935deb 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -111,7 +111,7 @@ in
};
extraConfig = mkOption {
- type = types.str;
+ type = types.lines;
default = "";
example = "mail_debug = yes";
description = "Additional entries to put verbatim into Dovecot's config file.";
diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix
index fb94560e10a..53acdba4245 100644
--- a/nixos/modules/services/mail/opensmtpd.nix
+++ b/nixos/modules/services/mail/opensmtpd.nix
@@ -1,17 +1,16 @@
{ config, lib, pkgs, ... }:
-with pkgs;
with lib;
let
cfg = config.services.opensmtpd;
- conf = writeText "smtpd.conf" cfg.serverConfiguration;
+ conf = pkgs.writeText "smtpd.conf" cfg.serverConfiguration;
args = concatStringsSep " " cfg.extraServerArgs;
sendmail = pkgs.runCommand "opensmtpd-sendmail" {} ''
mkdir -p $out/bin
- ln -s ${opensmtpd}/sbin/smtpctl $out/bin/sendmail
+ ln -s ${pkgs.opensmtpd}/sbin/smtpctl $out/bin/sendmail
'';
in {
@@ -48,21 +47,19 @@ in {
};
serverConfiguration = mkOption {
- type = types.string;
- default = "";
+ type = types.lines;
example = ''
listen on lo
accept for any deliver to lmtp localhost:24
- '';
+ '';
description = ''
The contents of the smtpd.conf configuration file. See the
- OpenSMTPD documentation for syntax information. If this option
- is left empty, the OpenSMTPD server will not start.
+ OpenSMTPD documentation for syntax information.
'';
};
procPackages = mkOption {
- type = types.listOf types.path;
+ type = types.listOf types.package;
default = [];
description = ''
Packages to search for filters, tables, queues, and schedulers.
@@ -100,12 +97,11 @@ in {
systemd.services.opensmtpd = let
procEnv = pkgs.buildEnv {
name = "opensmtpd-procs";
- paths = [ opensmtpd ] ++ cfg.procPackages;
+ paths = [ pkgs.opensmtpd ] ++ cfg.procPackages;
pathsToLink = [ "/libexec/opensmtpd" ];
};
in {
wantedBy = [ "multi-user.target" ];
- wants = [ "network.target" ];
after = [ "network.target" ];
preStart = ''
mkdir -p /var/spool/smtpd
@@ -119,7 +115,7 @@ in {
chown smtpq.root /var/spool/smtpd/purge
chmod 700 /var/spool/smtpd/purge
'';
- serviceConfig.ExecStart = "${opensmtpd}/sbin/smtpd -d -f ${conf} ${args}";
+ serviceConfig.ExecStart = "${pkgs.opensmtpd}/sbin/smtpd -d -f ${conf} ${args}";
environment.OPENSMTPD_PROC_PATH = "${procEnv}/libexec/opensmtpd";
};
diff --git a/nixos/modules/services/misc/bepasty.nix b/nixos/modules/services/misc/bepasty.nix
index 5bda73ab64f..52719222db6 100644
--- a/nixos/modules/services/misc/bepasty.nix
+++ b/nixos/modules/services/misc/bepasty.nix
@@ -53,7 +53,7 @@ in
};
extraConfig = mkOption {
- type = types.str;
+ type = types.lines;
description = ''
Extra configuration for bepasty server to be appended on the
configuration.
diff --git a/nixos/modules/services/misc/dictd.nix b/nixos/modules/services/misc/dictd.nix
index ef744439c3d..24dca15dd91 100644
--- a/nixos/modules/services/misc/dictd.nix
+++ b/nixos/modules/services/misc/dictd.nix
@@ -2,6 +2,10 @@
with lib;
+let
+ cfg = config.services.dictd;
+in
+
{
###### interface
@@ -20,7 +24,7 @@ with lib;
DBs = mkOption {
type = types.listOf types.package;
- default = [];
+ default = with pkgs.dictdDBs; [ wiktionary wordnet ];
example = [ pkgs.dictdDBs.nld2eng ];
description = ''List of databases to make available.'';
};
@@ -34,8 +38,8 @@ with lib;
config = let dictdb = pkgs.dictDBCollector { dictlist = map (x: {
name = x.name;
- filename = x; } ) config.services.dictd.DBs; };
- in mkIf config.services.dictd.enable {
+ filename = x; } ) cfg.DBs; };
+ in mkIf cfg.enable {
# get the command line client on system path to make some use of the service
environment.systemPackages = [ pkgs.dict ];
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index f8881233dce..3e4584c7a51 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -463,6 +463,7 @@ in {
systemd.services.gitlab = {
after = [ "network.target" "postgresql.service" "redis.service" ];
+ requires = [ "gitlab-sidekiq.service" ];
wantedBy = [ "multi-user.target" ];
environment = gitlabEnv;
path = with pkgs; [
diff --git a/nixos/modules/services/misc/nix-gc.nix b/nixos/modules/services/misc/nix-gc.nix
index 5c13da6e83d..304168c65b0 100644
--- a/nixos/modules/services/misc/nix-gc.nix
+++ b/nixos/modules/services/misc/nix-gc.nix
@@ -53,7 +53,7 @@ in
systemd.services.nix-gc =
{ description = "Nix Garbage Collector";
script = "exec ${config.nix.package.out}/bin/nix-collect-garbage ${cfg.options}";
- startAt = optionalString cfg.automatic cfg.dates;
+ startAt = optional cfg.automatic cfg.dates;
};
};
diff --git a/nixos/modules/services/misc/nix-optimise.nix b/nixos/modules/services/misc/nix-optimise.nix
index 87ce05c5a11..a76bfd9f1f1 100644
--- a/nixos/modules/services/misc/nix-optimise.nix
+++ b/nixos/modules/services/misc/nix-optimise.nix
@@ -41,7 +41,7 @@ in
systemd.services.nix-optimise =
{ description = "Nix Store Optimiser";
serviceConfig.ExecStart = "${config.nix.package}/bin/nix-store --optimise";
- startAt = optional cfg.automatic cfg.dates;
+ startAt = optionals cfg.automatic cfg.dates;
};
};
diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix
index 7c9483911f2..e3f1ec67cbb 100644
--- a/nixos/modules/services/misc/redmine.nix
+++ b/nixos/modules/services/misc/redmine.nix
@@ -71,7 +71,7 @@ in {
};
extraConfig = mkOption {
- type = types.str;
+ type = types.lines;
default = "";
description = "Extra configuration in configuration.yml";
};
diff --git a/nixos/modules/services/monitoring/bosun.nix b/nixos/modules/services/monitoring/bosun.nix
index 9a1e790d3ab..496838a131b 100644
--- a/nixos/modules/services/monitoring/bosun.nix
+++ b/nixos/modules/services/monitoring/bosun.nix
@@ -107,7 +107,7 @@ in {
};
extraConfig = mkOption {
- type = types.string;
+ type = types.lines;
default = "";
description = ''
Extra configuration options for Bosun. You should describe your
diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index 1de3320dc42..b8be9296bc9 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -167,7 +167,7 @@ in {
CACHE_TYPE: 'filesystem'
CACHE_DIR: '/tmp/graphite-api-cache'
'';
- type = types.str;
+ type = types.lines;
};
};
diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix
index aaa041ad4cd..57df16b58d9 100644
--- a/nixos/modules/services/monitoring/munin.nix
+++ b/nixos/modules/services/monitoring/munin.nix
@@ -100,6 +100,7 @@ in
extraConfig = mkOption {
default = "";
+ type = types.lines;
description = ''
munin-node.conf extra configuration. See
diff --git a/nixos/modules/services/monitoring/riemann-tools.nix b/nixos/modules/services/monitoring/riemann-tools.nix
index ce277f09464..de858813a76 100644
--- a/nixos/modules/services/monitoring/riemann-tools.nix
+++ b/nixos/modules/services/monitoring/riemann-tools.nix
@@ -50,6 +50,7 @@ in {
systemd.services.riemann-health = {
wantedBy = [ "multi-user.target" ];
+ path = [ procps ];
serviceConfig = {
User = "riemanntools";
ExecStart = "${healthLauncher}/bin/riemann-health";
diff --git a/nixos/modules/services/monitoring/zabbix-agent.nix b/nixos/modules/services/monitoring/zabbix-agent.nix
index a943075be0c..88a63b4bf16 100644
--- a/nixos/modules/services/monitoring/zabbix-agent.nix
+++ b/nixos/modules/services/monitoring/zabbix-agent.nix
@@ -53,6 +53,7 @@ in
extraConfig = mkOption {
default = "";
+ type = types.lines;
description = ''
Configuration that is injected verbatim into the configuration file.
'';
diff --git a/nixos/modules/services/network-filesystems/cachefilesd.nix b/nixos/modules/services/network-filesystems/cachefilesd.nix
new file mode 100644
index 00000000000..61981340840
--- /dev/null
+++ b/nixos/modules/services/network-filesystems/cachefilesd.nix
@@ -0,0 +1,59 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+
+ cfg = config.services.cachefilesd;
+
+ cfgFile = pkgs.writeText "cachefilesd.conf" ''
+ dir ${cfg.cacheDir}
+ ${cfg.extraConfig}
+ '';
+
+in
+
+{
+ options = {
+ services.cachefilesd = {
+
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Whether to enable cachefilesd network filesystems caching daemon.";
+ };
+
+ cacheDir = mkOption {
+ type = types.str;
+ default = "/var/cache/fscache";
+ description = "Directory to contain filesystem cache.";
+ };
+
+ extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ example = "brun 10%";
+ description = "Additional configuration file entries. See cachefilesd.conf(5) for more information.";
+ };
+
+ };
+ };
+
+ ###### implementation
+
+ config = mkIf cfg.enable {
+
+ systemd.services.cachefilesd = {
+ description = "Local network file caching management daemon";
+ wantedBy = [ "multi-user.target" ];
+ path = [ pkgs.kmod pkgs.cachefilesd ];
+ script = ''
+ modprobe -qab cachefiles
+ mkdir -p ${cfg.cacheDir}
+ chmod 700 ${cfg.cacheDir}
+ exec cachefilesd -n -f ${cfgFile}
+ '';
+ };
+
+ };
+}
diff --git a/nixos/modules/services/network-filesystems/xtreemfs.nix b/nixos/modules/services/network-filesystems/xtreemfs.nix
index b051214e1d0..0c6714563d8 100644
--- a/nixos/modules/services/network-filesystems/xtreemfs.nix
+++ b/nixos/modules/services/network-filesystems/xtreemfs.nix
@@ -153,6 +153,7 @@ in
'';
};
extraConfig = mkOption {
+ type = types.lines;
default = "";
example = ''
# specify whether SSL is required
@@ -173,6 +174,7 @@ in
replication = {
enable = mkEnableOption "XtreemFS DIR replication plugin";
extraConfig = mkOption {
+ type = types.lines;
example = ''
# participants of the replication including this replica
babudb.repl.participant.0 = 192.168.0.10
@@ -269,6 +271,7 @@ in
'';
};
extraConfig = mkOption {
+ type = types.lines;
example = ''
osd_check_interval = 300
no_atime = true
@@ -307,6 +310,7 @@ in
replication = {
enable = mkEnableOption "XtreemFS MRC replication plugin";
extraConfig = mkOption {
+ type = types.lines;
example = ''
# participants of the replication including this replica
babudb.repl.participant.0 = 192.168.0.10
@@ -385,6 +389,7 @@ in
'';
};
extraConfig = mkOption {
+ type = types.lines;
example = ''
local_clock_renewal = 0
remote_time_sync = 30000
diff --git a/nixos/modules/services/networking/atftpd.nix b/nixos/modules/services/networking/atftpd.nix
index d875ddc6352..e7fd48c99a8 100644
--- a/nixos/modules/services/networking/atftpd.nix
+++ b/nixos/modules/services/networking/atftpd.nix
@@ -20,13 +20,27 @@ in
default = false;
type = types.bool;
description = ''
- Whenever to enable the atftpd TFTP server.
+ Whether to enable the atftpd TFTP server. By default, the server
+ binds to address 0.0.0.0.
+ '';
+ };
+
+ extraOptions = mkOption {
+ default = [];
+ type = types.listOf types.str;
+ example = literalExample ''
+ [ "--bind-address 192.168.9.1"
+ "--verbose=7"
+ ]
+ '';
+ description = ''
+ Extra command line arguments to pass to atftp.
'';
};
root = mkOption {
- default = "/var/empty";
- type = types.str;
+ default = "/srv/tftp";
+ type = types.path;
description = ''
Document root directory for the atftpd.
'';
@@ -39,11 +53,11 @@ in
config = mkIf cfg.enable {
systemd.services.atftpd = {
- description = "atftpd TFTP server";
+ description = "TFTP Server";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
# runs as nobody
- serviceConfig.ExecStart = "${pkgs.atftp}/sbin/atftpd --daemon --no-fork --bind-address 0.0.0.0 ${cfg.root}";
+ serviceConfig.ExecStart = "${pkgs.atftp}/sbin/atftpd --daemon --no-fork ${lib.concatStringsSep " " cfg.extraOptions} ${cfg.root}";
};
};
diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix
index ecc091d1d03..6a786e75bbc 100644
--- a/nixos/modules/services/networking/avahi-daemon.nix
+++ b/nixos/modules/services/networking/avahi-daemon.nix
@@ -175,11 +175,20 @@ in
environment.systemPackages = [ pkgs.avahi ];
+ systemd.sockets.avahi-daemon =
+ { description = "Avahi mDNS/DNS-SD Stack Activation Socket";
+ listenStreams = [ "/var/run/avahi-daemon/socket" ];
+ wantedBy = [ "sockets.target" ];
+ };
+
systemd.services.avahi-daemon =
- { description = "Avahi daemon";
+ { description = "Avahi mDNS/DNS-SD Stack";
wantedBy = [ "multi-user.target" ];
- # Receive restart event after resume
- partOf = [ "post-resume.target" ];
+ requires = [ "avahi-daemon.socket" ];
+
+ serviceConfig."NotifyAccess" = "main";
+ serviceConfig."BusName" = "org.freedesktop.Avahi";
+ serviceConfig."Type" = "dbus";
path = [ pkgs.coreutils pkgs.avahi ];
diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix
index 41d7128ec31..72110e62576 100644
--- a/nixos/modules/services/networking/bind.nix
+++ b/nixos/modules/services/networking/bind.nix
@@ -113,6 +113,7 @@ in
};
extraConfig = mkOption {
+ type = types.lines;
default = "";
description = "
Extra lines to be added verbatim to the generated named configuration file.
diff --git a/nixos/modules/services/networking/chrony.nix b/nixos/modules/services/networking/chrony.nix
index a38142b4a08..d40865ebbd5 100644
--- a/nixos/modules/services/networking/chrony.nix
+++ b/nixos/modules/services/networking/chrony.nix
@@ -51,6 +51,7 @@ in
};
extraConfig = mkOption {
+ type = types.lines;
default = "";
description = ''
Extra configuration directives that should be added to
diff --git a/nixos/modules/services/networking/cjdns-hosts.sh b/nixos/modules/services/networking/cjdns-hosts.sh
deleted file mode 100644
index 8a2b47e5214..00000000000
--- a/nixos/modules/services/networking/cjdns-hosts.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-pubs=($pubs)
-hosts=($hosts)
-
-lines="''\n"
-for ((i = 0; i < ${#pubs[*]}; i++)); do
- addr=$($cjdns/bin/publictoip6 ${pubs[i]})
- lines="${lines}$addr ${hosts[i]}\n"
-done
-lines="${lines}''"
-
-echo -ne $lines > $out
diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix
index cb00139c5f1..5e15e40ea0c 100644
--- a/nixos/modules/services/networking/cjdns.nix
+++ b/nixos/modules/services/networking/cjdns.nix
@@ -28,21 +28,18 @@ let
};
};
- peers = mapAttrsToList (n: v: v) (cfg.ETHInterface.connectTo // cfg.UDPInterface.connectTo);
-
- pubs = toString (map (p: if p.hostname == "" then "" else p.publicKey) peers);
- hosts = toString (map (p: if p.hostname == "" then "" else p.hostname) peers);
-
- cjdnsHosts =
- if hosts != "" then
- import (pkgs.stdenv.mkDerivation {
- name = "cjdns-hosts";
- builder = ./cjdns-hosts.sh;
-
- inherit (pkgs) cjdns;
- inherit pubs hosts;
- })
- else "";
+ # Additional /etc/hosts entries for peers with an associated hostname
+ cjdnsExtraHosts = import (pkgs.runCommand "cjdns-hosts" {}
+ # Generate a builder that produces an output usable as a Nix string value
+ ''
+ exec >$out
+ echo \'\'
+ ${concatStringsSep "\n" (mapAttrsToList (k: v:
+ optionalString (v.hostname != "")
+ "echo $(${pkgs.cjdns}/bin/publictoip6 ${x.key}) ${x.host}")
+ (cfg.ETHInterface.connectTo // cfg.UDPInterface.connectTo))}
+ echo \'\'
+ '');
parseModules = x:
x // { connectTo = mapAttrs (name: value: { inherit (value) password publicKey; }) x.connectTo; };
@@ -95,8 +92,8 @@ in
};
confFile = mkOption {
- type = types.str;
- default = "";
+ type = types.nullOr types.path;
+ default = null;
example = "/etc/cjdroute.conf";
description = ''
Ignore all other cjdns options and load configuration from this file.
@@ -112,14 +109,14 @@ in
"49275fut6tmzu354pq70sr5b95qq0vj"
];
description = ''
- Any remote cjdns nodes that offer these passwords on
+ Any remote cjdns nodes that offer these passwords on
connection will be allowed to route through this node.
'';
};
-
+
admin = {
bind = mkOption {
- type = types.string;
+ type = types.str;
default = "127.0.0.1:11234";
description = ''
Bind the administration port to this address and port.
@@ -129,7 +126,7 @@ in
UDPInterface = {
bind = mkOption {
- type = types.string;
+ type = types.str;
default = "";
example = "192.168.1.32:43211";
description = ''
@@ -154,6 +151,7 @@ in
ETHInterface = {
bind = mkOption {
+ type = types.str;
default = "";
example = "eth0";
description =
@@ -201,7 +199,7 @@ in
};
- config = mkIf config.services.cjdns.enable {
+ config = mkIf cfg.enable {
boot.kernelModules = [ "tun" ];
@@ -212,7 +210,7 @@ in
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
- preStart = if cfg.confFile != "" then "" else ''
+ preStart = if cfg.confFile != null then "" else ''
[ -e /etc/cjdns.keys ] && source /etc/cjdns.keys
if [ -z "$CJDNS_PRIVATE_KEY" ]; then
@@ -228,13 +226,13 @@ in
fi
if [ -z "$CJDNS_ADMIN_PASSWORD" ]; then
- echo "CJDNS_ADMIN_PASSWORD=$(${pkgs.coreutils}/bin/head -c 96 /dev/urandom | ${pkgs.coreutils}/bin/tr -dc A-Za-z0-9)" \
+ echo "CJDNS_ADMIN_PASSWORD=$(tr -dc A-Za-z0-9 > /etc/cjdns.keys
fi
'';
script = (
- if cfg.confFile != "" then "${pkg}/bin/cjdroute < ${cfg.confFile}" else
+ if cfg.confFile != null then "${pkg}/bin/cjdroute < ${cfg.confFile}" else
''
source /etc/cjdns.keys
echo '${cjdrouteConf}' | sed \
@@ -247,13 +245,16 @@ in
serviceConfig = {
Type = "forking";
Restart = "on-failure";
+
+ ProtectHome = true;
+ PrivateTmp = true;
};
};
- networking.extraHosts = "${cjdnsHosts}";
+ networking.extraHosts = cjdnsExtraHosts;
assertions = [
- { assertion = ( cfg.ETHInterface.bind != "" || cfg.UDPInterface.bind != "" || cfg.confFile != "" );
+ { assertion = ( cfg.ETHInterface.bind != "" || cfg.UDPInterface.bind != "" || cfg.confFile != null );
message = "Neither cjdns.ETHInterface.bind nor cjdns.UDPInterface.bind defined.";
}
{ assertion = config.networking.enableIPv6;
diff --git a/nixos/modules/services/networking/cntlm.nix b/nixos/modules/services/networking/cntlm.nix
index 76c0fd7d0ea..890ff508407 100644
--- a/nixos/modules/services/networking/cntlm.nix
+++ b/nixos/modules/services/networking/cntlm.nix
@@ -61,6 +61,7 @@ in
};
extraConfig = mkOption {
+ type = types.lines;
default = "";
description = "Verbatim contents of cntlm.conf.";
};
diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix
index e74d68cad90..5050ecbd749 100644
--- a/nixos/modules/services/networking/ddclient.nix
+++ b/nixos/modules/services/networking/ddclient.nix
@@ -89,7 +89,7 @@ in
extraConfig = mkOption {
default = "";
- type = str;
+ type = lines;
description = ''
Extra configuration. Contents will be added verbatim to the configuration file.
'';
diff --git a/nixos/modules/services/networking/dhcpd.nix b/nixos/modules/services/networking/dhcpd.nix
index 36b4c5d5c1e..d2cd00e74a1 100644
--- a/nixos/modules/services/networking/dhcpd.nix
+++ b/nixos/modules/services/networking/dhcpd.nix
@@ -47,6 +47,7 @@ in
};
extraConfig = mkOption {
+ type = types.lines;
default = "";
example = ''
option subnet-mask 255.255.255.0;
diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index 2714e8d7599..5a24db8ccba 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -35,7 +35,11 @@ in
options = {
services.dnscrypt-proxy = {
- enable = mkEnableOption "DNSCrypt client proxy";
+ enable = mkOption {
+ default = false;
+ type = types.bool;
+ description = "Whether to enable the DNSCrypt client proxy";
+ };
localAddress = mkOption {
default = "127.0.0.1";
diff --git a/nixos/modules/services/networking/dnscrypt-proxy.xml b/nixos/modules/services/networking/dnscrypt-proxy.xml
index e212a8d3e2c..982961833ad 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.xml
+++ b/nixos/modules/services/networking/dnscrypt-proxy.xml
@@ -49,8 +49,8 @@
{
- services.dnsmasq.enable = true;
- services.dnsmasq.servers = [ "127.0.0.1#43" ];
+ services.dnsmasq.enable = true;
+ services.dnsmasq.servers = [ "127.0.0.1#43" ];
}
@@ -60,12 +60,9 @@
{
- networking.nameservers = [ "127.0.0.1" ];
- services.unbound.enable = true;
- services.unbound.forwardAddresses = [ "127.0.0.1@43" ];
- services.unbound.extraConfig = ''
- do-not-query-localhost: no
- '';
+ networking.nameservers = [ "127.0.0.1" ];
+ services.unbound.enable = true;
+ services.unbound.forwardAddresses = [ "127.0.0.1@43" ];
}
diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix
index 287964aab07..51f95af4802 100644
--- a/nixos/modules/services/networking/hostapd.nix
+++ b/nixos/modules/services/networking/hostapd.nix
@@ -140,7 +140,7 @@ in
ieee80211n=1
ht_capab=[HT40-][SHORT-GI-40][DSSS_CCK-40]
'';
- type = types.string;
+ type = types.lines;
description = "Extra configuration options to put in hostapd.conf.";
};
};
diff --git a/nixos/modules/services/networking/kippo.nix b/nixos/modules/services/networking/kippo.nix
index 1e7f7437b8a..834de4fdc09 100644
--- a/nixos/modules/services/networking/kippo.nix
+++ b/nixos/modules/services/networking/kippo.nix
@@ -46,7 +46,7 @@ rec {
};
extraConfig = mkOption {
default = "";
- type = types.string;
+ type = types.lines;
description = ''Extra verbatim configuration added to the end of kippo.cfg.'';
};
};
diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix
index 134544cda68..81f968ae9fe 100644
--- a/nixos/modules/services/networking/murmur.nix
+++ b/nixos/modules/services/networking/murmur.nix
@@ -230,7 +230,7 @@ in
};
extraConfig = mkOption {
- type = types.str;
+ type = types.lines;
default = "";
description = "Extra configuration to put into mumur.ini.";
};
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 65ffaece477..8f353979d3f 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -198,6 +198,9 @@ in {
{ source = "${networkmanager_l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name";
target = "NetworkManager/VPN/nm-l2tp-service.name";
}
+ { source = "${networkmanager_strongswan}/etc/NetworkManager/VPN/nm-strongswan-service.name";
+ target = "NetworkManager/VPN/nm-strongswan-service.name";
+ }
] ++ optional (cfg.appendNameservers == [] || cfg.insertNameservers == [])
{ source = overrideNameserversScript;
target = "NetworkManager/dispatcher.d/02overridedns";
diff --git a/nixos/modules/services/networking/openfire.nix b/nixos/modules/services/networking/openfire.nix
index ed91b45ec94..454b504eda2 100644
--- a/nixos/modules/services/networking/openfire.nix
+++ b/nixos/modules/services/networking/openfire.nix
@@ -47,7 +47,7 @@ with lib;
export HOME=/tmp
mkdir /var/log/openfire || true
mkdir /etc/openfire || true
- for i in ${openfire}/conf.inst/*; do
+ for i in ${pkgs.openfire}/conf.inst/*; do
if ! test -f /etc/openfire/$(basename $i); then
cp $i /etc/openfire/
fi
diff --git a/nixos/modules/services/networking/prayer.nix b/nixos/modules/services/networking/prayer.nix
index cb8fe6bf4fe..9d63f549b23 100644
--- a/nixos/modules/services/networking/prayer.nix
+++ b/nixos/modules/services/networking/prayer.nix
@@ -56,6 +56,7 @@ in
};
extraConfig = mkOption {
+ type = types.lines;
default = "" ;
description = ''
Extra configuration. Contents will be added verbatim to the configuration file.
diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix
index 247c4f1efb0..5682b506344 100644
--- a/nixos/modules/services/networking/prosody.nix
+++ b/nixos/modules/services/networking/prosody.nix
@@ -195,6 +195,7 @@ in
};
extraConfig = mkOption {
+ type = types.lines;
default = '''';
description = "Additional prosody configuration";
};
diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix
index cc373ae892a..0c1f8d8cdb9 100644
--- a/nixos/modules/services/networking/smokeping.nix
+++ b/nixos/modules/services/networking/smokeping.nix
@@ -244,7 +244,7 @@ in
description = "Target configuration";
};
extraConfig = mkOption {
- type = types.string;
+ type = types.lines;
default = "";
description = "Any additional customization not already included.";
};
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 3e9fae35847..81941ce1cfb 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -242,7 +242,7 @@ in
systemd =
let
- service =
+ sshd-service =
{ description = "SSH Daemon";
wantedBy = optional (!cfg.startWhenNeeded) "multi-user.target";
@@ -253,16 +253,8 @@ in
environment.LD_LIBRARY_PATH = nssModulesPath;
- preStart =
- ''
- mkdir -m 0755 -p /etc/ssh
-
- ${flip concatMapStrings cfg.hostKeys (k: ''
- if ! [ -f "${k.path}" ]; then
- ssh-keygen -t "${k.type}" ${if k ? bits then "-b ${toString k.bits}" else ""} -f "${k.path}" -N ""
- fi
- '')}
- '';
+ wants = [ "sshd-keygen.service" ];
+ after = [ "sshd-keygen.service" ];
serviceConfig =
{ ExecStart =
@@ -278,6 +270,26 @@ in
PIDFile = "/run/sshd.pid";
});
};
+
+ sshd-keygen-service =
+ { description = "SSH Host Key Generation";
+ path = [ cfgc.package ];
+ script =
+ ''
+ mkdir -m 0755 -p /etc/ssh
+ ${flip concatMapStrings cfg.hostKeys (k: ''
+ if ! [ -f "${k.path}" ]; then
+ ssh-keygen -t "${k.type}" ${if k ? bits then "-b ${toString k.bits}" else ""} -f "${k.path}" -N ""
+ fi
+ '')}
+ '';
+
+ serviceConfig = {
+ Type = "oneshot";
+ RemainAfterExit = "yes";
+ };
+ };
+
in
if cfg.startWhenNeeded then {
@@ -289,11 +301,13 @@ in
socketConfig.Accept = true;
};
- services."sshd@" = service;
+ services.sshd-keygen = sshd-keygen-service;
+ services."sshd@" = sshd-service;
} else {
- services.sshd = service;
+ services.sshd-keygen = sshd-keygen-service;
+ services.sshd = sshd-service;
};
diff --git a/nixos/modules/services/networking/supplicant.nix b/nixos/modules/services/networking/supplicant.nix
index e433ec7c5b9..0c459fb1dd0 100644
--- a/nixos/modules/services/networking/supplicant.nix
+++ b/nixos/modules/services/networking/supplicant.nix
@@ -34,7 +34,8 @@ let
'';
in
{ description = "Supplicant ${iface}${optionalString (iface=="WLAN"||iface=="LAN") " %I"}";
- wantedBy = [ "network.target" ] ++ deps;
+ wantedBy = [ "multi-user.target" ] ++ deps;
+ wants = [ "network.target" ];
bindsTo = deps;
after = deps;
before = [ "network.target" ];
diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index 8a430734319..dcdc203bdc6 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -3,46 +3,11 @@
with lib;
let
-
cfg = config.services.syncthing;
defaultUser = "syncthing";
-
- header = {
- description = "Syncthing service";
- after = [ "network.target" ];
- environment = {
- STNORESTART = "yes";
- STNOUPGRADE = "yes";
- inherit (cfg) all_proxy;
- } // config.networking.proxy.envVars;
- };
-
- service = {
- Restart = "on-failure";
- SuccessExitStatus = "2 3 4";
- RestartForceExitStatus="3 4";
- };
-
- iNotifyHeader = {
- description = "Syncthing Inotify File Watcher service";
- after = [ "network.target" "syncthing.service" ];
- requires = [ "syncthing.service" ];
- };
-
- iNotifyService = {
- SuccessExitStatus = "2";
- RestartForceExitStatus = "3";
- Restart = "on-failure";
- };
-
-in
-
-{
-
+in {
###### interface
-
options = {
-
services.syncthing = {
enable = mkEnableOption ''
@@ -100,6 +65,19 @@ in
'';
};
+ openDefaultPorts = mkOption {
+ type = types.bool;
+ default = false;
+ example = literalExample "true";
+ description = ''
+ Open the default ports in the firewall:
+ - TCP 22000 for transfers
+ - UDP 21027 for discovery
+ If multiple users are running syncthing on this machine, you will need to manually open a set of ports for each instance and leave this disabled.
+ Alternatively, if are running only a single instance on this machine using the default ports, enable this.
+ '';
+ };
+
package = mkOption {
type = types.package;
default = pkgs.syncthing;
@@ -117,6 +95,14 @@ in
config = mkIf cfg.enable {
+ networking.firewall = mkIf cfg.openDefaultPorts {
+ allowedTCPPorts = [ 22000 ];
+ allowedUDPPorts = [ 21027 ];
+ };
+
+ systemd.packages = [ pkgs.syncthing ]
+ ++ lib.optional cfg.useInotify pkgs.syncthing-inotify;
+
users = mkIf (cfg.user == defaultUser) {
extraUsers."${defaultUser}" =
{ group = cfg.group;
@@ -131,39 +117,44 @@ in
};
systemd.services = {
- syncthing = mkIf cfg.systemService (header // {
- wants = mkIf cfg.useInotify [ "syncthing-inotify.service" ];
- wantedBy = [ "multi-user.target" ];
- serviceConfig = service // {
- User = cfg.user;
- Group = cfg.group;
- PermissionsStartOnly = true;
- ExecStart = "${cfg.package}/bin/syncthing -no-browser -home=${cfg.dataDir}";
- };
- });
-
- syncthing-inotify = mkIf (cfg.systemService && cfg.useInotify) (iNotifyHeader // {
+ syncthing = mkIf cfg.systemService {
+ description = "Syncthing service";
+ after = [ "network.target" ];
+ environment = {
+ STNORESTART = "yes";
+ STNOUPGRADE = "yes";
+ inherit (cfg) all_proxy;
+ } // config.networking.proxy.envVars;
+ wants = mkIf cfg.useInotify [ "syncthing-inotify.service" ];
wantedBy = [ "multi-user.target" ];
- serviceConfig = iNotifyService // {
+ serviceConfig = {
+ Restart = "on-failure";
+ SuccessExitStatus = "2 3 4";
+ RestartForceExitStatus="3 4";
User = cfg.user;
- ExecStart = "${pkgs.syncthing-inotify.bin}/bin/syncthing-inotify -home=${cfg.dataDir} -logflags=0";
- };
- });
- };
-
- systemd.user.services = {
- syncthing = header // {
- serviceConfig = service // {
- ExecStart = "${cfg.package}/bin/syncthing -no-browser";
+ Group = cfg.group;
+ PermissionsStartOnly = true;
+ ExecStart = "${cfg.package}/bin/syncthing -no-browser -home=${cfg.dataDir}";
};
};
- syncthing-inotify = mkIf cfg.useInotify (iNotifyHeader // {
- serviceConfig = iNotifyService // {
- ExecStart = "${pkgs.syncthing-inotify.bin}/bin/syncthing-inotify -logflags=0";
- };
- });
- };
+ syncthing-resume = {
+ wantedBy = [ "suspend.target" ];
+ };
+ syncthing-inotify = mkIf (cfg.systemService && cfg.useInotify) {
+ description = "Syncthing Inotify File Watcher service";
+ after = [ "network.target" "syncthing.service" ];
+ requires = [ "syncthing.service" ];
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ SuccessExitStatus = "2";
+ RestartForceExitStatus = "3";
+ Restart = "on-failure";
+ User = cfg.user;
+ ExecStart = "${pkgs.syncthing-inotify.bin}/bin/syncthing-inotify -home=${cfg.dataDir} -logflags=0";
+ };
+ };
+ };
};
}
diff --git a/nixos/modules/services/networking/tftpd.nix b/nixos/modules/services/networking/tftpd.nix
index 9b3cc6b8ec4..c9c0a2b321d 100644
--- a/nixos/modules/services/networking/tftpd.nix
+++ b/nixos/modules/services/networking/tftpd.nix
@@ -13,12 +13,13 @@ with lib;
default = false;
description = ''
Whether to enable tftpd, a Trivial File Transfer Protocol server.
+ The server will be run as an xinetd service.
'';
};
services.tftpd.path = mkOption {
type = types.path;
- default = "/home/tftp";
+ default = "/srv/tftp";
description = ''
Where the tftp server files are stored.
'';
diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix
index 6375ebee320..f3a04d97c98 100644
--- a/nixos/modules/services/networking/unbound.nix
+++ b/nixos/modules/services/networking/unbound.nix
@@ -79,7 +79,7 @@ in
extraConfig = mkOption {
default = "";
- type = types.str;
+ type = types.lines;
description = ''
Extra unbound config. See
unbound.conf8
diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index a344d785546..5657b91c1e7 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -128,9 +128,11 @@ in {
in {
description = "WPA Supplicant";
- after = [ "network.target" ] ++ lib.concatMap deviceUnit ifaces;
+ after = lib.concatMap deviceUnit ifaces;
+ before = [ "network.target" ];
+ wants = [ "network.target" ];
requires = lib.concatMap deviceUnit ifaces;
- wantedBy = [ "network-online.target" ];
+ wantedBy = [ "multi-user.target" ];
path = [ pkgs.wpa_supplicant ];
diff --git a/nixos/modules/services/networking/xinetd.nix b/nixos/modules/services/networking/xinetd.nix
index 270122ee659..00224502780 100644
--- a/nixos/modules/services/networking/xinetd.nix
+++ b/nixos/modules/services/networking/xinetd.nix
@@ -124,7 +124,7 @@ in
};
extraConfig = mkOption {
- type = types.string;
+ type = types.lines;
default = "";
description = "Extra configuration-lines added to the section of the service.";
};
diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix
index 196a14dd40e..676e82aa893 100644
--- a/nixos/modules/services/networking/znc.nix
+++ b/nixos/modules/services/networking/znc.nix
@@ -26,53 +26,35 @@ let
};
# Keep znc.conf in nix store, then symlink or copy into `dataDir`, depending on `mutable`.
+ notNull = a: ! isNull a;
mkZncConf = confOpts: ''
- // Also check http://en.znc.in/wiki/Configuration
-
- AnonIPLimit = 10
- ConnectDelay = 5
- # Add `LoadModule = x` for each module...
+ Version = 1.6.3
${concatMapStrings (n: "LoadModule = ${n}\n") confOpts.modules}
- MaxBufferSize = 500
- ProtectWebSessions = true
- SSLCertFile = ${cfg.dataDir}/znc.pem
- ServerThrottle = 30
- Skin = dark-clouds
- StatusPrefix = *
- Version = 1.2
-
- AllowIRC = true
- AllowWeb = true
+
+ Port = ${toString confOpts.port}
IPv4 = true
- IPv6 = false
- Port = ${if confOpts.useSSL then "+" else ""}${toString confOpts.port}
+ IPv6 = true
SSL = ${if confOpts.useSSL then "true" else "false"}
- Admin = true
- Allow = *
- AltNick = ${confOpts.nick}_
- AppendTimestamp = false
- AutoClearChanBuffer = false
- Buffer = 150
- ChanModes = +stn
- DenyLoadMod = false
- DenySetBindHost = false
- Ident = ident
- JoinTries = 10
- MaxJoins = 0
- MaxNetworks = 1
- MultiClients = true
- Nick = ${confOpts.nick}
- PrependTimestamp = true
- QuitMsg = Quit
- RealName = ${confOpts.nick}
- TimestampFormat = [%H:%M:%S]
- ${concatMapStrings (n: "LoadModule = ${n}\n") confOpts.userModules}
-
${confOpts.passBlock}
+ Admin = true
+ Nick = ${confOpts.nick}
+ AltNick = ${confOpts.nick}_
+ Ident = ${confOpts.nick}
+ RealName = ${confOpts.nick}
+ ${concatMapStrings (n: "LoadModule = ${n}\n") confOpts.userModules}
+
+ ${ lib.concatStringsSep "\n" (lib.mapAttrsToList (name: net: ''
+
+ ${concatMapStrings (m: "LoadModule = ${m}\n") net.modules}
+ Server = ${net.server} ${if net.useSSL then "+" else ""}${toString net.port}
+
+ ${concatMapStrings (c: "\n\n") net.channels}
+
+ '') confOpts.networks) }
${confOpts.extraZncConf}
'';
@@ -84,6 +66,62 @@ let
else mkZncConf cfg.confOptions;
};
+ networkOpts = { ... }: {
+ options = {
+ server = mkOption {
+ type = types.str;
+ example = "chat.freenode.net";
+ description = ''
+ IRC server address.
+ '';
+ };
+
+ port = mkOption {
+ type = types.int;
+ default = 6697;
+ example = 6697;
+ description = ''
+ IRC server port.
+ '';
+ };
+
+ useSSL = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether to use SSL to connect to the IRC server.
+ '';
+ };
+
+ modulePackages = mkOption {
+ type = types.listOf types.package;
+ default = [];
+ example = [ "pkgs.zncModules.push" "pkgs.zncModules.fish" ];
+ description = ''
+ External ZNC modules to build.
+ '';
+ };
+
+ modules = mkOption {
+ type = types.listOf types.str;
+ default = [ "simple_away" ];
+ example = literalExample "[ simple_away sasl ]";
+ description = ''
+ ZNC modules to load.
+ '';
+ };
+
+ channels = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ example = [ "nixos" ];
+ description = ''
+ IRC channels to join.
+ '';
+ };
+ };
+ };
+
in
{
@@ -111,6 +149,15 @@ in
'';
};
+ group = mkOption {
+ default = "";
+ example = "users";
+ type = types.string;
+ description = ''
+ Group to own the ZNCserver process.
+ '';
+ };
+
dataDir = mkOption {
default = "/var/lib/znc/";
example = "/home/john/.znc/";
@@ -125,27 +172,16 @@ in
example = "See: http://wiki.znc.in/Configuration";
type = types.lines;
description = ''
- The contents of the `znc.conf` file to use when creating it.
+ Config file as generated with `znc --makeconf` to use for the whole ZNC configuration.
If specified, `confOptions` will be ignored, and this value, as-is, will be used.
If left empty, a conf file with default values will be used.
- Recommended to generate with `znc --makeconf` command.
'';
};
- /* TODO: add to the documentation of the current module:
-
- Values to use when creating a `znc.conf` file.
-
- confOptions = {
- modules = [ "log" ];
- userName = "john";
- nick = "johntron";
- };
- */
confOptions = {
modules = mkOption {
type = types.listOf types.str;
- default = [ "partyline" "webadmin" "adminlog" "log" ];
+ default = [ "webadmin" "adminlog" ];
example = [ "partyline" "webadmin" "adminlog" "log" ];
description = ''
A list of modules to include in the `znc.conf` file.
@@ -154,8 +190,8 @@ in
userModules = mkOption {
type = types.listOf types.str;
- default = [ ];
- example = [ "fish" "push" ];
+ default = [ "chansaver" "controlpanel" ];
+ example = [ "chansaver" "controlpanel" "fish" "push" ];
description = ''
A list of user modules to include in the `znc.conf` file.
'';
@@ -166,29 +202,42 @@ in
example = "johntron";
type = types.string;
description = ''
- The user name to use when generating the `znc.conf` file.
- This is the user name used by the user logging into the ZNC web admin.
+ The user name used to log in to the ZNC web admin interface.
'';
};
+ networks = mkOption {
+ default = { };
+ type = types.loaOf types.optionSet;
+ description = ''
+ IRC networks to connect the user to.
+ '';
+ options = [ networkOpts ];
+ example = {
+ "freenode" = {
+ server = "chat.freenode.net";
+ port = 6697;
+ ssl = true;
+ modules = [ "simple_away" ];
+ };
+ };
+ };
+
nick = mkOption {
default = "znc-user";
example = "john";
type = types.string;
description = ''
- The IRC nick to use when generating the `znc.conf` file.
+ The IRC nick.
'';
};
passBlock = mkOption {
- default = defaultPassBlock;
- example = "Must be the block generated by the `znc --makepass` command.";
+ example = defaultPassBlock;
type = types.string;
description = ''
- The pass block to use when generating the `znc.conf` file.
- This is the password used by the user logging into the ZNC web admin.
- This is the block generated by the `znc --makepass` command.
- !!! If not specified, please change this after starting the service. !!!
+ Generate with znc --makepass.
+ This is the password used to log in to the ZNC web admin interface.
'';
};
@@ -206,7 +255,7 @@ in
example = true;
type = types.bool;
description = ''
- Indicates whether the ZNC server should use SSL when listening on the specified port.
+ Indicates whether the ZNC server should use SSL when listening on the specified port. A self-signed certificate will be generated.
'';
};
@@ -214,7 +263,7 @@ in
default = "";
type = types.lines;
description = ''
- Extra config to `znc.conf` file
+ Extra config to `znc.conf` file.
'';
};
};
@@ -265,6 +314,7 @@ in
after = [ "network.service" ];
serviceConfig = {
User = cfg.user;
+ Group = cfg.group;
Restart = "always";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
ExecStop = "${pkgs.coreutils}/bin/kill -INT $MAINPID";
diff --git a/nixos/modules/services/search/hound.nix b/nixos/modules/services/search/hound.nix
new file mode 100644
index 00000000000..708f57a5eb7
--- /dev/null
+++ b/nixos/modules/services/search/hound.nix
@@ -0,0 +1,123 @@
+{ config, lib, pkgs, ... }:
+with lib;
+let
+ cfg = config.services.hound;
+in {
+ options = {
+ services.hound = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to enable the hound code search daemon.
+ '';
+ };
+
+ user = mkOption {
+ default = "hound";
+ type = types.str;
+ description = ''
+ User the hound daemon should execute under.
+ '';
+ };
+
+ group = mkOption {
+ default = "hound";
+ type = types.str;
+ description = ''
+ Group the hound daemon should execute under.
+ '';
+ };
+
+ extraGroups = mkOption {
+ type = types.listOf types.str;
+ default = [ ];
+ example = [ "dialout" ];
+ description = ''
+ List of extra groups that the "hound" user should be a part of.
+ '';
+ };
+
+ home = mkOption {
+ default = "/var/lib/hound";
+ type = types.path;
+ description = ''
+ The path to use as hound's $HOME. If the default user
+ "hound" is configured then this is the home of the "hound"
+ user.
+ '';
+ };
+
+ package = mkOption {
+ default = pkgs.hound;
+ description = ''
+ Package for running hound.
+ '';
+ };
+
+ config = mkOption {
+ type = types.str;
+ description = ''
+ The full configuration of the Hound daemon. Note the dbpath
+ should be an absolute path to a writable location on disk.
+ '';
+ example = ''
+ {
+ "max-concurrent-indexers" : 2,
+ "dbpath" : "''${services.hound.home}/data",
+ "repos" : {
+ "nixpkgs": {
+ "url" : "https://www.github.com/NixOS/nixpkgs.git"
+ }
+ }
+ }
+ '';
+ };
+
+ listen = mkOption {
+ type = types.str;
+ default = "0.0.0.0:6080";
+ example = "127.0.0.1:6080 or just :6080";
+ description = ''
+ Listen on this IP:port / :port
+ '';
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ users.extraGroups = optional (cfg.group == "hound") {
+ name = "hound";
+ gid = config.ids.gids.hound;
+ };
+
+ users.extraUsers = optional (cfg.user == "hound") {
+ name = "hound";
+ description = "hound code search";
+ createHome = true;
+ home = cfg.home;
+ group = cfg.group;
+ extraGroups = cfg.extraGroups;
+ uid = config.ids.uids.hound;
+ };
+
+ systemd.services.hound = {
+ description = "Hound Code Search";
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" ];
+
+ serviceConfig = {
+ User = cfg.user;
+ Group = cfg.group;
+ WorkingDirectory = cfg.home;
+ ExecStartPre = "${pkgs.git}/bin/git config --global --replace-all http.sslCAinfo /etc/ssl/certs/ca-certificates.crt";
+ ExecStart = "${cfg.package}/bin/houndd" +
+ " -addr ${cfg.listen}" +
+ " -conf ${pkgs.writeText "hound.json" cfg.config}";
+
+ };
+ path = [ pkgs.git ];
+ };
+ };
+
+}
diff --git a/nixos/modules/services/web-apps/quassel-webserver.nix b/nixos/modules/services/web-apps/quassel-webserver.nix
new file mode 100644
index 00000000000..7de9480d4c4
--- /dev/null
+++ b/nixos/modules/services/web-apps/quassel-webserver.nix
@@ -0,0 +1,99 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.quassel-webserver;
+ quassel-webserver = cfg.pkg;
+ settings = ''
+ module.exports = {
+ default: {
+ host: '${cfg.quasselCoreHost}', // quasselcore host
+ port: ${toString cfg.quasselCorePort}, // quasselcore port
+ initialBacklogLimit: ${toString cfg.initialBacklogLimit}, // Amount of backlogs to fetch per buffer on connection
+ backlogLimit: ${toString cfg.backlogLimit}, // Amount of backlogs to fetch per buffer after first retrieval
+ securecore: ${if cfg.secureCore then "true" else "false"}, // Connect to the core using SSL
+ theme: '${cfg.theme}' // Default UI theme
+ },
+ themes: ['default', 'darksolarized'], // Available themes
+ forcedefault: ${if cfg.forceHostAndPort then "true" else "false"}, // Will force default host and port to be used, and will hide the corresponding fields in the UI
+ prefixpath: '${cfg.prefixPath}' // Configure this if you use a reverse proxy
+ };
+ '';
+ settingsFile = pkgs.writeText "settings-user.js" settings;
+in {
+ options = {
+ services.quassel-webserver = {
+ enable = mkOption {
+ default = false;
+ type = types.bool;
+ description = "Whether to enable the quassel webclient service";
+ };
+ pkg = mkOption {
+ default = pkgs.quassel-webserver;
+ description = "The quassel-webserver package";
+ };
+ quasselCoreHost = mkOption {
+ default = "";
+ type = types.str;
+ description = "The default host of the quassel core";
+ };
+ quasselCorePort = mkOption {
+ default = 4242;
+ type = types.int;
+ description = "The default quassel core port";
+ };
+ initialBacklogLimit = mkOption {
+ default = 20;
+ type = types.int;
+ description = "Amount of backlogs to fetch per buffer on connection";
+ };
+ backlogLimit = mkOption {
+ default = 100;
+ type = types.int;
+ description = "Amount of backlogs to fetch per buffer after first retrieval";
+ };
+ secureCore = mkOption {
+ default = true;
+ type = types.bool;
+ description = "Connect to the core using SSL";
+ };
+ theme = mkOption {
+ default = "default";
+ type = types.str;
+ description = "default or darksolarized";
+ };
+ prefixPath = mkOption {
+ default = "";
+ type = types.str;
+ description = "Configure this if you use a reverse proxy. Must start with a '/'";
+ example = "/quassel";
+ };
+ port = mkOption {
+ default = 60443;
+ type = types.int;
+ description = "The port the quassel webserver should listen on";
+ };
+ useHttps = mkOption {
+ default = true;
+ type = types.bool;
+ description = "Whether the quassel webserver connection should be a https connection";
+ };
+ forceHostAndPort = mkOption {
+ default = false;
+ type = types.bool;
+ description = "Force the users to use the quasselCoreHost and quasselCorePort defaults";
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ systemd.services.quassel-webserver = {
+ description = "A web server/client for Quassel";
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ ExecStart = "${quassel-webserver}/lib/node_modules/quassel-webserver/bin/www -p ${toString cfg.port} -m ${if cfg.useHttps == true then "https" else "http"} -c ${settingsFile}";
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
index 4f9e9f52f9e..1ed489bcb09 100644
--- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -288,6 +288,7 @@ in
};
extraConfig = mkOption {
+ type = types.lines;
default = "";
example =
''
diff --git a/nixos/modules/services/web-servers/apache-httpd/moodle.nix b/nixos/modules/services/web-servers/apache-httpd/moodle.nix
index aa00e89967d..d525348d5c7 100644
--- a/nixos/modules/services/web-servers/apache-httpd/moodle.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/moodle.nix
@@ -164,6 +164,7 @@ in
extraConfig = mkOption {
+ type = types.lines;
default = "";
example =
''
diff --git a/nixos/modules/services/web-servers/apache-httpd/trac.nix b/nixos/modules/services/web-servers/apache-httpd/trac.nix
index 3196edc2838..87ed36e3530 100644
--- a/nixos/modules/services/web-servers/apache-httpd/trac.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/trac.nix
@@ -102,7 +102,6 @@ in
pkgs.setuptools
pkgs.pythonPackages.genshi
pkgs.pythonPackages.psycopg2
- pkgs.python.modules.sqlite3
subversion
];
};
diff --git a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
index 2315c4729ae..32dd4439675 100644
--- a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
@@ -212,6 +212,7 @@ in
example = "[ \"en_GB\" \"de_DE\" ];";
};
extraConfig = mkOption {
+ type = types.lines;
default = "";
example =
''
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 7b822619a2f..166e5a6b2ce 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -392,6 +392,8 @@ in
security.acme.certs = filterAttrs (n: v: v != {}) (
mapAttrs (vhostName: vhostConfig:
optionalAttrs vhostConfig.enableACME {
+ user = cfg.user;
+ group = cfg.group;
webroot = vhostConfig.acmeRoot;
extraDomains = genAttrs vhostConfig.serverAliases (alias: null);
postRun = ''
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index dc71531759b..5d1af09e7aa 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -82,7 +82,7 @@ in {
environment.gnome3.packageSet = mkOption {
default = null;
- example = literalExample "pkgs.gnome3_20";
+ example = literalExample "pkgs.gnome3_22";
description = "Which GNOME 3 package set to use.";
apply = p: if p == null then pkgs.gnome3 else p;
};
@@ -108,6 +108,7 @@ in {
services.gnome3.gnome-documents.enable = mkDefault true;
services.gnome3.gnome-keyring.enable = true;
services.gnome3.gnome-online-accounts.enable = mkDefault true;
+ services.gnome3.gnome-terminal-server.enable = mkDefault true;
services.gnome3.gnome-user-share.enable = mkDefault true;
services.gnome3.gvfs.enable = true;
services.gnome3.seahorse.enable = mkDefault true;
diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix
index 4241ec890dd..d13b7352c95 100644
--- a/nixos/modules/services/x11/desktop-managers/lxqt.nix
+++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix
@@ -61,9 +61,11 @@ in
pkgs.lxqt.obconf-qt
pkgs.lxqt.pavucontrol-qt
pkgs.lxqt.pcmanfm-qt
+ pkgs.lxqt.qlipper
pkgs.lxqt.qps
pkgs.lxqt.qterminal
pkgs.lxqt.qtermwidget
+ pkgs.lxqt.screengrab
pkgs.menu-cache
pkgs.openbox # default window manager
pkgs.qt5.qtsvg # provides QT5 plugins for svg icons
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 52847d2f8d2..d3aa63fd428 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -95,9 +95,8 @@ in
services.xserver.displayManager.job =
{
environment = {
- GDM_X_SERVER = "${cfg.xserverBin} ${cfg.xserverArgs}";
+ GDM_X_SERVER_EXTRA_ARGS = "${cfg.xserverArgs}";
GDM_SESSIONS_DIR = "${cfg.session.desktops}";
- XDG_CONFIG_DIRS = "${gnome3.gnome_settings_daemon}/etc/xdg";
# Find the mouse
XCURSOR_PATH = "~/.icons:${config.system.path}/share/icons";
};
@@ -108,10 +107,12 @@ in
systemd.services.display-manager.wants = [ "systemd-machined.service" ];
systemd.services.display-manager.after = [ "systemd-machined.service" ];
- systemd.services.display-manager.path = [ gnome3.gnome_shell gnome3.caribou pkgs.xorg.xhost pkgs.dbus_tools ];
+ systemd.services.display-manager.path = [ gnome3.gnome_session ];
services.dbus.packages = [ gdm ];
+ systemd.user.services.dbus.wantedBy = [ "default.target" ];
+
programs.dconf.profiles.gdm = "${gdm}/share/dconf/profile/gdm";
# Use AutomaticLogin if delay is zero, because it's immediate.
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 33cd51f37c6..1d309aa3429 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -207,6 +207,9 @@ in
services.dbus.enable = true;
services.dbus.packages = [ lightdm ];
+ # lightdm uses the accounts daemon to rember language/window-manager per user
+ services.accounts-daemon.enable = true;
+
security.pam.services.lightdm = {
allowNullPassword = true;
startSession = true;
diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix
index c79893e77aa..36daf55a36a 100644
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixos/modules/services/x11/display-managers/sddm.nix
@@ -86,7 +86,7 @@ in
};
extraConfig = mkOption {
- type = types.str;
+ type = types.lines;
default = "";
example = ''
[Autologin]
diff --git a/nixos/modules/services/x11/window-managers/bspwm-unstable.nix b/nixos/modules/services/x11/window-managers/bspwm-unstable.nix
new file mode 100644
index 00000000000..3282e0d0851
--- /dev/null
+++ b/nixos/modules/services/x11/window-managers/bspwm-unstable.nix
@@ -0,0 +1,48 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.xserver.windowManager.bspwm-unstable;
+in
+
+{
+ options = {
+ services.xserver.windowManager.bspwm-unstable = {
+ enable = mkEnableOption "bspwm-unstable";
+ startThroughSession = mkOption {
+ type = with types; bool;
+ default = false;
+ description = "
+ Start the window manager through the script defined in
+ sessionScript. Defaults to the the bspwm-session script
+ provided by bspwm
+ ";
+ };
+ sessionScript = mkOption {
+ default = "${pkgs.bspwm-unstable}/bin/bspwm-session";
+ defaultText = "(pkgs.bspwm-unstable)/bin/bspwm-session";
+ description = "
+ The start-session script to use. Defaults to the
+ provided bspwm-session script from the bspwm package.
+
+ Does nothing unless `bspwm.startThroughSession` is enabled
+ ";
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ services.xserver.windowManager.session = singleton {
+ name = "bspwm-unstable";
+ start = if cfg.startThroughSession
+ then cfg.sessionScript
+ else ''
+ export _JAVA_AWT_WM_NONREPARENTING=1
+ SXHKD_SHELL=/bin/sh ${pkgs.sxhkd-unstable}/bin/sxhkd -f 100 &
+ ${pkgs.bspwm-unstable}/bin/bspwm
+ '';
+ };
+ environment.systemPackages = [ pkgs.bspwm-unstable ];
+ };
+}
diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix
index f005decfa33..dabe2c26a72 100644
--- a/nixos/modules/services/x11/window-managers/default.nix
+++ b/nixos/modules/services/x11/window-managers/default.nix
@@ -10,6 +10,7 @@ in
imports = [
./afterstep.nix
./bspwm.nix
+ ./bspwm-unstable.nix
./compiz.nix
./dwm.nix
./exwm.nix
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index e34f0c21663..f5ed5233818 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -515,6 +515,7 @@ in
{ description = "X11 Server";
after = [ "systemd-udev-settle.service" "local-fs.target" "acpid.service" "systemd-logind.service" ];
+ wants = [ "systemd-udev-settle.service" ];
restartIfChanged = false;
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index 51b3b8a3dca..e751ff141f7 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -214,8 +214,8 @@ in
"hid_generic" "hid_lenovo"
"hid_apple" "hid_logitech_dj" "hid_lenovo_tpkbd" "hid_roccat"
- # Misc. stuff.
- "pcips2" "atkbd"
+ # Misc. keyboard stuff.
+ "pcips2" "atkbd" "i8042"
# Temporary fix for https://github.com/NixOS/nixpkgs/issues/18451
# Remove as soon as upstream gets fixed - marking it:
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index abab5f20baa..7803f1bd1aa 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -498,8 +498,7 @@ eval "exec $logOutFd>&- $logErrFd>&-"
#
# Storage daemons are distinguished by an @ in front of their command line:
# https://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons/
-local pidsToKill="$(pgrep -v -f '^@')"
-for pid in $pidsToKill; do
+for pid in $(pgrep -v -f '^@'); do
# Make sure we don't kill kernel processes, see #15226 and:
# http://stackoverflow.com/questions/12213445/identifying-kernel-threads
readlink "/proc/$pid/exe" &> /dev/null || continue
diff --git a/nixos/modules/system/boot/systemd-nspawn.nix b/nixos/modules/system/boot/systemd-nspawn.nix
index 2527ab35719..f765db275e7 100644
--- a/nixos/modules/system/boot/systemd-nspawn.nix
+++ b/nixos/modules/system/boot/systemd-nspawn.nix
@@ -41,41 +41,43 @@ let
];
instanceOptions = {
+ options = {
- 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.
- '';
- };
+ 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.
- '';
- };
+ 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.
- '';
+ 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.
+ '';
+ };
};
};
@@ -99,8 +101,7 @@ in {
systemd.nspawn = mkOption {
default = {};
- type = types.attrsOf types.optionSet;
- options = [ instanceOptions ];
+ type = with types; attrsOf (submodule instanceOptions);
description = "Definition of systemd-nspawn configurations.";
};
diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix
index 731b1701e00..4c3fc30358c 100644
--- a/nixos/modules/system/boot/systemd-unit-options.nix
+++ b/nixos/modules/system/boot/systemd-unit-options.nix
@@ -316,7 +316,7 @@ in rec {
startAt = mkOption {
type = with types; either str (listOf str);
- default = "";
+ default = [];
example = "Sun 14:00:00";
description = ''
Automatically start this unit at the given date/time, which
@@ -326,6 +326,7 @@ in rec {
to adding a corresponding timer unit with
set to the value given here.
'';
+ apply = v: if isList v then v else [ v ];
};
};
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index d44c2e234b0..d1f3f923e5e 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -777,7 +777,7 @@ in
{ wantedBy = [ "timers.target" ];
timerConfig.OnCalendar = service.startAt;
})
- (filterAttrs (name: service: service.enable && service.startAt != "") cfg.services);
+ (filterAttrs (name: service: service.enable && service.startAt != []) cfg.services);
# Generate timer units for all services that have a ‘startAt’ value.
systemd.user.timers =
@@ -785,7 +785,7 @@ in
{ wantedBy = [ "timers.target" ];
timerConfig.OnCalendar = service.startAt;
})
- (filterAttrs (name: service: service.startAt != "") cfg.user.services);
+ (filterAttrs (name: service: service.startAt != []) cfg.user.services);
systemd.sockets.systemd-journal-gatewayd.wantedBy =
optional config.services.journald.enableHttpGateway "sockets.target";
diff --git a/nixos/release.nix b/nixos/release.nix
index 10c624afebc..fbd3efd16ff 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -245,6 +245,7 @@ in rec {
tests.gnome3-gdm = callTest tests/gnome3-gdm.nix {};
tests.grsecurity = callTest tests/grsecurity.nix {};
tests.hibernate = callTest tests/hibernate.nix {};
+ tests.hound = callTest tests/hound.nix {};
tests.i3wm = callTest tests/i3wm.nix {};
tests.installer = callSubTests tests/installer.nix {};
tests.influxdb = callTest tests/influxdb.nix {};
diff --git a/nixos/tests/hound.nix b/nixos/tests/hound.nix
new file mode 100644
index 00000000000..82fd44e8e36
--- /dev/null
+++ b/nixos/tests/hound.nix
@@ -0,0 +1,58 @@
+# Test whether `houndd` indexes nixpkgs
+import ./make-test.nix ({ pkgs, ... } : {
+ name = "hound";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ grahamc ];
+ };
+ machine = { config, pkgs, ... }: {
+ services.hound = {
+ enable = true;
+ config = ''
+ {
+ "max-concurrent-indexers": 1,
+ "dbpath": "/var/lib/hound/data",
+ "repos": {
+ "nix": {
+ "url": "file:///var/lib/hound/my-git"
+ }
+ }
+ }
+ '';
+ };
+
+ systemd.services.houndseed = {
+ description = "seed hound with a git repo";
+ requiredBy = [ "hound.service" ];
+ before = [ "hound.service" ];
+
+ serviceConfig = {
+ User = "hound";
+ Group = "hound";
+ WorkingDirectory = "/var/lib/hound";
+ };
+ path = [ pkgs.git ];
+ script = ''
+ git config --global user.email "you@example.com"
+ git config --global user.name "Your Name"
+ git init my-git --bare
+ git init my-git-clone
+ cd my-git-clone
+ echo 'hi nix!' > hello
+ git add hello
+ git commit -m "hello there :)"
+ git remote add origin /var/lib/hound/my-git
+ git push origin master
+ '';
+ };
+ };
+
+ testScript =
+ '' startAll;
+
+ $machine->waitForUnit("network.target");
+ $machine->waitForUnit("hound.service");
+ $machine->waitForOpenPort(6080);
+ $machine->succeed('curl http://127.0.0.1:6080/api/v1/search\?stats\=fosho\&repos\=\*\&rng=%3A20\&q\=hi\&files\=\&i=nope | grep "Filename" | grep "hello"');
+
+ '';
+})
diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix
index 66f16ed8bcc..02a8fc68028 100644
--- a/nixos/tests/virtualbox.nix
+++ b/nixos/tests/virtualbox.nix
@@ -11,10 +11,10 @@ let
#!${pkgs.stdenv.shell} -xe
export PATH="${lib.makeBinPath [ pkgs.coreutils pkgs.utillinux ]}"
- mkdir -p /var/run/dbus
+ mkdir -p /run/dbus
cat > /etc/passwd < /etc/group < "$out/share/applications/ardour.desktop" << EOF
diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 6adb3a0ed47..b7ea32cd1d4 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -3,7 +3,7 @@
, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
, libusb, libuuid, libxml2, libxslt, lilv-svn, lv2, makeWrapper
-, perl, pkgconfig, python, rubberband, serd, sord-svn, sratom
+, perl, pkgconfig, python2, rubberband, serd, sord-svn, sratom
, taglib, vampSDK, dbus, fftw, pango, suil, libarchive }:
let
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
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
+ makeWrapper pango perl pkgconfig python2 rubberband serd sord-svn
sratom suil taglib vampSDK libarchive
];
@@ -47,12 +47,12 @@ stdenv.mkDerivation rec {
patchShebangs ./tools/
'';
- configurePhase = "python waf configure --optimize --docs --with-backends=jack,alsa --prefix=$out";
+ configurePhase = "${python2.interpreter} waf configure --optimize --docs --with-backends=jack,alsa --prefix=$out";
- buildPhase = "python waf";
+ buildPhase = "${python2.interpreter} waf";
installPhase = ''
- python waf install
+ ${python2.interpreter} waf install
# Install desktop file
mkdir -p "$out/share/applications"
diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix
index e6287af497a..eaf02bd2689 100644
--- a/pkgs/applications/audio/drumgizmo/default.nix
+++ b/pkgs/applications/audio/drumgizmo/default.nix
@@ -3,12 +3,12 @@
}:
stdenv.mkDerivation rec {
- version = "0.9.10";
+ version = "0.9.11";
name = "drumgizmo-${version}";
src = fetchurl {
url = "http://www.drumgizmo.org/releases/${name}/${name}.tar.gz";
- sha256 = "142si734lsyywxhn7msiz053ir96kl5im3h1jql3vhcb4807f3d1";
+ sha256 = "04hf3nhccwr98n2081rrvfccz50nly6k3gbk9zxccp1522qz5xvf";
};
configureFlags = [ "--enable-lv2" ];
diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix
index 7fdf1c34771..a14d642cd83 100644
--- a/pkgs/applications/audio/drumkv1/default.nix
+++ b/pkgs/applications/audio/drumkv1/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, libjack2, libsndfile, lv2, qt4 }:
+{ stdenv, fetchurl, libjack2, alsaLib, libsndfile, liblo, lv2, qt5 }:
stdenv.mkDerivation rec {
name = "drumkv1-${version}";
- version = "0.7.1";
+ version = "0.7.6";
src = fetchurl {
url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
- sha256 = "0mpf8akqaakg7vbn8gba0ns64hzhn5xzh1qxqpchcv32swn21cq4";
+ sha256 = "0cl1rbj26nsbvg9wzsh2j8xlx69xjxn29x46ypmy3939zbk81bi6";
};
- buildInputs = [ libjack2 libsndfile lv2 qt4 ];
+ buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ];
meta = with stdenv.lib; {
description = "An old-school drum-kit sampler synthesizer with stereo fx";
diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix
index 3ef69606c77..a546441996e 100644
--- a/pkgs/applications/audio/eq10q/default.nix
+++ b/pkgs/applications/audio/eq10q/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, cmake, fftw, gtkmm2, libxcb, lv2, pkgconfig, xorg }:
stdenv.mkDerivation rec {
name = "eq10q-${version}";
- version = "2.0";
+ version = "2.1";
src = fetchurl {
url = "mirror://sourceforge/project/eq10q/${name}.tar.gz";
- sha256 = "08vlfly0qqrfqiwpn5g5php680icpk97pwnwjadmj5syhgvi0i3h";
+ sha256 = "0brrr6ydsppi4zzn3vcgl0zgq5r8jmlcap1hpr3k43yvlwggb880";
};
buildInputs = [ cmake fftw gtkmm2 libxcb lv2 pkgconfig xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ];
diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix
index f22aaa84b89..eb9ddf164d4 100644
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/pkgs/applications/audio/gpodder/default.nix
@@ -30,7 +30,7 @@ pythonPackages.buildPythonApplication rec {
];
propagatedBuildInputs = with pythonPackages; [
- feedparser dbus-python mygpoclient sqlite3 pygtk eyeD3
+ feedparser dbus-python mygpoclient pygtk eyeD3
] ++ stdenv.lib.optional ipodSupport libgpod;
checkPhase = ''
diff --git a/pkgs/applications/audio/groovebasin/default.nix b/pkgs/applications/audio/groovebasin/default.nix
index 0bbf2baf105..7eb2e85f7be 100644
--- a/pkgs/applications/audio/groovebasin/default.nix
+++ b/pkgs/applications/audio/groovebasin/default.nix
@@ -62,5 +62,8 @@ in nodePackages.buildNodePackage rec {
Groove Basin supports Last.fm scrobbling.
'';
+ # groovebasin was built with nodejs 0.10 which reached end of LTS
+ # in October 216, it doesn't built with nodejs 4.x
+ broken = true;
};
}
diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix
index c5593a8d600..ac484445b1e 100644
--- a/pkgs/applications/audio/kid3/default.nix
+++ b/pkgs/applications/audio/kid3/default.nix
@@ -1,23 +1,24 @@
{ stdenv, fetchurl
-, pkgconfig, cmake, perl, ffmpeg
+, pkgconfig, cmake
, docbook_xml_dtd_45, docbook_xsl, libxslt
-, phonon, automoc4, chromaprint, id3lib
-, taglib, mp4v2, flac, libogg, libvorbis
+, python, ffmpeg, mp4v2, flac, libogg, libvorbis
+, phonon, automoc4, chromaprint, id3lib, taglib
, qt, zlib, readline
, makeWrapper
}:
stdenv.mkDerivation rec {
- name = "kid3-${meta.version}";
+ name = "kid3-${version}";
+ version = "3.4.2";
src = fetchurl {
- url = "mirror://sourceforge/project/kid3/kid3/${meta.version}/${name}.tar.gz";
- sha256 = "12sa54mg1b3wkagmh5yi20ski8km9d199lk0a1yfxy0ffjfld7js";
+ url = "mirror://sourceforge/project/kid3/kid3/${version}/${name}.tar.gz";
+ sha256 = "0gka4na583015jyqva18g85q7vnkjdk0iji2jp88di3kpvqhf1sw";
};
buildInputs = with stdenv.lib;
- [ pkgconfig cmake perl ffmpeg docbook_xml_dtd_45 docbook_xsl libxslt
+ [ pkgconfig cmake python ffmpeg docbook_xml_dtd_45 docbook_xsl libxslt
phonon automoc4 chromaprint id3lib taglib mp4v2 flac libogg libvorbis
qt zlib readline makeWrapper ];
@@ -33,7 +34,6 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- version = "3.3.0";
description = "A simple and powerful audio tag editor";
longDescription = ''
If you want to easily tag multiple MP3, Ogg/Vorbis, FLAC, MPC,
@@ -71,4 +71,4 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
};
}
-# TODO: Qt5 support
+# TODO: Qt5 support - not so urgent!
diff --git a/pkgs/applications/audio/lastwatch/default.nix b/pkgs/applications/audio/lastwatch/default.nix
index 61d502ce334..0e4e1a5a8a3 100644
--- a/pkgs/applications/audio/lastwatch/default.nix
+++ b/pkgs/applications/audio/lastwatch/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchgit, pythonPackages }:
+{ stdenv, fetchgit, python2Packages }:
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
name = "lastwatch-${version}";
namePrefix = "";
version = "0.4.1";
@@ -11,14 +11,12 @@ pythonPackages.buildPythonApplication rec {
sha256 = "0nlng3595j5jvnikk8i5hb915zak5zsmfn2306cc4gfcns9xzjwp";
};
- pythonPath = [
- pythonPackages.pyinotify
- pythonPackages.pylast
- pythonPackages.mutagen
+ propagatedBuildInputs = with python2Packages; [
+ pyinotify
+ pylast
+ mutagen
];
- propagatedBuildInputs = pythonPath;
-
meta = {
homepage = "https://github.com/aszlig/LastWatch";
description = "An inotify-based last.fm audio scrobbler";
diff --git a/pkgs/applications/audio/mopidy-moped/default.nix b/pkgs/applications/audio/mopidy-moped/default.nix
index ee3134f5fd8..c8afd4c6290 100644
--- a/pkgs/applications/audio/mopidy-moped/default.nix
+++ b/pkgs/applications/audio/mopidy-moped/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pythonPackages, mopidy }:
+{ stdenv, fetchurl, pythonPackages, mopidy, glibcLocales }:
pythonPackages.buildPythonApplication rec {
name = "mopidy-moped-${version}";
@@ -9,6 +9,8 @@ pythonPackages.buildPythonApplication rec {
sha256 = "0xff8y1kc7rwwsd7ppgbvywf6i8lchjwbxjisfl1kmilwsb166yr";
};
+ LC_ALL = "en_US.UTF-8";
+ buildInputs = [ glibcLocales ];
propagatedBuildInputs = [ mopidy ];
doCheck = false;
diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix
index 9ff4aef6083..9004a46115e 100644
--- a/pkgs/applications/audio/mpg123/default.nix
+++ b/pkgs/applications/audio/mpg123/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl, alsaLib }:
stdenv.mkDerivation rec {
- name = "mpg123-1.22.2";
+ name = "mpg123-1.23.8";
src = fetchurl {
url = "mirror://sourceforge/mpg123/${name}.tar.bz2";
- sha256 = "0i1phi6fdjas37y00h3j8rb0b8ngr9az6hy5ff5bl53ify3j87kd";
+ sha256 = "13ngfzk84k4ks7ymanmq8f6707yrybra5h0mk3ir6mdnxk4068yy";
};
buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix
index d5e0ed1c476..a13009407eb 100644
--- a/pkgs/applications/audio/openmpt123/default.nix
+++ b/pkgs/applications/audio/openmpt123/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, SDL2, pkgconfig }:
+{ stdenv, fetchurl, SDL2, pkgconfig, flac, libsndfile }:
let
version = "0.2.7025-beta20.1";
@@ -8,7 +8,7 @@ in stdenv.mkDerivation rec {
url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}.tar.gz";
sha256 = "0qp2nnz6pnl1d7yv9hcjyim7q6yax5881k1jxm8jfgjqagmz5k6p";
};
- buildInputs = [ SDL2 pkgconfig ];
+ buildInputs = [ SDL2 pkgconfig flac libsndfile ];
makeFlags = [ "NO_LTDL=1 TEST=0 EXAMPLES=0" ]
++ stdenv.lib.optional (stdenv.isDarwin) "SHARED_SONAME=0";
installFlags = "PREFIX=\${out}";
diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index 046789119ec..4b789e158bb 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -1,9 +1,10 @@
-{ stdenv, pythonPackages, fetchurl, gettext
+{ stdenv, python2Packages, fetchurl, gettext
, pkgconfig, libofa, ffmpeg, chromaprint
}:
let
version = "1.3.2";
+ pythonPackages = python2Packages;
in pythonPackages.buildPythonApplication {
name = "picard-${version}";
namePrefix = "";
diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix
index 3bbed303aec..b8213f4d9f4 100644
--- a/pkgs/applications/audio/puddletag/default.nix
+++ b/pkgs/applications/audio/puddletag/default.nix
@@ -1,33 +1,31 @@
-{ stdenv, lib, fetchFromGitHub, pythonPackages, makeWrapper, chromaprint }:
+{ stdenv, fetchFromGitHub, python2Packages, makeWrapper, chromaprint }:
-with lib;
-with pythonPackages;
+let
+ pypkgs = python2Packages;
-buildPythonApplication rec {
- version = "1.1.1";
+in pypkgs.buildPythonApplication rec {
name = "puddletag-${version}";
- namePrefix = "";
+ version = "1.1.1";
src = fetchFromGitHub {
owner = "keithgg";
repo = "puddletag";
- rev = "1.1.1";
+ rev = version;
sha256 = "0zmhc01qg64fb825b3kj0mb0r0d9hms30nqvhdks0qnv7ahahqrx";
};
sourceRoot = "${name}-src/source";
- disabled = isPy3k;
+ disabled = pypkgs.isPy3k; # work to support python 3 has not begun
outputs = [ "out" ];
- propagatedBuildInputs = [
- chromaprint
+ propagatedBuildInputs = [ chromaprint ] ++ (with pypkgs; [
configobj
mutagen
pyparsing
pyqt4
- ];
+ ]);
doCheck = false; # there are no tests
dontStrip = true; # we are not generating any binaries
@@ -36,7 +34,7 @@ buildPythonApplication rec {
siteDir=$(toPythonPath $out)
mkdir -p $siteDir
PYTHONPATH=$PYTHONPATH:$siteDir
- ${python.interpreter} setup.py install --prefix $out
+ ${pypkgs.python.interpreter} setup.py install --prefix $out
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix
index 42c98cbb110..f5f3119f73d 100644
--- a/pkgs/applications/audio/qmidinet/default.nix
+++ b/pkgs/applications/audio/qmidinet/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, qt4, alsaLib, libjack2 }:
+{ stdenv, fetchurl, qt5, alsaLib, libjack2 }:
stdenv.mkDerivation rec {
- version = "0.2.1";
+ version = "0.4.1";
name = "qmidinet-${version}";
src = fetchurl {
url = "mirror://sourceforge/qmidinet/${name}.tar.gz";
- sha256 = "1a1pj4w74wj1gcfv4a0vzcglmr5sw0xp0y56w8rk3ig4k11xi8sa";
+ sha256 = "1hh06g19lfh6r673avfvy0l2mq999mxk2jnv396226swj97lv7yz";
};
hardeningDisable = [ "format" ];
- buildInputs = [ qt4 alsaLib libjack2 ];
+ buildInputs = [ qt5.qtbase qt5.qttools alsaLib libjack2 ];
meta = with stdenv.lib; {
description = "A MIDI network gateway application that sends and receives MIDI data (ALSA Sequencer and/or JACK MIDI) over the network";
diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix
index fa9df2f603e..aeb8396e0a6 100644
--- a/pkgs/applications/audio/samplv1/default.nix
+++ b/pkgs/applications/audio/samplv1/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, libjack2, libsndfile, lv2, qt4 }:
+{ stdenv, fetchurl, libjack2, alsaLib, liblo, libsndfile, lv2, qt5 }:
stdenv.mkDerivation rec {
name = "samplv1-${version}";
- version = "0.7.1";
+ version = "0.7.6";
src = fetchurl {
url = "mirror://sourceforge/samplv1/${name}.tar.gz";
- sha256 = "0494w1xhhadwzvdr0v4gg5pzr2w2ah2vk896znj59j1y9gn3gilq";
+ sha256 = "071j7mi2cwhx0ml5hq8izmjb0s4yhbkscqaxfdg56xfpfsqsa63l";
};
- buildInputs = [ libjack2 libsndfile lv2 qt4 ];
+ buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools];
meta = with stdenv.lib; {
description = "An old-school all-digital polyphonic sampler synthesizer with stereo fx";
diff --git a/pkgs/applications/audio/swh-lv2/default.nix b/pkgs/applications/audio/swh-lv2/default.nix
index ab1ba242cfd..faa895e2e30 100644
--- a/pkgs/applications/audio/swh-lv2/default.nix
+++ b/pkgs/applications/audio/swh-lv2/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchgit, fftwSinglePrec, libxslt, lv2, pkgconfig }:
+{ stdenv, fetchurl, fftwSinglePrec, libxslt, lv2, pkgconfig }:
stdenv.mkDerivation rec {
- name = "swh-lv2-git-2013-05-17";
+ name = "swh-lv2-v${version}";
+ version = "1.0.16";
- src = fetchgit {
- url = "https://github.com/swh/lv2.git";
- rev = "978d5d8f549fd22048157a6d044af0faeaacbd7f";
- sha256 = "10jj8sp67caxvmzjxwyzapc34jpry5nrkkp49kyyvyk5dgkpbsjw";
+ src = fetchurl {
+ url = "https://github.com/swh/lv2/archive/v${version}.tar.gz";
+ sha256 = "0j1mih0lp4fds07knp5i32in515sh0df1qi6694pmyz2wqnm295w";
};
patchPhase = ''
diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix
index 43003782f2f..4050675e51f 100644
--- a/pkgs/applications/audio/synthv1/default.nix
+++ b/pkgs/applications/audio/synthv1/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, qt4, libjack2, lv2 }:
+{ stdenv, fetchurl, qt5, libjack2, alsaLib, liblo, lv2 }:
stdenv.mkDerivation rec {
name = "synthv1-${version}";
- version = "0.7.1";
+ version = "0.7.6";
src = fetchurl {
url = "mirror://sourceforge/synthv1/${name}.tar.gz";
- sha256 = "0asjhz0xj1kwysvsj9q54r8j8fy7cnr408ygfpdhg7yn24rv67hh";
+ sha256 = "03vnmmiyq92p2gh4zax1vg2lx6y57bsxch936pzbiwx649x53wi9";
};
- buildInputs = [ qt4 libjack2 lv2 ];
+ buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ];
meta = with stdenv.lib; {
description = "An old-school 4-oscillator subtractive polyphonic synthesizer with stereo fx";
diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix
index 0ec39940775..0f6bd45df27 100644
--- a/pkgs/applications/audio/yoshimi/default.nix
+++ b/pkgs/applications/audio/yoshimi/default.nix
@@ -6,11 +6,11 @@ assert stdenv ? glibc;
stdenv.mkDerivation rec {
name = "yoshimi-${version}";
- version = "1.3.8.2";
+ version = "1.4.1";
src = fetchurl {
url = "mirror://sourceforge/yoshimi/${name}.tar.bz2";
- sha256 = "0wl4ln6v1nkkx56kfah23chyrhga2vi93i82g0s200c4s4184xr8";
+ sha256 = "133sx42wb66g803pcrgdwph40wh94knvab3yfqkgm0001jv4v14y";
};
buildInputs = [
diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index e788585a0a9..291439db5be 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -6,14 +6,14 @@
let
ver_branch = "1.19";
- version = "1.19.4";
+ version = "1.19.5";
in
stdenv.mkDerivation rec {
name = "lightdm-${version}";
src = fetchurl {
url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz";
- sha256 = "1l105y07wkl9dj0cjhbs8qh6flpkyfj97wkw0rdd3n624lknvbqf";
+ sha256 = "0gbz8jk1ljh8rwgvldkiqma1k61sd27yh008228ahdqd5i2v1r1z";
};
patches = [ ./fix-paths.patch ];
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 6cbd3dea825..a044f82baaf 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "atom-${version}";
- version = "1.10.1";
+ version = "1.11.2";
src = fetchurl {
url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
- sha256 = "0v03a93qa57ajji4sfz7hyr06n20jnlq87103nr7wqycv1v4dm85";
+ sha256 = "1mvlj1j0hyvm5di95nn0x99lm5arw2amm1s1va1m73zss3bzlhpm";
name = "${name}.deb";
};
diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix
index 4237ce73f21..e9f36b19195 100644
--- a/pkgs/applications/editors/brackets/default.nix
+++ b/pkgs/applications/editors/brackets/default.nix
@@ -4,22 +4,22 @@ let
bracketsEnv = buildEnv {
name = "env-brackets";
paths = [
- gtk2 glib gdk_pixbuf stdenv.cc.cc alsaLib nss nspr gconf cups libgcrypt_1_5
- dbus systemd.lib
+ gtk2 glib gdk_pixbuf stdenv.cc.cc.lib alsaLib nss nspr gconf cups libgcrypt_1_5
+ dbus.lib systemd.lib
];
};
in
stdenv.mkDerivation rec {
name = "brackets-${version}";
- version = "1.5";
+ version = "1.7";
src = fetchurl {
url = "https://github.com/adobe/brackets/releases/download/release-${version}/Brackets.Release.${version}.64-bit.deb";
- sha256 = "1fc8wvh9wbcydd1sw20yfnwlfv7nllb6vrssr6hgn80m7i0zl3db";
+ sha256 = "0nsiy3gvp8rd71a0misf6v1kz067kxnszr5mpch9fj4jqmg6nj8m";
name = "${name}.deb";
};
- phases = [ "installPhase" ];
+ phases = [ "installPhase" "fixupPhase" ];
buildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/editors/deadpixi-sam/default.nix b/pkgs/applications/editors/deadpixi-sam/default.nix
index 03b920ffab0..d1ed4826c68 100644
--- a/pkgs/applications/editors/deadpixi-sam/default.nix
+++ b/pkgs/applications/editors/deadpixi-sam/default.nix
@@ -1,14 +1,16 @@
{ stdenv, fetchFromGitHub, freetype, libX11, libXt, libXft
+, version ? "2016-10-08"
+, rev ? "a17c4a9c2a1af2de0a756fe16d482e0db88c0541"
+, sha256 ? "03xmfzlijz4gbmr7l0pb1gl9kmlz1ab3hr8d51innvlasy4g6xgj"
}:
stdenv.mkDerivation rec {
- name = "deadpixi-sam-unstable";
- version = "2016-09-15";
+ inherit version;
+ name = "deadpixi-sam-unstable-${version}";
src = fetchFromGitHub {
+ inherit sha256 rev;
owner = "deadpixi";
repo = "sam";
- rev = "a6a8872246e8634d884b0ce52bc3be9770ab1b0f";
- sha256 = "1zr8dl0vp1xic3dq69h4bp2fcxsjhrzasfl6ayvkibjd6z5dn07p";
};
postPatch = ''
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index c688065e6ea..4663e8c64f8 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -12,192 +12,7 @@ rec {
buildEclipse = callPackage ./build-eclipse.nix { };
- eclipse-sdk-35 = buildEclipse {
- name = "eclipse-sdk-3.5.2";
- description = "Eclipse Classic";
- src =
- if stdenv.system == "x86_64-linux" then
- fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.5.2-201002111343/eclipse-SDK-3.5.2-linux-gtk-x86_64.tar.gz;
- sha256 = "1ndvanxw62b5ywi6ww0dyimabfmjdsw9q3xpy95zd8d5ygj2qsgq";
- }
- else
- fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.5.2-201002111343/eclipse-SDK-3.5.2-linux-gtk.tar.gz;
- sha256 = "0y5n0cyr9lgjmmzkfmav7j5w66rc1jq3300hcw3vrfjiv1k6ng3w";
- };
- };
- eclipse_sdk_35 = eclipse-sdk-35; # backward compatibility, added 2016-01-30
-
- eclipse-sdk-36 = buildEclipse {
- name = "eclipse-sdk-3.6.2";
- description = "Eclipse Classic";
- src =
- if stdenv.system == "x86_64-linux" then
- fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.6.2-201102101200/eclipse-SDK-3.6.2-linux-gtk-x86_64.tar.gz;
- sha256 = "0dfcfadcd6337c897fbfd5b292de481931dfce12d43289ecb93691fd27dd47f4";
- }
- else
- fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.6.2-201102101200/eclipse-SDK-3.6.2-linux-gtk.tar.gz;
- sha256 = "1bh8ykliqr8wbciv13vpiy50rvm7yszk7y8dslr796dbwhi5b1cj";
- };
- };
- eclipse_sdk_36 = eclipse-sdk-36; # backward compatibility, added 2016-01-30
-
- eclipse-scala-sdk-40 = buildEclipse {
- name = "eclipse-scala-sdk-4.0.0";
- description = "Eclipse IDE for Scala Developers";
- src =
- if stdenv.system == "x86_64-linux" then
- fetchurl { # tested
- url = http://downloads.typesafe.com/scalaide-pack/4.0.0.vfinal-luna-211-20150305/scala-SDK-4.0.0-vfinal-2.11-linux.gtk.x86_64.tar.gz;
- sha256 = "b65c5e8160e72c8389537e9e427138e6daa2065f9df3a943a86e40dd1543dd83";
- }
- else
- fetchurl { # untested
- url = http://downloads.typesafe.com/scalaide-pack/4.0.0.vfinal-luna-211-20150305/scala-SDK-4.0.0-vfinal-2.11-linux.gtk.x86.tar.gz;
- sha256 = "f422aea5903c97d212264a5a43c6ebc638aecbd4ce5e6078d92618725bc5d31e";
- };
- };
- eclipse_scala_sdk_40 = eclipse-scala-sdk-40; # backward compatibility, added 2016-01-30
-
- eclipse-cpp-36 = buildEclipse {
- name = "eclipse-cpp-3.6.2";
- description = "Eclipse IDE for C/C++ Developers";
- src =
- if stdenv.system == "x86_64-linux" then
- fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/helios/SR2/eclipse-cpp-helios-SR2-linux-gtk-x86_64.tar.gz;
- sha1 = "6f914e11fa15a900c46825e4aa8299afd76e7e65";
- }
- else
- fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/helios/SR2/eclipse-cpp-helios-SR2-linux-gtk.tar.gz;
- sha1 = "1156e4bc0253ae3a3a4e54839e4944dc64d3108f";
- };
- };
- eclipse_cpp_36 = eclipse-cpp-36; # backward compatibility, added 2016-01-30
-
- eclipse-modeling-36 = buildEclipse {
- name = "eclipse-modeling-3.6.2";
- description = "Eclipse Modeling Tools (includes Incubating components)";
- src =
- if stdenv.system == "x86_64-linux" then
- fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/helios/SR2/eclipse-modeling-helios-SR2-incubation-linux-gtk-x86_64.tar.gz;
- sha1 = "e96f5f006298f68476f4a15a2be8589158d5cc61";
- }
- else
- fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/helios/SR2/eclipse-modeling-helios-SR2-incubation-linux-gtk.tar.gz;
- sha1 = "696377895bb26445de39d82a916b7e69edb1d939";
- };
- };
- eclipse_modeling_36 = eclipse-modeling-36; # backward compatibility, added 2016-01-30
-
- eclipse-sdk-37 = buildEclipse {
- name = "eclipse-sdk-3.7";
- description = "Eclipse Classic";
- sources = {
- "x86_64-linux" = fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.7.2-201202080800/eclipse-SDK-3.7.2-linux-gtk-x86_64.tar.gz;
- sha256 = "0nf4nv7awhp1k8b1hjb7chpjyjrqnyszsjbc4dlk9phpjv3j4wg5";
- };
- "i686-linux" = fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.7.2-201202080800/eclipse-SDK-3.7.2-linux-gtk.tar.gz;
- sha256 = "1isn7i45l9kyn2yx6vm88jl1gnxph8ynank0aaa218cg8kdygk7j";
- };
- };
- };
- eclipse_sdk_37 = eclipse-sdk-37; # backward compatibility, added 2016-01-30
-
- eclipse-cpp-37 = buildEclipse {
- name = "eclipse-cpp-3.7";
- description = "Eclipse IDE for C/C++ Developers";
- src =
- if stdenv.system == "x86_64-linux" then
- fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/indigo/R/eclipse-cpp-indigo-incubation-linux-gtk-x86_64.tar.gz;
- sha256 = "14ppc9g9igzvj1pq7jl01vwhzb66nmzbl9wsdl1sf3xnwa9wnqk3";
- }
- else
- fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/indigo/R/eclipse-cpp-indigo-incubation-linux-gtk.tar.gz;
- sha256 = "1cvg1vgyazrkinwzlvlf0dpl197p4784752srqybqylyj5psdi3b";
- };
- };
- eclipse_cpp_37 = eclipse-cpp-37; # backward compatibility, added 2016-01-30
-
- eclipse-cpp-42 = buildEclipse {
- name = "eclipse-cpp-4.2";
- description = "Eclipse IDE for C/C++ Developers";
- src =
- if stdenv.system == "x86_64-linux" then
- fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/juno/SR2/eclipse-cpp-juno-SR2-linux-gtk-x86_64.tar.gz;
- sha256 = "1qq04926pf7v9sf3s0z53zvlbl1j0rmmjmbmhqi49473fnjikh7y";
- }
- else
- fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/juno/SR2/eclipse-cpp-juno-SR2-linux-gtk.tar.gz;
- sha256 = "1a4s9qlhfpfpdhvffyglnfdr3dq5r2ywcxqywhqi95yhq5nmsgyk";
- };
- };
- eclipse_cpp_42 = eclipse-cpp-42; # backward compatibility, added 2016-01-30
-
- eclipse-cpp-43 = buildEclipse {
- name = "eclipse-cpp-4.3.2";
- description = "Eclipse IDE for C/C++ Developers";
- src =
- if stdenv.system == "x86_64-linux" then
- fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/kepler/SR2/eclipse-cpp-kepler-SR2-linux-gtk-x86_64.tar.gz;
- sha256 = "16zhjm6bx78263b1clg75kfiliahkhwg0k116vp9fj039nlpc30l";
- }
- else
- fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/kepler/SR2/eclipse-cpp-kepler-SR2-linux-gtk.tar.gz;
- sha256 = "0d6jlj7hwz8blx6csrlyi2h2prql0wckbh7ihwjmgclwpcpj84g6";
- };
- };
- eclipse_cpp_43 = eclipse-cpp-43; # backward compatibility, added 2016-01-30
-
- eclipse-cpp-44 = buildEclipse {
- name = "eclipse-cpp-4.4.2";
- description = "Eclipse IDE for C/C++ Developers";
- src =
- if stdenv.system == "x86_64-linux" then
- fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/luna/SR2/eclipse-cpp-luna-SR2-linux-gtk-x86_64.tar.gz;
- sha256 = "1vxwj7yihgipvrb3gksmddqkarzazpwk3mh1mjnw0i5xz2y32ba4";
- }
- else
- fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/luna/SR2/eclipse-cpp-luna-SR2-linux-gtk.tar.gz;
- sha256 = "1yn7yzzx8izc199c8w4f7vrc0b08idyq0dn113i8123b0mxw5lkp";
- };
- };
- eclipse_cpp_44 = eclipse-cpp-44; # backward compatibility, added 2016-01-30
-
- eclipse-cpp-45 = buildEclipse {
- name = "eclipse-cpp-4.5.1";
- description = "Eclipse IDE for C/C++ Developers, Mars release";
- src =
- if stdenv.system == "x86_64-linux" then
- fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/mars/1/eclipse-cpp-mars-1-linux-gtk-x86_64.tar.gz;
- sha256 = "1j6rsgr44kya2v7y34ifscajqk7lnq1w9m9fx4i0qgby84sy4xj7";
- }
- else if stdenv.system == "i686-linux" then
- fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/mars/1/eclipse-cpp-mars-1-linux-gtk.tar.gz;
- sha256 = "0qsbvjkq0ssxbnafh4gs8pfclynqis3nf7xlxx4w3k20jcjx7sr2";
- }
- else throw "Unsupported system: ${stdenv.system}";
- };
- eclipse_cpp_45 = eclipse-cpp-45; # backward compatibility, added 2016-01-30
+ ### Eclipse CPP
eclipse-cpp-46 = buildEclipse {
name = "eclipse-cpp-4.6.0";
@@ -205,222 +20,143 @@ rec {
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/R/eclipse-cpp-neon-R-linux-gtk-x86_64.tar.gz;
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/R/eclipse-cpp-neon-R-linux-gtk-x86_64.tar.gz;
sha256 = "09fqsgvbjfdqvn7z03crkii34z4bsb34y272q68ib8741bxk0i6m";
}
else if stdenv.system == "i686-linux" then
fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/R/eclipse-cpp-neon-R-linux-gtk.tar.gz;
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/R/eclipse-cpp-neon-R-linux-gtk.tar.gz;
sha256 = "0a12qmqq22v7sbmwn1hjv1zcrkmp64bf0ajmdjljhs9ac79mxn5h";
}
else throw "Unsupported system: ${stdenv.system}";
};
- eclipse-sdk-421 = buildEclipse {
- name = "eclipse-sdk-4.2.1";
- description = "Eclipse Classic";
+ eclipse-cpp-37 = buildEclipse {
+ name = "eclipse-cpp-3.7";
+ description = "Eclipse IDE for C/C++ Developers";
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.2.1-201209141800/eclipse-SDK-4.2.1-linux-gtk-x86_64.tar.gz;
- sha256 = "1mlyy90lk08lb2971ynglgi3nqvqfq1k70md2kb39jk160wd1xrk";
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/indigo/R/eclipse-cpp-indigo-incubation-linux-gtk-x86_64.tar.gz;
+ sha256 = "14ppc9g9igzvj1pq7jl01vwhzb66nmzbl9wsdl1sf3xnwa9wnqk3";
}
else
fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.2.1-201209141800/eclipse-SDK-4.2.1-linux-gtk.tar.gz;
- sha256 = "1av6qm9wkbyk123qqf38f0jq4jv2bj9wp6fmpnl55zg6qr463c1w";
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/indigo/R/eclipse-cpp-indigo-incubation-linux-gtk.tar.gz;
+ sha256 = "1cvg1vgyazrkinwzlvlf0dpl197p4784752srqybqylyj5psdi3b";
};
- };
- eclipse_sdk_421 = eclipse-sdk-421; # backward compatibility, added 2016-01-30
+ };
+ eclipse_cpp_37 = eclipse-cpp-37; # backward compatibility, added 2016-01-30
- eclipse-sdk-422 = buildEclipse {
- name = "eclipse-sdk-4.2.2";
- description = "Eclipse Classic";
- sources = {
- "x86_64-linux" = fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.2.2-201302041200/eclipse-SDK-4.2.2-linux-gtk-x86_64.tar.gz;
- sha256 = "0ysa6ymk4h3k1vn59dc909iy197kmx132671kbzfwbim87jmgnqb";
- };
- "i686-linux" = fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.2.2-201302041200/eclipse-SDK-4.2.2-linux-gtk.tar.gz;
- sha256 = "038yibbrcia38wi72qrdl03g7l35mpvl5nxdfdnvpqxrkfffb826";
- };
- };
- };
- eclipse_sdk_422 = eclipse-sdk-422; # backward compatibility, added 2016-01-30
+ ### Eclipse Modeling
- eclipse-sdk-431 = buildEclipse {
- name = "eclipse-sdk-4.3.1";
- description = "Eclipse Classic";
- sources = {
- "x86_64-linux" = fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.3.1-201309111000/eclipse-SDK-4.3.1-linux-gtk-x86_64.tar.gz;
- sha256 = "0ncm56ylwxw9z8rk8ccgva68c2yr9yrf1kcr1zkgw6p87xh1yczd";
+ eclipse-modeling-46 = buildEclipse {
+ name = "eclipse-modeling-4.6";
+ description = "Eclipse Modeling Tools";
+ src =
+ if stdenv.system == "x86_64-linux" then
+ fetchurl {
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/1a/eclipse-modeling-neon-1a-linux-gtk-x86_64.tar.gz;
+ sha1 = "3695fd049c4cca2d235f424557e19877795a8183";
+ }
+ else
+ fetchurl {
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/1a/eclipse-modeling-neon-1a-linux-gtk.tar.gz;
+ sha1 = "fa0694a0b44e8e9c2301417f84dba45cf9ac6e61";
};
- "i686-linux" = fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.3.1-201309111000/eclipse-SDK-4.3.1-linux-gtk.tar.gz;
- sha256 = "1zxsh838khny7mvl01h28xna6xdh01yi4mvls28zj22v0340lgsg";
- };
- };
};
- eclipse_sdk_431 = eclipse-sdk-431; # backward compatibility, added 2016-01-30
- eclipse-sdk-44 = buildEclipse {
- name = "eclipse-sdk-4.4";
- description = "Eclipse Classic";
- sources = {
- "x86_64-linux" = fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.4-201406061215/eclipse-SDK-4.4-linux-gtk-x86_64.tar.gz;
- sha256 = "14hdkijsjq0hhzi9ijpwjjkhz7wm0pry86l3dniy5snlh3l5bsb2";
+ eclipse-modeling-36 = buildEclipse {
+ name = "eclipse-modeling-3.6.2";
+ description = "Eclipse Modeling Tools (includes Incubating components)";
+ src =
+ if stdenv.system == "x86_64-linux" then
+ fetchurl {
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/helios/SR2/eclipse-modeling-helios-SR2-incubation-linux-gtk-x86_64.tar.gz;
+ sha1 = "e96f5f006298f68476f4a15a2be8589158d5cc61";
+ }
+ else
+ fetchurl {
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/helios/SR2/eclipse-modeling-helios-SR2-incubation-linux-gtk.tar.gz;
+ sha1 = "696377895bb26445de39d82a916b7e69edb1d939";
};
- "i686-linux" = fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.4-201406061215/eclipse-SDK-4.4-linux-gtk.tar.gz;
- sha256 = "0hjc4zrsmik6vff851p0a4ydnx99840j2xrx8348kk6h0af8vx6z";
- };
- };
};
- eclipse_sdk_44 = eclipse-sdk-44; # backward compatibility, added 2016-01-30
+ eclipse_modeling_36 = eclipse-modeling-36; # backward compatibility, added 2016-01-30
- eclipse-sdk-442 = buildEclipse {
- name = "eclipse-sdk-4.4.2";
- description = "Eclipse Classic";
- sources = {
- "x86_64-linux" = fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.4.2-201502041700/eclipse-SDK-4.4.2-linux-gtk-x86_64.tar.gz;
- sha256 = "0g00alsixfaakmn4khr0m9fxvkrbhbg6qqfa27xr6a9np6gzg98l";
- };
- "i686-linux" = fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.4.2-201502041700/eclipse-SDK-4.4.2-linux-gtk.tar.gz;
- sha256 = "1hacyjjwhhxi7r3xyhpqgjqpd5r0irw9bfkalz5s5l6shb0lq4i7";
- };
- };
- };
- eclipse_sdk_442 = eclipse-sdk-442; # backward compatibility, added 2016-01-30
-
- eclipse-sdk-45 = buildEclipse {
- name = "eclipse-sdk-4.5";
- description = "Eclipse Mars Classic";
- sources = {
- "x86_64-linux" = fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-SDK-4.5-linux-gtk-x86_64.tar.gz;
- sha256 = "0vfql4gh263ms8bg7sgn05gnjajplx304cn3nr03jlacgr3pkarf";
- };
- "i686-linux" = fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-SDK-4.5-linux-gtk.tar.gz;
- sha256 = "0xv66l6hdlvxpswcqrsh398wg6xhy30f833dr7jvvz45s5437hm3";
- };
- };
- };
- eclipse_sdk_45 = eclipse-sdk-45; # backward compatibility, added 2016-01-30
-
- eclipse-sdk-451 = buildEclipse {
- name = "eclipse-sdk-4.5.1";
- description = "Eclipse Mars Classic";
- sources = {
- "x86_64-linux" = fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5.1-201509040015/eclipse-SDK-4.5.1-linux-gtk-x86_64.tar.gz;
- sha256 = "b56503ab4b86f54e1cdc93084ef8c32fb1eaabc6f6dad9ef636153b14c928e02";
- };
- "i686-linux" = fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5.1-201509040015/eclipse-SDK-4.5.1-linux-gtk.tar.gz;
- sha256 = "f2e41da52e138276f8f121fd4d57c3f98839817836b56f8424e99b63c9b1b025";
- };
- };
- };
- eclipse_sdk_451 = eclipse-sdk-451; # backward compatibility, added 2016-01-30
-
- eclipse-sdk-452 = buildEclipse {
- name = "eclipse-sdk-4.5.2";
- description = "Eclipse Mars Classic";
- sources = {
- "x86_64-linux" = fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5.2-201602121500/eclipse-SDK-4.5.2-linux-gtk-x86_64.tar.gz;
- sha256 = "87f82b0c13c245ee20928557dbc4435657d1e029f72d9135683c8d585c69ba8d";
- };
- "i686-linux" = fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5.2-201602121500/eclipse-SDK-4.5.2-linux-gtk.tar.gz;
- sha256 = "78f7e537b34333401fc782fbd1260087c586ff93b17b88da5b177642f3aa5a02";
- };
- };
- };
-
- eclipse-sdk-46 = buildEclipse {
- name = "eclipse-sdk-4.6";
- description = "Eclipse Neon Classic";
- sources = {
- "x86_64-linux" = fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6-201606061100/eclipse-SDK-4.6-linux-gtk-x86_64.tar.gz;
- sha256 = "4d7a39ce4e04ba1f5179f6a72926eb86ed506d97842a3bf4247814491c508e0a";
- };
- "i686-linux" = fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6-201606061100/eclipse-SDK-4.6-linux-gtk.tar.gz;
- sha256 = "d9e1d390cac504a17a65d4a22ebb8da6a592bcc54491912cbc29577990d77014";
- };
- };
- };
+ ### Eclipse Platform
eclipse-platform = eclipse-platform-46;
- eclipse-platform-45 = buildEclipse {
- name = "eclipse-platform-4.5";
- description = "Eclipse platform";
- sources = {
- "x86_64-linux" = fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-platform-4.5-linux-gtk-x86_64.tar.gz;
- sha256 = "1510j41yr86pbzwf48kjjdd46nkpkh8zwn0hna0cqvsw1gk2vqcg";
- };
- "i686-linux" = fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-platform-4.5-linux-gtk.tar.gz;
- sha256 = "1f97jd3qbi3830y3djk8bhwzd9whsq8gzfdk996chxc55prn0qbd";
- };
- };
- };
-
- eclipse-platform-451 = buildEclipse {
- name = "eclipse-platform-4.5.1";
- description = "Eclipse platform";
- sources = {
- "x86_64-linux" = fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5.1-201509040015/eclipse-platform-4.5.1-linux-gtk-x86_64.tar.gz;
- sha256 = "1m7bzyi20yss6cz74d7hvhxj1cddcpgzxjia5wcjycsvq33kkny0";
- };
- "i686-linux" = fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5.1-201509040015/eclipse-platform-4.5.1-linux-gtk.tar.gz;
- sha256 = "17x8w4k0rba0c0v9ghxdl0zqfadla5c1aakfd5k0q9q3x3qi6rxp";
- };
- };
- };
-
- eclipse-platform-452 = buildEclipse {
- name = "eclipse-platform-4.5.2";
- description = "Eclipse platform";
- sources = {
- "x86_64-linux" = fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5.2-201602121500/eclipse-SDK-4.5.2-linux-gtk-x86_64.tar.gz;
- sha256 = "13dsd5f5i39wd0sr2bgp57hd2msn8g2dnmw5j8hfwif22c62py47";
- };
- "i686-linux" = fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5.2-201602121500/eclipse-SDK-4.5.2-linux-gtk.tar.gz;
- sha256 = "00jsmbrl4xhpbgd8hyxijgzqdic700kd3yw2qwgl0cs3ncvybxvq";
- };
- };
- };
-
eclipse-platform-46 = buildEclipse {
- name = "eclipse-platform-4.6";
+ name = "eclipse-platform-4.6.1";
description = "Eclipse platform";
sources = {
"x86_64-linux" = fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6-201606061100/eclipse-SDK-4.6-linux-gtk-x86_64.tar.gz;
- sha256 = "02lfa0f4j53q4ks3nal4jxnm1vc6xck2k9zng58izfh49v73jyjd";
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.1-201609071200/eclipse-SDK-4.6.1-linux-gtk-x86_64.tar.gz;
+ sha256 = "1mr7sj4whz23iwz5j6mbqd80a39177qv0r7b6cip7dji4n2agl8j";
};
"i686-linux" = fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6-201606061100/eclipse-SDK-4.6-linux-gtk.tar.gz;
- sha256 = "053hsy87jmr9phn934a4qny959d6inxjx8nlcmxa2165ra8d7qfr";
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.1-201609071200/eclipse-SDK-4.6.1-linux-gtk.tar.gz;
+ sha256 = "0kgj0zpgzwx90q13c4mr8swf63azd56532ycxgq2rbs0d1qbl87j";
};
};
};
+ ### Eclipse Scala SDK
+
+ eclipse-scala-sdk-441 = buildEclipse {
+ name = "eclipse-scala-sdk-4.4.1";
+ description = "Eclipse IDE for Scala Developers";
+ src =
+ if stdenv.system == "x86_64-linux" then
+ fetchurl { # tested
+ url = https://downloads.typesafe.com/scalaide-pack/4.4.1-vfinal-luna-211-20160504/scala-SDK-4.4.1-vfinal-2.11-linux.gtk.x86_64.tar.gz;
+ sha256 = "4c2d1ac68384e12a11a851cf0fc7757aea087eba69329b21d539382a65340d27";
+ }
+ else
+ fetchurl { # untested
+ url = https://downloads.typesafe.com/scalaide-pack/4.4.1-vfinal-luna-211-20160504/scala-SDK-4.4.1-vfinal-2.11-linux.gtk.x86.tar.gz;
+ sha256 = "35383cb09567187e14a30c15de9fd9aa0eef99e4bbb342396ce3acd11fb5cbac";
+ };
+ };
+
+ ### Eclipse SDK
+
+ eclipse-sdk-46 = buildEclipse {
+ name = "eclipse-sdk-4.6.1";
+ description = "Eclipse Neon Classic";
+ sources = {
+ "x86_64-linux" = fetchurl {
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.1-201609071200/eclipse-SDK-4.6.1-linux-gtk-x86_64.tar.gz;
+ sha256 = "1mr7sj4whz23iwz5j6mbqd80a39177qv0r7b6cip7dji4n2agl8j";
+ };
+ "i686-linux" = fetchurl {
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.1-201609071200/eclipse-SDK-4.6.1-linux-gtk.tar.gz;
+ sha256 = "0kgj0zpgzwx90q13c4mr8swf63azd56532ycxgq2rbs0d1qbl87j";
+ };
+ };
+ };
+
+ eclipse-sdk-37 = buildEclipse {
+ name = "eclipse-sdk-3.7";
+ description = "Eclipse Classic";
+ sources = {
+ "x86_64-linux" = fetchurl {
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.7.2-201202080800/eclipse-SDK-3.7.2-linux-gtk-x86_64.tar.gz;
+ sha256 = "0nf4nv7awhp1k8b1hjb7chpjyjrqnyszsjbc4dlk9phpjv3j4wg5";
+ };
+ "i686-linux" = fetchurl {
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.7.2-201202080800/eclipse-SDK-3.7.2-linux-gtk.tar.gz;
+ sha256 = "1isn7i45l9kyn2yx6vm88jl1gnxph8ynank0aaa218cg8kdygk7j";
+ };
+ };
+ };
+ eclipse_sdk_37 = eclipse-sdk-37; # backward compatibility, added 2016-01-30
+
+ ### Environments
+
+ # Function that assembles a complete Eclipse environment from an
+ # Eclipse package and list of Eclipse plugins.
eclipseWithPlugins = { eclipse, plugins ? [], jvmArgs ? [] }:
let
# Gather up the desired plugins.
@@ -455,6 +191,8 @@ rec {
ln -s ${eclipse}/share $out/
'';
+ ### Plugins
+
plugins = callPackage ./plugins.nix { };
}
diff --git a/pkgs/applications/editors/emacs-modes/cask/default.nix b/pkgs/applications/editors/emacs-modes/cask/default.nix
index 0566e0e8b87..56ba5ba9710 100644
--- a/pkgs/applications/editors/emacs-modes/cask/default.nix
+++ b/pkgs/applications/editors/emacs-modes/cask/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, emacs, python }:
stdenv.mkDerivation rec {
- version = "0.7.4";
+ version = "0.8.1";
name = "cask-${version}";
src = fetchFromGitHub {
owner = "cask";
repo = "cask";
rev = "v${version}";
- sha256 = "1hvm6r6a8rgjwnn2mcamwqrmhz424vlr4mbvbri3wmn0ikbk510l";
+ sha256 = "1sl094adnchjvf189c3l1njawrj5ww1sv5vvjr9hb1ng2rw20z7b";
};
buildInputs = [ emacs python ];
diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index d54b686244e..a9e2711711f 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -81,10 +81,10 @@
aggressive-indent = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "aggressive-indent";
- version = "1.8.1";
+ version = "1.8.3";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/aggressive-indent-1.8.1.el";
- sha256 = "07d311dwg6rpzydh9bw9dn1djf4x4f00ma41jmsl35mcd2m0bpz8";
+ url = "https://elpa.gnu.org/packages/aggressive-indent-1.8.3.el";
+ sha256 = "0jnzccl50x0wapprgwxinp99pwwa6j43q6msn4gv437j7swy8wnj";
};
packageRequires = [ cl-lib emacs ];
meta = {
@@ -175,10 +175,10 @@
}) {};
auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "auctex";
- version = "11.89.5";
+ version = "11.89.6";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/auctex-11.89.5.tar";
- sha256 = "0scab76ks9wnv1wp9lrm6h9hag7p70zn950srp2p02vrzz2z5p53";
+ url = "https://elpa.gnu.org/packages/auctex-11.89.6.tar";
+ sha256 = "1lfaki8s9ri6ds88mhpxwqb2jrjf7hbs1w3nxhg307344lac07gy";
};
packageRequires = [];
meta = {
@@ -228,10 +228,10 @@
}) {};
beacon = callPackage ({ elpaBuild, fetchurl, lib, seq }: elpaBuild {
pname = "beacon";
- version = "1.3.1";
+ version = "1.3.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/beacon-1.3.1.el";
- sha256 = "19dw9650kk4rch2qpp42wdq9687m3svj1addbp3yz4dijy7lx2mj";
+ url = "https://elpa.gnu.org/packages/beacon-1.3.2.el";
+ sha256 = "0ldja8xrrninm588f27bhxvp0b12cngazyz688lkxvwx28cpqb7n";
};
packageRequires = [ seq ];
meta = {
@@ -616,14 +616,15 @@
license = lib.licenses.free;
};
}) {};
- el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+ el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib, stream }:
+ elpaBuild {
pname = "el-search";
- version = "0.2.3";
+ version = "1.0.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/el-search-0.2.3.tar";
- sha256 = "0icxfq6hd8pfg4r5q70ylm84wgv1jiijpv0d56x7kjdh7wrdalrb";
+ url = "https://elpa.gnu.org/packages/el-search-1.0.1.tar";
+ sha256 = "14l7zq4bm5ihybpj8qvqpzzmgjsyhr8yq2d4jmadk35q5hlx1cbb";
};
- packageRequires = [ emacs ];
+ packageRequires = [ emacs stream ];
meta = {
homepage = "https://elpa.gnu.org/packages/el-search.html";
license = lib.licenses.free;
@@ -698,10 +699,10 @@
excorporate = callPackage ({ elpaBuild, emacs, fetchurl, fsm, lib, soap-client, url-http-ntlm }:
elpaBuild {
pname = "excorporate";
- version = "0.7.5";
+ version = "0.7.6";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/excorporate-0.7.5.tar";
- sha256 = "0w828zv8968ryphhi1zaizrs6fnxkgxdwjlhpriyc9129qnwx0cg";
+ url = "https://elpa.gnu.org/packages/excorporate-0.7.6.tar";
+ sha256 = "02bp0z6vpssc12vxxs1g4whmfxf88wsk0bcq4422vvz256l6vpf9";
};
packageRequires = [ emacs fsm soap-client url-http-ntlm ];
meta = {
@@ -1203,10 +1204,10 @@
}) {};
nameless = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
pname = "nameless";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/nameless-1.0.1.el";
- sha256 = "0gb97pjmis4fx48lsm7clp9fw0h2w4p3kdfq3z9vq4fwy5hjsn74";
+ url = "https://elpa.gnu.org/packages/nameless-1.0.2.el";
+ sha256 = "13c1payc46ry5bf8ia8cwqpshm2ya74fi5r4sxq5n410z5f0pgqx";
};
packageRequires = [ emacs ];
meta = {
@@ -1270,10 +1271,10 @@
}) {};
ntlm = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "ntlm";
- version = "2.0.0";
+ version = "2.1.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/ntlm-2.0.0.el";
- sha256 = "1n602yi60rwsacqw20kqbm97x6bhzjxblxbdprm36f31qmym8si4";
+ url = "https://elpa.gnu.org/packages/ntlm-2.1.0.el";
+ sha256 = "01d0bcmh8a36qf871w6bc05kjk9bmnh843m9869xw06zyvqwg9mv";
};
packageRequires = [];
meta = {
@@ -1336,10 +1337,10 @@
}) {};
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org";
- version = "20161003";
+ version = "20161024";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/org-20161003.tar";
- sha256 = "077v69l3w5q0rfbj1mm92cs2pz5yh3p89qnxxj0zn3g5m0dg9yjm";
+ url = "https://elpa.gnu.org/packages/org-20161024.tar";
+ sha256 = "1rg9hl8vghx72prc6m1c29p5crns0i70hh7lffbhqzjixq6jqvlj";
};
packageRequires = [];
meta = {
@@ -1661,10 +1662,10 @@
}) {};
sotlisp = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
pname = "sotlisp";
- version = "1.5.2";
+ version = "1.6.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/sotlisp-1.5.2.el";
- sha256 = "1kv161rmg71wjizd359s8l6d1z2ybyc8sbbvbwcbr778dj7x6wld";
+ url = "https://elpa.gnu.org/packages/sotlisp-1.6.2.el";
+ sha256 = "05cr4dmhg4wbmw7jbcfh0yrnbq6dhzp2wrbzvhwrfznz51j03nhi";
};
packageRequires = [ emacs ];
meta = {
@@ -1861,10 +1862,10 @@
url-http-ntlm = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, ntlm ? null }:
elpaBuild {
pname = "url-http-ntlm";
- version = "2.0.2";
+ version = "2.0.3";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/url-http-ntlm-2.0.2.el";
- sha256 = "0jci5cl31hw4dj0j9ljq0iplg530wnwbw7b63crrwn3mza5cb2wf";
+ url = "https://elpa.gnu.org/packages/url-http-ntlm-2.0.3.el";
+ sha256 = "01ivfcxrxiqs8dlqg4s3q17y4mxx0kpin60fkwrs18pca4hni203";
};
packageRequires = [ cl-lib ntlm ];
meta = {
@@ -1875,10 +1876,10 @@
validate = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "validate";
- version = "0.5";
+ version = "1.0.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/validate-0.5.el";
- sha256 = "1gzphvcqih5zz80mmnc2wx2kgc13g9hv98kqsfpndbdd3bw3blph";
+ url = "https://elpa.gnu.org/packages/validate-1.0.0.el";
+ sha256 = "10js4qds5xi5a89s4v4fz6f71b25g3x8jm1lcpf9s75i1q1xiysk";
};
packageRequires = [ cl-lib emacs ];
meta = {
diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 92ef4d0393c..4f41eb9675d 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 = "20160919.823";
+ version = "20161007.2307";
src = fetchFromGitHub {
owner = "etu";
repo = "0blayout-mode";
- rev = "b8bb44b5336965b5519b9a826a0f46f8ee31c471";
- sha256 = "1apv5zd3zzni2llj9is7h2bzq1xxbx67kr7c07dfjd26n7l0zvfi";
+ rev = "873732ddb99a3ec18845a37467ee06bce4e61d87";
+ sha256 = "1ymv9lqsn5xznyhax1pizw1i6h0pr7ckxhl28pix73wvzb5fl8mn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6521ec44ae8b0ba2e0523517f0f3d5b94ddbe1be/recipes/0blayout";
@@ -23,12 +23,12 @@
_0xc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "_0xc";
- version = "20161001.1852";
+ version = "20161018.1031";
src = fetchFromGitHub {
owner = "AdamNiederer";
repo = "0xc";
- rev = "9a05fcafe6727df0844feba7fbeb75e39ffe15a4";
- sha256 = "0yy83di1jc5nnnvfxd2l0pnzikp07m0d5szz2pkl88yrpacpnndn";
+ rev = "14891d76f031ce64969004644329d7f56821aabe";
+ sha256 = "189khq7q90bdphkfx5hdj3bci7lkhcvr6yng4bbr6nj8l4qj2c5s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3fbb2c86a50a8df9a3967787fc10f33beab2c933/recipes/0xc";
@@ -295,12 +295,12 @@
ac-cider = callPackage ({ auto-complete, cider, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ac-cider";
- version = "20160810.2358";
+ version = "20161006.19";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "ac-cider";
- rev = "8c652adebb0432e7aaafa2ff71200798b95e3a42";
- sha256 = "1lfdggd5mf5r623b3l0r6xwabikgxqyia7ym1x198lavxxvlrq1d";
+ rev = "d8670939bbf88079263d5ace2b8bc04cf325be36";
+ sha256 = "01g1h2j0rfih8v0yvvr5gjh3abcj2mz3jmfbis8a60ivmngab732";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e8adefaf2e284ef91baec3dbd3e10c868de69926/recipes/ac-cider";
@@ -380,8 +380,8 @@
src = fetchFromGitHub {
owner = "emacs-eclim";
repo = "emacs-eclim";
- rev = "6e52e1b8501288e57dd0523270ed6406795b0b9e";
- sha256 = "0jx04r7jz1ijq8y7kzcj1j8msxjnh3vbzi378dazr3762ixj51m5";
+ rev = "f2247f2515ee2eb0ff866bcbbf69d9f62b7b7780";
+ sha256 = "1d3zyaqgng0q41nnifmwwwwd9bm0w7yhkpj6lwir3m0pg5lrcw48";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim";
@@ -422,8 +422,8 @@
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-ac-emoji";
- rev = "f4b3a5b3548dc36f69daeff742f53b5bda538bae";
- sha256 = "19981mzxnqqdb8dsdizy2i8byb8sx9138x3nrvi6ap2qbcsabjmz";
+ rev = "92b691efea755c32574f9f7d88f14191971c3981";
+ sha256 = "1x7l2wm76xbrwzskk4jfd2g3smr4cvhdy4zks7h3n2mhf8k6hx83";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/15f591f9cba367b071046fef5ae01bbbd0475ce3/recipes/ac-emoji";
@@ -1069,12 +1069,12 @@
ace-window = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ace-window";
- version = "20160923.1117";
+ version = "20161018.1624";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "ace-window";
- rev = "92bd29c4fd8132944385083600b29a3f9a50a37c";
- sha256 = "078wsnslyh1wr8j8flwj7n06cf6vl152d92l9cjsj91hgy70bb73";
+ rev = "de873d17f0ac33d49b769b302f94a71ccddd4502";
+ sha256 = "1jyrycbgrl3m5ab1k9r5w4p2pvmiqf6cgpwqdbxz8wdgfpzjk9ki";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe131d3c2ea498e4df30ba539a6b91c00f5b07/recipes/ace-window";
@@ -1149,6 +1149,27 @@
license = lib.licenses.free;
};
}) {};
+ add-node-modules-path = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "add-node-modules-path";
+ version = "20160912.220";
+ src = fetchFromGitHub {
+ owner = "codesuki";
+ repo = "add-node-modules-path";
+ rev = "9ed240e05dcb9628ba380151b54b02688be5e78e";
+ sha256 = "0avv3ypdpscchq9n1lxs0ba0fc52zjyv7dbv54s7sclqxx4mi63k";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/63e99d8fc0678d7b1831cae8940e9e6547780861/recipes/add-node-modules-path";
+ sha256 = "0gbl875fgqr5np6r4cs8njs6fil1qmy8a5wir88x78ybdwwxsmbl";
+ name = "add-node-modules-path";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/add-node-modules-path";
+ license = lib.licenses.free;
+ };
+ }) {};
addressbook-bookmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "addressbook-bookmark";
@@ -1236,12 +1257,12 @@
ag = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "ag";
- version = "20160731.1323";
+ version = "20161021.2133";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "ag.el";
- rev = "e93d45fd09bcdac27cbd7bbab2a057cecbcbc01f";
- sha256 = "0jwdgpinz4as7npg7fhqycy6892p6i5g0gp5dd0n2n5r40gh620n";
+ rev = "53dde62ab6889b0beeb3012c2bdeefd85c126140";
+ sha256 = "0m43x263d9ksmxc34hqxngxhhwi7n2blb6n11vbckx2v91si2fjs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/67f410ac3a58a038e194bcf174bc0a8ceceafb9a/recipes/ag";
@@ -1257,12 +1278,12 @@
aggressive-fill-paragraph = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "aggressive-fill-paragraph";
- version = "20160301.1414";
+ version = "20161023.321";
src = fetchFromGitHub {
owner = "davidshepherd7";
repo = "aggressive-fill-paragraph-mode";
- rev = "0a0f8ff42b0964751889b9ce2477bab82acee3fe";
- sha256 = "05lci7hpla4f0z124zr58aj282pgmabqkzgcqadf0hbnqbz2jwcs";
+ rev = "25668da48db3b505f01875e0f4ededc5ad8dcb9e";
+ sha256 = "141vc0byjax91m192gbv7xlcqjzwhm8pp4hv5bka0chx20g14vq6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/982f5936f2d83222263df2886ca0b629076366bb/recipes/aggressive-fill-paragraph";
@@ -1278,12 +1299,12 @@
aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "aggressive-indent";
- version = "20160608.1625";
+ version = "20161016.1016";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "aggressive-indent-mode";
- rev = "6c3842eb4501bf6f39ea9b21c50aadd0339c4e6e";
- sha256 = "168p898flmvczqqh1ql46lgm8cw5y0ydzg5mxpylfiqa26gq3f20";
+ rev = "a8c462fbc03ef74e65f4d4a323ae3581f99e9683";
+ sha256 = "00j7mvzn1qsbk5xcw4h2wzwp1wzjvdn9qa3s0laa9x33k6kpxbha";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/aggressive-indent";
@@ -1298,11 +1319,11 @@
}) {};
ahg = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "ahg";
- version = "20160822.144";
+ version = "20161010.9";
src = fetchhg {
url = "https://bitbucket.com/agriggio/ahg";
- rev = "38f9f9740e19";
- sha256 = "0wcg03n9ddrh79r98i1pl59wncak7bb46cqcrv60hn239karsdaa";
+ rev = "5d878053fcbd";
+ sha256 = "1jisl6nh3c75fyzmr3azpf5sp8cdcfw8hd4aczbrgpjbii6127np";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ahg";
@@ -1444,12 +1465,12 @@
alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "alect-themes";
- version = "20160414.114";
+ version = "20161022.1101";
src = fetchFromGitHub {
owner = "alezost";
repo = "alect-themes";
- rev = "6fd786c0ccd5a07e8968942d0a868753503ab4c4";
- sha256 = "1g9fai2i8izswiih4ba0l2wamhfl6pvmkq7is8x0wr45waldcga9";
+ rev = "ae90b8e05a14e3439a1e4061111fcc3f75776880";
+ sha256 = "0d0dw8xjsvavmsvcgc9n4200mdq9csfxhqsjwpfphqabk89kfsdk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/84c25a290ae4bcc4674434c83c66ae128e4c4282/recipes/alect-themes";
@@ -1525,22 +1546,22 @@
license = lib.licenses.free;
};
}) {};
- all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }:
melpaBuild {
pname = "all-the-icons";
- version = "20160921.935";
+ version = "20161007.132";
src = fetchFromGitHub {
owner = "domtronn";
repo = "all-the-icons.el";
- rev = "21b2e084a8779a6eb2e800add37671e21e5fc5d8";
- sha256 = "1zw6mkayf9dqxkk6pfb6niarkxk1jcwdln45jp7q7n8vq3cqg6rp";
+ rev = "692ac0816783725600b80b5307bf48a83053a378";
+ sha256 = "13l5dqyhsma2a15khfs0vzk6c7rywfph4g9kgq10v89m3kwqich8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
sha256 = "00ba4gkfvg38l4s0gsb4asvv1hfw9yjl2786imybzy7bkg9f9x3q";
name = "all-the-icons";
};
- packageRequires = [ dash emacs ];
+ packageRequires = [ dash emacs font-lock-plus ];
meta = {
homepage = "https://melpa.org/#/all-the-icons";
license = lib.licenses.free;
@@ -1549,12 +1570,12 @@
amd-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s, seq }:
melpaBuild {
pname = "amd-mode";
- version = "20160923.134";
+ version = "20161021.251";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "amd-mode.el";
- rev = "c610c1a85728d161d28854d7373fc13b3dec311b";
- sha256 = "1ghs3gh410c9w2v17zb93wk184lwl5izpkzrm0qn37qz8i87jqcr";
+ rev = "0c4832d86e87cc2768d8ef6827d2e367ea8de403";
+ sha256 = "0449xh64lxng6pkavln4gxkrsrhngm2zmvc7lqawniq4j5j2izr3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e4d6e9935e4935c9de769c7bf1c1b6dd256e10da/recipes/amd-mode";
@@ -1642,12 +1663,12 @@
anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
melpaBuild {
pname = "anaconda-mode";
- version = "20160901.1423";
+ version = "20161009.1046";
src = fetchFromGitHub {
owner = "proofit404";
repo = "anaconda-mode";
- rev = "359c9d62649ad3f2cb007c4d8871e5b051d695f6";
- sha256 = "1kwn5lln7l754x5l3glij7ci3r2g6p9sapc43bm2gmwbgxa9fgis";
+ rev = "3f473150009f86dac68edb02e2f22850788289a5";
+ sha256 = "16c2q6c44qc3bdaxq835rrbyq49z6rd3h6cgss50p4gqwfwxfxn7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode";
@@ -1787,12 +1808,12 @@
annotate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "annotate";
- version = "20160906.2352";
+ version = "20161006.16";
src = fetchFromGitHub {
owner = "bastibe";
repo = "annotate.el";
- rev = "9616c55812c4b6f11365e0f4e90f9357c95280ff";
- sha256 = "0wkdvmszabx1rcwqbm6rw07niwd7n4bdb9h2iav2miljwy68s40x";
+ rev = "e6af7f8ef7d241fdc9f866d57dce24beb4bb6b87";
+ sha256 = "19a419rnqqsmvrcl2vwy3gl7mvbfg669vyin2h2xpm56rxsinvy1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae88b8e3b080501195d291012deab31aaf35f7/recipes/annotate";
@@ -1826,22 +1847,22 @@
license = lib.licenses.free;
};
}) {};
- annoying-arrows-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ annoying-arrows-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "annoying-arrows-mode";
- version = "20151113.902";
+ version = "20161023.2346";
src = fetchFromGitHub {
owner = "magnars";
repo = "annoying-arrows-mode.el";
- rev = "fe59f3fd464e7a87cc43fb8a1f135b3bdf8a2fb3";
- sha256 = "1ppq3kszzj2fgr7mwj565bjs8bs285ymy384cnnw7paddgcr9z02";
+ rev = "3c42e9807d7696da2da2a21b63beebf9cdb3f5dc";
+ sha256 = "06gs5ln3w1xvq8f8k9225rwiipbh9cs0dzyyb7z05717rmqixcc4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/annoying-arrows-mode";
sha256 = "13bwqv3mv7kgi1gms58f5g03q5g7q98n4vv6n28zqmppxm5z33s7";
name = "annoying-arrows-mode";
};
- packageRequires = [];
+ packageRequires = [ cl-lib ];
meta = {
homepage = "https://melpa.org/#/annoying-arrows-mode";
license = lib.licenses.free;
@@ -1871,12 +1892,12 @@
ansible = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "ansible";
- version = "20160326.831";
+ version = "20161016.1658";
src = fetchFromGitHub {
owner = "k1LoW";
repo = "emacs-ansible";
- rev = "950e24319940526aa14ac33e2b67f7567dd5dc17";
- sha256 = "0k927pwhmn1cfl6jqs7ww1g6f64nq5i8f6a732d4q2rbl3aqzbdi";
+ rev = "c5e4c00135ae8860b8301d1227c3382a7c05ab09";
+ sha256 = "0v1asp6q1c744nad3hvhyw3llmpr0jz5yp8dlzfi82pdxk66qhp4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8e45bf58b980ff542a5e887707a6361eb5ac0492/recipes/ansible";
@@ -1913,12 +1934,12 @@
ansible-vault = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ansible-vault";
- version = "20161001.1001";
+ version = "20161008.1435";
src = fetchFromGitHub {
owner = "zellio";
repo = "ansible-vault-mode";
- rev = "8b4cdebb817c979b13eab625e3bbeebb08ddf026";
- sha256 = "1gqga59qinmkjalk1jkbh8w70sqvb3p033sbx69qljc2mivs8rh8";
+ rev = "57fd8017ab93cc6a1f9bbc795d494a069557a1cb";
+ sha256 = "04sdgg98z9gydgx8sf4nfmkwazm799gyvywssfa0mkcvza2z7s21";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2bff0da29a9b883e53a3d211c5577a3e0bc263a0/recipes/ansible-vault";
@@ -2224,22 +2245,22 @@
license = lib.licenses.free;
};
}) {};
- anzu = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ anzu = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "anzu";
- version = "20160818.619";
+ version = "20161017.907";
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-anzu";
- rev = "1965307a41aac029db2be007120e0c743226dba4";
- sha256 = "0xizn58wplk7r7zmfm12b0rkkl4nhlskbk6h20pdfic3xvad9zyk";
+ rev = "e6c56ca8b23ac433f7be58b6f3f50801dd4164e4";
+ sha256 = "1y6s45k3f2x30fc9d5dv1v3cypj9wylx56khs5zxczgk5ky1ffp4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/04ac359d02d91725c8fc451b17bc2f06a7fe57a5/recipes/anzu";
sha256 = "0i2ia0jisj31vc2pjx9bhv8jccbp24q7c406x3nhh9hxjzs1f41i";
name = "anzu";
};
- packageRequires = [ cl-lib emacs ];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/anzu";
license = lib.licenses.free;
@@ -2485,18 +2506,19 @@
license = lib.licenses.free;
};
}) {};
- aria2 = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
+ aria2 = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "aria2";
version = "20141107.1517";
- src = fetchgit {
- url = "https://bitbucket.org/ukaszg/aria2.git";
+ src = fetchFromGitLab {
+ owner = "ukaszg";
+ repo = "aria2";
rev = "3c54254e424c6c8b4eb0d8e7c4907b094c27a3f0";
sha256 = "1xkgz3l7idw5bk1xlffdaddf5v1q6fm3grbryl4xvssrbwgnyisf";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/9444cfcdf2ea01891e63c599bcbba36a6bf47cce/recipes/aria2";
- sha256 = "10x2k99m3kl6y0k0mw590gq1ac162nmdwk58i8i7a4mb72zmsmhc";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/89a55e7c313066ae1bc0db0af5c289814c85fcb1/recipes/aria2";
+ sha256 = "1gsqdqs3q86k7q88rf7qamc0sp5ca00xn9kr1r717vf6qq6a0c3c";
name = "aria2";
};
packageRequires = [ emacs ];
@@ -2652,12 +2674,12 @@
assess = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }:
melpaBuild {
pname = "assess";
- version = "20160628.1539";
+ version = "20161012.753";
src = fetchFromGitHub {
owner = "phillord";
repo = "assess";
- rev = "61771edab753d5469d4bb9b8273f55e79b3fda04";
- sha256 = "1phhjq40fwb4vv35wkdphbc676y8gqxh25iqnrd3km818md5mqlb";
+ rev = "e2e5f1cbbdeb4bdeb7a474f0ec1b038c3786b1ef";
+ sha256 = "1pv8q88f5aj6qxqv0n8knfb3gk079wgk6l0nkch8518pq00vwnif";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6f917a34506193f2674b195569dfd3c13ba62c1d/recipes/assess";
@@ -2673,12 +2695,12 @@
async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "async";
- version = "20160711.2235";
+ version = "20161010.2322";
src = fetchFromGitHub {
owner = "jwiegley";
repo = "emacs-async";
- rev = "8bc0678ebca97e7b1c6e78e75e03f8dfd502d63a";
- sha256 = "1b56qfggajh2a3aanq3q40wa88nj5adpj6v85x2v4y5bi01r5nib";
+ rev = "31b169150c58b8d40db552094018ed7b053d234d";
+ sha256 = "0m9kqyd0krfvp5vliqj3rcdd9j32r4hlxhhvb6mx2lvjxfmdi1wi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6a0fe448e82f42cad0fdaa40c964032892fedd83/recipes/async";
@@ -2817,22 +2839,22 @@
license = lib.licenses.free;
};
}) {};
- aurel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ aurel = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "aurel";
- version = "20160309.36";
+ version = "20161023.122";
src = fetchFromGitHub {
owner = "alezost";
repo = "aurel";
- rev = "2b462d08c0e21f7fee0039457a02fa766fc6181c";
- sha256 = "0dqr1yrzf7a8655dsbcch4622rc75j9yjbn9zhkyikqjicddnlda";
+ rev = "a77e8afd1cc34a1f042be7b1c34a17eb699d826a";
+ sha256 = "0r4z97n99gh62yn21b2zzs4bc85hwbnyi4x1gllyrrmmb6qjg1lr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d1612acd2cf1fea739739608113923ec51d307e9/recipes/aurel";
sha256 = "13zyi55ksv426pcksbm3l9s6bmp102w7j1xbry46bc48al6i2nnl";
name = "aurel";
};
- packageRequires = [ emacs ];
+ packageRequires = [ bui dash emacs ];
meta = {
homepage = "https://melpa.org/#/aurel";
license = lib.licenses.free;
@@ -2859,36 +2881,15 @@
license = lib.licenses.free;
};
}) {};
- aurora-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "aurora-theme";
- version = "20151015.1102";
- src = fetchFromGitHub {
- owner = "xzerocode";
- repo = "aurora-theme";
- rev = "3cd8c3359b7b15148e5cea503f3d071e1ed7fc79";
- sha256 = "1z2n6gd63mgj2wj45n6g1gmfrk0iwzlrzb6g1rdd9r9a03c03qi6";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a687ff55ba0f473484b9dadf98d5ea4961f346b9/recipes/aurora-theme";
- sha256 = "1fhlng30v25ycr502vfvajl70vimscqkipva6ghr670j35ac5vz5";
- name = "aurora-theme";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/aurora-theme";
- license = lib.licenses.free;
- };
- }) {};
auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }:
melpaBuild {
pname = "auth-password-store";
- version = "20160909.50";
+ version = "20161021.2302";
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "auth-password-store";
- rev = "73bf5a83697f10fb9291ae30d58ae0f1f4f9f2c0";
- sha256 = "0dqgxfw0c6zdnhfdsys8and60qxpd3vk459kx4xgbvmv0vljl83h";
+ rev = "5ca6a838489c1175de3df7af025751559eb13cb3";
+ sha256 = "10y6grxwp8sw24fv8i9f50lc83qcdxnkw2bm1v983fw6di4i3a8w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store";
@@ -3258,12 +3259,12 @@
auto-dim-other-buffers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "auto-dim-other-buffers";
- version = "20160811.548";
+ version = "20161004.539";
src = fetchFromGitHub {
owner = "mina86";
repo = "auto-dim-other-buffers.el";
- rev = "b797afadb48f69671d167050243e086923dcd364";
- sha256 = "0qx4db2m6xpz9j9p2jj49dilqzikbz16b4gf1p38r48w51ff8779";
+ rev = "31c13e7ed87dd862c73b836d11c127164edb1458";
+ sha256 = "0snkc7pkiv8iiy7xb64mg8ja7ig0rzkp5b6qkbalgxk9m4l8nmcb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/auto-dim-other-buffers";
@@ -3776,12 +3777,12 @@
avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }:
melpaBuild {
pname = "avy-migemo";
- version = "20161001.845";
+ version = "20161005.720";
src = fetchFromGitHub {
owner = "momomo5717";
repo = "avy-migemo";
- rev = "74d57be48c29a05e79a920f890a083ab0da75769";
- sha256 = "0s9lhg6kjm51h4wzv2rz6rbl2wr7k54i4bhvsifq6c66cmwz5phl";
+ rev = "591102f3826b1ab0731866a4926e708e6fc014cc";
+ sha256 = "0cwrk8iaibd280w4c5yr0swfglsx9fwjqqshky2m1fc5kf332vpv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo";
@@ -3833,22 +3834,22 @@
license = lib.licenses.free;
};
}) {};
- aws-ec2 = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, tablist }:
+ aws-ec2 = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, tblui }:
melpaBuild {
pname = "aws-ec2";
- version = "20161002.628";
+ version = "20161007.1214";
src = fetchFromGitHub {
owner = "Yuki-Inoue";
repo = "aws.el";
- rev = "2bac460bd54cefe4d1781255ea4800a9037fc520";
- sha256 = "0d8n7ii5z81cc4i5fhbs31b0wfh492qmi8n207cy0ndvpm774l8v";
+ rev = "5601d4f268fc34b86a02ca90cde7d3771619a368";
+ sha256 = "15idbbxsghzn737s9jppnx820nnm1srcl1418458hwfy3wqhq38g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/90ac00160cbf692baa1f3953122ac828356944e0/recipes/aws-ec2";
sha256 = "040c69g8rhpcmrdjjg4avdmqarxx3dfzylmz62yxhfpn02qh48xd";
name = "aws-ec2";
};
- packageRequires = [ cl-lib dash emacs magit-popup tablist ];
+ packageRequires = [ dash emacs tblui ];
meta = {
homepage = "https://melpa.org/#/aws-ec2";
license = lib.licenses.free;
@@ -4007,12 +4008,12 @@
badwolf-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "badwolf-theme";
- version = "20160920.839";
+ version = "20161004.15";
src = fetchFromGitHub {
owner = "bkruczyk";
repo = "badwolf-emacs";
- rev = "436f48df120530f4eab7c9f02e0b55805122b970";
- sha256 = "0hnb3a4yyz4q94cgbmv1ygpir7azgmzd70l7zafibbxvsp4zir43";
+ rev = "ea01a3d9358e968f75e3ed15dec6a2a96ce3d9a1";
+ sha256 = "0a6adsxvmw3mgji17is75jrq3ifmzpch8rwqqyfgc99xzndvab7l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/01f3deade0759830ed2e70e00e596915be5f5c11/recipes/badwolf-theme";
@@ -4070,12 +4071,12 @@
base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "base16-theme";
- version = "20160930.2031";
+ version = "20161012.1122";
src = fetchFromGitHub {
owner = "belak";
repo = "base16-emacs";
- rev = "4a50d7fce61c96865d603829f5fe1003848e8fbb";
- sha256 = "1v0ayygk51m292b4vb677v1mafma6a68zxfkhv9a0825ax8w42ix";
+ rev = "df75fdf19e9159d1249b1708c0d416dc334c97cb";
+ sha256 = "0zqhcm3i2aldhwrrd8wgq85jr5lxgwqvmd34zwykb76pcj0a21a4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -4443,12 +4444,12 @@
beacon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "beacon";
- version = "20160708.2012";
+ version = "20161004.756";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "beacon";
- rev = "c9cc62d42ef0c14079c97890bdd402c8efa4e52b";
- sha256 = "0j9l2j22nj1dddqa9ykdcv4an3xipn1zwp8kaw84ac18fql0br7x";
+ rev = "c9d86457d43decf61810006752544d7f7bd5a61d";
+ sha256 = "132ixmzjz3sg15qvdbv3s8p6dv3bz7vwlhs50dax0z19dr79cda0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d09cfab21be800831644218e9c8c4433087951c0/recipes/beacon";
@@ -4650,12 +4651,12 @@
biblio = callPackage ({ biblio-core, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "biblio";
- version = "20160901.1115";
+ version = "20161014.1604";
src = fetchFromGitHub {
owner = "cpitclaudel";
repo = "biblio.el";
- rev = "0036495a2e0d4b02b9e957e498f9437e394d6ed9";
- sha256 = "1f0p5fgvabdpafil7s8sy82hgcfzg1skxfgj72ylv3crq36bn4vp";
+ rev = "a5a68fcf677f286f205f32dc7486f6c9f66aa6af";
+ sha256 = "1gxjind6r235az59dr8liv03d8994mqb8a7m28j3c12q7p70aziz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c5fbaa8c59b0e64d13beb0e0f18b0734afa84f51/recipes/biblio";
@@ -4675,8 +4676,8 @@
src = fetchFromGitHub {
owner = "cpitclaudel";
repo = "biblio.el";
- rev = "0036495a2e0d4b02b9e957e498f9437e394d6ed9";
- sha256 = "1f0p5fgvabdpafil7s8sy82hgcfzg1skxfgj72ylv3crq36bn4vp";
+ rev = "a5a68fcf677f286f205f32dc7486f6c9f66aa6af";
+ sha256 = "1gxjind6r235az59dr8liv03d8994mqb8a7m28j3c12q7p70aziz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f4f086d3e8fd6a95ce198e148cd3ede35dd73fb8/recipes/biblio-core";
@@ -4780,8 +4781,8 @@
src = fetchFromGitHub {
owner = "jwiegley";
repo = "use-package";
- rev = "ca736c378404d66e9ff0df27969bad2b921c8d08";
- sha256 = "1133n9rgclqyyqba91cc8n1hfhcqxkzh67c6nq5szwy30zjqpzy1";
+ rev = "b9117844856b72d0ac331813ca6ae0f1abca9fc6";
+ sha256 = "1fxb3sc5k82mjjds45fwcva8z7fdmpyjvl2pciq96g72md9is8kk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key";
@@ -4885,8 +4886,8 @@
src = fetchFromGitHub {
owner = "canatella";
repo = "bitbake-el";
- rev = "da272d5c32e1ff45c6bfe4163e4013b402e3d0e7";
- sha256 = "038cyx0pfkqc4fgf07ks6ph3v7zfjqag603387010csn7f0z02is";
+ rev = "4ab424d970bee0f6b91a1fc545b14ded173e3476";
+ sha256 = "0xqi5s8536hajjl3g1a2i8p9ll4vq9gdx2jjbjzlid65h669bny8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/da099b66180ed537f8962ab4ca727d2441f9691d/recipes/bitbake";
@@ -5067,12 +5068,12 @@
bm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bm";
- version = "20160924.1310";
+ version = "20161024.1006";
src = fetchFromGitHub {
owner = "joodland";
repo = "bm";
- rev = "acdd5fef7c72969c1e973113ce4989a9651e2d32";
- sha256 = "19gh8mzq6hvpssp5fdm17gchqmwpdhdrfhg3mvd6qinh0wn2hrgz";
+ rev = "c77ea49f5632b5d987243eddb4b36e84b870bf42";
+ sha256 = "0jfi24kck1ag19lfcfzbivwb1zhid173p7f8chc01cz68l1pp7jw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/bm";
@@ -5172,12 +5173,12 @@
boogie-friends = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "boogie-friends";
- version = "20160805.1441";
+ version = "20161019.1425";
src = fetchFromGitHub {
owner = "boogie-org";
repo = "boogie-friends";
- rev = "a0c3942ddbeebc7a45c31303157409a283ad4496";
- sha256 = "1sfv50x6al276w70170nyy5fyi60r1rp3y81332pp2mn1rlqsflv";
+ rev = "8b567f5efe71d94bba3c29c52dffd58a33abc0cb";
+ sha256 = "1gwj8d1635l7l7cqk1508gkzfgi8hpq6w0x22w7rd5yrwz1nmx5b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5bdd06b82d002677c046876642efe1dc01bc3e77/recipes/boogie-friends";
@@ -5211,12 +5212,12 @@
boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
melpaBuild {
pname = "boon";
- version = "20160929.1310";
+ version = "20161013.2331";
src = fetchFromGitHub {
owner = "jyp";
repo = "boon";
- rev = "dde68b2e64ea7192d313d57536960237ce2db1fd";
- sha256 = "1mbma82ikhywfk71x3y0y49ys101aidxikgsmxyiy26ngfvkm9ml";
+ rev = "bd3f79f3f1c1aaef942ee5d2ef053534bd3adbff";
+ sha256 = "0jrrfrs277spd1h3gha9fp3jbyafj4cxzg7gdzxj9px04iyyn4zs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon";
@@ -5400,12 +5401,12 @@
browse-at-remote = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "browse-at-remote";
- version = "20160618.105";
+ version = "20161018.858";
src = fetchFromGitHub {
owner = "rmuslimov";
repo = "browse-at-remote";
- rev = "3124d791d159d22661ebe1a1c938a292c8d3e207";
- sha256 = "17kfmxcjndk7xigc1vwxvycsjmzrwaik5f0nscah0y867vicz3lf";
+ rev = "f55bb2abdc139b8da0cb5c9764388bb5ad24e9d8";
+ sha256 = "04sv02mfjn3gvqpln0x7z5wa8w0dd2khv277jb84ifvy8bmchd2g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/203e177f09eac4ebb8c7e3532bd82f749f8e2607/recipes/browse-at-remote";
@@ -5746,6 +5747,48 @@
license = lib.licenses.free;
};
}) {};
+ bui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "bui";
+ version = "20161023.113";
+ src = fetchFromGitHub {
+ owner = "alezost";
+ repo = "bui.el";
+ rev = "c1bc2a1cd7e43d51915dd736af299632061515b2";
+ sha256 = "0yncgymgcdp2g094f5f6n46326gv647997i5kafii8snc0y2nxyl";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/38b7c9345de75a707b4a73e8bb8e2f213e4fd739/recipes/bui";
+ sha256 = "0a4g55k02hi3cwvk4d35lk2x5kc4fabskl2025i83hx0rqw4w3f1";
+ name = "bui";
+ };
+ packageRequires = [ dash emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/bui";
+ license = lib.licenses.free;
+ };
+ }) {};
+ build-helper = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
+ melpaBuild {
+ pname = "build-helper";
+ version = "20161009.1055";
+ src = fetchFromGitHub {
+ owner = "afonso360";
+ repo = "build-helper";
+ rev = "7a6fe71125a26ed1c492dab77cc688a7fe1d68ac";
+ sha256 = "0pipdzjf7arli6b88fp21as5d4v8ylsy19hixywhfgb7917qsrkv";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/af56cde18ae0efb0ae91c818e6804c55cdb3b8c2/recipes/build-helper";
+ sha256 = "1asgpf2k4i7p88ask1i6ra4krhsxr6j2d2qv0gfxlsa5p330mmgh";
+ name = "build-helper";
+ };
+ packageRequires = [ projectile ];
+ meta = {
+ homepage = "https://melpa.org/#/build-helper";
+ license = lib.licenses.free;
+ };
+ }) {};
bundler = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
melpaBuild {
pname = "bundler";
@@ -6234,7 +6277,7 @@
version = "20151009.845";
src = fetchsvn {
url = "http://caml.inria.fr/svn/ocaml/trunk/emacs/";
- rev = "16551";
+ rev = "16552";
sha256 = "16qw82m87i1fcnsccqcvr9l6p2cy0jdhljsgaivq0q10hdmbgqdw";
};
recipeFile = fetchurl {
@@ -6272,12 +6315,12 @@
cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
melpaBuild {
pname = "cargo";
- version = "20160910.827";
+ version = "20161019.542";
src = fetchFromGitHub {
owner = "kwrooijen";
repo = "cargo.el";
- rev = "45ec3ac3bce4aac6b832e158efc8cb784caaf5f2";
- sha256 = "0jmdh4bllmr3jgv2v35d014pjcl4brffz9p9l17dvdi01pwkhan0";
+ rev = "6964b08c9474a2cd4809e66efa646b871139b5d1";
+ sha256 = "17jc1jvys1a3rg5hvcwkzcq98slwcidff89f7vri23hks69dc2bp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo";
@@ -6444,8 +6487,8 @@
src = fetchFromGitHub {
owner = "skk-dev";
repo = "ddskk";
- rev = "c06ead712c4c0f44c809552014ba6f12f36102fb";
- sha256 = "1ixg1871v9k755yflh4c92bp00ylip5aax5zgsqhbxj7mpi535pd";
+ rev = "d0d80ff47a2d39969c7091aa594fd51f21953b07";
+ sha256 = "0mwfbd99kv4cb6ba50swll944vcrdsbs4hy2kkcsff8n84pbap17";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc";
@@ -6486,8 +6529,8 @@
src = fetchFromGitHub {
owner = "skk-dev";
repo = "ddskk";
- rev = "c06ead712c4c0f44c809552014ba6f12f36102fb";
- sha256 = "1ixg1871v9k755yflh4c92bp00ylip5aax5zgsqhbxj7mpi535pd";
+ rev = "d0d80ff47a2d39969c7091aa594fd51f21953b07";
+ sha256 = "0mwfbd99kv4cb6ba50swll944vcrdsbs4hy2kkcsff8n84pbap17";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb";
@@ -6673,8 +6716,8 @@
src = fetchFromGitHub {
owner = "cfengine";
repo = "core";
- rev = "2029d3e544c83a43ef785ab59a3969bb6992186a";
- sha256 = "0vfaxdf87ry4ykvmnyk5b5skmrmz207slpf9nm94zi9lq40nscdd";
+ rev = "67075d95e0eef274d7d423dac80665d5b938277b";
+ sha256 = "1jrr49ckph5h2z3q1xpmbj10v7h95vaw5pidxh46l344gzbczniz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -6713,7 +6756,7 @@
version = "20160801.615";
src = fetchsvn {
url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
- rev = "11758";
+ rev = "11826";
sha256 = "1wbk9aslvcmwj3n28appdhl3p2m6jgrpb5cijij8fk0szzxi1hrl";
};
recipeFile = fetchurl {
@@ -6896,12 +6939,12 @@
chee = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "chee";
- version = "20160720.1318";
+ version = "20161020.45";
src = fetchFromGitHub {
owner = "eikek";
repo = "chee";
- rev = "d15d10c32447edb528b9e6e00091ab326a100a25";
- sha256 = "0y0k30pmrdfkadxp3j60i9bjiai8ds7l5a6iy6xmkkmiksgjdv4k";
+ rev = "e0a001819033b01e95aae81246dbcd5db659695d";
+ sha256 = "0w1napa2zmxmh5dvk5sdxl1w7pl27vjjmqhbjxljh4vs2vy2v9zi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9f4a3775720924e5a292819511a8ea42efe1a7dc/recipes/chee";
@@ -7022,12 +7065,12 @@
chinese-fonts-setup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "chinese-fonts-setup";
- version = "20160915.1934";
+ version = "20161008.450";
src = fetchFromGitHub {
owner = "tumashu";
repo = "chinese-fonts-setup";
- rev = "dc7a7bfb2ed5f26d99bfe416f2586aba50082c64";
- sha256 = "0rghbg1a8bqll5zn6r2gff94l8jn22q52aac7hpcw5n53ypqk4c1";
+ rev = "3f1e8d13837d22109a0eb0af4ee85fb2e90b31a1";
+ sha256 = "0xx692nbnw6wkdh84i59kfr0nzq6jh4iarzzqppd60rr48r3l9wx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c536882e613e83a4a2baf86479bfb3efb86d916a/recipes/chinese-fonts-setup";
@@ -7040,6 +7083,27 @@
license = lib.licenses.free;
};
}) {};
+ chinese-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "chinese-number";
+ version = "20161007.2209";
+ src = fetchFromGitHub {
+ owner = "zhcosin";
+ repo = "chinese-number";
+ rev = "7311c2a0c5eea5f016a90d733dfe75144c302fb2";
+ sha256 = "01i7nycjnx4cpfgwakj14jv9dwybjl5jnslcxic9pr1n77mz53wk";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6c2e447028dbae2dfefc47859c185af254210fe8/recipes/chinese-number";
+ sha256 = "0qj7lh7asic77dsdlsv4pg2jzickqa0m5lvn8f184qq98yfmj6d6";
+ name = "chinese-number";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/chinese-number";
+ license = lib.licenses.free;
+ };
+ }) {};
chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }:
melpaBuild {
pname = "chinese-pyim";
@@ -7250,12 +7314,12 @@
cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
melpaBuild {
pname = "cider";
- version = "20160927.2135";
+ version = "20161016.424";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "cider";
- rev = "cb2ec12357ab84c04b91b9dd17a007ae78a04afd";
- sha256 = "0jf7d5mjwkykvn9zfbwq2knmk9axfmyz8m20h3m9ih7f5bvsxci0";
+ rev = "3be082ae4a3d0b40d360648b20fb7caa14c0a9fc";
+ sha256 = "00c0674gxwwn8ijg2g61mq546bzwh142cj16lm960zq2rnbc0ia0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -7296,8 +7360,8 @@
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "cider-eval-sexp-fu";
- rev = "06fefc17ea8a87997d1f18b25e78d874b10299ad";
- sha256 = "1lhf5g5gi31pv2c80fsnw62zfikj3prbs6xwaikbywp48dzhx02y";
+ rev = "5687e7b33e17f2be40b036dac82da4a5bc6705fb";
+ sha256 = "0wyx51vggs76wj1gawwv1za6sa5gv1pj60vmc1ymzaw153ryhdq8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/947f4d106d70f95ca8aac124ab0d90b2975208df/recipes/cider-eval-sexp-fu";
@@ -7310,6 +7374,27 @@
license = lib.licenses.free;
};
}) {};
+ cider-hydra = callPackage ({ cider, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
+ melpaBuild {
+ pname = "cider-hydra";
+ version = "20161018.2254";
+ src = fetchFromGitHub {
+ owner = "clojure-emacs";
+ repo = "cider-hydra";
+ rev = "6bb341143fe16f12be2262b2bcd003a246962676";
+ sha256 = "094641g6rzm4y6k8ph1bbkfiwpp37wk1q9mcylbah01qlqd9c9qm";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/51d5e6471f88337c478ee5c189f037aaec937f56/recipes/cider-hydra";
+ sha256 = "1qjgfrj3ck70vkyc9c00mif0jq5hc2yan2hql31qzbpqzg3pi2r7";
+ name = "cider-hydra";
+ };
+ packageRequires = [ cider hydra ];
+ meta = {
+ homepage = "https://melpa.org/#/cider-hydra";
+ license = lib.licenses.free;
+ };
+ }) {};
cider-profile = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cider-profile";
@@ -7418,12 +7503,12 @@
circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "circe";
- version = "20160608.1315";
+ version = "20161023.1346";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "circe";
- rev = "0564dfae13590d183889950724a7ef2e8df5b1df";
- sha256 = "1nwdbm9dnybghcv2rjw9c8783k5r060cmxzklsn9by4l7i1x9k2r";
+ rev = "85d8c18cacbf9c006deb331867cde65fad90b47f";
+ sha256 = "0skbqd38lb0xh55xfd13c80s6xn70sqg67cpvdx6qck644apg4af";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe";
@@ -7502,11 +7587,11 @@
clang-format = callPackage ({ cl-lib ? null, fetchsvn, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "clang-format";
- version = "20160912.302";
+ version = "20161004.253";
src = fetchsvn {
url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
- rev = "283173";
- sha256 = "0fp1q99rrc5c8y9n3bvxqjmfpapkl5qbm47cijipb25bv189gqym";
+ rev = "284990";
+ sha256 = "15d5ils5nlqydqmvjjm5znnbj9r489n9018qym8zl58m2dw0i753";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format";
@@ -7711,12 +7796,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 = "20160922.329";
+ version = "20161005.344";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clj-refactor.el";
- rev = "85feb15737823e1bdc07c39088cc3a4f7b18168e";
- sha256 = "16r7ymh4i3n890zi5z4a7s4ryybgml8jhjfnacv47yfgx7x5flds";
+ rev = "8bacd65fb89a530f8e72b5ee78593e7dfcef57e3";
+ sha256 = "1pj72q9mqjj22h5cplxgplp1wcljcyg46ni8j6xh3ys3j8bs3jyp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor";
@@ -7870,12 +7955,12 @@
clojure-cheatsheet = callPackage ({ cider, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "clojure-cheatsheet";
- version = "20160707.118";
+ version = "20161004.2328";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clojure-cheatsheet";
- rev = "11544e07d788df0fe82a2cf6c496f73fbda4955c";
- sha256 = "1gzfgzykyj9nsi970j9v2fpdlll8by7dg308yh8q3ahq5jk09p92";
+ rev = "57e877d9466934b5319989b542f93b42dffec9ae";
+ sha256 = "1d61q50h4vxk8i3jwxf71rbqah7ydfsd0dny59zq0klszfz2q26b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0569da79bd8145df334965c5d4364a50b6b548fa/recipes/clojure-cheatsheet";
@@ -7891,12 +7976,12 @@
clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "clojure-mode";
- version = "20160803.140";
+ version = "20161017.1134";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clojure-mode";
- rev = "464c9de6734cb4b426137674041d695c2a7c7ef9";
- sha256 = "0xg85x5lrh1d8vlnkzrxpdrcqsqngjy6xp7p509wnhx7k8j85vpm";
+ rev = "d3034dcbfeb5e818b5a891034a91cbc5eea87a73";
+ sha256 = "04qcgj7c4z8cxq7qh25nailqv9sv2ijjbdxipb0bkvp6kvarnmn6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode";
@@ -7916,8 +8001,8 @@
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clojure-mode";
- rev = "464c9de6734cb4b426137674041d695c2a7c7ef9";
- sha256 = "0xg85x5lrh1d8vlnkzrxpdrcqsqngjy6xp7p509wnhx7k8j85vpm";
+ rev = "d3034dcbfeb5e818b5a891034a91cbc5eea87a73";
+ sha256 = "04qcgj7c4z8cxq7qh25nailqv9sv2ijjbdxipb0bkvp6kvarnmn6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking";
@@ -7954,12 +8039,12 @@
clojure-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "clojure-snippets";
- version = "20160728.29";
+ version = "20161024.16";
src = fetchFromGitHub {
owner = "mpenet";
repo = "clojure-snippets";
- rev = "c5220e978709bc7234e3adfe336b66eff2b89b4b";
- sha256 = "08zrmbhczr08s8ni76i9g338250rgk95vz7sl22rj5fxln3zn6xz";
+ rev = "bc9144ae5cd9e4468a9d34f1ae8a05d9933e5a39";
+ sha256 = "1xcjlid47w4xjxishal2rvfdwk7qyphy2v2bphdaysllccclw9pq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4898fc6746b30b0d0453b3b56d02479bfb0f70b9/recipes/clojure-snippets";
@@ -8122,12 +8207,12 @@
cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, seq }:
melpaBuild {
pname = "cmake-ide";
- version = "20160929.2359";
+ version = "20161023.1225";
src = fetchFromGitHub {
owner = "atilaneves";
repo = "cmake-ide";
- rev = "3e20bd79267b6896154b4d1ca213491e685c3244";
- sha256 = "1jxwrwja9z54jij69wjgin1kbkp6570xz6qxivjz86dk29rqxflv";
+ rev = "16449deab6d160c7f0d3d0e50013b6606e958138";
+ sha256 = "0fhahc1c8a7qdndgj4gp1lkxw6k80m8ajab8z9w4r8793gbvdrd8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide";
@@ -8147,8 +8232,8 @@
src = fetchFromGitHub {
owner = "Kitware";
repo = "CMake";
- rev = "484dc1e5d85f4f468e27816eab0fccc9c7d6ec11";
- sha256 = "0f66d728xb5dwpac4pz1x9ghhndd4axflbgy369snz38sw57hyn3";
+ rev = "f660832999e086f02a9f3552c028aed900cd7249";
+ sha256 = "02v72yi1b3crq549959wi0a4rxjwknzkx6wqalraz7r2p5vfwdwy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -8474,12 +8559,12 @@
color-identifiers-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "color-identifiers-mode";
- version = "20160810.2142";
+ version = "20161019.1314";
src = fetchFromGitHub {
owner = "ankurdave";
repo = "color-identifiers-mode";
- rev = "c2cc1e5e6a7120da37de3a24d6796678c6637e0f";
- sha256 = "08y8ks2a017899prwgjxqxl15dip6g2kxfglnsfq03vgzjp7ry21";
+ rev = "2b02b8d4ed0233d63a698a7f929b87fcaa8d0048";
+ sha256 = "1jqvdask079373q9lgfp058892apx8qcchnrwwwd2zgfnwhjhy1q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5c735755e414fdf169aca5ec6f742533d21472e0/recipes/color-identifiers-mode";
@@ -8704,12 +8789,12 @@
column-enforce-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "column-enforce-mode";
- version = "20140902.949";
+ version = "20161020.434";
src = fetchFromGitHub {
owner = "jordonbiondo";
repo = "column-enforce-mode";
- rev = "f43263e50ae83db099d83ea445f93e248a3207a0";
- sha256 = "0ay4wrnyrdp4v3vjxr99hy8fpq6zsyh246c0gbp7bh63l5fx8nwr";
+ rev = "858a49daca67188cbcc151a7b531556552d48d00";
+ sha256 = "1hb2lwnq7f81qnp3kymhld0y05kqd249nnpnbiby4pdfwwfc92fl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/91bebef8e97665a5d076c557d559367911a25ea2/recipes/column-enforce-mode";
@@ -9000,6 +9085,27 @@
license = lib.licenses.free;
};
}) {};
+ company-bibtex = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, regexp-opt }:
+ melpaBuild {
+ pname = "company-bibtex";
+ version = "20161023.1605";
+ src = fetchFromGitHub {
+ owner = "gbgar";
+ repo = "company-bibtex";
+ rev = "223002a6ff83ff3851d07155b470d5941ba09455";
+ sha256 = "17y4i37a1j9crdl8bpbbs71l1mnkif8s42a3p7rgvp3mn6z8qsdi";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7c366ac2949eae48766fce70a7b01bbada6fcc27/recipes/company-bibtex";
+ sha256 = "14s3hxm7avpw59v4sz0d3drjzin745rczp93rcv4s7i3a7kdmn30";
+ name = "company-bibtex";
+ };
+ packageRequires = [ cl-lib company parsebib regexp-opt ];
+ meta = {
+ homepage = "https://melpa.org/#/company-bibtex";
+ license = lib.licenses.free;
+ };
+ }) {};
company-c-headers = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-c-headers";
@@ -9028,8 +9134,8 @@
src = fetchFromGitHub {
owner = "iquiw";
repo = "company-cabal";
- rev = "f458de88cad16ed48a605e8347e56433e73dcef8";
- sha256 = "0ll9dxzsgrpy4psz3dqhzny990lfccn63swcyfvl8mnqgwbrq8k0";
+ rev = "05886d6f2621b019fafb40cff4d2567e5d8045b4";
+ sha256 = "1yxp6l8a16d6g2sfwrpfx97ds7nfrgk2akwydal1dzr2bjq02pc6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ee888b1ba57b6af3a3330607898810cd248862db/recipes/company-cabal";
@@ -9066,12 +9172,12 @@
company-dcd = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, flycheck-dmd-dub, ivy, lib, melpaBuild, popwin, yasnippet }:
melpaBuild {
pname = "company-dcd";
- version = "20160806.1852";
+ version = "20161020.430";
src = fetchFromGitHub {
owner = "tsukimizake";
repo = "company-dcd";
- rev = "d2cead0a3f70a0ef944bc778643d26934331642d";
- sha256 = "0w410mqhafxfywa1hfgms21kzpww6sfw4v4fl43pkcxfki94fv1r";
+ rev = "24c5c56efee1e850ae851a87e8345313a2388ef4";
+ sha256 = "1mcr6rbmkk5yh1icgfhq1qfcvpmrwimqcp7f8k8dmyk99lpkmx6f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ad5be8c53911271fba03a88da7e9d518c6508ffe/recipes/company-dcd";
@@ -9161,8 +9267,8 @@
src = fetchFromGitHub {
owner = "emacs-eclim";
repo = "emacs-eclim";
- rev = "6e52e1b8501288e57dd0523270ed6406795b0b9e";
- sha256 = "0jx04r7jz1ijq8y7kzcj1j8msxjnh3vbzi378dazr3762ixj51m5";
+ rev = "f2247f2515ee2eb0ff866bcbbf69d9f62b7b7780";
+ sha256 = "1d3zyaqgng0q41nnifmwwwwd9bm0w7yhkpj6lwir3m0pg5lrcw48";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim";
@@ -9245,8 +9351,8 @@
src = fetchFromGitHub {
owner = "iquiw";
repo = "company-ghc";
- rev = "4d1f1e3c9529b1a833fa58e835226cebf0e415b7";
- sha256 = "1mc7y4j772x54n2wc2dskb5wjc46r7sg2jwyvmnj44cyaasxqmck";
+ rev = "976f10fca813e851d395b8c52ae6edf23d35ae63";
+ sha256 = "1gmnll0m9lh4p9i44ddnxlnbg5lf20410imyfbk88jwhidx1pg7s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/28f6a983444f796c81df7e5ee94d74c480b21298/recipes/company-ghc";
@@ -9283,12 +9389,12 @@
company-go = callPackage ({ company, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
melpaBuild {
pname = "company-go";
- version = "20160306.1355";
+ version = "20161006.1616";
src = fetchFromGitHub {
owner = "nsf";
repo = "gocode";
- rev = "7a0b9e99156df54d06a720e3a2a9f55618e5a25a";
- sha256 = "0hlbga620b2mr03vnrgmz8yd0n3sviyz03idz2jwbrrlk50qsbkl";
+ rev = "478b96fe0e77b4451b866559e2adb407fbce7120";
+ sha256 = "1ymhpiklyqxi79h65yarmh1hgyswsdx5jahg9pmhg4jww34778y3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go";
@@ -9427,22 +9533,22 @@
license = lib.licenses.free;
};
}) {};
- company-nand2tetris = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, names, nand2tetris }:
+ company-nand2tetris = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, nand2tetris }:
melpaBuild {
pname = "company-nand2tetris";
- version = "20151027.1436";
+ version = "20161011.1748";
src = fetchFromGitHub {
owner = "CestDiego";
repo = "nand2tetris.el";
- rev = "0297cd8d76cad072cb64318ffacdc65d8a1ad948";
- sha256 = "003zgkpzz9q0bkkw6psks0vbfikzikfm42myqk14xn7330vgcxz7";
+ rev = "9c5161c840f30f01647c188699dacba5e51b3b44";
+ sha256 = "05ngqw29gzjs0zzs8nyldfcqkbnh9n7jkaxrsc40dfqikjhaj5xc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/company-nand2tetris";
sha256 = "1g2i33jjh7kbpzk835kbnqicf0w4cq5rqv934bqzz5kavj9cg886";
name = "company-nand2tetris";
};
- packageRequires = [ cl-lib company names nand2tetris ];
+ packageRequires = [ cl-lib company nand2tetris ];
meta = {
homepage = "https://melpa.org/#/company-nand2tetris";
license = lib.licenses.free;
@@ -9451,12 +9557,12 @@
company-ngram = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-ngram";
- version = "20160826.1722";
+ version = "20161013.805";
src = fetchFromGitHub {
owner = "kshramt";
repo = "company-ngram";
- rev = "1f5a36ffdc19c77e2fcbe790be2332d16fd4c35f";
- sha256 = "03jap56722rp9sbb5chad9nbvqmimcjipr0rfhqz5szd9xahpihc";
+ rev = "6a39e9c22d6f1e5d5a725c6a1c276f9ecfacdad4";
+ sha256 = "1cjrw0g8hjbk8d2vmgy8brfvamswf24iylgwvqpz90x4si22xrzc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/937e6a23782450525c4a90392c414173481e101b/recipes/company-ngram";
@@ -9602,8 +9708,8 @@
src = fetchFromGitHub {
owner = "iquiw";
repo = "company-restclient";
- rev = "752f39490178832f6a09abd82e10d9356636350a";
- sha256 = "04829y7510zxjww9pq8afvnzwyyv30c0b3a71mxwf6ympfxb9rx5";
+ rev = "3955ad1792e17e7af9c886aae5e4bce0c160808f";
+ sha256 = "11siamfl62q2fv608p4slc72zdincp68klcm1fkvr50g808hwd7h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dd063bc3789772fdcc6a8555817588962e60825/recipes/company-restclient";
@@ -9667,12 +9773,12 @@
company-tern = callPackage ({ cl-lib ? null, company, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tern }:
melpaBuild {
pname = "company-tern";
- version = "20160713.541";
+ version = "20161004.1147";
src = fetchFromGitHub {
owner = "proofit404";
repo = "company-tern";
- rev = "d285b4d3ff96493cb7d7ff129e6dd9ff0ac7be88";
- sha256 = "1v43cp8x6w73i2c3lsm6xryqzf23k3rbyga4rrv2nf5n5cxdb6x6";
+ rev = "b20b3e490bf277c8480712210e3c92ea489859ef";
+ sha256 = "1l4b54rqwsb32r8zwwrag7s35zc3kpviafdrqkq8r1nyshg2yccm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/company-tern";
@@ -9755,8 +9861,8 @@
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-ycmd";
- rev = "a8ca68b508c448f6ac5ed6fa35ee3fe0a4771098";
- sha256 = "0v8by6y25sl7528vvrb1xsmm184xbqivqvllykx3kmaxpdh5hvih";
+ rev = "adda8765e1c1819bcf63feefea805bd8c0b00335";
+ sha256 = "1bm0kagq6aanybc0rrsfq296sd1485f4lvkz84hxamkfm329illm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd";
@@ -10086,12 +10192,12 @@
counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
melpaBuild {
pname = "counsel";
- version = "20161001.543";
+ version = "20161020.2248";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "9b2892724be0cadb6afaf7bf8ae72f0feabe37b5";
- sha256 = "1xrc3z2w133g13xm017zcrnib43iw8ymkkwlxmga9sibscrrgsa4";
+ rev = "714cb8c140faa2c019fe1816ac9fe6bb8fbef1a1";
+ sha256 = "0r3ni9c8pmcpfgikyindr1yaia59vgil5bdwf02hc6gb0albmffr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -10149,12 +10255,12 @@
counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
melpaBuild {
pname = "counsel-projectile";
- version = "20160926.547";
+ version = "20161022.1525";
src = fetchFromGitHub {
owner = "ericdanan";
repo = "counsel-projectile";
- rev = "e5f2f20a167941d212b98b95a52c776c42704baf";
- sha256 = "0fh4w52q42mafbc1lv41x6v6qv8zq04yy15nqf808q7n0xakmssa";
+ rev = "675d17d2dc8c5016e6aecff76af3bd39ec4c5536";
+ sha256 = "0x9lfavgm7pgnxqsn530mjdv2qdl0vcp20irg2g26cy16y555w7k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile";
@@ -10483,12 +10589,12 @@
crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "crux";
- version = "20160725.59";
+ version = "20161005.634";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "crux";
- rev = "3e03d7272f99939eb669c59f5b8843912e1e49cf";
- sha256 = "0s4b2qljac3d7lilmfxk3j385g95fm4jsg64kn21n7dqqwqljpiv";
+ rev = "b60d9f49e4874a9f333a9477e2c2440f4e419782";
+ sha256 = "04dnlsfachgigpz8q5nprk2hflh0vabkavhbk8n6fzslaxvxys33";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/575e3442a925500a5806e0b900208c1e6bfd11ae/recipes/crux";
@@ -10772,12 +10878,12 @@
cubicaltt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cubicaltt";
- version = "20160914.1356";
+ version = "20161020.1343";
src = fetchFromGitHub {
owner = "mortberg";
repo = "cubicaltt";
- rev = "20ee756ff1159c19c2aa57ddfe241f3d746f4984";
- sha256 = "0k000693g68dx9nlxa8ysfm0x2jr8vh4flxp5n021fxh94zpqi5d";
+ rev = "3257eadf70826fb3ef060c46f85b7a4d60464b1d";
+ sha256 = "1c5nfzsj4bi2rk3d3r2iw03kkpc5dg9p3q3xzj7cxfg2wmg1xaxk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt";
@@ -10913,12 +11019,12 @@
cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cyberpunk-theme";
- version = "20160930.815";
+ version = "20161012.1855";
src = fetchFromGitHub {
owner = "n3mo";
repo = "cyberpunk-theme.el";
- rev = "db5e86634d25cf0740f3d070cf2d521378fdf910";
- sha256 = "17y28k5p0in2silrxi9yc1873k9g5lw58rnwab8dyfgda3lw7i7y";
+ rev = "eb6ee11315180ae27b17b351163f47a1014348a0";
+ sha256 = "0s9ja6l2y75lnkd1js4x3ks6pj5p6x7i9sm5vlcr5yq4qvmamn3h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4c632d1e501d48dab54432ab111ce589aa229125/recipes/cyberpunk-theme";
@@ -11061,8 +11167,8 @@
src = fetchFromGitHub {
owner = "cython";
repo = "cython";
- rev = "b1d7b0de9e4cdc1eb866661e34f3da8892993fba";
- sha256 = "0m00lbxaa8gd79v8a11mhp89d0hn9sz7fxgksr41hkwpby6wfd1f";
+ rev = "d8c5467133aa16c3eccb19427c41a62a51115837";
+ sha256 = "1afanvmf4w1ic2gr8nzrh47f5gbp83bbhrzgfpwfk4ci3487y47l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -11099,12 +11205,12 @@
d-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "d-mode";
- version = "20160504.955";
+ version = "20161011.1257";
src = fetchFromGitHub {
owner = "Emacs-D-Mode-Maintainers";
repo = "Emacs-D-Mode";
- rev = "3e733780e96b8e72bc624677f242aff67fb26e89";
- sha256 = "1568jqcrw3xks1pvvn6dyn6jiam26vmp5m53jf8q4165ic2lazi8";
+ rev = "98af62e67026fee1dda9155e1a463917fc83802e";
+ sha256 = "0fzplvi1sm8k2sabfdvrd7j2xypwqh0g9v1mxa75dajdmcd85zpj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3c13e9ccc358743de660b1f0e89d6bb709c42bff/recipes/d-mode";
@@ -11162,12 +11268,12 @@
danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "danneskjold-theme";
- version = "20160611.1127";
+ version = "20161024.227";
src = fetchFromGitHub {
owner = "rails-to-cosmos";
repo = "danneskjold-theme";
- rev = "7d2c58d60b797dba1c53b31a34459e6d21a65bf4";
- sha256 = "1dfp2k5wh8g7jrmwlvwkmr9bp3s5kjb64g40iv1axy7dkn6ch6ci";
+ rev = "203e731f0415789fd1e15f795f245ab19ebd8cc7";
+ sha256 = "1j88rqh2rqhmas72wz8y2j6izgq23q53x33wz33bfjprrs14dyv2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme";
@@ -11183,12 +11289,12 @@
darcula-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "darcula-theme";
- version = "20160305.221";
+ version = "20161004.2218";
src = fetchFromGitLab {
owner = "fommil";
repo = "emacs-darcula-theme";
- rev = "eb799be242a9420a8e6730d659939d4703d44b43";
- sha256 = "128a9iv1vrassmk4sy4cs4nj6lggr5v4rhjj04v1xssj5nn5flxf";
+ rev = "834202004507221c3bdf49457219a56760b13d22";
+ sha256 = "1j2g94cz9b3ivv0w88gw1hcf236kc0c7hnrf13yyspxjm5jfdmd5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/23c8f10205187babb17e3abc3dc40eb1938e6640/recipes/darcula-theme";
@@ -11330,12 +11436,12 @@
darktooth-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "darktooth-theme";
- version = "20160929.1724";
+ version = "20161022.713";
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "emacs-theme-darktooth";
- rev = "825a61d8d65dbbe9fca44f865dc0a57dbd6bf3db";
- sha256 = "1b2i5fvg3q4fwg5inp08ivznv97cvz2x073i21pv82rk1p8f39q7";
+ rev = "1a5d0dc5ae9c57bcb07085ded6fa82c3512ff80f";
+ sha256 = "0hz3hhkyg6m2wvffanpclc2wq7y8n63sgz726kg87iqgq2lfa096";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme";
@@ -11372,12 +11478,12 @@
dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dash";
- version = "20160820.501";
+ version = "20161018.136";
src = fetchFromGitHub {
owner = "magnars";
repo = "dash.el";
- rev = "2996a0dc3a3ef17afbd67cb60c15c87b93e81620";
- sha256 = "0v11n1vq3cblxnb97wy6p5wb31sc87lmw67vwgpzkcrvdkaxf1w4";
+ rev = "b7ba21202ec876775768fca08163e2cbfd130799";
+ sha256 = "11kj6hd7cc02b6b32ay1dnzlwq1slvwyv7qsslgcf2kbk7qpsn94";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash";
@@ -11418,8 +11524,8 @@
src = fetchFromGitHub {
owner = "magnars";
repo = "dash.el";
- rev = "2996a0dc3a3ef17afbd67cb60c15c87b93e81620";
- sha256 = "0v11n1vq3cblxnb97wy6p5wb31sc87lmw67vwgpzkcrvdkaxf1w4";
+ rev = "b7ba21202ec876775768fca08163e2cbfd130799";
+ sha256 = "11kj6hd7cc02b6b32ay1dnzlwq1slvwyv7qsslgcf2kbk7qpsn94";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional";
@@ -11477,12 +11583,12 @@
datetime = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "datetime";
- version = "20160521.1303";
+ version = "20161007.1137";
src = fetchFromGitHub {
owner = "doublep";
repo = "datetime";
- rev = "02465ed669ed122ce3ce1682142dfca60820ae5d";
- sha256 = "0dz65zw7zi4kjldxs3syjxnss8kaf7hx0v6a22jplcsy35iai6xn";
+ rev = "6585b2dcb0b3871a2a63656d01baa0c9a300d457";
+ sha256 = "07rb8r3j8293h0ffpwhf7mxnshqi08pb63swhmdzb34hn57cx4jg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fff9f0748b0ef76130b24e85ed109325256f956e/recipes/datetime";
@@ -11603,12 +11709,12 @@
ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ddskk";
- version = "20161003.1408";
+ version = "20161005.453";
src = fetchFromGitHub {
owner = "skk-dev";
repo = "ddskk";
- rev = "c06ead712c4c0f44c809552014ba6f12f36102fb";
- sha256 = "1ixg1871v9k755yflh4c92bp00ylip5aax5zgsqhbxj7mpi535pd";
+ rev = "d0d80ff47a2d39969c7091aa594fd51f21953b07";
+ sha256 = "0mwfbd99kv4cb6ba50swll944vcrdsbs4hy2kkcsff8n84pbap17";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk";
@@ -11895,12 +12001,12 @@
demo-it = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "demo-it";
- version = "20160801.1728";
+ version = "20161021.1305";
src = fetchFromGitHub {
owner = "howardabrams";
repo = "demo-it";
- rev = "58c500aa1137c2be5e64eba0f52601d0dea2d2bb";
- sha256 = "0jjc3093yb5jxgsf2lr3mxsz3bchckln7kmabn5abgzr8wjpbg9a";
+ rev = "43b1ee8180d0e0eeb91998eb81dbae11eac23bff";
+ sha256 = "1amgjanl0dmsfv3w2kvggiq5yhwb3qvp7lfhgl29xg8gjdgy60z1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1dec5877db00c29d81d76be0ee2504399bad9cc4/recipes/demo-it";
@@ -12083,12 +12189,12 @@
diff-hl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "diff-hl";
- version = "20160827.1922";
+ version = "20161023.1607";
src = fetchFromGitHub {
owner = "dgutov";
repo = "diff-hl";
- rev = "f8ce39d157144ee4b22d386dd40673ea7f87ecd7";
- sha256 = "0cnhmcdkmbjikbv2hca54xw258f7wys0srxk07wp02jaryvj1298";
+ rev = "fa74f2f513351464f01a133b145339014811d042";
+ sha256 = "0s5rdhghcr26qwk8xlankbivayg5246knbkkaifpy64gpl3v0k51";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cf8fc25abd2fb91ec6a6ba951d89a19ca4f5571f/recipes/diff-hl";
@@ -12208,12 +12314,12 @@
dim-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dim-autoload";
- version = "20160521.728";
+ version = "20161008.1332";
src = fetchFromGitHub {
owner = "tarsius";
repo = "dim-autoload";
- rev = "ac04fade74a50fd2aac48fc298e4d21d8427f737";
- sha256 = "0jn3hwnqg455fz85m79mbwsiv93ps4sfr1fcfjfwj3qhhbhq7d82";
+ rev = "3a9b7f6c5a2b71149c4cdda7e4b4ea3bd729baa5";
+ sha256 = "0jp3rps3ps8mh7zsn1y9367l1gh26hhmbz61l1dcv3sk4jrw46mw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/66b1a81dfd09a2859ae996d5d8e3d704857a340f/recipes/dim-autoload";
@@ -12313,12 +12419,12 @@
dired-avfs = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-avfs";
- version = "20160526.1336";
+ version = "20161012.404";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "d53877ccfd6955c2037d0c214638b6945c8e4511";
- sha256 = "09vypvsmva71z4pi7y6npwj6r6rj98d32zyqzmq5kygz7calxkhx";
+ rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c";
+ sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs";
@@ -12476,12 +12582,12 @@
dired-filter = callPackage ({ cl-lib ? null, dash, dired-hacks-utils, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-filter";
- version = "20160526.1336";
+ version = "20161009.530";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "d53877ccfd6955c2037d0c214638b6945c8e4511";
- sha256 = "09vypvsmva71z4pi7y6npwj6r6rj98d32zyqzmq5kygz7calxkhx";
+ rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c";
+ sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter";
@@ -12501,8 +12607,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "d53877ccfd6955c2037d0c214638b6945c8e4511";
- sha256 = "09vypvsmva71z4pi7y6npwj6r6rj98d32zyqzmq5kygz7calxkhx";
+ rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c";
+ sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils";
@@ -12515,6 +12621,27 @@
license = lib.licenses.free;
};
}) {};
+ dired-icon = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "dired-icon";
+ version = "20161023.19";
+ src = fetchFromGitLab {
+ owner = "xuhdev";
+ repo = "dired-icon";
+ rev = "ffcd62cb997efadbbc1da62e1cffe957a21a22c8";
+ sha256 = "0say1v2xlqhdvkbfcm7yfmqad2lq9c7m6ldplsxcw921yfadf4qx";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c6d0947148441ed48f92f4cfaaf39c2a9aadda48/recipes/dired-icon";
+ sha256 = "1fl12pbncvq80la3bjgq1wlbpmf32mq76sq61mbnwcimi3nj27na";
+ name = "dired-icon";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/dired-icon";
+ license = lib.licenses.free;
+ };
+ }) {};
dired-imenu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-imenu";
@@ -12543,8 +12670,8 @@
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-dired-k";
- rev = "57f263b42ea83c6a1cf391fcccffd0f36d213f35";
- sha256 = "1w2grc91m71k9mr4n423vbnakkqg6vc10bham869xs3yr8fs7nay";
+ rev = "26aa877bed6246feeb448c659a5b676d7796197e";
+ sha256 = "062zylfm18200d987m0vphaqph6syzah28ll8zz79fhqajgv6ndz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7f8a828b2fbfa11c4b74192d9d0cfa0ad34b3da7/recipes/dired-k";
@@ -12585,8 +12712,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "d53877ccfd6955c2037d0c214638b6945c8e4511";
- sha256 = "09vypvsmva71z4pi7y6npwj6r6rj98d32zyqzmq5kygz7calxkhx";
+ rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c";
+ sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow";
@@ -12606,8 +12733,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "d53877ccfd6955c2037d0c214638b6945c8e4511";
- sha256 = "09vypvsmva71z4pi7y6npwj6r6rj98d32zyqzmq5kygz7calxkhx";
+ rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c";
+ sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open";
@@ -12622,10 +12749,10 @@
}) {};
dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "dired-plus";
- version = "20160920.1522";
+ version = "20161022.916";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/dired+.el";
- sha256 = "1f6gigw8lzw30qjgl3z13kivwhbgp81fkg3n1b5a8jdg04lkgldp";
+ sha256 = "1j3w3gfk0lnyj576wg1mzdn2k1l0s777j8z36cvrs82z6pln6qb4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/dired+";
@@ -12666,8 +12793,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "d53877ccfd6955c2037d0c214638b6945c8e4511";
- sha256 = "09vypvsmva71z4pi7y6npwj6r6rj98d32zyqzmq5kygz7calxkhx";
+ rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c";
+ sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow";
@@ -12687,8 +12814,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "d53877ccfd6955c2037d0c214638b6945c8e4511";
- sha256 = "09vypvsmva71z4pi7y6npwj6r6rj98d32zyqzmq5kygz7calxkhx";
+ rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c";
+ sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger";
@@ -12784,8 +12911,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "d53877ccfd6955c2037d0c214638b6945c8e4511";
- sha256 = "09vypvsmva71z4pi7y6npwj6r6rj98d32zyqzmq5kygz7calxkhx";
+ rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c";
+ sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree";
@@ -13236,12 +13363,12 @@
dix = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dix";
- version = "20160919.638";
+ version = "20161004.450";
src = fetchFromGitHub {
owner = "unhammer";
repo = "dix";
- rev = "8b0a4f62b040a0b6b0b81bd052d8b2ea1e8822fa";
- sha256 = "1pb6y8rrbfg0hnnlhn1akgx79hgyazk0rqjd748iyi5dggc2dhq6";
+ rev = "9e6facb25e1137ef4e1329151a7902dc2d168507";
+ sha256 = "1raz281dyq3dgxbmwrcpdy1g8i5kwlv0i42ixpsdhhj1dcmzhqza";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/149eeba213b82aa0bcda1073aaf1aa02c2593f91/recipes/dix";
@@ -13261,8 +13388,8 @@
src = fetchFromGitHub {
owner = "unhammer";
repo = "dix";
- rev = "8b0a4f62b040a0b6b0b81bd052d8b2ea1e8822fa";
- sha256 = "1pb6y8rrbfg0hnnlhn1akgx79hgyazk0rqjd748iyi5dggc2dhq6";
+ rev = "9e6facb25e1137ef4e1329151a7902dc2d168507";
+ sha256 = "1raz281dyq3dgxbmwrcpdy1g8i5kwlv0i42ixpsdhhj1dcmzhqza";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9dcceb57231bf2082154cab394064a59d84d3a5/recipes/dix-evil";
@@ -13404,12 +13531,12 @@
dkl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dkl";
- version = "20161001.1825";
+ version = "20161004.1707";
src = fetchFromGitHub {
owner = "flexibeast";
repo = "dkl";
- rev = "0a6b1ef7dbbf3fcf43ea386d1aab8bd7ae039d8c";
- sha256 = "1vjs9zjcyyk728x80b53v16cvlwswxgvhn2dwncajkcfva0pjjwj";
+ rev = "6b4584f86037bda3383960c678d51f340229fb91";
+ sha256 = "1xpidgj5xk0g4ajpglhbhi02s5il8qqcvh2ccf4ac9daa1r34kxp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e8bd9cf21473f676aa54e142b6f0bf0427f40d29/recipes/dkl";
@@ -13551,12 +13678,12 @@
docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }:
melpaBuild {
pname = "docker";
- version = "20160911.1215";
+ version = "20161018.2349";
src = fetchFromGitHub {
owner = "Silex";
repo = "docker.el";
- rev = "7d9b72ed0e7afa992a6f15066bfd974d5f2e1696";
- sha256 = "05pll1a7j9clgjn00llhra59svkwqhynyyjvsih0p3rhp3vg7297";
+ rev = "6fcc5082b4cb4b40e75c36d2569511139ee9de72";
+ sha256 = "16hw7qbbln3rcd6n052wqwyyw5mpd4h4fsg4c2pz8vwixk5jhnmj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker";
@@ -13601,12 +13728,12 @@
docker-tramp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "docker-tramp";
- version = "20160113.1952";
+ version = "20161020.2220";
src = fetchFromGitHub {
owner = "emacs-pe";
repo = "docker-tramp.el";
- rev = "769a5c87bfe16549ebc981e3bd85806290f55e7a";
- sha256 = "0bvnvs17cbisymiqp96q4y2w2jqy5hd0zyk6rv7mihr9p97ak9kv";
+ rev = "d8b510365d8e65551f4f792f251e7212411708c3";
+ sha256 = "0lxvzmfg52fhxrhbvp92zwp7cv4i1rlxnkyyzgngj3sjm7y60yvg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker-tramp";
@@ -13706,12 +13833,12 @@
doom-themes = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "doom-themes";
- version = "20160926.844";
+ version = "20161009.1630";
src = fetchFromGitHub {
owner = "hlissner";
repo = "emacs-doom-theme";
- rev = "1b257a7dcb21193b4af0722262c79bc53a4ab866";
- sha256 = "1ccm4lpgmkzg0fhqak4xl25vp2is1dcid0hahd8f1ly7fzn7xwmq";
+ rev = "af85fb024a5d18852cc86ad791f966e77aa7e4ad";
+ sha256 = "02rpcziiqaqfzj36aldcpx9z5r8bz1ngp6fqwdya8jxpzydvcz9a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes";
@@ -13816,19 +13943,22 @@
license = lib.licenses.free;
};
}) {};
- dot-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+ dot-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
pname = "dot-mode";
- version = "20151029.655";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/dot-mode.el";
- sha256 = "0xhbzq3yvfvvvl6mfihrzkd3pn5p5yxvbcyf2jhsppk7lscifsgk";
+ version = "20161005.1443";
+ src = fetchFromGitHub {
+ owner = "wyrickre";
+ repo = "dot-mode";
+ rev = "783ccf5b1de591e9926c0b7133ad64a26db62315";
+ sha256 = "1zsbr6cyyynczik7wdd7p6ii5nw7zn44ir7lvm2kkslwjswx34qc";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/fa20f7845ebf84c09ba34dbffe58dee5438d7c49/recipes/dot-mode";
- sha256 = "1fik32635caq3r5f9k62qbj2dkwczz2z1v28mc7bcj7jv2p93nvh";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/b3082fb1c8a5e0439b3ae5e968845aecd99d28e2/recipes/dot-mode";
+ sha256 = "18dj3bvnm28j7mllv4f575ahnhzziinycg48wbr73qi70vq059z8";
name = "dot-mode";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/dot-mode";
license = lib.licenses.free;
@@ -13918,6 +14048,27 @@
license = lib.licenses.free;
};
}) {};
+ dr-racket-like-unicode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "dr-racket-like-unicode";
+ version = "20161021.511";
+ src = fetchFromGitHub {
+ owner = "david-christiansen";
+ repo = "dr-racket-like-unicode";
+ rev = "4953f1c8a68472e157a0dcd0a7e35a4ec2577133";
+ sha256 = "1i7k7d2gnzd2izplhdmjbkcxvkwnc3y3y0hrcp2rq60bjpkcl1gv";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6e612ede00c4b44ace741d2b6baabc61571af15c/recipes/dr-racket-like-unicode";
+ sha256 = "0cqcbn4hmv99d8z03xc0rqw4yh5by6g09y33h75dhl9nh95rybgf";
+ name = "dr-racket-like-unicode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/dr-racket-like-unicode";
+ license = lib.licenses.free;
+ };
+ }) {};
dracula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dracula-theme";
@@ -14109,7 +14260,7 @@
version = "20130120.1257";
src = fetchsvn {
url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
- rev = "1763224";
+ rev = "1766432";
sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
};
recipeFile = fetchurl {
@@ -14210,12 +14361,12 @@
dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
melpaBuild {
pname = "dumb-jump";
- version = "20160928.1442";
+ version = "20161015.1230";
src = fetchFromGitHub {
owner = "jacktasia";
repo = "dumb-jump";
- rev = "77e27004289981d0ae3d9425dfefc725ef1829f9";
- sha256 = "1ngvffh4lfd1nasnpqw8vvd4pyl286m4fn82xx4fhfz50m797pcy";
+ rev = "a6d6e78eb346542d0ef88ade9ade2f583caceab2";
+ sha256 = "1wkzizs50k2ahdqhcr9qgnhwgy0mkxmyysfd61k5iinwjz1z1xxd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2a60e7c166c2d68e4f719d293014a22139593dde/recipes/dumb-jump";
@@ -14294,11 +14445,11 @@
dyalog-mode = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dyalog-mode";
- version = "20160926.1456";
+ version = "20161015.530";
src = fetchhg {
url = "https://bitbucket.com/harsman/dyalog-mode";
- rev = "2664661b55eb";
- sha256 = "1yawkav0hdsn41lx9q33lxsfpjy7fiwk0f5xlly5vswsn2va9zlv";
+ rev = "6ff00cc2f12b";
+ sha256 = "1sjpwgjimrmh8s8lzbjrhhqvhrfcvs36l8ls75qmrrz5rvp386l3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode";
@@ -14734,12 +14885,12 @@
ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }:
melpaBuild {
pname = "ebib";
- version = "20160923.210";
+ version = "20161016.1143";
src = fetchFromGitHub {
owner = "joostkremers";
repo = "ebib";
- rev = "212b6a594d13ffcc5683f9bcfd274682abff2b05";
- sha256 = "1d19qw9980iq4idmcdr8ri42pdmyig6c1nwpxijqvdnd0zxfbnph";
+ rev = "007c001d8a200ed27c0bf6f32e09f6ed38a1fb37";
+ sha256 = "1374r0j8i5zmxdnd23h7svpbcwghb2wskn0fgpvnk06859xjhpgl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib";
@@ -14776,16 +14927,16 @@
ecb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ecb";
- version = "20140215.114";
+ version = "20160101.933";
src = fetchFromGitHub {
- owner = "alexott";
+ owner = "ecb-home";
repo = "ecb";
- rev = "071706b22efcfeb65da8381e317220d7f9d8cb54";
- sha256 = "1hs069m4m6vhb37ac2x6hzbp9mfmpd3zhp4m631lx8dlmx11rydz";
+ rev = "7df501f5e9bc38f8fdd0d0ecc1e60d2b32914afa";
+ sha256 = "0h50amhz0yzp9zz9nviaimmh9i0rgrr10pdf5fjxc8nc669b35z5";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/c0a4c225c05166572de4538f7ee9e4e0d088a409/recipes/ecb";
- sha256 = "097hdskhfh255znrqamcssx4ns1sgkxchlbc7pjqwzpflsi0fx89";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/4db5183f35bedbc459843ad9f442f9cb6608c5fc/recipes/ecb";
+ sha256 = "0z61p9zgv7gcx04m4jv16a3mn9kjvnw0rdd65kpvbmzkgls0nk8d";
name = "ecb";
};
packageRequires = [];
@@ -14815,12 +14966,12 @@
eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }:
melpaBuild {
pname = "eclim";
- version = "20160901.16";
+ version = "20161019.838";
src = fetchFromGitHub {
owner = "emacs-eclim";
repo = "emacs-eclim";
- rev = "6e52e1b8501288e57dd0523270ed6406795b0b9e";
- sha256 = "0jx04r7jz1ijq8y7kzcj1j8msxjnh3vbzi378dazr3762ixj51m5";
+ rev = "f2247f2515ee2eb0ff866bcbbf69d9f62b7b7780";
+ sha256 = "1d3zyaqgng0q41nnifmwwwwd9bm0w7yhkpj6lwir3m0pg5lrcw48";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim";
@@ -14861,8 +15012,8 @@
src = fetchFromGitHub {
owner = "ecukes";
repo = "ecukes";
- rev = "1dcfebf13506e6ecc7e76e668665cff9cf79acda";
- sha256 = "0grk10s0fzcdpcimdk1dblq5f8k999h7mlqhhjvvdwjbypmy9891";
+ rev = "dbaac412c465dcee0a637fbaf64d6fc954f6ae6c";
+ sha256 = "14cv67nbn10j43h9s60a4h8wjg67m2xw4s19lrdhj3fbyp0g0zby";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/ecukes";
@@ -15004,12 +15155,12 @@
ede-php-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ede-php-autoload";
- version = "20160924.152";
+ version = "20161018.436";
src = fetchFromGitHub {
owner = "stevenremot";
repo = "ede-php-autoload";
- rev = "73bdbfa4dc9dda7ff735db8a8b25c18b66c9f256";
- sha256 = "1dqxi3w6pp3mkd8jgy5ylx7bqmzf58g4qgkvrpvg0j3c2j9arfpq";
+ rev = "7cf21be8b6d39a9ce1d6d354a47f60d460cbaa1c";
+ sha256 = "0rqpw5fl0fi1n0669gsmdjsnhrfhwys9lfgfymzjbv62q3dda6qy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8ee9f7fd9cbc3397cd9af34b08b75c3d9d8bc551/recipes/ede-php-autoload";
@@ -15332,8 +15483,8 @@
src = fetchFromGitHub {
owner = "egisatoshi";
repo = "egison3";
- rev = "d4f408a78a1b60f78053fbdeaab99b8b350c13af";
- sha256 = "1l2631q3n2wla2pqlfg8r1ppqzl0np62270v6mwg8zlr17yi59fi";
+ rev = "1d18f9f62fe85cf18b5ab522069d83d4733e85c2";
+ sha256 = "0znr8i6p5ik8dh3abwycgfdm0byz0ywnj4fwh98smwb1ad3jdv37";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
@@ -15349,12 +15500,12 @@
ego = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
melpaBuild {
pname = "ego";
- version = "20160909.937";
+ version = "20161017.2111";
src = fetchFromGitHub {
owner = "emacs-china";
repo = "EGO";
- rev = "ec36eacb1455b551a2084f8b7cc79981723dbd38";
- sha256 = "0pv0a8d0czk3kyliynbwmcqmr3adaw0pis2wgbdy9qz07m2k64s3";
+ rev = "758820bfd9a6bb3c95d559074e508a19308868d8";
+ sha256 = "1npy4471xy9f2ww1851nqfpskxw0g3i7ls1ca1zzmjc7iqsm5irf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0090a628a5d566a887cac0d24b080ee6bafe4612/recipes/ego";
@@ -15410,16 +15561,16 @@
ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
melpaBuild {
pname = "ein";
- version = "20160923.837";
+ version = "20161021.1010";
src = fetchFromGitHub {
owner = "millejoh";
repo = "emacs-ipython-notebook";
- rev = "71d8994ebb7636fc13b305d009c537d8f0b357ef";
- sha256 = "1cayckl1r8mhfz8sz6w4b6vrydd677mxjxm9lpnfk2yr6iwxvnbi";
+ rev = "701ddbe39cd11d751601fd7830dd8f26e2dfebeb";
+ sha256 = "0g627j293hykhzxzb9q3ab2xy4ycdkfh905wyyc4fvxci0672zkv";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/3201516c0158c47d0226ef9c5d324d29ac7b088b/recipes/ein";
- sha256 = "1nksj1cpf4d9brr3rb80bgp2x05qdq9xmlp8mwbic1s27mw80bpp";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
+ sha256 = "14blq1cbrp00rq0ilk7z9qppqfj0r4n3jidw3abcpchvh5ln086r";
name = "ein";
};
packageRequires = [ cl-generic request websocket ];
@@ -15452,12 +15603,12 @@
eink-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eink-theme";
- version = "20160826.51";
+ version = "20161021.452";
src = fetchFromGitHub {
owner = "maio";
repo = "eink-emacs";
- rev = "a817ef1cc891de174a4ec9d9b06551a1ebf8d8e4";
- sha256 = "0cf587c7wl8r3if7wiqh7rw0r2dmjck79wjnm2il1l45ffff2nzn";
+ rev = "b884e49afb7a89a3766bf8d9efb96bad239375f6";
+ sha256 = "0mgdaw57av3wx9wr615p1abrd1mlbx4rn3a4xn5v77gv2g9xyfcr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a1349c3f93ab60983f77c28f97048fa258b612a6/recipes/eink-theme";
@@ -15470,22 +15621,22 @@
license = lib.licenses.free;
};
}) {};
- ejc-sql = callPackage ({ auto-complete, clomacs, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ ejc-sql = callPackage ({ auto-complete, clomacs, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }:
melpaBuild {
pname = "ejc-sql";
- version = "20160916.33";
+ version = "20161019.20";
src = fetchFromGitHub {
owner = "kostafey";
repo = "ejc-sql";
- rev = "52c5845d25416405c19362125598ac2447f2333f";
- sha256 = "0j1vyjx060bsmkkczvhvpzhamx6nr5qgqk8ld86aaxyd8kb3x4q4";
+ rev = "bef894ead140c69f82b7eb706c60f7731c3b9b8a";
+ sha256 = "0kj117fs9sl2w3bjnmqknhb7zjxiydaqqdackjzv7ypifjbk8plv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql";
sha256 = "0v9mmwc2gm58nky81q7fibj93zi7zbxq1jzjw55dg6cb6qb87vnx";
name = "ejc-sql";
};
- packageRequires = [ auto-complete clomacs dash emacs ];
+ packageRequires = [ auto-complete clomacs dash emacs spinner ];
meta = {
homepage = "https://melpa.org/#/ejc-sql";
license = lib.licenses.free;
@@ -15515,12 +15666,12 @@
el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "el-get";
- version = "20160929.613";
+ version = "20161022.614";
src = fetchFromGitHub {
owner = "dimitri";
repo = "el-get";
- rev = "0c3c33e604830e9e4dabc35a1b4bd0bc5ae0f3a6";
- sha256 = "1dpbw9pj44lda7fnm17ap8cgw28h0cydx2sxhf49az0s7h2czdip";
+ rev = "0eafb42926eb4698cef52878c34ae6d1a6246b23";
+ sha256 = "0fry19m2012gpsllilp02pyzcq29y4r28rq5pik4rv2znn9zvp9j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get";
@@ -15845,12 +15996,12 @@
electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
melpaBuild {
pname = "electric-operator";
- version = "20160904.910";
+ version = "20161023.241";
src = fetchFromGitHub {
owner = "davidshepherd7";
repo = "electric-operator";
- rev = "a23a5b92e0efba55314bc621502a373e28784d1a";
- sha256 = "04dnkrrxim82ysdzwcqhvhqabxm3f97z8nqgn8g8idj0m1as4wm9";
+ rev = "cbb27a753bb3ff69c2fbe31e5d9df77f764f5472";
+ sha256 = "1wb00qms1rpz729zkdnk1j2mh2lnx6cfh5g9i7la4pnfdvsgpy4j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator";
@@ -15908,12 +16059,12 @@
elf-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elf-mode";
- version = "20160901.435";
+ version = "20161009.48";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "elf-mode";
- rev = "284dc09309360c69efa19979113b2245c551b259";
- sha256 = "1rv0ri5hhj3d5f1l4034sd9rd4g8z8zi2vpcd3vhdprlpgnqvn0z";
+ rev = "cd280d683cd3341d8bb31af6db7e3b74a133e6ab";
+ sha256 = "0cbvjbk2893ag1iy8ggixpirfiyhssm7fii96hb9jqdz874cdl0k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/368d1ff91f310e5ffe68f872ab0a91584a41a66e/recipes/elf-mode";
@@ -15929,12 +16080,12 @@
elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elfeed";
- version = "20160911.1353";
+ version = "20161021.1247";
src = fetchFromGitHub {
owner = "skeeto";
repo = "elfeed";
- rev = "f45deed1694340df010e5c60776bfef3784a2c7f";
- sha256 = "01my4vsjxrgnvybayshikagmw801g5dispi7mlrc7w20lab26lk5";
+ rev = "d54bc55af47591e87e3af9d72b91108c55629719";
+ sha256 = "1pb94jasrg4539ndph1sv5fbnyfjppabic2fgi9fyh7qsab79sfk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -16003,8 +16154,8 @@
src = fetchFromGitHub {
owner = "skeeto";
repo = "elfeed";
- rev = "f45deed1694340df010e5c60776bfef3784a2c7f";
- sha256 = "01my4vsjxrgnvybayshikagmw801g5dispi7mlrc7w20lab26lk5";
+ rev = "d54bc55af47591e87e3af9d72b91108c55629719";
+ sha256 = "1pb94jasrg4539ndph1sv5fbnyfjppabic2fgi9fyh7qsab79sfk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -16108,8 +16259,8 @@
src = fetchFromGitHub {
owner = "Wilfred";
repo = "refs.el";
- rev = "0f6746fd0ee911244f116061574ece4496be776e";
- sha256 = "0fncp8hhyrzlp53w20la0i2jcf25s4xhgz4ql0r2krshf2dvdyz4";
+ rev = "f4c04cbf533bbea93ac2fb6b6a41ba50c4dd2456";
+ sha256 = "07x2hkhjm7nazi10h5sfkvcnpzyg86q383qyqclp78f5n6l4axif";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs";
@@ -16167,12 +16318,12 @@
elixir-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
melpaBuild {
pname = "elixir-mode";
- version = "20160922.857";
+ version = "20161015.1200";
src = fetchFromGitHub {
owner = "elixir-lang";
repo = "emacs-elixir";
- rev = "765828706971050b4bd78d22203ebe22ed2d2dab";
- sha256 = "1r1wzw1sk3320qv72yk8d6l2r1knlnbvfaa0cnn4vlk5ww7bh1yh";
+ rev = "b71145e1f23f1222220549bd28bce3557711717e";
+ sha256 = "06m937mkd4hiqi28drqnkk8pr089ijkbcacgbxf86d5iy8qwyhw4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6374ced0de38d83bf99147f702f30706615480ed/recipes/elixir-mode";
@@ -16209,12 +16360,12 @@
elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
melpaBuild {
pname = "elm-mode";
- version = "20161002.103";
+ version = "20161006.11";
src = fetchFromGitHub {
owner = "jcollard";
repo = "elm-mode";
- rev = "2f7f0c3e42d137aaefd12bc28383807d35a2a290";
- sha256 = "137189r1rba5l9m82qj3zba8x0gkm0c3xc9df1vri4wsbz4df7nm";
+ rev = "750bb9ced539db9dfdbd143bb2624aea54eb1e16";
+ sha256 = "12s8pphf6wigaaarapp78srisqdkk2wk7myhxkidrna38pq1ad5b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode";
@@ -16251,12 +16402,12 @@
elmacro = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "elmacro";
- version = "20161003.1228";
+ version = "20161004.5";
src = fetchFromGitHub {
owner = "Silex";
repo = "elmacro";
- rev = "1014e515c9714613921622cdb3f36ed4ef27233e";
- sha256 = "14rjlxskxhjlidj4v50g0xsm0xhqm6gxl0bi9lwm699dlw9h5z4r";
+ rev = "d9703c73ca37fa07f6cea003efcb0974db1f7776";
+ sha256 = "0rc97dpdb2y418msw1z1nry6swffqdi4q806f4klfv1qr6rn2vwd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/566cc5bc0f71c5a4191ad93b917dc268f6e1a2da/recipes/elmacro";
@@ -16440,12 +16591,12 @@
elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, yasnippet }:
melpaBuild {
pname = "elpy";
- version = "20160903.841";
+ version = "20161008.910";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "elpy";
- rev = "4137f5aa88fc219f84effc6a6f79def8249bff6e";
- sha256 = "1jfn3pb0hh5sybgcfmgba7xairpwpcx56xg9gbrn0sviwbcmyjwp";
+ rev = "22bfc60a8017e7cab18b442818210263ffc6d24a";
+ sha256 = "1q7wbjz3y3xd31fprf9dpv6ifjijw31kwsgayg7dl0bxkhqigrfn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a36daf2b034653cd73ee2db2bc30df2a5be6f3d1/recipes/elpy";
@@ -16824,12 +16975,12 @@
emacsshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emacsshot";
- version = "20160822.756";
+ version = "20161018.743";
src = fetchFromGitHub {
owner = "marcowahl";
repo = "emacsshot";
- rev = "634f6cca9531c6a65dbea9267ca5b64a93ec543f";
- sha256 = "050csja2p1zzvh48dpa28lsnvdxxmdpi60pd7jx5cvkfjbic86c5";
+ rev = "11ace77ab718292d05b82d93178380aff591468b";
+ sha256 = "108zbpg51x2pljvizmdvlxsqyibbp8rinf7747asf6b7ahkxj97w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/efdd85accc6053f92efcbfdb7ddc37b23a07a3b0/recipes/emacsshot";
@@ -17380,12 +17531,12 @@
engine-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "engine-mode";
- version = "20150902.1035";
+ version = "20161009.1718";
src = fetchFromGitHub {
owner = "hrs";
repo = "engine-mode";
- rev = "244610231f48af10e9cd0931827543e1fcdb3f32";
- sha256 = "066pxfv4rpxgi7jxdyc0a3g5z9m1j66sbi5gh2l7m4rwhzkqchn9";
+ rev = "5d6c6495b31a8029b5122cfe9790c1c2609dd731";
+ sha256 = "1y23yj749i14r373cfymqw6bakqvrsdgyjn91i0rp51y1rzdpp3p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ea1b5dfb6628cf17e77369f25341835aad425f54/recipes/engine-mode";
@@ -17485,12 +17636,12 @@
ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
melpaBuild {
pname = "ensime";
- version = "20160921.1725";
+ version = "20161023.113";
src = fetchFromGitHub {
owner = "ensime";
repo = "ensime-emacs";
- rev = "3dcff1facb075149158175c76326900eb01c99da";
- sha256 = "08m7g0h9iap2sma7mhni6pg6rbgibf9gkhicx7i2z7r3sbgaal43";
+ rev = "525692bc3ca2b4edb1122fd9f0101eee768caf93";
+ sha256 = "1813f8yzyfpgc9b36fsznqkbjm9wnb2zs5kmwdl3wwg674lwm2dh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -18077,22 +18228,22 @@
license = lib.licenses.free;
};
}) {};
- ergoemacs-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ ergoemacs-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }:
melpaBuild {
pname = "ergoemacs-mode";
- version = "20160926.919";
+ version = "20161012.2127";
src = fetchFromGitHub {
owner = "ergoemacs";
repo = "ergoemacs-mode";
- rev = "7e08fda94454bfe6be92f35bc2be3aceb32e90ad";
- sha256 = "0ic29n4x0m3cii03bcgbs2mn5b0ng5knzal4b10q10n33zazwcvi";
+ rev = "ac70b2563fb6e3d69ea382fddc87b5721c20c292";
+ sha256 = "0ydxyylijdd6da4n9by441352shphrpfyk2631ld5aq3gz27z9gi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode";
sha256 = "0h99m0n3q41lw5fm33pc1405lrxyc8rzghnc6c7j4a6gr1d82s62";
name = "ergoemacs-mode";
};
- packageRequires = [];
+ packageRequires = [ cl-lib emacs undo-tree ];
meta = {
homepage = "https://melpa.org/#/ergoemacs-mode";
license = lib.licenses.free;
@@ -18122,16 +18273,16 @@
erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "erlang";
- version = "20160831.740";
+ version = "20161019.117";
src = fetchFromGitHub {
owner = "erlang";
repo = "otp";
- rev = "a0abdb8631d7bd7a154023950ccdcbf09c85b92d";
- sha256 = "19yy1sci2fdqp5iwzfm1rpw4b97vpbplfc7hwhv036afzkg9kj7m";
+ rev = "055b1b09537b8900489d28ba37078edd7be57d04";
+ sha256 = "05kj124sdrc29b1agcf1cps27kn023z6ii6smf6cds091nmqf897";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/erlang";
- sha256 = "1gmrdkfanivb9l5lmkl0853snlhl62w34537r82w11z2fbk9lxhc";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
+ sha256 = "1cs768xxbyrr78ln50k4yknmpbcc1iplws3k07r0gx5f3ca73iaq";
name = "erlang";
};
packageRequires = [];
@@ -18182,11 +18333,11 @@
ert-junit = callPackage ({ ert ? null, fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ert-junit";
- version = "20140830.1521";
+ version = "20161018.1217";
src = fetchgit {
url = "https://bitbucket.org/olanilsson/ert-junit";
- rev = "aaffe0bba23fe7271741779ff642b7b0deadf22f";
- sha256 = "0klccgh38y9q1kc2kyahbhwh0x8gjlxmx692rwaf9gp0g7ddpyl3";
+ rev = "e1d7b795176dceae40adb15c28717276c00269e4";
+ sha256 = "0d6ab0f22sing9cimpc86yydvyzb3z3s36372x082pg62ilrj0pi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/27c627eacab54896a1363dbabc56250a65343dd8/recipes/ert-junit";
@@ -18493,6 +18644,27 @@
license = lib.licenses.free;
};
}) {};
+ eshell-up = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "eshell-up";
+ version = "20161019.1214";
+ src = fetchFromGitHub {
+ owner = "peterwvj";
+ repo = "eshell-up";
+ rev = "380d7f66b2f7118be786289e9c8d87b5106803da";
+ sha256 = "1ll0k99jblswp04hw2n9i7g91hypgpgxdh1cjfzd84pdwlc4avc5";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/4d033b20d047db8ddd42bdfa2fcf190de559f706/recipes/eshell-up";
+ sha256 = "0v26dqaszdg57brg8sls9ddmfwxzf98wkp471q1cqw75ss4999jd";
+ name = "eshell-up";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/eshell-up";
+ license = lib.licenses.free;
+ };
+ }) {};
eshell-z = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eshell-z";
@@ -18622,12 +18794,12 @@
ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
melpaBuild {
pname = "ess";
- version = "20161003.124";
+ version = "20161022.447";
src = fetchFromGitHub {
owner = "emacs-ess";
repo = "ESS";
- rev = "c37aaa8b672c25686cd4dd92f4b230116a1897b8";
- sha256 = "19xghzyabl0i5kg4b73jdik3npkq4bs5xsnn1kx3zrvr2szf89js";
+ rev = "c5282d4dc4d6fc07155e694d8a0f33e100c7697a";
+ sha256 = "1lywwy0lhsjdd5sxm1i69np98l6y1ya3s44ga8fkm2zg2yl72wcb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess";
@@ -19018,8 +19190,8 @@
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-evil-anzu";
- rev = "a041db15bd6e2eb353b24f6f984f6c5ee618d460";
- sha256 = "0cnj91lwpmk4c8nf3xi80yvv6anvkg8h1kbzbp16glkgmy6jpmy8";
+ rev = "183e42a7e4a47b1aa4dcc69e1cca87b48ffc6c5c";
+ sha256 = "0fqz1545hyz6p76vgjlg09mqhfwhi8swrlkwx8q8i5vl2r14s9px";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06b0609b56016d938b28d56d9eeb6305116b38af/recipes/evil-anzu";
@@ -19140,12 +19312,12 @@
evil-commentary = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-commentary";
- version = "20160221.1230";
+ version = "20161015.1251";
src = fetchFromGitHub {
owner = "linktohack";
repo = "evil-commentary";
- rev = "6d9079894da0bdda8a317c03c90481b8754635c7";
- sha256 = "183fdg7rmnnbps0knnj2kmhf1hxk0q91wbqx1flhciq6wq4rilni";
+ rev = "5fe309effae89fa60a3b9dc47383fa54fce2bc7e";
+ sha256 = "0nsragb714xycmq35kl29ngmchwapvm2hdk0fc29iv75mrmflnr1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fe5b05152c919d49ddd920b1bd5ffc351141fa0d/recipes/evil-commentary";
@@ -19182,12 +19354,12 @@
evil-easymotion = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-easymotion";
- version = "20160617.1840";
+ version = "20161023.2356";
src = fetchFromGitHub {
owner = "PythonNut";
repo = "evil-easymotion";
- rev = "8515834580f948021d0e9389f42c6e9f04ccb17a";
- sha256 = "09xvx3y6r04rbwq590cypi91zj3lga1ay95l2q71p2m2yanqgi50";
+ rev = "6d5cb5825ce3a266cc3e10c5ad40a1e038f068f3";
+ sha256 = "1qgmpvwbay7s1b9gsll06nf5hygrb1ixw155538ckhcaxra48719";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e67955ead0b9d69acab40d66d4e0b821229d635c/recipes/evil-easymotion";
@@ -19518,12 +19690,12 @@
evil-matchit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-matchit";
- version = "20160906.1723";
+ version = "20161023.1639";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "evil-matchit";
- rev = "b01763bf766a7449626e6216c2d360ae1e80e5c1";
- sha256 = "197ycwx02mjlvck5xraw2jwlsv3ham5jm2yv8133i4cq8dszcfaa";
+ rev = "51d46747e39dc247ea4b72839421b85f53d487be";
+ sha256 = "15fr19gv2rf8pvns7r0jmy1z2f08bjprqxz3hj1fzn9wgc42iwg7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit";
@@ -19602,12 +19774,12 @@
evil-multiedit = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }:
melpaBuild {
pname = "evil-multiedit";
- version = "20160602.1213";
+ version = "20161010.1703";
src = fetchFromGitHub {
owner = "hlissner";
repo = "evil-multiedit";
- rev = "04a7633ce4cd77617ea54cc5465293d013cc3c2b";
- sha256 = "171bq84dg86s33p73l6lji155c4as2dnjs7q3jyl8jhqsqf2cmyg";
+ rev = "5f263a9388dd3593b5acefe9f523c819bd3b338f";
+ sha256 = "0bsdyy5jw8adj26p85831n4f34d0sv4rrv9xlhjqkzx9gsr4h7d1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/997f5a6999d1add57fae33ba8eb3e3bc60d7bb56/recipes/evil-multiedit";
@@ -19662,6 +19834,27 @@
license = lib.licenses.free;
};
}) {};
+ evil-opener = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, opener }:
+ melpaBuild {
+ pname = "evil-opener";
+ version = "20161017.235";
+ src = fetchFromGitHub {
+ owner = "0robustus1";
+ repo = "opener.el";
+ rev = "ad3c65a5a748230bf07c18f56b1998ac03e3807a";
+ sha256 = "178h7sbpgsn0xl93j7375f2ahmqcszmbl3f7mfb6vgjmm791q03p";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/da8d4e5bf23985632f993336b9183fe9f480addc/recipes/evil-opener";
+ sha256 = "08vcf9i0rplw2p6gjl7zzrc7kxdl5yv2rggj2ihgdnnfpc4sl33h";
+ name = "evil-opener";
+ };
+ packageRequires = [ evil opener ];
+ meta = {
+ homepage = "https://melpa.org/#/evil-opener";
+ license = lib.licenses.free;
+ };
+ }) {};
evil-org = callPackage ({ evil, evil-leader, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "evil-org";
@@ -19791,12 +19984,12 @@
evil-smartparens = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }:
melpaBuild {
pname = "evil-smartparens";
- version = "20160502.155";
+ version = "20161010.322";
src = fetchFromGitHub {
owner = "expez";
repo = "evil-smartparens";
- rev = "a415c03783cc44a9aaf30adbfed37d76c7cf9397";
- sha256 = "1jvyj2qc340vzw379ij9vkzfw5qningkv0n1mwzhzhb1dg8i1ciq";
+ rev = "3bbb96c1064accee0715b039d09955ed5ca9851f";
+ sha256 = "0c3zb0s6snsb0a312pgha760njvb6gpl25g8ywm5dzp03r99490d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/850898fbfc8e0aeb779e8feae56476d989110e79/recipes/evil-smartparens";
@@ -19959,12 +20152,12 @@
evil-textobj-anyblock = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-textobj-anyblock";
- version = "20151017.1417";
+ version = "20161020.1112";
src = fetchFromGitHub {
owner = "noctuid";
repo = "evil-textobj-anyblock";
- rev = "a9e1fdd546312fa787cd0a0acc7ca5e0253de945";
- sha256 = "1v4z2snllgg32cy8glv7xl0m9ib7rwi5ixgdydz1d0sx0z62jyhw";
+ rev = "66dd87d10843f99cb4b7f76e55f00fca9dd48ac3";
+ sha256 = "0a0vr4nqnigrdblr0wfxzl6n3xv4sfi7w3rdrsq8n4sywfdzwlap";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/36b734960313d4cb484cebaac0f112781436631c/recipes/evil-textobj-anyblock";
@@ -20043,12 +20236,12 @@
evil-vimish-fold = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, vimish-fold }:
melpaBuild {
pname = "evil-vimish-fold";
- version = "20160430.440";
+ version = "20161017.1837";
src = fetchFromGitHub {
owner = "alexmurray";
repo = "evil-vimish-fold";
- rev = "46f879698c7096d072ff9777c47a64dafa127c77";
- sha256 = "1z75wp4az5pykvn90vszfb9y8w675g1w288lx8ar9i2hyddsids4";
+ rev = "37fa430eb435ef6a6ac8ac01a6ea0102f5d751c6";
+ sha256 = "0g9r9b95b3g5p8wcd0r5akmdxb7vb4wp8fj75dc5v3frgfssd1pc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fcd51e24f88ebbbd3fddfc7c6f3b667d5104cf2b/recipes/evil-vimish-fold";
@@ -20232,12 +20425,12 @@
expand-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "expand-region";
- version = "20160729.131";
+ version = "20161020.1412";
src = fetchFromGitHub {
owner = "magnars";
repo = "expand-region.el";
- rev = "cfef9aab6a3e826124ac53409b5c7bd6defa3b2d";
- sha256 = "0bfszrc6r2i6ggf5wplzppfyym50s2rn0h3ankjy26xrnnx0is8f";
+ rev = "0bc14fc7fbbcca5da4fdd9695cfd7cbd36eb3b96";
+ sha256 = "0h40dhc3kn8fq86xnwi5lz7ql8my8737y7wkqr897p15y90swr35";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/expand-region";
@@ -20423,8 +20616,8 @@
src = fetchFromGitHub {
owner = "rejeep";
repo = "f.el";
- rev = "cc9adc134c1eedab88147b65723800d76aa1efa2";
- sha256 = "0c772p7jjx86z7i3qfqyfbwba7zjiw3q1kaa4k1y5p8jpdhrv5bn";
+ rev = "4ef57d1539a964a0d02b23becbe9b5e49b805d66";
+ sha256 = "1hymz7chs177pwgfddz6prb18iqj93n1j2xzfszlgl28246939cl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/22ddcf536af597b688d8edb70b3636ed6c265bf5/recipes/f";
@@ -20788,12 +20981,12 @@
fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fcitx";
- version = "20160608.1119";
+ version = "20161013.1040";
src = fetchFromGitHub {
owner = "cute-jumper";
repo = "fcitx.el";
- rev = "77f1e187b9cecb6975bedcfe91c8c81f1b133686";
- sha256 = "0n0v9jwswcc16cigyffvy3m9y7qqrs8qzjs11sq3d420zrv16b39";
+ rev = "433176166c561a2de8d511a1cf6fec751bcb0c57";
+ sha256 = "1nvr4jh3f0qs4lpsb1sw3ih4mi5pcgn8ryxlbnax11rdcdkm625r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e8c40f09d9397b3ca32a7ed37203f490497dc984/recipes/fcitx";
@@ -21639,8 +21832,8 @@
src = fetchFromGitHub {
owner = "IvanMalison";
repo = "flimenu";
- rev = "66a063612daad59ef8035aeacc1a1ed244ba22d0";
- sha256 = "0krs5qjkis01qh21xvxqxd1jn6yw9276si36hacgwv0q92mk8x0b";
+ rev = "ecbd47c857781b9c38035048d69415b617a75422";
+ sha256 = "0a37kjpcpkm172icd2dbb5ndi6s164rbrpvy0c7kr0gl30n1gb8c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0ffc67a266de3d58553b27325b7fc6937df425be/recipes/flimenu";
@@ -21758,12 +21951,12 @@
flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
melpaBuild {
pname = "flycheck";
- version = "20160930.944";
+ version = "20161023.738";
src = fetchFromGitHub {
owner = "flycheck";
repo = "flycheck";
- rev = "c6fc7237f55cc61cced7a400f331491333b1f2a9";
- sha256 = "1b38rr6ad2qg17v0vdmxfp1859m1aavns7zw9d7jgbb5cv63rx14";
+ rev = "b6e3e2db7bd8347a93637f78cc8fe20c4a4b6008";
+ sha256 = "03h3g2yb4lfhg2z6n3isgy7kf6g5q3ph6k0f07kq0vg3rg4486ra";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -22448,22 +22641,22 @@
license = lib.licenses.free;
};
}) {};
- flycheck-package = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ flycheck-package = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, package-lint }:
melpaBuild {
pname = "flycheck-package";
- version = "20160921.1826";
+ version = "20161015.1803";
src = fetchFromGitHub {
owner = "purcell";
repo = "flycheck-package";
- rev = "f6efe48411b695bf1db62d00b3697818dbd60b65";
- sha256 = "1qq2vbks6c42114s1saq9g185b1r9z1k4gih4acxsdjw2vid4pj6";
+ rev = "cf561bf9896d3e7b6bdcdb7801de6cb9f548b573";
+ sha256 = "124ahlxpkcb5mcndmg8k8rdxx0piis6372zllxk6ywmgxz9mlgy1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d17ec69c9f192625e74dfadf03b11d0d7dc575e7/recipes/flycheck-package";
sha256 = "0068kpia17rsgjdmzsjnw0n6x5z9jvfxggxlzkszvwsx73mvcs2d";
name = "flycheck-package";
};
- packageRequires = [ cl-lib emacs flycheck ];
+ packageRequires = [ flycheck package-lint ];
meta = {
homepage = "https://melpa.org/#/flycheck-package";
license = lib.licenses.free;
@@ -22616,15 +22809,36 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-rebar3 = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flycheck-rebar3";
+ version = "20161022.433";
+ src = fetchFromGitHub {
+ owner = "joedevivo";
+ repo = "flycheck-rebar3";
+ rev = "534df87b0c2197fa15057f1e1a19763411c59220";
+ sha256 = "1sai968p20g7yiyrnmq52lxlwxdls80drjw4f1abkr99awzffsb3";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2acff5eea030b91e457df8aa75243993c87ca00e/recipes/flycheck-rebar3";
+ sha256 = "1ml9k61n5vy4c2q6c10q9j10ky0iqkinx21bl7hip1r6b5b1kmmc";
+ name = "flycheck-rebar3";
+ };
+ packageRequires = [ flycheck ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-rebar3";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, seq }:
melpaBuild {
pname = "flycheck-rust";
- version = "20161002.543";
+ version = "20161019.1103";
src = fetchFromGitHub {
owner = "flycheck";
repo = "flycheck-rust";
- rev = "737ca5faa159d1a7788f4bf52cb33ee79b1e4225";
- sha256 = "0235dj863cdh1pysrgj10dkc4fhvpgbpxj6gj97lfb0fchbavypc";
+ rev = "f8ae845d4d7a18c1873ee1edd1a4db272fde5dd3";
+ sha256 = "1p7ijqcbrflaxqk7r5zvgxznsvd8kcr8hfnzlymdylwbgy04j6wy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/68d8cdf3d225b13ebbbe5ce81a01366f33266aed/recipes/flycheck-rust";
@@ -22728,8 +22942,8 @@
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-ycmd";
- rev = "a8ca68b508c448f6ac5ed6fa35ee3fe0a4771098";
- sha256 = "0v8by6y25sl7528vvrb1xsmm184xbqivqvllykx3kmaxpdh5hvih";
+ rev = "adda8765e1c1819bcf63feefea805bd8c0b00335";
+ sha256 = "1bm0kagq6aanybc0rrsfq296sd1485f4lvkz84hxamkfm329illm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd";
@@ -23396,12 +23610,12 @@
flyspell-correct = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "flyspell-correct";
- version = "20160731.329";
+ version = "20161014.216";
src = fetchFromGitHub {
owner = "d12frosted";
repo = "flyspell-correct";
- rev = "d50f3661ad545b30acac4c8819eda2238ff375fc";
- sha256 = "1j39vsmcz2qwab4yld7asvf4wm3249728fdyf7myiqg5bnivd8ig";
+ rev = "f4ce74cf3502ff87099ec1ef6749e37def0627fa";
+ sha256 = "1il46dxfxnvsllp5y3wh2fwscixkb3alykbdfdkyd8g4dqg4fg16";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fa06fbe3bc40ae5e3f6d10dee93a9d49e9288ba5/recipes/flyspell-correct";
@@ -23421,8 +23635,8 @@
src = fetchFromGitHub {
owner = "d12frosted";
repo = "flyspell-correct";
- rev = "d50f3661ad545b30acac4c8819eda2238ff375fc";
- sha256 = "1j39vsmcz2qwab4yld7asvf4wm3249728fdyf7myiqg5bnivd8ig";
+ rev = "f4ce74cf3502ff87099ec1ef6749e37def0627fa";
+ sha256 = "1il46dxfxnvsllp5y3wh2fwscixkb3alykbdfdkyd8g4dqg4fg16";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-helm";
@@ -23442,8 +23656,8 @@
src = fetchFromGitHub {
owner = "d12frosted";
repo = "flyspell-correct";
- rev = "d50f3661ad545b30acac4c8819eda2238ff375fc";
- sha256 = "1j39vsmcz2qwab4yld7asvf4wm3249728fdyf7myiqg5bnivd8ig";
+ rev = "f4ce74cf3502ff87099ec1ef6749e37def0627fa";
+ sha256 = "1il46dxfxnvsllp5y3wh2fwscixkb3alykbdfdkyd8g4dqg4fg16";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-ivy";
@@ -23463,8 +23677,8 @@
src = fetchFromGitHub {
owner = "d12frosted";
repo = "flyspell-correct";
- rev = "d50f3661ad545b30acac4c8819eda2238ff375fc";
- sha256 = "1j39vsmcz2qwab4yld7asvf4wm3249728fdyf7myiqg5bnivd8ig";
+ rev = "f4ce74cf3502ff87099ec1ef6749e37def0627fa";
+ sha256 = "1il46dxfxnvsllp5y3wh2fwscixkb3alykbdfdkyd8g4dqg4fg16";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-popup";
@@ -23564,12 +23778,12 @@
focus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "focus";
- version = "20160131.1418";
+ version = "20161013.401";
src = fetchFromGitHub {
owner = "larstvei";
repo = "Focus";
- rev = "abad47f1c40e595779c376a1e936c1609be1cdf4";
- sha256 = "0vqjyc00ba9wy2rn454hhy9rnnghljc1i8f3zrpkdmkqn5cg3336";
+ rev = "741a94586651d8f07bbfa939de25e3c2d76444a7";
+ sha256 = "15fns0wpvj0lgq3ax14zhqkpfbkss68zib542cppnnl3q88jvbf6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e8f1217224514f9b048b7101c89e3b1a305821e/recipes/focus";
@@ -23918,12 +24132,12 @@
forth-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "forth-mode";
- version = "20161003.541";
+ version = "20161019.2157";
src = fetchFromGitHub {
owner = "larsbrinkhoff";
repo = "forth-mode";
- rev = "039bf122ee7412a29b1283bb23d8687aa07c22cd";
- sha256 = "1f1c37d5vlpj3ach1qpc43ay399vvcv52dn1nm2mz8l0q1916sz2";
+ rev = "2813a7bf3dbcdf7780834b53385993620c7a9fd5";
+ sha256 = "0akbznzqibcnzq59mhnpsx9hgxddg1656ns7c5lrn7pvmajw8vwm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d1c8b5b9fe8f17905de801f5d7dea28ca73daa4e/recipes/forth-mode";
@@ -23981,12 +24195,12 @@
fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fountain-mode";
- version = "20160930.642";
+ version = "20161011.2319";
src = fetchFromGitHub {
owner = "rnkn";
repo = "fountain-mode";
- rev = "57567cfa879acef36e396138795a48c4405023ed";
- sha256 = "0g0br07v1lxw8sdsprsgn2hc9gmskqgjb74pin4riwja1wvgdpc7";
+ rev = "bba892a595efa1e376637dab6b31473faffdf754";
+ sha256 = "0c77dkc5rqzybym2n7mqi5jhkr1g0r77yrfmbpakbc2l0550bg8r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode";
@@ -24254,12 +24468,12 @@
fstar-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fstar-mode";
- version = "20160721.654";
+ version = "20161017.739";
src = fetchFromGitHub {
owner = "FStarLang";
repo = "fstar-mode.el";
- rev = "843fde937786d3f5ea1c54632379b31beed46e24";
- sha256 = "081a208jccs2602c3aqpwzkkf9zfgvp1mb8f9hb63bywyqkv24w5";
+ rev = "52b4f97c0852fde10fd8de40c1ace626923f77fc";
+ sha256 = "18b2sifxvwb8biq3d4vksad093mxmbvlzfbba22fi784fainvvvq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e1198ee309675c391c479ce39efcdca23f548d2a/recipes/fstar-mode";
@@ -24275,11 +24489,11 @@
fuel = callPackage ({ cl-lib ? null, emacs, fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fuel";
- version = "20160825.254";
+ version = "20161007.2213";
src = fetchgit {
url = "git://factorcode.org/git/factor.git";
- rev = "78d9065db0ad87041b519b888f729f820ea49f9f";
- sha256 = "05c6z9bwmyn110940wbglf74rcgs7v1vgf3ixfhm0xk2nvzrplf7";
+ rev = "417e296d46a80eeadcdbfcc06b017ccb3f86fbb9";
+ sha256 = "00ghsi7yr540km7c2b4202pq17qak8g8gziqlx6l5nw64hjjkg6n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
@@ -24686,12 +24900,12 @@
geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "geiser";
- version = "20161001.1854";
+ version = "20161010.1358";
src = fetchFromGitHub {
owner = "jaor";
repo = "geiser";
- rev = "e6535d461bc33ee0d7353b722f2fd5f8ee2bb2e5";
- sha256 = "17p3qwj5qyx5sql09slf9pwghiljlfx3ndkh1izbbqhc5m410r2f";
+ rev = "16035b9fa475496f7f89a57fa81455057af749a0";
+ sha256 = "1rrafizrhjkai0msryjiz4c5dcdyihf0i2wmgiy8br74rwbxpyl5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser";
@@ -24707,12 +24921,12 @@
general = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "general";
- version = "20160923.1826";
+ version = "20161018.819";
src = fetchFromGitHub {
owner = "noctuid";
repo = "general.el";
- rev = "86a0c0e3c41036c7f525f89ad65590c7a97aaa61";
- sha256 = "0gdw02za93w93jmcx9xpgcv30yrfd0bkyvgg8jdam83fb380p6v6";
+ rev = "ae3c4e653c89dc3455f4cd8e75eb53fe41830de5";
+ sha256 = "0lw189b05aq5l12qrb54wm2rw8dvcpw7ryx5ank7kbaza0nmx0mx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general";
@@ -24770,12 +24984,12 @@
german-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "german-holidays";
- version = "20151102.743";
+ version = "20161011.13";
src = fetchFromGitHub {
owner = "rudolfochrist";
repo = "german-holidays";
- rev = "8388b3bf5b5c38f9b9fcc9216ca26ef0640c6edc";
- sha256 = "0344w4sbd6wlgl13j163v0hzjw9nwhvpr5s7658xsdd90wp4i701";
+ rev = "d7d540c229c1a8be68ee09fbda08fe3ea31b7d29";
+ sha256 = "1rfka83jwd68k93vn3f7llxd6z0ma5k98gws0081y8i9fc21fnsd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bf5b3807ff989b13f95e8d6fad2f26a42ff0643c/recipes/german-holidays";
@@ -24833,12 +25047,12 @@
ggtags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ggtags";
- version = "20161001.1836";
+ version = "20161022.251";
src = fetchFromGitHub {
owner = "leoliu";
repo = "ggtags";
- rev = "7a7ee76a8055531482927e6abf7e0ef676165dd2";
- sha256 = "1kyg26wdimy5k5icglgqg9gdfvzkgk4xis12nx1xkh01j2imzl97";
+ rev = "2149f3a4a855ccebbe0c8832079a9f5d5d50909a";
+ sha256 = "1nggwr28wbiz0ch7c5w9rs909gm5qxdqhfnv7d4zikfh568dv8y5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b158bb1bc2fbe3de61a6b21174eac7b1457edda2/recipes/ggtags";
@@ -24900,8 +25114,8 @@
src = fetchFromGitHub {
owner = "DanielG";
repo = "ghc-mod";
- rev = "b7cda9e9b9515ac2cbf8a0cf0ffe7cd4ba52844b";
- sha256 = "183ssyryfqzz4dacirkfn6ycigsm6mfvr6mx4hivav9jzyrd9n7x";
+ rev = "757e17f34ae7c9c167cb98a5b404c7854e7d57ee";
+ sha256 = "0y61l3c4rnhydr84v18r42bg26wxs3rm4nfcj822z3s5hrsd34cd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc";
@@ -25190,12 +25404,12 @@
git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
melpaBuild {
pname = "git-commit";
- version = "20160929.801";
+ version = "20161011.1738";
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "a49dfe13916ea0062f3970b787b1b6fa80eb4d83";
- sha256 = "0flxkv0qiic8bhr319cy1sc81sx396ighqygg13x7g9zaf97qvz2";
+ rev = "95cacde4fcccc95c25d6fb9988d2aa097193f8c0";
+ sha256 = "117jm8bafwi87n4bvivyyizxw6ayaiv4xwf469jh0jqnlggd6pwr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -25257,8 +25471,8 @@
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-git-gutter";
- rev = "a786465bd527c13e32c73c02b95086560c1be878";
- sha256 = "1abagq0psip7cgsqbfjv72qy60ywsny0ibsfcn74ldj6a9v17mz5";
+ rev = "338172b896bcc758a7e635cb5f79e19addf167e6";
+ sha256 = "19a535y7k5s0kw12qrvxd74mb5ikszh0alsjivqpc8ydzvpqb9r7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/git-gutter";
@@ -25278,8 +25492,8 @@
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-git-gutter-fringe";
- rev = "dbcaaba83a5fc3e23a735e871e8f31068b92228a";
- sha256 = "1wklzf8vdsjpzs26xg8d97zq6fddw9hbrkd5npi3qwjmjl1xccws";
+ rev = "b52080a72042d60939db2281c234a6b9c5a56492";
+ sha256 = "08p0nrdwz37yagaaln9xcvyvd9zmj9j6f2hy43nhjhv4bxcapbg6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/git-gutter-fringe";
@@ -25358,12 +25572,12 @@
git-link = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "git-link";
- version = "20160911.1640";
+ version = "20161019.1718";
src = fetchFromGitHub {
owner = "sshaw";
repo = "git-link";
- rev = "f5b62320b45cfdfaf8db5b4e91f536bf0043ff0f";
- sha256 = "1s18x9cnmx4jjgyi7jnsg4qsvjlxq9aablg5c3z458w2fh25h3rg";
+ rev = "efd2a9a40b07e93cd5030d8b409d380c77fca88b";
+ sha256 = "0yhk4r5fdlmiw7n0cpdbjqcsm2vkm37qwwvkb7xz9046mkdag6gy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1385443585e628e3d4efb3badb7611e9d653e0c9/recipes/git-link";
@@ -25383,8 +25597,8 @@
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-git-messenger";
- rev = "9412a975f4723e9bc9c9feb4ec064b2e8c0c659d";
- sha256 = "1hh99ippc1bpqpnchvhbh7yzcsjx9v7bbpy5r9hx82kx0xqih0sc";
+ rev = "199601fe9a71473e9c015fb2ae13f6e1ca1764e0";
+ sha256 = "1k66j0fi7101icn5a0v0km0jdckhwagmi5p6rf1fv9r90pkln1k0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e791293133f30e5d96c4b29e972f9016c06c476d/recipes/git-messenger";
@@ -25673,12 +25887,12 @@
gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }:
melpaBuild {
pname = "gitlab";
- version = "20160909.56";
+ version = "20161013.604";
src = fetchFromGitHub {
owner = "nlamirault";
repo = "emacs-gitlab";
- rev = "2ed2e36dd023c12545f00b41d01bca326048656e";
- sha256 = "16rygpggqq48xhjyc8vnzppwq9kc9h4b1gabfnnfgk7m9g1ly8kz";
+ rev = "2efdc9bc2f572fceb11199cecdd04aae03df3cb0";
+ sha256 = "0pxmmgsrn5d2jmak3plwb6h15h2d4sbwk49q6gdniglcf9nagckq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/gitlab";
@@ -26111,12 +26325,12 @@
go-add-tags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "go-add-tags";
- version = "20161003.1549";
+ version = "20161005.948";
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-go-add-tags";
- rev = "14865351e15a4a6d3bfbcae7a17c84435d308b00";
- sha256 = "18phz9ysyspcpb3h4lc079wy5sarxzfkg4ycz1wg0yx21r107vjh";
+ rev = "c77bd5788347009d1dc14c0d5cbedd73d4544745";
+ sha256 = "0ppps79749fprcbrwd1grlqaj36yi5a8vlvk040rqyhi9g3phr3c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/55d3b893bd68d3d2d86ecdbb4ed442edd256516a/recipes/go-add-tags";
@@ -26136,8 +26350,8 @@
src = fetchFromGitHub {
owner = "nsf";
repo = "gocode";
- rev = "7a0b9e99156df54d06a720e3a2a9f55618e5a25a";
- sha256 = "0hlbga620b2mr03vnrgmz8yd0n3sviyz03idz2jwbrrlk50qsbkl";
+ rev = "478b96fe0e77b4451b866559e2adb407fbce7120";
+ sha256 = "1ymhpiklyqxi79h65yarmh1hgyswsdx5jahg9pmhg4jww34778y3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete";
@@ -26216,12 +26430,12 @@
go-eldoc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
melpaBuild {
pname = "go-eldoc";
- version = "20160307.616";
+ version = "20161012.616";
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-go-eldoc";
- rev = "6b28222429158f11988358f143da3eac7d0d48fb";
- sha256 = "13r0m5ghqvpgkq6yxsqdx4g64s29qv9hn2cfcxk7wza7bxz1p9nk";
+ rev = "ecf71a75ccfac7f9bc6fac64ef536f2ffb56b3bf";
+ sha256 = "1q3l8x7qlcblxy0h4j48hzqjx90c14qh7nzbk8gds3ff2yrxy2kl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6ce1190db06cc214746215dd27648eded5fe5140/recipes/go-eldoc";
@@ -26276,18 +26490,19 @@
license = lib.licenses.free;
};
}) {};
- go-guru = callPackage ({ cl-lib ? null, fetchgit, fetchurl, go-mode, lib, melpaBuild }:
+ go-guru = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
melpaBuild {
pname = "go-guru";
- version = "20160715.854";
- src = fetchgit {
- url = "https://go.googlesource.com/tools";
- rev = "fc2b74b64ef08c618146ebc92062f6499db5314c";
- sha256 = "0f5nx76iqr86x0bi4v06yr7x7p74n3azhhp68441w0c7cq7wsdra";
+ version = "20161013.1055";
+ src = fetchFromGitHub {
+ owner = "dominikh";
+ repo = "go-mode.el";
+ rev = "965dcbc5eb06d73cb700724535dd449a00082b84";
+ sha256 = "0g7r8yhz8j2k2qnfwxkbapakvgjp3x3m4lmd7shhix0m6jl6kdin";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/816a2511c54e451313c7ac9433d0860f95e68da6/recipes/go-guru";
- sha256 = "0c62rvsfqcx2g02iwaga2zp1266w0zhkc73ihpi0iq7cd6nr4wn0";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru";
+ sha256 = "01f0gz65z8d0iv8k49xl2sp6q4qnsvwhd4g8fb2irp7iclb0xmvk";
name = "go-guru";
};
packageRequires = [ cl-lib go-mode ];
@@ -26303,8 +26518,8 @@
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-go-impl";
- rev = "55c6215c009458c8bc36e344c2b3ae48536e8de4";
- sha256 = "168kcz1f0m6dxi0hj2jwl1299469zy7mrri5i5ym2hzc85rhgazp";
+ rev = "f1a8088bca73acf254b605cf421b4661b45ff2ba";
+ sha256 = "0figyrv859i48s4pzm580hr0cgyzhyi26v0gzp6ws2686i20algf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aa1a0845cc1a6970018b397d13394aaa8147e5d0/recipes/go-impl";
@@ -26320,16 +26535,16 @@
go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "go-mode";
- version = "20160913.944";
+ version = "20161022.1435";
src = fetchFromGitHub {
owner = "dominikh";
repo = "go-mode.el";
- rev = "004575eb128ab01a11b4a4d278c544f91cf752fd";
- sha256 = "0il6hbk1lvmqb6c45zima372g7my14bm13c9mlcsxghpp0hs1fj4";
+ rev = "965dcbc5eb06d73cb700724535dd449a00082b84";
+ sha256 = "0g7r8yhz8j2k2qnfwxkbapakvgjp3x3m4lmd7shhix0m6jl6kdin";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/8a9d94efc1a0cedaaa0a1acd1227b2530efefca2/recipes/go-mode";
- sha256 = "1852zjxandmq0cpbf7m56ar3rbdi7bx613gdgsf1bg8hsdvkgzfx";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode";
+ sha256 = "0ghqm4lbkfla79plqiyb1lzf5kbz0380h9vf8px15zal00xrv0bl";
name = "go-mode";
};
packageRequires = [];
@@ -26345,8 +26560,8 @@
src = fetchFromGitHub {
owner = "grafov";
repo = "go-playground";
- rev = "c0acf75774d4e87a8454be610de1408e7c3a344b";
- sha256 = "1zr8bhmihix8lwhz84qgbih9q9spvb4681c0n4s6x4qhk61231q3";
+ rev = "08add53262501d9432767116125a5030d9609911";
+ sha256 = "1i93im43ipdkm1p83d15kfi14h4gqxgqx31z6qn1fc121916rx66";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/900aabb7bc2350698f8740d72a5fad69c9219c33/recipes/go-playground";
@@ -26401,18 +26616,19 @@
license = lib.licenses.free;
};
}) {};
- go-rename = callPackage ({ fetchgit, fetchurl, go-mode, lib, melpaBuild }:
+ go-rename = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
melpaBuild {
pname = "go-rename";
- version = "20160307.744";
- src = fetchgit {
- url = "https://go.googlesource.com/tools";
- rev = "fc2b74b64ef08c618146ebc92062f6499db5314c";
- sha256 = "0f5nx76iqr86x0bi4v06yr7x7p74n3azhhp68441w0c7cq7wsdra";
+ version = "20161019.1204";
+ src = fetchFromGitHub {
+ owner = "dominikh";
+ repo = "go-mode.el";
+ rev = "965dcbc5eb06d73cb700724535dd449a00082b84";
+ sha256 = "0g7r8yhz8j2k2qnfwxkbapakvgjp3x3m4lmd7shhix0m6jl6kdin";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/421911dd75eec0f857295b76d310b8282053b57f/recipes/go-rename";
- sha256 = "1sc3iwxiydgs787a6pi778i0qzqv3bf498r47jwiw5b6mmib3fah";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename";
+ sha256 = "1cd2nfgwnqzylbry11ahahdip8w66w5hnrndrs65ip10s08w2xki";
name = "go-rename";
};
packageRequires = [ go-mode ];
@@ -26487,12 +26703,12 @@
gobgen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gobgen";
- version = "20160928.2013";
+ version = "20161020.823";
src = fetchFromGitHub {
owner = "gergelypolonkai";
repo = "gobgen.el";
- rev = "20ac2dff2eab2184c487393f334d5c8a660c4151";
- sha256 = "003in5qpc0qq8vy20psnfc9cdahrbkfc4xkl3ivb8mhbpkwh3398";
+ rev = "ed2c2b0d217deae293096f3cf14aa492791ddd4f";
+ sha256 = "1isda941gzrl9r2xxaxbsqjxq146cmnhl04m634m8m0q2d751pwk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8c9fed22bb8dbfb359e4fdb0d802ed4b5781f50d/recipes/gobgen";
@@ -26526,6 +26742,27 @@
license = lib.licenses.free;
};
}) {};
+ godoctor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "godoctor";
+ version = "20161014.2042";
+ src = fetchFromGitHub {
+ owner = "microamp";
+ repo = "godoctor.el";
+ rev = "d0755622a2600aece8c3319de0a1b8bc6d798ec3";
+ sha256 = "1b7r3c5n3yp92gsphiyadp4ab9185vzfbbqqzgxq8rcxi3f4yjv2";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0e23e1362ff7d477ad9ce6cfff694db989dfb87b/recipes/godoctor";
+ sha256 = "0k734hry9npsr6zhsplcvmcjqw6jdf79pv4k9dw0xvd598hkpazz";
+ name = "godoctor";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/godoctor";
+ license = lib.licenses.free;
+ };
+ }) {};
gold-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sws-mode }:
melpaBuild {
pname = "gold-mode";
@@ -26596,8 +26833,8 @@
src = fetchFromGitHub {
owner = "golang";
repo = "lint";
- rev = "64229b89515c2a585c623c79a7ccdea71e8589ff";
- sha256 = "05wjfps01hc5y8pc26lf4iq887jjvdqdkr1w2h6q8783dl0608n5";
+ rev = "3390df4df2787994aea98de825b964ac7944b817";
+ sha256 = "00kjfvbi29agwsilfapgccx4ynqrbj04whk6iflxky14zrmz044q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/34f22d829257456abbc020c006b92da9c7a7860e/recipes/golint";
@@ -26802,12 +27039,12 @@
gotest = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }:
melpaBuild {
pname = "gotest";
- version = "20160627.21";
+ version = "20161017.204";
src = fetchFromGitHub {
owner = "nlamirault";
repo = "gotest.el";
- rev = "74128f5c759318b5a25792a72924ea130db27e72";
- sha256 = "0kasaiz3wi7gnl91byhfg2hczhv0r6i59cyh32m4abrmwagbk3xj";
+ rev = "2ae187078beb5d9672ca14cb636b6b4021de4230";
+ sha256 = "1pq9zjfs7gp7bz3jq11fx75m4zcx9p772lja5jicz535khpgxw7f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/gotest";
@@ -26823,12 +27060,12 @@
gotham-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gotham-theme";
- version = "20160823.106";
+ version = "20161022.848";
src = fetchFromGitHub {
owner = "wasamasa";
repo = "gotham-theme";
- rev = "d45287581d3844dbc7218cff646de16f685edbea";
- sha256 = "13lgj7hy9g98797lcw1a82fww7fglgxwlzbza07hs9vp48y8mwcj";
+ rev = "223f3771d84f2d5a9f20390e496cecc529f769d6";
+ sha256 = "0y28gqmnvbagnv9qp7173bylkbl4sgpy8szzn1s9q46fjysdj8b8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4b388de872be397864a1217a330ba80437c287c0/recipes/gotham-theme";
@@ -26904,12 +27141,12 @@
govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
melpaBuild {
pname = "govc";
- version = "20160909.1241";
+ version = "20161020.1626";
src = fetchFromGitHub {
owner = "vmware";
repo = "govmomi";
- rev = "b932baf416e9101c762b7075f12af5a6fb364627";
- sha256 = "18xmhdlm94p1b1jnj2mvj2dhjcgdm9cklksgp3qifwwph9xlyrh8";
+ rev = "bb498f73762deb009468da8c3bd93b7c6002a63e";
+ sha256 = "0vqrqv0fdlw3z3402y9vmkr5lpf40nsf2nl5gi5gwr06fzcrv1dg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -27034,8 +27271,8 @@
src = fetchFromGitHub {
owner = "Groovy-Emacs-Modes";
repo = "groovy-emacs-modes";
- rev = "9d42f284b3163215484e16bef1785456d2e7b68d";
- sha256 = "1dwj53z4422ks30cqr5rj6x91qf63sjzbmb06sz4ac5pdr1d66q6";
+ rev = "5dc1e6a43727b8170f828b48fbbc52aad152de46";
+ sha256 = "0lp54fnz1v1pppbs9zjv9q292jri3padphriqz313hslyvb0mv09";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -27093,12 +27330,12 @@
graphene = callPackage ({ company, dash, exec-path-from-shell, fetchFromGitHub, fetchurl, flycheck, graphene-meta-theme, ido-ubiquitous, lib, melpaBuild, ppd-sr-speedbar, smartparens, smex, sr-speedbar, web-mode }:
melpaBuild {
pname = "graphene";
- version = "20151108.2340";
+ version = "20161009.38";
src = fetchFromGitHub {
owner = "rdallasgray";
repo = "graphene";
- rev = "dcc0e34c6c4632d5d5445ec023f5b1ca04c7d1b7";
- sha256 = "1f34bhjxmbf2jjrkpdvqg2gwp83ka6d5vrxmsxdl3r57yc6rbrwa";
+ rev = "47c5a194f81796eface2e2f062144c17ee3cfdb7";
+ sha256 = "0xx3cnwbbil6d7y15d61wkp777w4j5rsdm7gwd5gpcr8910405n2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0206d6adcb7855c2174c3cd506b71c21def1209b/recipes/graphene";
@@ -27144,6 +27381,27 @@
license = lib.licenses.free;
};
}) {};
+ graphql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "graphql-mode";
+ version = "20161016.635";
+ src = fetchFromGitHub {
+ owner = "davazp";
+ repo = "graphql-mode";
+ rev = "7798aef2a8d369d0cf6a3cbf1f85d2495969c253";
+ sha256 = "1phmpj77hv2f5cq6685r6nngp2c5ssml55w7mdh4x4yji5mndn42";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3850073e6706d4d8151bc6ab12963a19deae8be9/recipes/graphql-mode";
+ sha256 = "074dc8fgbrikb5inv837n9bpmz1ami7aaxsqcci1f94x3iw8i74i";
+ name = "graphql-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/graphql-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
graphviz-dot-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "graphviz-dot-mode";
@@ -27372,12 +27630,12 @@
groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "groovy-mode";
- version = "20160504.211";
+ version = "20161015.114";
src = fetchFromGitHub {
owner = "Groovy-Emacs-Modes";
repo = "groovy-emacs-modes";
- rev = "9d42f284b3163215484e16bef1785456d2e7b68d";
- sha256 = "1dwj53z4422ks30cqr5rj6x91qf63sjzbmb06sz4ac5pdr1d66q6";
+ rev = "5dc1e6a43727b8170f828b48fbbc52aad152de46";
+ sha256 = "0lp54fnz1v1pppbs9zjv9q292jri3padphriqz313hslyvb0mv09";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
@@ -27393,12 +27651,12 @@
gruber-darker-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gruber-darker-theme";
- version = "20160417.430";
+ version = "20161017.1108";
src = fetchFromGitHub {
owner = "rexim";
repo = "gruber-darker-theme";
- rev = "0c2a75d170547a808ce4d22fb63a1d86b4ddf3b2";
- sha256 = "0dn1iscy0vw2bcnh5s675wjnfk9f20i30b8slyffvpzbbi369pys";
+ rev = "ac87018437667c84fb5bb7e7b17e5ab2c8347272";
+ sha256 = "0gw06d9h0fn9jds8vk8dkz8ghf62jrjmxj8q0qlaisdipmdqk87n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/87ade74553c04cb9dcfe16d03f263cc6f1fed046/recipes/gruber-darker-theme";
@@ -27435,12 +27693,12 @@
gruvbox-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gruvbox-theme";
- version = "20160917.2225";
+ version = "20161019.1949";
src = fetchFromGitHub {
owner = "Greduan";
repo = "emacs-theme-gruvbox";
- rev = "9b0526be614190cfc78d06024b2254802fbc706d";
- sha256 = "0xfansmy336g16smr47bf5pm8allzb6imzbyny4jry2mvk7q74p3";
+ rev = "89b060abf49791cad2639f234b230dc4882bdc39";
+ sha256 = "0bhg2za2a67r6hkb0628zvzxx65rcj7cm3kq3m44wls8q8cr2jxj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme";
@@ -27477,12 +27735,12 @@
gscholar-bibtex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gscholar-bibtex";
- version = "20160929.1218";
+ version = "20161006.1944";
src = fetchFromGitHub {
owner = "cute-jumper";
repo = "gscholar-bibtex";
- rev = "0b083af54385d292c1f6b12876f509be15269020";
- sha256 = "12s6zhp3fy37vj53d347rhp3k1kw7hdb37p7wbnr6d1wh7vi0kpx";
+ rev = "734696423b8f807e6c1f0e871a8577a5f3a731f3";
+ sha256 = "1vva58pcrh1rbvl1yyiy0fw2vmnfzlkpinjkr9yv19zmh0jphjzd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9fa546d3dce59b07a623ee83e3befe139dc10481/recipes/gscholar-bibtex";
@@ -27519,12 +27777,12 @@
guide-key-tip = callPackage ({ fetchFromGitHub, fetchurl, guide-key, lib, melpaBuild, pos-tip }:
melpaBuild {
pname = "guide-key-tip";
- version = "20140406.1820";
+ version = "20161011.123";
src = fetchFromGitHub {
owner = "aki2o";
repo = "guide-key-tip";
- rev = "d1773156b62566e1245f39936abd151844bd471c";
- sha256 = "1s6p4ysdbqx5fk68s317ckj5rjmpkwwb0324sbqqa6byhw3j0xyj";
+ rev = "02c5d4b0b65f3e91be5a47f0ff1ae5e86e00c64e";
+ sha256 = "1xkrfjmhprnj8i39a85wfcs5whm93fw8l57c606wdhiwqj719ciz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1f23db7563654ab58632d56e3b01d2f78276fc3e/recipes/guide-key-tip";
@@ -27960,12 +28218,12 @@
haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "haskell-mode";
- version = "20160925.103";
+ version = "20161020.2211";
src = fetchFromGitHub {
owner = "haskell";
repo = "haskell-mode";
- rev = "f755c369d1ce22225b7dd7896fcc2620e2235ea4";
- sha256 = "1zjmkq8sxg3vfb9hy85x39anarl8yf1z6p0hl0gg6y10xmvjv7s6";
+ rev = "7c763a3dd75b303da06917441c294516520dc3d1";
+ sha256 = "03g79q9w08nbypjjs3zrlp85l99picyy101z0wbzz6gpxcwdqr15";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -28168,12 +28426,12 @@
hcl-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hcl-mode";
- version = "20160502.1700";
+ version = "20161006.950";
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-hcl-mode";
- rev = "2e3fa6fbc793a3bcf260fc269c5218cb09ca45aa";
- sha256 = "1qlrkd10vszzqps86pzr6mv9ykffyhhpcp65y9nq3ds4aviv6jay";
+ rev = "4ce807c57c755b1eb15e17e35f2680c86595c171";
+ sha256 = "0mb0knl84wzgyizxf2p82wwslla7s13bvxb7yd05xlnskr0yrnk8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/66b441525dc300b364d9be0358ae1e0fa2a8b4fe/recipes/hcl-mode";
@@ -28228,12 +28486,12 @@
helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
melpaBuild {
pname = "helm";
- version = "20160929.1313";
+ version = "20161024.701";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "2b91583c4f183b505d4870b4e6d3441d57637eae";
- sha256 = "0fbhfzy3karvdbfk49wp4pil5c2xncs8lpw5n9l4nv5yyvc4i2md";
+ rev = "8e00f252aede5521dd8d8d33cc464badafbd0ced";
+ sha256 = "0hf60w1b0m1gkj70h0cnpf7028r50y7m58mvranlam59lfmcvw7m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -28312,12 +28570,12 @@
helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-ag";
- version = "20160923.2128";
+ version = "20161020.952";
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-helm-ag";
- rev = "7839e04d072e2c86c339f5bb4da61b391e7ad93b";
- sha256 = "0ssallh4rva31sw03088fvv0vm5n0ykrrm1a44jqpi4fx25az11i";
+ rev = "5bb0effbfb526d545a0b5a243cc5ed386ce72029";
+ sha256 = "1cagdwiy2h0nhsjfbkmhnaklfy0jfy40b0cfc17xd9ywr55g19ym";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-ag";
@@ -28417,12 +28675,12 @@
helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }:
melpaBuild {
pname = "helm-bibtex";
- version = "20160928.2345";
+ version = "20161018.807";
src = fetchFromGitHub {
owner = "tmalsburg";
repo = "helm-bibtex";
- rev = "5d8f8488537f3c8ced5803d73dc38bcd30a31ebc";
- sha256 = "1lnmwvhfsmv8yx5v7i5dfcfhiy1grphbmphv9ii2pzzmdj4psk8z";
+ rev = "ff592982a051b4d733a5dbb824d4ed81211a03e0";
+ sha256 = "17fl92d8hkihygsjf25njrsk259chj5vlzw0z73hfzs317pgc5yx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex";
@@ -28610,8 +28868,8 @@
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "helm-cider";
- rev = "eab25fb6bc151b467a1d6a16b8d7a9e39f6ccdac";
- sha256 = "1hrvlj38rifyh1fsjcl4l77xlvnjavgff9wx5i6da20zkz2kqzf1";
+ rev = "9481f84bfbc6538e1cbe1a4cb01255088bfe1491";
+ sha256 = "00zciia468svzhk4f7w9bwj20ixb280gwd7vfrxr1iw60p23x237";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/31d3cd618f2ac88860d0b11335ff81b6e2973982/recipes/helm-cider";
@@ -28753,12 +29011,12 @@
helm-company = callPackage ({ company, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-company";
- version = "20160516.2258";
+ version = "20161010.59";
src = fetchFromGitHub {
owner = "manuel-uberti";
repo = "helm-company";
- rev = "d796bfc43489656c87b269c4c893d84745effb31";
- sha256 = "0kbm8w1hxff0nb8pyjnq2l43ra1m0ywzjvvqs0lncji5zqirvp8l";
+ rev = "5202ddde359d8b3b8db242e998d0766d06db2be6";
+ sha256 = "03hdnnqigg3q73mb9zbqav2d91iamkxgsbc5857jxxr04bq23ak9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/78ff0a6cf493ff148406140f3e4902bfafd83e4a/recipes/helm-company";
@@ -28774,12 +29032,12 @@
helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "helm-core";
- version = "20160929.1313";
+ version = "20161024.13";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "2b91583c4f183b505d4870b4e6d3441d57637eae";
- sha256 = "0fbhfzy3karvdbfk49wp4pil5c2xncs8lpw5n9l4nv5yyvc4i2md";
+ rev = "8e00f252aede5521dd8d8d33cc464badafbd0ced";
+ sha256 = "0hf60w1b0m1gkj70h0cnpf7028r50y7m58mvranlam59lfmcvw7m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -28904,8 +29162,8 @@
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm-describe-modes";
- rev = "2ce64bf7ad31f13830cabe5f03c3fa8e35c130b7";
- sha256 = "0n5xx7yl7hppdc5nlrj0pchczzrmzvbiiws3n8x7g5dgdwx79hfr";
+ rev = "74e086a2462fc64234dd0222cde3c5c060a60068";
+ sha256 = "01kwh3f8hxacvjk5vva084jd4f55jlg8f8aa9hmcirif7r7pdidi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/23f0b2025073850c477ba4646c3821b3c7de6c42/recipes/helm-describe-modes";
@@ -28942,12 +29200,12 @@
helm-dired-history = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-dired-history";
- version = "20161003.58";
+ version = "20161023.806";
src = fetchFromGitHub {
owner = "jixiuf";
repo = "helm-dired-history";
- rev = "dd324f383a66a5306ccd0fc3cf7a2c4815f45e8f";
- sha256 = "1xjnblqmk2247c0brbi6byiq3k7d9lz9bb94w9n6j1qyls0flinm";
+ rev = "75416fa6ca9c5e113cca409ef63518266b4d8d56";
+ sha256 = "17z84dx3z48mx2ssdhlhgzaqrxlzdy9mx3d14qlm0rcrmc0sck8i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/56036d496c2a5fb1a6b32cdfcd1814944618e652/recipes/helm-dired-history";
@@ -29236,12 +29494,12 @@
helm-ghq = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-ghq";
- version = "20160203.727";
+ version = "20161015.117";
src = fetchFromGitHub {
owner = "masutaka";
repo = "emacs-helm-ghq";
- rev = "db37bfe290b234ed3f39dcce24667072172ded41";
- sha256 = "0y379qap3mssz9nslb08vfzq5ihqcm156fbx0dszgz9d6xgkpdhw";
+ rev = "21ccdb537a3be3d9351e01c6365df8e804e8bc56";
+ sha256 = "1v3h6dszj223yvlkrjj6r4jwiyaj3iswbcl5d4ffwgaf72cxm4gn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e94eec646def7c77b15f6a6ac1841200848e62c7/recipes/helm-ghq";
@@ -29296,22 +29554,22 @@
license = lib.licenses.free;
};
}) {};
- helm-git-grep = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+ helm-git-grep = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
melpaBuild {
pname = "helm-git-grep";
- version = "20160820.635";
+ version = "20161016.407";
src = fetchFromGitHub {
owner = "yasuyk";
repo = "helm-git-grep";
- rev = "dc66d07ecfb70b0b3c57b0849c74cf80b2bb1312";
- sha256 = "1zjimp0rww90xffzwf9yrhd0xg7jiv5r79v2hw84mxqmbqq70icj";
+ rev = "21ae7521a6ea0268b88a95c15c5ceb46851a44d3";
+ sha256 = "1vx94f1vx0rj9by74q8gmxf06kjska06l3il4qzpsn2wasky2pr3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/338d28c3fe201a7b2f15793be6d540f44819f4d8/recipes/helm-git-grep";
sha256 = "1ww6a4q78w5hnwikq7y93ic2b7x070c27r946lh6p8cz1k4b8vqi";
name = "helm-git-grep";
};
- packageRequires = [ helm ];
+ packageRequires = [ helm-core ];
meta = {
homepage = "https://melpa.org/#/helm-git-grep";
license = lib.licenses.free;
@@ -29366,8 +29624,8 @@
src = fetchFromGitHub {
owner = "nlamirault";
repo = "emacs-gitlab";
- rev = "2ed2e36dd023c12545f00b41d01bca326048656e";
- sha256 = "16rygpggqq48xhjyc8vnzppwq9kc9h4b1gabfnnfgk7m9g1ly8kz";
+ rev = "2efdc9bc2f572fceb11199cecdd04aae03df3cb0";
+ sha256 = "0pxmmgsrn5d2jmak3plwb6h15h2d4sbwk49q6gdniglcf9nagckq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/helm-gitlab";
@@ -29471,8 +29729,8 @@
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-helm-gtags";
- rev = "1dd22dcc97a593f920f10acd7afd167f0e060f7b";
- sha256 = "0sixfcs6114x9af9m8frjj0cz1krzrm5z704crlfjlbw8a8a16l1";
+ rev = "76c573d2c0bd277041d917c9968b180d48a0fdce";
+ sha256 = "1dxm1r5qfriv33kaqf9gzwdrlmsww08lzvmxvfg9505qsjma4b5c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-gtags";
@@ -29572,12 +29830,12 @@
helm-hunks = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-hunks";
- version = "20160720.24";
+ version = "20161019.144";
src = fetchFromGitHub {
owner = "torgeir";
repo = "helm-hunks.el";
- rev = "3c5ba9c3945db9f2aa88a47661d3597b09559062";
- sha256 = "0ww183bi2d989carii4c4hh1ir5d1imj4j0lfxh9qdirap0wpchz";
+ rev = "1fb924561748c17b471ce14a5fe4fb11b1b038db";
+ sha256 = "0972vwzhzq2c1axfvxk5vg0y90078pn74bvv3k96a7jmdjbc4yah";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d61cbe53ad42f2405a66de9f551f5b870a60709f/recipes/helm-hunks";
@@ -29806,7 +30064,7 @@
version = "20150717.39";
src = fetchsvn {
url = "https://svn.macports.org/repository/macports/users/chunyang/helm-ls-svn.el";
- rev = "153526";
+ rev = "154226";
sha256 = "0b7gah21rkfd43mb89lrwaqrrwq646abh7wi4q74sx796gmpz4dz";
};
recipeFile = fetchurl {
@@ -29907,12 +30165,12 @@
helm-mu = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-mu";
- version = "20160819.1132";
+ version = "20161010.102";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm-mu";
- rev = "3d53161fdd15a229c9afe96004118167ba0593b1";
- sha256 = "0ja4vka6wxyy5vg8cdg0znkisvmrn158mhkrph7l0p4b59qdxal6";
+ rev = "1f9a6b0f8217c0c6359f53b724d9da4c3c3f896c";
+ sha256 = "0ch0zip9ldsza3vq66hs8kyczlhdywr2i9sqkza4inm8b938y1dv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/63ee2e2aa622c96993c1b705d0fd223d6b36fd0f/recipes/helm-mu";
@@ -29991,12 +30249,12 @@
helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
melpaBuild {
pname = "helm-org-rifle";
- version = "20160926.1239";
+ version = "20161008.1645";
src = fetchFromGitHub {
owner = "alphapapa";
repo = "helm-org-rifle";
- rev = "604e473dc2b3e107cc6fb35d10b3326c4591a0dd";
- sha256 = "1rqm28xgp8drwk92n3vfxbm3q2rhl3ziy95l2pps1n240qj7is82";
+ rev = "671827a2b72ab6ee1f2736ea33a68b4bf5f93324";
+ sha256 = "1z7jr7v67g9vxf7bv18vvmrdi09rvhjp8aw3malynp9iddz8hab6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle";
@@ -30138,12 +30396,12 @@
helm-proc = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-proc";
- version = "20160917.138";
+ version = "20161005.2005";
src = fetchFromGitHub {
owner = "markus1189";
repo = "helm-proc";
- rev = "a096066d352174cdc71f3107b089913d6b0b588d";
- sha256 = "02rzbjzfvpszgh6gdnklsgmcxyzl1w4j88fkh7jkk3jdrrapysdm";
+ rev = "576d31c2d74ba3897d56e2acd2b0993f52c2547c";
+ sha256 = "11xahzybwh02ds19y6h5hbpqdj278kcb4239vyykdl3wx8p048a7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4d7905061141721ce9f2f8ccea8fc4cf53519481/recipes/helm-proc";
@@ -30180,12 +30438,12 @@
helm-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }:
melpaBuild {
pname = "helm-projectile";
- version = "20160922.4";
+ version = "20161008.45";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "helm-projectile";
- rev = "29836e0a062d715fe6072f1a2af9229ac9a55d38";
- sha256 = "0hddp85zh1ddzycvfijy9kdr55g38f36ingcpacbx9b4qb84ipik";
+ rev = "bc14d326fe892c902c55d093cccefb0fefde29b9";
+ sha256 = "1gkyk8cj55n5dxhhvflqvf14gcbg5i6pj329j04nnmk5kdn0crni";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile";
@@ -30303,6 +30561,27 @@
license = lib.licenses.free;
};
}) {};
+ helm-rage = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
+ melpaBuild {
+ pname = "helm-rage";
+ version = "20161020.554";
+ src = fetchFromGitHub {
+ owner = "bomgar";
+ repo = "helm-rage";
+ rev = "ae05bfa38f83e6b6c468b26ab4b02dfd29569108";
+ sha256 = "1jjxfzvzqjg2illwn1ljv03cxjcfmkgsq3xvk7x9247xkv61xifk";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/84f831fdc5a0e90c23ac11c79f193f4d3c1ebb04/recipes/helm-rage";
+ sha256 = "02pdmkzwnqhf1r0v7b498z5b2il3ng75ykdwgmwd60k6hiygj70x";
+ name = "helm-rage";
+ };
+ packageRequires = [ dash emacs helm s ];
+ meta = {
+ homepage = "https://melpa.org/#/helm-rage";
+ license = lib.licenses.free;
+ };
+ }) {};
helm-rails = callPackage ({ fetchFromGitHub, fetchurl, helm, inflections, lib, melpaBuild }:
melpaBuild {
pname = "helm-rails";
@@ -30667,8 +30946,8 @@
src = fetchFromGitHub {
owner = "bomgar";
repo = "helm-unicode";
- rev = "2193512aa1a46939a38a35189e307b9add68b58a";
- sha256 = "1cxhwcbbnsdi00pmjzy0f8rrgfnzyl0ar4kwqmnbsl6r8hmf29ly";
+ rev = "e331c38e651287981e5d34c27e5d7dc4ff24b0d4";
+ sha256 = "05pvswisi44bl35anjbimd0q8i3c7kkjfksvaj69gcr788lhb8iv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f720b9f9b667bf9ff3080938beab36aa0036dc92/recipes/helm-unicode";
@@ -31300,12 +31579,12 @@
highlight-indentation = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "highlight-indentation";
- version = "20150307.208";
+ version = "20161012.209";
src = fetchFromGitHub {
owner = "antonj";
repo = "Highlight-Indentation-for-Emacs";
- rev = "cd6d8168ccb04c6c0394f42e9512c58f23c01689";
- sha256 = "00l54k75qk24a0znzl4ij3s3nrnr2wy9ha3za8apphzlm98m907k";
+ rev = "731fe2058b68b2eee8c6bc99d914d30f3de233c5";
+ sha256 = "093cvm4sabpchay49xm40mr65q6fk4df2i8kmlqiy2c5dvs5vsgf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/31c443de5088410c0fe1b1c18f664b33ad259277/recipes/highlight-indentation";
@@ -31552,8 +31831,8 @@
src = fetchFromGitHub {
owner = "chrisdone";
repo = "hindent";
- rev = "bdee6d4138aca96bfd8f39f4e5d5e3fd3d17523d";
- sha256 = "0h8rbvcci2virps05s958781jxkp0wk2dm8glmb7ghd5bp09p4rw";
+ rev = "ed127251c80be3c1606913868fea09683ed0e8fb";
+ sha256 = "1xdnvfq32pj5gkmwr32wa8ly5968kkibirhvaviy3wq2dzs2qbb9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
@@ -31629,27 +31908,6 @@
license = lib.licenses.free;
};
}) {};
- hipster-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "hipster-theme";
- version = "20141205.2005";
- src = fetchFromGitHub {
- owner = "xzerocode";
- repo = "hipster-theme";
- rev = "0583bcef489c0bbe2393f813c17f634a9487e04f";
- sha256 = "17dcpwx2y464g8qi3ixlsf3la8dn0bkxax296bhfg4vh73dxccl3";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/c18f56647858f8ae1811a3f0964728d222b6d2e1/recipes/hipster-theme";
- sha256 = "1xrgpqlzp4lhh5h3sv7pg1nqzc9wcv1hs6ybv2h4x6jangicwfl2";
- name = "hipster-theme";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/hipster-theme";
- license = lib.licenses.free;
- };
- }) {};
history = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "history";
@@ -31875,12 +32133,12 @@
hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hl-todo";
- version = "20160807.523";
+ version = "20161008.1357";
src = fetchFromGitHub {
owner = "tarsius";
repo = "hl-todo";
- rev = "215ff60d7a4097b5104edaf2784f9a3257db4403";
- sha256 = "1f7dz1r42qy3dwsqx7x802m7v4jfnmfp2q4678gs8d0scgxxfqb4";
+ rev = "3ef6c978011ffd01d3de060cfbde8c91d4b269f2";
+ sha256 = "0lssxnxg0dknmmrp0fri2d4wbpshnkk5zfnfbc2c9jii6bvg4982";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7/recipes/hl-todo";
@@ -31893,6 +32151,27 @@
license = lib.licenses.free;
};
}) {};
+ hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }:
+ melpaBuild {
+ pname = "hledger-mode";
+ version = "20161024.921";
+ src = fetchFromGitHub {
+ owner = "narendraj9";
+ repo = "hledger-mode";
+ rev = "a26cf703567661488fe1bb8550f301d4db19da08";
+ sha256 = "0vs26h7kwjawj7mbijz13p8fp84cypn6x3pjshvvl9mbd8v0yww4";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c656975c61396d8d4ded0f13ab52b17ccc238408/recipes/hledger-mode";
+ sha256 = "1xpar3nx1axc6yb0bph8xwvx0jcl79da9bz40an2fpr4l1pp4fw3";
+ name = "hledger-mode";
+ };
+ packageRequires = [ async emacs htmlize popup ];
+ meta = {
+ homepage = "https://melpa.org/#/hledger-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
hlint-refactor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hlint-refactor";
@@ -32125,12 +32404,12 @@
ht = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ht";
- version = "20160911.1900";
+ version = "20161015.1945";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "ht.el";
- rev = "addf09885e019a7c279ecd3693c35eda1c642e25";
- sha256 = "1kjlppsrddgvljd3qqfa198h1dlpkvqh97b7g0z2cqfjlsn6sxk9";
+ rev = "8b9281611c49335e97f2b644e34aa07a47dc4b2a";
+ sha256 = "1pnsrirbh901qzqals6p2bbf28g2xn2zminwzj2x02cj49vfyqsz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6c7589bca1c1dfcc0fe76779f6847fda946ab981/recipes/ht";
@@ -32329,6 +32608,27 @@
license = lib.licenses.free;
};
}) {};
+ hungarian-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "hungarian-holidays";
+ version = "20161020.438";
+ src = fetchFromGitHub {
+ owner = "gergelypolonkai";
+ repo = "hungarian-holidays";
+ rev = "653108769279499d84a79267c90e640d98823872";
+ sha256 = "0jjparw5axydjf2lj8asccmksbbj9zgdiv2kc211h122q5712gvm";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0c2dc20ce4b878a32c540744016a40f6cc2a657a/recipes/hungarian-holidays";
+ sha256 = "1bdl0ynlni1i19hq4h48k8j9b2davv2kfgrpd2mrl2xqmjvhm1m2";
+ name = "hungarian-holidays";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/hungarian-holidays";
+ license = lib.licenses.free;
+ };
+ }) {};
hungry-delete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hungry-delete";
@@ -32378,8 +32678,8 @@
src = fetchFromGitHub {
owner = "iquiw";
repo = "hyai";
- rev = "1ad6876a090dc54a5be1feab1c7f83b9a679e43a";
- sha256 = "0k7r5zddlfipnf6za467lmjx8s6h68dflj7gk05vqr4n4xniwgja";
+ rev = "85df4feb527ee65f0b0228832ecfcc452fe572fd";
+ sha256 = "05fhbs4ifa40s8fp6bhccm0kdd5laq1g8r8rvyjbq9f7mj0s9g87";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1dd9bd1cfd2f3b760b664a4677b0e4e617cbdfa6/recipes/hyai";
@@ -32604,7 +32904,7 @@
}) {};
icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "icicles";
- version = "20160831.954";
+ version = "20161012.1345";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/icicles.el";
sha256 = "0x082kilmzq26f9pwwbq2bid98s9mjyfwljcwz2qlj8fbihwjn6l";
@@ -32830,12 +33130,12 @@
ido-describe-bindings = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ido-describe-bindings";
- version = "20160105.53";
+ version = "20161023.402";
src = fetchFromGitHub {
owner = "danil";
repo = "ido-describe-bindings";
- rev = "1f5c78bf56f2cab137a323ec426e906f2215bf7f";
- sha256 = "0055dda1la7yah33xsi19j4hcdmqp17ily2dvkipm4y6d3ww8yqa";
+ rev = "a142ff1c33df23ed9665497d0dcae2943b3c706a";
+ sha256 = "0967709jyp9s04i6gi90axgqzhz03cdf1j1w39yrkds6q1b6v7jw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/31b8e255630f1348a5b5730f7b624ad550d219ad/recipes/ido-describe-bindings";
@@ -33187,12 +33487,12 @@
idris-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, prop-menu }:
melpaBuild {
pname = "idris-mode";
- version = "20160302.635";
+ version = "20161010.710";
src = fetchFromGitHub {
owner = "idris-hackers";
repo = "idris-mode";
- rev = "dc122c178c2a0ddda36fccdd0d3976fc7cd27245";
- sha256 = "0ngqsh0ncwcr377ifvnx5j352bf1f7lhcq7qc8avcn5pwlshri4w";
+ rev = "7965a00a33155588c55c597db84d89e5eb266acf";
+ sha256 = "161sncq7x3flnbqd0ag4fg8yb299qkj5ri5hj451p1nz5s7hibfi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/17a86efca3bdebef7c92ba6ece2de214d283c627/recipes/idris-mode";
@@ -33434,12 +33734,12 @@
imapfilter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "imapfilter";
- version = "20160419.246";
+ version = "20161008.1357";
src = fetchFromGitHub {
owner = "tarsius";
repo = "imapfilter";
- rev = "f3aca4c07178c56080e4c85875f78321e94a9649";
- sha256 = "15lflvpapm5749qq7jzdwbd0isb89i6df3np4wn9y9gjl7y92wk7";
+ rev = "a879ddc36fedc30311693f308f414c520fdfc370";
+ sha256 = "0rx4r6822iwl4gb9j0fii0sqinqvp3lzrc768rasgicgpklaqkjs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2415894afa3404fbd73c84c58f8b8267187d6d86/recipes/imapfilter";
@@ -33745,12 +34045,12 @@
inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inf-clojure";
- version = "20160404.2138";
+ version = "20161015.2329";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "inf-clojure";
- rev = "aa81e316c2a0fcb2026ac036a7c1e5ab01a3d377";
- sha256 = "1632q7zbqqs5nvvxly3b2fj9b9q9mgxwh5sspamj7442s7i0j645";
+ rev = "98b530af7c3098a2c30b9c38751c3e80c37acac4";
+ sha256 = "006cmqqykr09krlhwhb2wbv0f466w4wdmc6xxvn39qiqmprwv9a2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -33808,12 +34108,12 @@
inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inf-ruby";
- version = "20160617.551";
+ version = "20161019.1425";
src = fetchFromGitHub {
owner = "nonsequitur";
repo = "inf-ruby";
- rev = "4d820954241988b4506e067fa9fdf6d574876e2c";
- sha256 = "1h7yna7lm7dp4grqc7q1sf0frjr672jp801aynfl51dgg5vr5aqq";
+ rev = "df014b0717d5b35b54587fcfcda6f753d3e1091e";
+ sha256 = "1vbykxzy4b4vgnvrjj9vwi2m4f65i1wkw2kiy0l4abssrdwsnsdc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby";
@@ -33847,22 +34147,22 @@
license = lib.licenses.free;
};
}) {};
- inflections = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ inflections = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inflections";
- version = "20121016.157";
+ version = "20161017.157";
src = fetchFromGitHub {
owner = "eschulte";
repo = "jump.el";
- rev = "56cec33dd98231a95faa26dd4c0612885d923f78";
- sha256 = "0061hcmj63g13bvacwkmcb5iggwnk27dvb04fz4hihqis6jg01c5";
+ rev = "23984a363dcb1a5faad2e5d0a731b7d593d97efc";
+ sha256 = "1s0cw1vcagx1rxpk00nnca8bnqphvblyi7p5rjj6fiq5rb5adqqj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/392c7616d27bf12b29ef3c2ea71e42ffaea81cc6/recipes/inflections";
sha256 = "0f02bhm2a5xiaxnf2c2hlpa4p121xfyyj3c59fy0yldipdxhvw70";
name = "inflections";
};
- packageRequires = [];
+ packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://melpa.org/#/inflections";
license = lib.licenses.free;
@@ -33910,12 +34210,12 @@
inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inherit-local";
- version = "20160909.755";
+ version = "20161007.724";
src = fetchFromGitHub {
owner = "shlevy";
repo = "inherit-local";
- rev = "e687c702adb27ce5f69fb28a47fe21a86cf84063";
- sha256 = "11z3b1xwg6r769w3scd29lqg62fx8mp81g8dbx4klmj3clvyn69i";
+ rev = "426f7997af0906013846d20729a499f0ce6db634";
+ sha256 = "1n97636c3zi7cq93m5fxvgqkqg5aryn742q7pb1s1w47smdpclgl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/inherit-local";
@@ -34140,12 +34440,12 @@
intellij-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "intellij-theme";
- version = "20160915.1707";
+ version = "20161004.2215";
src = fetchFromGitLab {
owner = "fommil";
repo = "emacs-intellij-theme";
- rev = "8e86c414aebb37543656f672e6afab0d54aa40ba";
- sha256 = "1iqzcjyawj02ayzff3h19abc7fxwi074yjd17yj4rzfqcy67kbd1";
+ rev = "c4b4a7ecdad6ed57545c114b40da9f76371f566e";
+ sha256 = "1wz6j7szb271g1baf6jj4k4kw1dfiz8l677vrazx4wyqdpmzlk0c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cfe86071b2e84929476a771da99341f4a73cfd06/recipes/intellij-theme";
@@ -34203,12 +34503,12 @@
intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
melpaBuild {
pname = "intero";
- version = "20160927.127";
+ version = "20161020.340";
src = fetchFromGitHub {
owner = "commercialhaskell";
repo = "intero";
- rev = "293acc9de8b47e0ef3faabfef810115f7dcc3ab2";
- sha256 = "1g13lw5dj83673j5a67cngv3s7ffnzqck636dkw2llrz7a3cpsq4";
+ rev = "e858b01160bd1ed844ceae54d785032907dea4a7";
+ sha256 = "1laaqs85fhrrl860xv7s1fjiz2mm3a2xdwpd0b72h1991q19dhwf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -34266,12 +34566,12 @@
io-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "io-mode";
- version = "20140814.321";
+ version = "20161004.56";
src = fetchFromGitHub {
owner = "superbobry";
repo = "io-mode";
- rev = "79f2de13d8a448892266da26642525747d048aa8";
- sha256 = "10xpxmbzhmi0lmby2rpmxrbr3qf1vlbif2inmfsvkj85wyh8a7rp";
+ rev = "fd65ae769093defcf554d6d637eba6e6dfc29f56";
+ sha256 = "1x3j4asbczfr9vrqd7bms57ngqzaik73sm2njcgjshf9c3js3aa9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/29ac993c86f992a452784c75c1511d15c4718c91/recipes/io-mode";
@@ -34535,10 +34835,10 @@
}) {};
isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "isearch-plus";
- version = "20160930.1057";
+ version = "20161022.1545";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/isearch+.el";
- sha256 = "0iwqmw42h6r1jh88kpvhs8196wspfd4mzindj8fjlisrigif497s";
+ sha256 = "15a8gd2rsllk5avv6w0m1dkjv6aydsbbimywvj0i3mwjm6ika9lj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8a847ee5f4c4206b48cb164c49e9e82a266a0730/recipes/isearch+";
@@ -34656,12 +34956,12 @@
itail = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "itail";
- version = "20151113.835";
+ version = "20161022.1431";
src = fetchFromGitHub {
owner = "re5et";
repo = "itail";
- rev = "ff80d0456a0039062de1cf73932a5a32d46821b1";
- sha256 = "1az986mk8j8hyvr1mi9hirixwcd73jcqkjsw4xy34vjbwxi122r9";
+ rev = "129d7089fcf712c296706841afc5918955a83f19";
+ sha256 = "0jllp27syd533raj7lqfj5ismm7g7f4av9ikgqar8048m3xkvy2q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6b810bf1deeb79064144d8b684fab336686018ef/recipes/itail";
@@ -34761,12 +35061,12 @@
ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ivy";
- version = "20160926.221";
+ version = "20161021.2214";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "9b2892724be0cadb6afaf7bf8ae72f0feabe37b5";
- sha256 = "1xrc3z2w133g13xm017zcrnib43iw8ymkkwlxmga9sibscrrgsa4";
+ rev = "714cb8c140faa2c019fe1816ac9fe6bb8fbef1a1";
+ sha256 = "0r3ni9c8pmcpfgikyindr1yaia59vgil5bdwf02hc6gb0albmffr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -34782,12 +35082,12 @@
ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }:
melpaBuild {
pname = "ivy-bibtex";
- version = "20160928.2352";
+ version = "20161018.807";
src = fetchFromGitHub {
owner = "tmalsburg";
repo = "helm-bibtex";
- rev = "5d8f8488537f3c8ced5803d73dc38bcd30a31ebc";
- sha256 = "1lnmwvhfsmv8yx5v7i5dfcfhiy1grphbmphv9ii2pzzmdj4psk8z";
+ rev = "ff592982a051b4d733a5dbb824d4ed81211a03e0";
+ sha256 = "17fl92d8hkihygsjf25njrsk259chj5vlzw0z73hfzs317pgc5yx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex";
@@ -34800,22 +35100,22 @@
license = lib.licenses.free;
};
}) {};
- ivy-erlang-complete = callPackage ({ async, counsel, dash, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, s }:
+ ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "ivy-erlang-complete";
- version = "20160927.108";
+ version = "20161018.1145";
src = fetchFromGitHub {
owner = "s-kostyaev";
repo = "ivy-erlang-complete";
- rev = "aaca516a0e3d817dcbfdadfccaed548a60083651";
- sha256 = "1lhrg7kkld9kr557fc9plsm1hmn5rlys4zmd5k036wbda3cl58n2";
+ rev = "8d3716a93200226625b11dda8230862933f9bef6";
+ sha256 = "1rfn2jfinqxdqrjns0h9wjbxsy1g28x89g85nyl51xx7n4b2cbgf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
sha256 = "00fqjgrhvcn3ibpgiy4b0sr4x9p6ym5r1rvi4rdzsw2i3nxmgf3a";
name = "ivy-erlang-complete";
};
- packageRequires = [ async counsel dash emacs erlang ivy s ];
+ packageRequires = [ async counsel emacs erlang ivy ];
meta = {
homepage = "https://melpa.org/#/ivy-erlang-complete";
license = lib.licenses.free;
@@ -34828,8 +35128,8 @@
src = fetchFromGitHub {
owner = "nlamirault";
repo = "emacs-gitlab";
- rev = "2ed2e36dd023c12545f00b41d01bca326048656e";
- sha256 = "16rygpggqq48xhjyc8vnzppwq9kc9h4b1gabfnnfgk7m9g1ly8kz";
+ rev = "2efdc9bc2f572fceb11199cecdd04aae03df3cb0";
+ sha256 = "0pxmmgsrn5d2jmak3plwb6h15h2d4sbwk49q6gdniglcf9nagckq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/35d4d4f22e4c567954287b2a1cabcb595497095a/recipes/ivy-gitlab";
@@ -34849,8 +35149,8 @@
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "9b2892724be0cadb6afaf7bf8ae72f0feabe37b5";
- sha256 = "1xrc3z2w133g13xm017zcrnib43iw8ymkkwlxmga9sibscrrgsa4";
+ rev = "714cb8c140faa2c019fe1816ac9fe6bb8fbef1a1";
+ sha256 = "0r3ni9c8pmcpfgikyindr1yaia59vgil5bdwf02hc6gb0albmffr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -35053,12 +35353,12 @@
jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
melpaBuild {
pname = "jade";
- version = "20160916.1606";
+ version = "20161014.103";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "jade";
- rev = "8b654ed00d4854c82c97a3c331709bb34f83c97e";
- sha256 = "1fdr0hnq4fjmc74flsypf0jwmcwb0i6mk9v06qv11p4jma1aaqdv";
+ rev = "c9dfafc5e721db7cd11f02ca65fdf8ec3798f6e9";
+ sha256 = "08xa0839df1pz8n2zk1zsr89lzrx0a5a2cjvq9gdmmgjqppry9hs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade";
@@ -35389,12 +35689,12 @@
jdee = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "jdee";
- version = "20160728.1152";
+ version = "20161022.612";
src = fetchFromGitHub {
owner = "jdee-emacs";
repo = "jdee";
- rev = "3bbae544db19da22d3943d226eb45c33d7919b43";
- sha256 = "0dr5mfaykqrsmmsbykwh46nkndggccs87v8y5qdxd6mqkivacfyl";
+ rev = "12811feaa621bd06d29ebb0e0021d650e4c442d8";
+ sha256 = "12m4iw9fjjr2kr1ffwhk98j1fs76zxrqhkbn4m9mg5cb96lmgmi9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/92d19f9b3c3163dbac4c0407e90fdfce5bf9008c/recipes/jdee";
@@ -35740,6 +36040,27 @@
license = lib.licenses.free;
};
}) {};
+ js-auto-beautify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, web-beautify, web-mode }:
+ melpaBuild {
+ pname = "js-auto-beautify";
+ version = "20161021.1922";
+ src = fetchFromGitHub {
+ owner = "Qquanwei";
+ repo = "auto-beautify.el";
+ rev = "71f69c8ba65faf66c4752af322b45f56c3239ebd";
+ sha256 = "1z2y4r1p3ar9h8irkyh7ifvpp1igjmdmag5wzqa828xhs1xhbq80";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7658000fb834fb17950a333967b116a785150633/recipes/js-auto-beautify";
+ sha256 = "1as6xkmm295swyc2r6hac2lpf7r36mkq5ib5rxc11f30nnzyya9r";
+ name = "js-auto-beautify";
+ };
+ packageRequires = [ web-beautify web-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/js-auto-beautify";
+ license = lib.licenses.free;
+ };
+ }) {};
js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "js-comint";
@@ -35782,6 +36103,27 @@
license = lib.licenses.free;
};
}) {};
+ js-import = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
+ melpaBuild {
+ pname = "js-import";
+ version = "20161022.620";
+ src = fetchFromGitHub {
+ owner = "jakoblind";
+ repo = "js-import";
+ rev = "fdc6709469a95c848aa1619c11230827a9670206";
+ sha256 = "1cldgsyy7jrm1splqk5fhg5x033ra8827wzv9z57734z6di1yk6a";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/69613bafcb5ca5d5436a4b27be6863f37a7d2fab/recipes/js-import";
+ sha256 = "0hbs84sp50f7w0sn8qrskkwdi53076mv00xz3gpvf3a4nfdr7fci";
+ name = "js-import";
+ };
+ packageRequires = [ dash emacs f projectile ];
+ meta = {
+ homepage = "https://melpa.org/#/js-import";
+ license = lib.licenses.free;
+ };
+ }) {};
js2-closure = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
melpaBuild {
pname = "js2-closure";
@@ -35827,12 +36169,12 @@
js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "js2-mode";
- version = "20160926.1243";
+ version = "20161016.156";
src = fetchFromGitHub {
owner = "mooz";
repo = "js2-mode";
- rev = "64ec0a26673215e36f89e31d7935f99b731fd03d";
- sha256 = "1mcrnibbpnwykhp928f2fjpyapjnv87zrr067vg29h5fmkgn5xli";
+ rev = "91e722a798fc8c30cfa4fad119acc83892d41e9c";
+ sha256 = "1pg9cdl8i10qlbsr756dsrsjvbp6fym04a97q54mfgjsv25kvrg7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -35848,12 +36190,12 @@
js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }:
melpaBuild {
pname = "js2-refactor";
- version = "20161003.1225";
+ version = "20161019.911";
src = fetchFromGitHub {
owner = "magnars";
repo = "js2-refactor.el";
- rev = "71fc914e08fe0b8d51112f482ddd4cb044259719";
- sha256 = "0zs05a7y8xyc2a4l5k5rr1yviyskvmfwhyjfmb1gv796hrx0mkwf";
+ rev = "1d15ffd95c0eecbb5ba3b5b5189ba87eb2126fdd";
+ sha256 = "1nk1ap4cy6fqyy1c6prqnv0spcqy72vkjw2npnzffvg9afqcrlyh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor";
@@ -36119,12 +36461,12 @@
julia-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "julia-mode";
- version = "20160803.1643";
+ version = "20161017.613";
src = fetchFromGitHub {
owner = "JuliaLang";
repo = "julia-emacs";
- rev = "7b1d3fb053c32d9affe82fbf20cc0f8795f45026";
- sha256 = "0fz4165rzkh2nqv99ai25y3k26y1j2igakv3gg43ffhmxxkfil5l";
+ rev = "483805b938a3fe543e075cbb60eefd4af805ad23";
+ sha256 = "0diyvgm5y8iw0zsg4vjzv74kgzib0mspw4b4di06rg1gs7ivfl8r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8522d197cb1b2c139959e7189765001c5ee7e61a/recipes/julia-mode";
@@ -36182,12 +36524,12 @@
jump = callPackage ({ fetchFromGitHub, fetchurl, findr, inflections, lib, melpaBuild }:
melpaBuild {
pname = "jump";
- version = "20151009.129";
+ version = "20161016.2313";
src = fetchFromGitHub {
owner = "eschulte";
repo = "jump.el";
- rev = "56cec33dd98231a95faa26dd4c0612885d923f78";
- sha256 = "0061hcmj63g13bvacwkmcb5iggwnk27dvb04fz4hihqis6jg01c5";
+ rev = "23984a363dcb1a5faad2e5d0a731b7d593d97efc";
+ sha256 = "1s0cw1vcagx1rxpk00nnca8bnqphvblyi7p5rjj6fiq5rb5adqqj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f0c791aebccc08b770b3969ce5d2e82cbe26f80e/recipes/jump";
@@ -36450,6 +36792,27 @@
license = lib.licenses.free;
};
}) {};
+ kdeconnect = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "kdeconnect";
+ version = "20161022.700";
+ src = fetchFromGitHub {
+ owner = "carldotac";
+ repo = "kdeconnect.el";
+ rev = "a91a045cd4aabd671b689361efa10f2e01ad8e8e";
+ sha256 = "0j9j3mlzkr8zw03fghpmvkb3i8r1ar0rarjcmvh9k6m4dk7l0g2d";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c363866d30fb86ae636d30def8c3847711ada762/recipes/kdeconnect";
+ sha256 = "1bcwpnwmm1l2jzc5znw8z6f5knysinidsbm12v4r1j8v6v80ydw6";
+ name = "kdeconnect";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/kdeconnect";
+ license = lib.licenses.free;
+ };
+ }) {};
kerl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "kerl";
@@ -36874,8 +37237,8 @@
src = fetchFromGitHub {
owner = "kivy";
repo = "kivy";
- rev = "97eaba281b9a52ca2d4749005d4c5341383ac410";
- sha256 = "11qdcr5cl52gflvd9spyvl7x0rz5gvx584a7izgwiqmmkkav6vj5";
+ rev = "57dd0d91b7e5cf79da3d8e5c314c4fc083e418e9";
+ sha256 = "11m239xgfpvfkjl3scbm1wf21ahp5fz1m7g10qjpa9ls7k1jni46";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -36937,8 +37300,8 @@
src = fetchFromGitHub {
owner = "for-GET";
repo = "know-your-http-well";
- rev = "6479e44f8578828655f1a42ef9db8d8c67b7e238";
- sha256 = "0dfq0f60d1fcrd2023r25rpcvwjnknz595imaj38bjpimlbw0xcq";
+ rev = "3cc5ab6d2764ab7aacb1b6e026abaccbeb6c37f2";
+ sha256 = "0hni9xvv0759nqwhngijiqkvpiz7alyd4ydf0mvi2vkmbxkci8n1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2ab50ae6278022281b2b7297c086089e5e669c7a/recipes/know-your-http-well";
@@ -36954,12 +37317,12 @@
kodi-remote = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
melpaBuild {
pname = "kodi-remote";
- version = "20160712.1652";
+ version = "20161007.1409";
src = fetchFromGitHub {
owner = "spiderbit";
repo = "kodi-remote.el";
- rev = "cb0c81e2907529ca8db7387588869a14044a3822";
- sha256 = "14vi1l7nmcy4i5490fvh2crv9ngbd1gf68nibzq6rc396d98f4aa";
+ rev = "5d767f98a65101cd32ea2dcc897967649b964a8f";
+ sha256 = "0v3lh67a2z0hl7qzcnp5cihgfl7421dircrsi7n0csbzla02wxqq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote";
@@ -36996,12 +37359,12 @@
kooten-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "kooten-theme";
- version = "20161002.1540";
+ version = "20161023.205";
src = fetchFromGitHub {
owner = "kootenpv";
repo = "emacs-kooten-theme";
- rev = "0ccd84962e02030dcc96436bb298a5d18f3b3bf3";
- sha256 = "0kfbwahpacbwyxd6rrs2q59dl579zwlj13gfmkpfk7cw3rjg485d";
+ rev = "d10197b4dd7af02cd14aeab2573c273a294798c3";
+ sha256 = "1vc97d3i7jh4fbpan7lfnmsm32c4gwgrg11j2vq7z3rwm42wkkyr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/692d268189740e8b540ba14ed92b07bb8b7fb399/recipes/kooten-theme";
@@ -37122,12 +37485,12 @@
kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "kurecolor";
- version = "20150423.2122";
+ version = "20161016.1827";
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "kurecolor";
- rev = "c8c72cea04e51f57701d2dd9be7dba5f3412e2f3";
- sha256 = "0da4y9pf6vq0i6w7bmvrszg9bji3ylhr44hmyrmxvah28pigb2fz";
+ rev = "2b2c6778d75ef90f42fdffbe3ba7e58fa661946a";
+ sha256 = "0zcqjphz2vad6jccw9z7fds8xmvv0vmgp7fi0d8i0i5fbhpwpfz7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/58a5ebdbf82e83e6602161bca049d468887abe02/recipes/kurecolor";
@@ -37521,8 +37884,8 @@
src = fetchFromGitHub {
owner = "aborn";
repo = "leanote-emacs";
- rev = "8c7b9e5283c1f2f45b71639fa71420b06f84abda";
- sha256 = "1bb97i5fidb4vxnr57r7q59vycj3j2gc1rbj5lq5c8gxwgfnq30g";
+ rev = "7aa69b38d16985943c398bf10f3961cf59b54835";
+ sha256 = "0iif540czjvikqk9dhdhrvkw372zdgsm882nzxpqiq81diw3chq2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b00b806ae4562ca5a74f41c12ef35bfa597bcfa8/recipes/leanote";
@@ -37727,12 +38090,12 @@
leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "leuven-theme";
- version = "20160925.1403";
+ version = "20161018.1057";
src = fetchFromGitHub {
owner = "fniessen";
repo = "emacs-leuven-theme";
- rev = "689d9309a0551daf053bfa49e6aed6455489079c";
- sha256 = "0x8ig2c9ikz4pj5s17m20pv0fgy8k91dyip4vbpdm5ia626qypjy";
+ rev = "05763cc1896c93ef0ed1df2f07e210137fad33d1";
+ sha256 = "0z0lxcnmvw1vdfrf2rcsskyxj28x1m7m5732yfyjzdnwywwvrwm1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme";
@@ -37791,8 +38154,8 @@
src = fetchFromGitHub {
owner = "rvirding";
repo = "lfe";
- rev = "bad3c20bdf6f707e0eff1173beee1ff632f62501";
- sha256 = "0v2w5n961fgvv3gq21pq1nw867jpbancg7q82zv6bni9bjrl5azq";
+ rev = "8cf18f7a2172212e5cbd295bf9a573896596a70e";
+ sha256 = "1mrqxlbhvzyz69axp4yvckms8lzrbqb9jyd539dv2dmml9mb7xbr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode";
@@ -38104,12 +38467,12 @@
lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
melpaBuild {
pname = "lispy";
- version = "20161003.838";
+ version = "20161019.2038";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "lispy";
- rev = "c4b91d70befbc40ec08e55ed6d0b4df611b5a70b";
- sha256 = "0zf77l1cq09x5q3m62mjgxdw2g46d1adqv10d5x80azamq62dbdb";
+ rev = "a8c9c82c7354cc09ad98ea5a7475ec51a6a638c5";
+ sha256 = "0sdhkw0krk1d4p2s3xzfyx84icm3k3ka1qv52c6fzj92pcv6rfap";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -38504,8 +38867,8 @@
version = "20150910.644";
src = fetchgit {
url = "http://llvm.org/git/llvm";
- rev = "dc1ddc021dd688b1efda20e804f2d6f5133ba4ab";
- sha256 = "1f64871k5vsdzs6fg3iyc97n0gfls9g27jm7z9j0v6vjrd376wc3";
+ rev = "05c107461ec2f9e25bb45e124186accc89f2c59f";
+ sha256 = "1apsp79k5javfm8775yd8vy26xq6jlsh45nfwllpnk3zwlaiwa2v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -38730,12 +39093,12 @@
logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "logview";
- version = "20160720.1501";
+ version = "20161007.1145";
src = fetchFromGitHub {
owner = "doublep";
repo = "logview";
- rev = "2a949309b6397ea88cc1560bddb0ef3634a1af1e";
- sha256 = "1bpnglr7k9wsx95g9h5hsvxdm9fk9l04mmsbh8fngybdsawy64q6";
+ rev = "9b2f610a32557937e704b32e97f4b61abdec6845";
+ sha256 = "0w1csjcgvl1jfhjpfj19hzrd6f055iaiq0qafpgjlyn6dd4sf9gj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview";
@@ -39123,12 +39486,12 @@
magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
melpaBuild {
pname = "magit";
- version = "20161001.1454";
+ version = "20161024.155";
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "a49dfe13916ea0062f3970b787b1b6fa80eb4d83";
- sha256 = "0flxkv0qiic8bhr319cy1sc81sx396ighqygg13x7g9zaf97qvz2";
+ rev = "95cacde4fcccc95c25d6fb9988d2aa097193f8c0";
+ sha256 = "117jm8bafwi87n4bvivyyizxw6ayaiv4xwf469jh0jqnlggd6pwr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -39235,12 +39598,12 @@
magit-gh-pulls = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild, pcache, s }:
melpaBuild {
pname = "magit-gh-pulls";
- version = "20160513.310";
+ version = "20161020.249";
src = fetchFromGitHub {
owner = "sigma";
repo = "magit-gh-pulls";
- rev = "afc0333296ba8185705f84ef34f628ce0e74caa8";
- sha256 = "1cnvfvf8c2f1jvxxl4qggzwhk082q0hfljhfm1znhc5qxh1vyc4x";
+ rev = "7eb4491d889c4de2e3169b91d34e7d863edf94b7";
+ sha256 = "180vqxyxv6jvp14qa0ks692c42rkf8wj0vk8nqx5j211f9gkh7vl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9b54fe4f51820c2f707e1f5d8a1128fff19a319c/recipes/magit-gh-pulls";
@@ -39281,8 +39644,8 @@
src = fetchFromGitHub {
owner = "qoocku";
repo = "magit-p4";
- rev = "01a42ac54606e272c29818f10320175b09b07cd6";
- sha256 = "12finsicwzpa5bchcw5ymm2mp8ca4lmic9rrbqy22bf8907yw7q8";
+ rev = "eb88123f184a20e6727c9829a4a08f2eae850599";
+ sha256 = "10y702vj5p7pbgny2b8w1kkm69bfy1angna8fgz7336bqwcpmf8a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/440d47ca465845eaa601ca8a6e4b15fc197e522b/recipes/magit-p4";
@@ -39298,12 +39661,12 @@
magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "magit-popup";
- version = "20160821.1338";
+ version = "20161009.1506";
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "a49dfe13916ea0062f3970b787b1b6fa80eb4d83";
- sha256 = "0flxkv0qiic8bhr319cy1sc81sx396ighqygg13x7g9zaf97qvz2";
+ rev = "95cacde4fcccc95c25d6fb9988d2aa097193f8c0";
+ sha256 = "117jm8bafwi87n4bvivyyizxw6ayaiv4xwf469jh0jqnlggd6pwr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -39319,12 +39682,12 @@
magit-rockstar = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "magit-rockstar";
- version = "20160517.651";
+ version = "20161013.544";
src = fetchFromGitHub {
owner = "tarsius";
repo = "magit-rockstar";
- rev = "47780d27141ba50f225f0bd8109f92ba6d1db8d5";
- sha256 = "075gxm4shbh5zfr17zpfn35w8ndgz9aqz6y3wws23wa4ff2n8kdc";
+ rev = "bccce1ac8e012f52e29470c1c7d815f9bb1a192b";
+ sha256 = "0z411x2w6ldy3b8qbavfvfgvkbjd1rl0m1plr44ynp55awrhj0k2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7a20b539cbd38ffa546c1b56b9fac78c0b9457f6/recipes/magit-rockstar";
@@ -39400,22 +39763,22 @@
license = lib.licenses.free;
};
}) {};
- magithub = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit, melpaBuild, s, with-editor }:
+ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit, melpaBuild, s, with-editor }:
melpaBuild {
pname = "magithub";
- version = "20160930.1523";
+ version = "20161013.2332";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "magithub";
- rev = "7be8c823c51149f339a9ea2b2f2224b6c9402e8f";
- sha256 = "0dxz3vcypfhac43iczi96y7nz2pnlj8kda962pyxij804xa8agzw";
+ rev = "78b1046f5c98e0286f1c48bd816eafd16e70d35c";
+ sha256 = "0jwqs508aipxb05y9qljpfqkk2m69iavg716h93qn4lm6mvnl668";
};
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 ];
+ packageRequires = [ emacs git-commit magit s with-editor ];
meta = {
homepage = "https://melpa.org/#/magithub";
license = lib.licenses.free;
@@ -39529,12 +39892,12 @@
make-it-so = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
melpaBuild {
pname = "make-it-so";
- version = "20160818.58";
+ version = "20161009.43";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "make-it-so";
- rev = "5417491b28ec6300823d8e20089b10a56a4b4dcd";
- sha256 = "0dqayvgjjac4kp1i8m0pp71y4g7mxa1vwm3cgwz00d1qxj9s3cxy";
+ rev = "9e10518a2fed8a4a5961b6abad50ef92b4747600";
+ sha256 = "0ilqa7jdfzyhjjnxn69cx93nj3py429jwyg8rgzas87kjk9qiv7m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aad592089ed2200e2f8c5191e8adeac1db4bce54/recipes/make-it-so";
@@ -39596,8 +39959,8 @@
src = fetchFromGitHub {
owner = "m0smith";
repo = "malabar-mode";
- rev = "cf5385cb13296ed64f9ddea59a6219e9c0f29202";
- sha256 = "0nbqnw95812zii8xbb9060csapahscp76ampw8w64pi5ra7b7naa";
+ rev = "e72597045a124fb05993447a009bbd18ec43b4e5";
+ sha256 = "13z3pn5fxn1rvf9w1sv41c6v21znxmqbk9sg4albkx8v7pxwfbs7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/29bbefd1e3cc5726584c89244fb5d8ecd18200c3/recipes/malabar-mode";
@@ -39907,12 +40270,12 @@
markdown-preview-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, websocket }:
melpaBuild {
pname = "markdown-preview-mode";
- version = "20160830.219";
+ version = "20161004.513";
src = fetchFromGitHub {
owner = "ancane";
repo = "markdown-preview-mode";
- rev = "25f1de28390a0b7be493e8f168749d851784ce12";
- sha256 = "116jms95wfdhlbcyn10nqq452jkplvhqwsl7al8f1zx4rn22snra";
+ rev = "a5de48c4dc2cb2c8703b3ca139863f59d91086c9";
+ sha256 = "1x0rv26sq7x5pd1zyc8j3xwhmg8cbm8q4aibhrnrzf9gmc54jn0l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/011d26360a109b074cdecbcb133269ec6452ab86/recipes/markdown-preview-mode";
@@ -40179,11 +40542,11 @@
matrix-client = callPackage ({ fetchgit, fetchurl, json ? null, lib, melpaBuild, request }:
melpaBuild {
pname = "matrix-client";
- version = "20160929.756";
+ version = "20161004.1933";
src = fetchgit {
url = "http://fort.kickass.systems/git/rrix/matrix-client.git";
- rev = "ab62f99be9d90fb261194d5b48a27379c9ebc920";
- sha256 = "1g8aa2i7kb5hb9i7aq2l2kfzdw3a346i78a2vagkn00hm613gj4i";
+ rev = "5bf61e088fba83754a9e9bbef8459c82bea3be1d";
+ sha256 = "1p8wfxf8pxy9ic5sd6ci1197v3j0r6564k4sw5agqplyzap5g9v5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/152969c540b57c0a9532e698c24eac0de5e0269c/recipes/matrix-client";
@@ -40427,12 +40790,12 @@
meghanada = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "meghanada";
- version = "20160929.127";
+ version = "20161018.259";
src = fetchFromGitHub {
owner = "mopemope";
repo = "meghanada-emacs";
- rev = "f80811e4f1efa712eabfa42fd995990d02fc1e5a";
- sha256 = "0w2ij8zh30qs19vwnqifg3p5cvk94akig03cv2f6mx14clvrwckn";
+ rev = "ce923c93124c60c2eda1e3ffa2e03d2adc43bff0";
+ sha256 = "043d6d1ajr19l78prg8c8gbg661p6c9d9l2xghj4zybwr0byv53f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -40613,12 +40976,12 @@
merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "merlin";
- version = "20160627.1923";
+ version = "20161017.205";
src = fetchFromGitHub {
owner = "the-lambda-church";
repo = "merlin";
- rev = "b2926cf6235827c0242797775188b8f0420386c5";
- sha256 = "0xfmvicagqccscxf45n04c25c7fqsnfk8mp8s90rnzlyr66gdck1";
+ rev = "6480e585a0e9d036d11aaf28bcee97e8e9b77c2e";
+ sha256 = "0p3hqxawp18q43ws6506cnndi49f3gxzmai0x2qch7h42dgh1cb8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin";
@@ -40757,12 +41120,12 @@
mew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mew";
- version = "20160904.1829";
+ version = "20161011.1859";
src = fetchFromGitHub {
owner = "kazu-yamamoto";
repo = "Mew";
- rev = "2f9efcd93a8ea6b89d87800c8f9611899610c936";
- sha256 = "177yp566lpc45xkzm6ahw97l358lnzpjsn90shvgfc4lhfsr6c2p";
+ rev = "eb3cb8f25f20a0a241f88ec48953cf49ff43a116";
+ sha256 = "1bnkbd448apnh244napsv28zvfcqczgsc0ly3fjh1qc2kfihx978";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/362dfc4d0fdb3e5cb39564160de62c3440ce182e/recipes/mew";
@@ -41194,12 +41557,12 @@
mips-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mips-mode";
- version = "20160923.209";
+ version = "20161008.212";
src = fetchFromGitHub {
owner = "hlissner";
repo = "emacs-mips-mode";
- rev = "e63064c926312d5b90d9da869db3b86de8fecee8";
- sha256 = "1cxpqbbdl431kxgn54008zi55hxzf6kjb1xamv73cv2gxh9aczy4";
+ rev = "00b9c0d92cca89a1313e203c33ec420a833c929b";
+ sha256 = "1bza70z7kfbv0yi4f3zvr1qid9wypqypngw3kcx9majx7mim54gq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/024a76b83efce47271bcb0ce3bde01b88349f391/recipes/mips-mode";
@@ -41232,10 +41595,10 @@
}) {};
misc-fns = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "misc-fns";
- version = "20160529.1452";
+ version = "20161016.1519";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/misc-fns.el";
- sha256 = "1549qcz5c4l6zjl09j1573i00qdgdl41nvnl5hhqg39gi4nz4c9b";
+ sha256 = "13m2j1ixfgx2m61yxznvk38jp6xfalq6vsmhxsc3klsal8mrkrhn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c2cbbe5a718ec961982a7f65de8f6ec1c9513696/recipes/misc-fns";
@@ -41664,12 +42027,12 @@
monitor = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "monitor";
- version = "20160925.605";
+ version = "20161018.444";
src = fetchFromGitHub {
owner = "GuiltyDolphin";
repo = "monitor";
- rev = "4b781279fd6bce744b7f553482fe6096b58b1ebb";
- sha256 = "0kqxjysbkv8dmjzb43h9lrcdvzfxwi8q1gq8bi32wmbwakaccy5b";
+ rev = "63f4643a0ee81616dbb692b8b03bae21df2283e2";
+ sha256 = "1hl7nzxvjwv9kknyjikkbxw1gbi5kx4hkkq7sw6jnj06192n93yg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b9df614e8e7b9dfdbd7eec552a2b13e0f5acfc22/recipes/monitor";
@@ -41790,12 +42153,12 @@
morlock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "morlock";
- version = "20160521.730";
+ version = "20161008.1358";
src = fetchFromGitHub {
owner = "tarsius";
repo = "morlock";
- rev = "185e3679ebeef3dc58555301e0958e864de775e5";
- sha256 = "0kjqdm6kzhgjmfdj4n95ivffw1wqf4r3gk62fvhfi4w29g7wd16j";
+ rev = "5845b60c705e8db88ce790b0b12cd8b917e1e5a5";
+ sha256 = "1a6kwpanwcnipsq0dc99r4iiz9xa2k883syj0kbk544dxgf338xj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b6ef53bbc80edda12a90a8a9705fe14415972833/recipes/morlock";
@@ -41808,6 +42171,27 @@
license = lib.licenses.free;
};
}) {};
+ mosey = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "mosey";
+ version = "20161015.319";
+ src = fetchFromGitHub {
+ owner = "alphapapa";
+ repo = "mosey.el";
+ rev = "eb0ae6ec10f1d9828a2665476f6d6811df9b0bfa";
+ sha256 = "1cpa38ay4y7cffi9h34s8lw308qggpf342hzqzgbsqy7rl9wr10k";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/76a9a43eea68db9f82c07677235c481a6f243aa2/recipes/mosey";
+ sha256 = "0zprzr5aqv77kmg1ki9w6fw1nc2ap6yqjl4ak05a1i9cq8g6nf3m";
+ name = "mosey";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/mosey";
+ license = lib.licenses.free;
+ };
+ }) {};
mote-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }:
melpaBuild {
pname = "mote-mode";
@@ -41871,12 +42255,12 @@
mouse-slider-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mouse-slider-mode";
- version = "20150910.1400";
+ version = "20161021.1214";
src = fetchFromGitHub {
owner = "skeeto";
repo = "mouse-slider-mode";
- rev = "a8d6489fe2a3c2769b421f93f3609f402c9b92f7";
- sha256 = "05pzplb3gmlnlvn2azbxdlf4vrkvk8fc9dkgi2nq4shysnh4c9v7";
+ rev = "b3c19cd231edecce76787c5a9bbe5e4046d91f88";
+ sha256 = "1qkbrwicp3gaknnmfrajf1qdyhj5s0c09cx62869rp2721p8rqaw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8fa747999bb928c3836400a43d8ab63939381673/recipes/mouse-slider-mode";
@@ -42183,12 +42567,12 @@
mtg-deck-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mtg-deck-mode";
- version = "20161001.1557";
+ version = "20161004.1742";
src = fetchFromGitHub {
owner = "mattiasb";
repo = "mtg-deck-mode";
- rev = "72c80dc970271f3f4f5bc3295b4f3e6227440d8c";
- sha256 = "0qlvj2g9hg18jy9axdx28iwcygyfa82nljip5py3n5vh3zd4b87m";
+ rev = "362fcac725b31570d01df6e9bad545ab636a7dc5";
+ sha256 = "0fzh2sq9gki87yqar48jxa34zqqmyfjiifcmv3br97im25sjfq3p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/425fa66cffe7bfda71de4ff2b49e951456bdeae1/recipes/mtg-deck-mode";
@@ -42327,12 +42711,12 @@
multi-line = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
melpaBuild {
pname = "multi-line";
- version = "20160908.1139";
+ version = "20161013.156";
src = fetchFromGitHub {
owner = "IvanMalison";
repo = "multi-line";
- rev = "7c03bfb2fc1c682ad78689325eac9cf302970ea0";
- sha256 = "1lb3kal8747z61l55dfpfzcn8m5114vrwgm8ar126rqp7hxa97xa";
+ rev = "778c7510b7f066f53cf1f96a6ad1079fda5dc1f7";
+ sha256 = "0lr1i2a4fw40iz8qz2zqch63ci9pwvrri219phv22kn76jqn39mh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8eee6798a0ba71d437a1cbf82e360a5b60eafb/recipes/multi-line";
@@ -42449,12 +42833,12 @@
multiple-cursors = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "multiple-cursors";
- version = "20160719.216";
+ version = "20161021.1431";
src = fetchFromGitHub {
owner = "magnars";
repo = "multiple-cursors.el";
- rev = "dfaf6215fced1eb81ce4b91e8a19a7346e94325e";
- sha256 = "0ii8a2r2ijhlz483fy64jg67ch4w3s90s23gdcxmpzcn4jzia3jj";
+ rev = "632768113df76ac9d688fef5530f567716419dd6";
+ sha256 = "19x0czlk51v5vd1rs8ny8f5zap3mxwbjmjg1g4flmvc0glwd05qd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f015e6b88be2a5ded363bd882a558e94d1f391/recipes/multiple-cursors";
@@ -42467,6 +42851,27 @@
license = lib.licenses.free;
};
}) {};
+ multitran = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "multitran";
+ version = "20161017.1307";
+ src = fetchFromGitHub {
+ owner = "zevlg";
+ repo = "multitran.el";
+ rev = "0a18683644b63aaf9a55a433c23ff4c83bceb915";
+ sha256 = "1fgwpzfr6bhzsbw52gvw0g4qn2fzrr9cw0a3g85p8qqkhja0cfbx";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d665759fa6491b77103920a75c18a561f6800c1c/recipes/multitran";
+ sha256 = "0nxrzzlinl5310zfrb4z5j0553cmg11m9y2gaf990j61afaw8f32";
+ name = "multitran";
+ };
+ packageRequires = [ cl-lib emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/multitran";
+ license = lib.licenses.free;
+ };
+ }) {};
mustache = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
melpaBuild {
pname = "mustache";
@@ -42635,12 +43040,12 @@
mwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mwim";
- version = "20161002.57";
+ version = "20161004.647";
src = fetchFromGitHub {
owner = "alezost";
repo = "mwim.el";
- rev = "a8c6f679d39c62cf16889aed23978ba8b08bf93b";
- sha256 = "0lpfsz6g8zvf44kg36lnviap6g3z914ldpadnwkvd810k185kinf";
+ rev = "e53da113b88a7e0693fd8f91862ce5948ad80a5b";
+ sha256 = "0vm6iynkx328zc4ww6zjibj7impiz53g2cqzxfa8bjfs2src2sw3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b7e1aa2fa1294b27ed7b6c5bdd5844fa5c37df72/recipes/mwim";
@@ -42926,12 +43331,12 @@
nameless = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nameless";
- version = "20160916.728";
+ version = "20161012.1214";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "Nameless";
- rev = "e5e2f0a23c56cba750f93e74442104222f7f30c5";
- sha256 = "06xvh0r4589kxb6pr8a4xxr4msxl4jfp3dh3f9xxvp1icwlf4j9b";
+ rev = "ab1a5c589378334eafca105af1a17f73b9065423";
+ sha256 = "107q1rximjnag9r9vgwh0iv687i3rsscbdnjc46f8l16j6vi4n7d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8e4ee4dae5f32a8d445dc0cc2455c1f7075c9b3d/recipes/nameless";
@@ -42986,43 +43391,43 @@
license = lib.licenses.free;
};
}) {};
- nand2tetris = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
+ nand2tetris = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nand2tetris";
- version = "20151027.1451";
+ version = "20161011.1748";
src = fetchFromGitHub {
owner = "CestDiego";
repo = "nand2tetris.el";
- rev = "0297cd8d76cad072cb64318ffacdc65d8a1ad948";
- sha256 = "003zgkpzz9q0bkkw6psks0vbfikzikfm42myqk14xn7330vgcxz7";
+ rev = "9c5161c840f30f01647c188699dacba5e51b3b44";
+ sha256 = "05ngqw29gzjs0zzs8nyldfcqkbnh9n7jkaxrsc40dfqikjhaj5xc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/nand2tetris";
sha256 = "1zg9xx7mj8334m2v2zqqfkr5vkj4dzqbj8y13qk6xhzb7qkppyqd";
name = "nand2tetris";
};
- packageRequires = [ names ];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/nand2tetris";
license = lib.licenses.free;
};
}) {};
- nand2tetris-assembler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, names, nand2tetris }:
+ nand2tetris-assembler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nand2tetris }:
melpaBuild {
pname = "nand2tetris-assembler";
- version = "20151027.1436";
+ version = "20161011.1748";
src = fetchFromGitHub {
owner = "CestDiego";
repo = "nand2tetris.el";
- rev = "0297cd8d76cad072cb64318ffacdc65d8a1ad948";
- sha256 = "003zgkpzz9q0bkkw6psks0vbfikzikfm42myqk14xn7330vgcxz7";
+ rev = "9c5161c840f30f01647c188699dacba5e51b3b44";
+ sha256 = "05ngqw29gzjs0zzs8nyldfcqkbnh9n7jkaxrsc40dfqikjhaj5xc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/nand2tetris-assembler";
sha256 = "1761kgrflipxba8894cnx90ks7f3ba4nj6ci515zzxcx9s45mfyy";
name = "nand2tetris-assembler";
};
- packageRequires = [ names nand2tetris ];
+ packageRequires = [ nand2tetris ];
meta = {
homepage = "https://melpa.org/#/nand2tetris-assembler";
license = lib.licenses.free;
@@ -43363,12 +43768,12 @@
neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "neotree";
- version = "20160921.1817";
+ version = "20161013.808";
src = fetchFromGitHub {
owner = "jaypei";
repo = "emacs-neotree";
- rev = "ed8de7fbb60b3e1d580c20a4e16cb5005a195cab";
- sha256 = "1s1snaa76f9zgrlbkkhpnsk5arch5mi4gpc644hrrn0slc61hx8k";
+ rev = "7ae38b71faf7878eac01cbb82c9819c903e5cd6d";
+ sha256 = "0bzmv6ds74f1y4w81v59wikraqzjjsd2minzjk7xqp6iiv2i7rgh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree";
@@ -43510,12 +43915,12 @@
nginx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nginx-mode";
- version = "20150824.1411";
+ version = "20161023.223";
src = fetchFromGitHub {
owner = "ajc";
repo = "nginx-mode";
- rev = "8a296e30b01adbc40d1aa9ccde369a972ac5ceab";
- sha256 = "08bpyk0brx0x2l0y8hn8zpkaxb2ndmxz22kzxxypj6hdz303wf38";
+ rev = "a04cef3a07d235eb03bd944fe6923664493896ee";
+ sha256 = "0bk5jjh0rz81q27k105f5azvgy1zcn4w33xygzzpblks760dkgar";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/nginx-mode";
@@ -43636,12 +44041,12 @@
nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nix-buffer";
- version = "20160906.251";
+ version = "20160908.523";
src = fetchFromGitHub {
owner = "shlevy";
repo = "nix-buffer";
- rev = "57ac482d998db58813e8d6f3b90887635f83d44e";
- sha256 = "1y5x49mqippngp7ya6y7p8z81anrc644n84wpd7y62yqv8qhz0fp";
+ rev = "2e2324c7f3a3ef27c9cb9cc3945cd82bec6b7755";
+ sha256 = "18ys3ddla3z733r4jf2nnfkllclrq496i08pfiyvkj6l3jnghzx0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer";
@@ -43661,8 +44066,8 @@
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
- rev = "4bd51d74af34cc0014cd1b2dd0dd105e379e9770";
- sha256 = "0gmyrmqd75bcmh2xa2i1ykyryb38k42vspcbkr2nmrp2r87qfkrs";
+ rev = "fdbbcc44924cb4d9028fa68b2f7d423fb5d8670f";
+ sha256 = "0g420z3n0yspks0zy5ky529gbwriyrp702glslwq27ndl38aiiza";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -43783,12 +44188,12 @@
no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "no-littering";
- version = "20160828.458";
+ version = "20161008.1358";
src = fetchFromGitHub {
owner = "tarsius";
repo = "no-littering";
- rev = "537e584d115fb056a23a0b055e0a28f543182c45";
- sha256 = "1cma5047c3486bjfshb612iq6j3yml0c02gqy8d0ms9507r60igq";
+ rev = "c176eae5d97f627c946ad43c980a1300e3cbeb50";
+ sha256 = "1fs50qll79w0kiyh4jr9kj08ara4s8mhfybx2x1s01xnd6yzjhk8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering";
@@ -43927,11 +44332,11 @@
}) {};
notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "notmuch";
- version = "20160930.313";
+ version = "20161022.847";
src = fetchgit {
url = "git://git.notmuchmail.org/git/notmuch";
- rev = "c2e74662bbbbf9be1fde0ae416dc2664ba3da3cd";
- sha256 = "1f68jin42nybygla41h84dp50hg4sdmn5y22a4iiapm6h6nnzmd0";
+ rev = "9be349c20faea4b119c69ec63a39476ec9570d85";
+ sha256 = "1l2rmi6mc6iqvr2iizfai3apwf6qads9il05v8rmsh1s0278p8w4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -44969,6 +45374,27 @@
license = lib.licenses.free;
};
}) {};
+ oceanic-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "oceanic-theme";
+ version = "20161015.119";
+ src = fetchFromGitHub {
+ owner = "terry3";
+ repo = "oceanic-theme";
+ rev = "a92ee9b470843c923e6cdcafdd65106ff994d04d";
+ sha256 = "1bj4l88546gmlfmwyg1zsqfz9g2l87hsa9jlrf8s4c907di736ir";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d85588df4e2057ef1c822ff177572054ed979b/recipes/oceanic-theme";
+ sha256 = "1i69dy9hfqwfyiykvnqzkqim0lv1p5z5fjsdk84068si4b029gzv";
+ name = "oceanic-theme";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/oceanic-theme";
+ license = lib.licenses.free;
+ };
+ }) {};
ocodo-svg-modelines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, svg-mode-line-themes }:
melpaBuild {
pname = "ocodo-svg-modelines";
@@ -45018,8 +45444,8 @@
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-octicons";
- rev = "229286a6166dba8ddabc8c4d338798c6cd3cf67d";
- sha256 = "0dp7dhmgrq078rjhpm1cr993qjqz7qgy2z4sn73qw6j55va7d9kw";
+ rev = "b993e666977e92432eab197c02728f18e81eaa72";
+ sha256 = "13v7nivp2rdqg6ndp553mlkkxh9cz8fn8n62qwl5sib7svcr2jwc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c62867eae1a254eb5fe820d4387dd4e8a0ff9be2/recipes/octicons";
@@ -45032,15 +45458,36 @@
license = lib.licenses.free;
};
}) {};
+ octo-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "octo-mode";
+ version = "20161008.529";
+ src = fetchFromGitHub {
+ owner = "cryon";
+ repo = "octo-mode";
+ rev = "bd4db7e5e3275b24c74e6a23c11d04f54e9feca5";
+ sha256 = "1blr664h8bq8bs1wr82nhhb9y7ggrlxp6x203i5bv542zm4a5rba";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/899ec190515d33f706e5279c8e3628514f733a12/recipes/octo-mode";
+ sha256 = "1xvpykdrkmxlk302kbqycasrq89f72xvhqlm14qrcd2lqnwhbi07";
+ name = "octo-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/octo-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
octopress = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "octopress";
- version = "20160925.1656";
+ version = "20161009.1232";
src = fetchFromGitHub {
owner = "aaronbieber";
repo = "octopress.el";
- rev = "a38e9fe336f558fbda2a142318349f5617511728";
- sha256 = "1x1yrpn6z0vzlp9rfq0iczsbda389bcsg003nn6lcplnpchq69n8";
+ rev = "0e06723eb725e775bd4e3d506695f5b902b94b0d";
+ sha256 = "0hj96wcd1dpvm3y4h0chfb4539s1pvaiiyxqy95a6dsl57y38l1j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7205d3d43797755077f19f57f531b4b39e77bae3/recipes/octopress";
@@ -45423,8 +45870,8 @@
src = fetchFromGitHub {
owner = "evgeny-panasyuk";
repo = "open-in-msvs.el";
- rev = "caa335b0cf83b0f529fdaa54fe039308d4de91ef";
- sha256 = "130469gqjidz7zvzncfm9dg83vmja49vsav03j6qvdxww5z7a74w";
+ rev = "488c4adb3ad89676472507dae89b1687e43a07df";
+ sha256 = "0s6qc7hn6q89nqyra633hvpx4gfas5dwrcjg7ykc306xh72ywnm3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/09a462fac31a7ceda4ee84a8550ff1db6d11140f/recipes/open-in-msvs";
@@ -45479,6 +45926,27 @@
license = lib.licenses.free;
};
}) {};
+ opener = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+ melpaBuild {
+ pname = "opener";
+ version = "20161017.236";
+ src = fetchFromGitHub {
+ owner = "0robustus1";
+ repo = "opener.el";
+ rev = "ad3c65a5a748230bf07c18f56b1998ac03e3807a";
+ sha256 = "178h7sbpgsn0xl93j7375f2ahmqcszmbl3f7mfb6vgjmm791q03p";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c5a448f1936f46176bc2462eb03955a0c19efb9e/recipes/opener";
+ sha256 = "0fhny4m7x19wnlnr19s4rkl04dkx95yppd51jzrkr96xiznw97s7";
+ name = "opener";
+ };
+ packageRequires = [ cl-lib emacs request ];
+ meta = {
+ homepage = "https://melpa.org/#/opener";
+ license = lib.licenses.free;
+ };
+ }) {};
opensource = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }:
melpaBuild {
pname = "opensource";
@@ -45669,12 +46137,12 @@
org-beautify-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-beautify-theme";
- version = "20160829.2146";
+ version = "20161019.1524";
src = fetchFromGitHub {
owner = "jonnay";
repo = "org-beautify-theme";
- rev = "26f5ce5769d8d1848f331c6076b7b6ad1a162f08";
- sha256 = "1d64ihrcy13gr7xj0nzajxjgqzlp7j699yd225aii5fjn740njiy";
+ rev = "7b7a7cbd4f25f77e8bd81783f517b2b182220fd9";
+ sha256 = "0nqw4apv642vqbjjqbi960zim9lkbnaszrlasf25c9fnzdg1m134";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f55f1ee9890f720e058401a052e14c7411252967/recipes/org-beautify-theme";
@@ -45690,12 +46158,12 @@
org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-board";
- version = "20161003.510";
+ version = "20161022.624";
src = fetchFromGitHub {
owner = "scallywag";
repo = "org-board";
- rev = "3cc35b17d69bc41eff396a1b4a97f8e34c21397e";
- sha256 = "1rcl8zk563d64a1vsbpl49bsk4awajdffc4sb277rd50jmv6a045";
+ rev = "ebb5c949cb505248619e24534de9d9a19fa2979a";
+ sha256 = "1clykj4ijm1pp3phhmm52w0vnz4ilhp8hb7gmfr0xvqd14cr9aq8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board";
@@ -45876,6 +46344,27 @@
license = lib.licenses.free;
};
}) {};
+ org-clock-today = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "org-clock-today";
+ version = "20161014.220";
+ src = fetchFromGitHub {
+ owner = "mallt";
+ repo = "org-clock-today-mode";
+ rev = "02b8fd541a01040405a9a1400c46dcb68b7c2a3a";
+ sha256 = "1gbkrgbpsrwkjd199giffim8jvx1n4dqrsyk53sz1swj9dlhxgp9";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1ddf5992be3677ef94ceac1ec6d3f90f520c7be9/recipes/org-clock-today";
+ sha256 = "0vnpkxlag5h793vw74l1ys6i2v87f5khvjrqbm3wzwmyc08vdz1q";
+ name = "org-clock-today";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/org-clock-today";
+ license = lib.licenses.free;
+ };
+ }) {};
org-commentary = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-commentary";
@@ -45963,12 +46452,12 @@
org-doing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-doing";
- version = "20160705.851";
+ version = "20161017.920";
src = fetchFromGitHub {
owner = "omouse";
repo = "org-doing";
- rev = "a79b5ef87c5e7452f29770721fe961c7110d16f5";
- sha256 = "1jmwwid3y8g9jihjvb91i0ch39zw0hbaylgmnzgghpqipkif9pmk";
+ rev = "4819e75c827c2115bd28f3b3148d846aa64ccd9b";
+ sha256 = "0pb7ljysh8ap572f9y813js6lvvac4kjky2a5r39hv28px33hmx5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4c497b87e14ab614c963f4b2f041bc0111b6e936/recipes/org-doing";
@@ -46152,12 +46641,12 @@
org-evil = callPackage ({ dash, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, monitor, org }:
melpaBuild {
pname = "org-evil";
- version = "20160925.620";
+ version = "20161019.802";
src = fetchFromGitHub {
owner = "GuiltyDolphin";
repo = "org-evil";
- rev = "aa94ee5f41cf170ec4a9c07bf3d25147d36e20db";
- sha256 = "0lbi9r551vs3rcagpiranrgxanwcsr69ibsss4qfghc4da638fsm";
+ rev = "d5c48f2f03b7aa85aa0ca850735ecb3539b21389";
+ sha256 = "1wl5v5f60m6dm6ca8pv7k5myr6y3dn7s2w3rdaz9dqpprxxpqh62";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/17a4772d409aa5dbda5fb84d86c237fd2653c70b/recipes/org-evil";
@@ -46340,12 +46829,12 @@
org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-journal";
- version = "20160907.621";
+ version = "20161024.46";
src = fetchFromGitHub {
owner = "bastibe";
repo = "org-journal";
- rev = "5f1445e9bafa252c8708b3bc223f30032f5ae82b";
- sha256 = "0aip4krrl5cyaa2agmmzipqw139zar3j6594vba93axalfdx9i9z";
+ rev = "8f3de8d1e60a9d1fcdd9c63e5dbe3d461448c75b";
+ sha256 = "0p79wqvsnvx94fkjkrapsalgs4drkj0dbybkbgxf1r8zi1040mm2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal";
@@ -46406,8 +46895,8 @@
version = "20140107.519";
src = fetchgit {
url = "git://orgmode.org/org-mode.git";
- rev = "17e73cf9496b9972e21c4024cd9719740c2b3e62";
- sha256 = "1hb7c7ab1jg445kdm0dp0w9f2ny9wa5f361jca7qck8jncq5gcjm";
+ rev = "359afa68060cee6a72707f53d69e1f9244cbc50c";
+ sha256 = "0mlba0mjzgfxfx7iy8nb5dz0js2l7b810x1lcj6lpfalk7yg9d50";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -46426,8 +46915,8 @@
version = "20160808.220";
src = fetchgit {
url = "git://orgmode.org/org-mode.git";
- rev = "17e73cf9496b9972e21c4024cd9719740c2b3e62";
- sha256 = "1hb7c7ab1jg445kdm0dp0w9f2ny9wa5f361jca7qck8jncq5gcjm";
+ rev = "359afa68060cee6a72707f53d69e1f9244cbc50c";
+ sha256 = "0mlba0mjzgfxfx7iy8nb5dz0js2l7b810x1lcj6lpfalk7yg9d50";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -46531,8 +47020,8 @@
src = fetchFromGitHub {
owner = "kelvinh";
repo = "org-page";
- rev = "0dc3cafc02d2fdb0e05b8da6c75e2ee8b68fc290";
- sha256 = "0jh296mndk5xpqzfiwf41vyc1ys9bfjmfyzpbalkmwyy95inl52p";
+ rev = "870d47a63f36f2aabe5d0d261d9b534127dedd4b";
+ sha256 = "13rsv2d96hndvkllfjgip7y6477pv4hkpi3asqszkbxian4y9rjd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/872f163d4da58760009001472e2240f00d4d2d89/recipes/org-page";
@@ -46598,12 +47087,12 @@
org-pdfview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, pdf-tools }:
melpaBuild {
pname = "org-pdfview";
- version = "20160125.1254";
+ version = "20161011.106";
src = fetchFromGitHub {
owner = "markus1189";
repo = "org-pdfview";
- rev = "569b22197f2a5a08e7be7198c4d871f29559811f";
- sha256 = "16z44kdsg8w1p27fsi72k8wqr35xbb0777rq7h7swv6j2jn1b6hc";
+ rev = "5ed6b514351132c07d65054cdfc9b3da747a26d2";
+ sha256 = "0707y3kw9snmj4ba2v5dqwgr9fyd50xnpdxabak1jy89ckcgahxv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aadf708e55ddfe13d93d124681a5e6f97a690d79/recipes/org-pdfview";
@@ -46686,8 +47175,8 @@
src = fetchFromGitHub {
owner = "IvanMalison";
repo = "org-projectile";
- rev = "a3c95858fc4bbc7b38f4e7253979942118f0a2ed";
- sha256 = "0k3r78nx0gd8azcam1lzrjkxlsv0a6dzbscij8prdj1l7j9r2mxm";
+ rev = "21956fa2276761c1ea8f70f4e731bed10a8e560d";
+ sha256 = "1viviyklv1cipa2n37n85kfmm3s2jlwgyh983afmj3b8jkz8xfw2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dde8c06c968d4375926d269150a16b31c3a840e/recipes/org-projectile";
@@ -46724,12 +47213,12 @@
org-random-todo = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-random-todo";
- version = "20160208.426";
+ version = "20161018.219";
src = fetchFromGitHub {
owner = "unhammer";
repo = "org-random-todo";
- rev = "27ed9f3878736f0e12a076db8e1658964e46257b";
- sha256 = "06apaa8pjrw14g2gyjpxjd6bjv1w0md4vl5jx78krcyr0bcc08mx";
+ rev = "10293cc751b13ef13ebdacb22968b4ffdcadb163";
+ sha256 = "1fjlrs12kwybpx9zqrvyhalp4macx7v3vw739nd7bqsl1srwwr4f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/80fad6244ea3e5bdf7f448c9f62374fae45bae78/recipes/org-random-todo";
@@ -46793,12 +47282,12 @@
org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }:
melpaBuild {
pname = "org-ref";
- version = "20161001.719";
+ version = "20161023.1844";
src = fetchFromGitHub {
owner = "jkitchin";
repo = "org-ref";
- rev = "341108cdc4830e604ba0145688bc99149efc051b";
- sha256 = "19jwj6m5nzjkv9p992amnwhvhwx0dz0cfhaa1radsiq17hj9mn5d";
+ rev = "95a75c1a14ce347b801cc346ff39462fdfb785bb";
+ sha256 = "11y8kfyfdzq6jx0mdnarac39jz8vk1b3bhbiiidaqqrjy31g427d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -47209,12 +47698,12 @@
org2elcomment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org2elcomment";
- version = "20160712.2026";
+ version = "20161014.2125";
src = fetchFromGitHub {
owner = "cute-jumper";
repo = "org2elcomment";
- rev = "0e2733f2eede71abc4586909aaf49e4deaf2df1e";
- sha256 = "0jjqj34k1q37mrqn9l34zdy5xchc3q3lid24xsj754bs7an6s3fg";
+ rev = "be67394b675f226b50a1ede46ef9d621d9534c6b";
+ sha256 = "1n3fa06nbk7f50cy1c65zfyix46067wxllin16ryi649rx5qklwl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8af13650de8b4a814832638d4182bf8ce576244c/recipes/org2elcomment";
@@ -47335,12 +47824,12 @@
orglink = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "orglink";
- version = "20160606.407";
+ version = "20161008.1359";
src = fetchFromGitHub {
owner = "tarsius";
repo = "orglink";
- rev = "4e3e6d920a74fd32a57d5722f81293428e9d8a46";
- sha256 = "0yjnnrrcvbsq41dpw8cz8gv6q3jd626y1k4fgzsimyciz9l23w11";
+ rev = "3b617ba7290ee550caab1aa055a6bedabe33d6fd";
+ sha256 = "0d1i30jbfbv0hm77sf278ism28ds5lz7675ji8f1gf01rfkchjbn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/be9b8e97cda6af91d54d402887f225e3a0caf055/recipes/orglink";
@@ -47881,12 +48370,12 @@
ox-clip = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-clip";
- version = "20160816.507";
+ version = "20161012.1107";
src = fetchFromGitHub {
owner = "jkitchin";
repo = "scimax";
- rev = "db84d90c9bedc7581129323fb3448b1e771de815";
- sha256 = "0b12n6wr6yn33f1ybbzf2pivhzdx5947ja91xclba5rl8n9d9r6y";
+ rev = "bdb140750528d54200771e1d43a644a8c0692a5f";
+ sha256 = "1cqvbk92cfr4p3i884vqi6hz1f67hkpcbvj71rx1z1x0vvs75505";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip";
@@ -47965,12 +48454,12 @@
ox-ioslide = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, makey, melpaBuild, org }:
melpaBuild {
pname = "ox-ioslide";
- version = "20160120.805";
+ version = "20161015.638";
src = fetchFromGitHub {
owner = "coldnew";
repo = "org-ioslide";
- rev = "746bce18ec534a470ec265a14c1d982ffc3f5d3c";
- sha256 = "0p03xzldz5v8lx3ip2pgll0da00ldfxmhr6r3jahwp6692kxpr6j";
+ rev = "6555680be5364c8ddd2bf446865cb1a82adb6b9e";
+ sha256 = "05d1bykgj454g0vq2k2sd36pd9hmcwr9a8033dagkqc625h7wj4h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b960abca4d642c47e640300876eefee1851e6b86/recipes/ox-ioslide";
@@ -48154,12 +48643,12 @@
ox-rst = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-rst";
- version = "20160607.1017";
+ version = "20161006.821";
src = fetchFromGitHub {
owner = "masayuko";
repo = "ox-rst";
- rev = "958ce46c0eacb6c0dbb6e0f006487af4e01c2298";
- sha256 = "0zwaliskikf2098a3wsqkjk40w9q2afmx33wygwaz7saxgs08jwl";
+ rev = "b4aceca6babd5f59a14225df1e3e99a3e313bae7";
+ sha256 = "13kk5cb2v1pv0zjrqvhprqpxxh96xv7jv920jgznbvgypvwbs9p0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3af3905e1ce36397645a54078280852a8a7eb1eb/recipes/ox-rst";
@@ -48343,12 +48832,12 @@
package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "package-build";
- version = "20160903.1832";
+ version = "20161014.2251";
src = fetchFromGitHub {
owner = "melpa";
repo = "package-build";
- rev = "680eeb78201d7c94d24bb920386486942ce0d465";
- sha256 = "0xzf8byg76lbhx0bypqr2k48scx86985g0998b5wsqw820q1qiw4";
+ rev = "9a6824cda477d1bd77d0507b62dcc09ed436b32e";
+ sha256 = "1yswi3yqpfm8sjlhcv4phd069vl9rc2ngi5ma6acpah532k4gi1f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build";
@@ -48382,6 +48871,27 @@
license = lib.licenses.free;
};
}) {};
+ package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "package-lint";
+ version = "20161024.443";
+ src = fetchFromGitHub {
+ owner = "purcell";
+ repo = "package-lint";
+ rev = "e821f61f2cff31de6532d10c72a2527c50f0d4be";
+ sha256 = "15dygw0kd73n159axxhrwgr75cnvynk9gi99kljr09yr1pc11vpg";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
+ sha256 = "0w7nkj4yz5yqmhr3mr7kxa6aqqfs75m3l2578s39940a5sdzirwy";
+ name = "package-lint";
+ };
+ packageRequires = [ cl-lib emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/package-lint";
+ license = lib.licenses.free;
+ };
+ }) {};
package-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "package-plus";
@@ -48511,12 +49021,12 @@
page-break-lines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "page-break-lines";
- version = "20160617.2100";
+ version = "20161015.1709";
src = fetchFromGitHub {
owner = "purcell";
repo = "page-break-lines";
- rev = "9229260e88fe84b53d384677fe5eda4a6652f015";
- sha256 = "11gg3bc41cn1fa04b6gf6r6bf5di1ffwbagmh2bb0n0i42idlcw8";
+ rev = "65fc27e4c89eb0b37dd3a8e87c32ceba78f37f42";
+ sha256 = "0lxfjryq13zg0ikbn1ydqghs57z6yxqwb5wvzkn98mf98iq6nlsp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/22b6035987994c11d5e2564862efb1e56848c3b6/recipes/page-break-lines";
@@ -48718,12 +49228,12 @@
paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }:
melpaBuild {
pname = "paradox";
- version = "20161002.1154";
+ version = "20161020.1842";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "paradox";
- rev = "c899a6d573294b34fc5950080d51caa0899a70d1";
- sha256 = "1kjakgwb0ypg48w90wi5ky2i51g5jys8d5ljbmmra3m7af03pfpg";
+ rev = "df7340518e229c42d2ea5decce8ca750a9bfa762";
+ sha256 = "0w23mqd0s3fdcmdwnwj0070gabqbipwwbd4h3f663zp200xrnyqs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox";
@@ -48821,12 +49331,12 @@
paren-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "paren-face";
- version = "20160521.755";
+ version = "20161008.1400";
src = fetchFromGitHub {
owner = "tarsius";
repo = "paren-face";
- rev = "7b115519d668301633f31a9f3d03b5e36d0541d7";
- sha256 = "0f128gqn170s6hl62n44i9asais75ns1mpvb4l8vzy1sc0v16c0k";
+ rev = "fd8b9a863f0e15e8feeab862d0f67ab35ef18be3";
+ sha256 = "08j4kgvbx7fr3f0243508chbgd3bh9i6dhbqkndqj93zmbxxdhcw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d398398d1d5838dc4985a06515ee668f0f566aab/recipes/paren-face";
@@ -48860,22 +49370,22 @@
license = lib.licenses.free;
};
}) {};
- parinfer = callPackage ({ aggressive-indent, cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "parinfer";
- version = "20161003.1729";
+ version = "20161024.750";
src = fetchFromGitHub {
owner = "DogLooksGood";
repo = "parinfer-mode";
- rev = "4d7fc1cdcf0d0e1674996e72a9f4feccec0d6c7f";
- sha256 = "120qvffimvw01d1dchgrs85h5lw8x8wp78vpfz6g1iny1nspsajg";
+ rev = "42fee8539ee71471531814466b9a7ee20af523d4";
+ sha256 = "0y26sg8qdvvhn1ya71abi58x99yl78pf78rkj3npa9vds3a718pj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer";
sha256 = "05w4w7j6xyj19dm63073amd4n7fw4zm3qnn4x02fk2011iw8fq7i";
name = "parinfer";
};
- packageRequires = [ aggressive-indent cl-lib dash ];
+ packageRequires = [ cl-lib dash ];
meta = {
homepage = "https://melpa.org/#/parinfer";
license = lib.licenses.free;
@@ -48926,12 +49436,12 @@
parsec = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "parsec";
- version = "20160714.1524";
+ version = "20161021.1405";
src = fetchFromGitHub {
owner = "cute-jumper";
repo = "parsec.el";
- rev = "7e65db0d4f21cd64434adc2a19d250589604531d";
- sha256 = "093gwb8ppgwvaz3jxp48mwj577xkcqckvzgq8cgl1l04si1lkcdc";
+ rev = "8c108be16dc07340d7681bebfba52649821e5d63";
+ sha256 = "1h564hjhqyb5l39nmin6k4n50qh18rryy8giwhgnl6pkr1fw7fdl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/248aaf5ff9c98cd3e439d0a26611cdefe6b6c32a/recipes/parsec";
@@ -48947,12 +49457,12 @@
pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }:
melpaBuild {
pname = "pass";
- version = "20160821.1136";
+ version = "20161014.255";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "pass";
- rev = "6093fb0a07a4afdd428c13178e6aef086c24da36";
- sha256 = "114dvh1grsx0xrw2x0l9hiki2vmc8d8grbz1p4cwcq230rcm6q2z";
+ rev = "beadbd50c60492248e950a7d61e22f2c3e5a2bd4";
+ sha256 = "06wjq0nmxdjay0jrs5jc6j02xbqvhxbz2v529zych7llyvkbyf9r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass";
@@ -49260,12 +49770,12 @@
pcap-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pcap-mode";
- version = "20160923.819";
+ version = "20161011.638";
src = fetchFromGitHub {
owner = "orgcandman";
repo = "pcap-mode";
- rev = "38169363f8e1da3837b049762e537a9c9bb516ca";
- sha256 = "13cf00pj238hmcmspvhwp6wrp2a2s0s5h2fzafpk1dn251yfybhc";
+ rev = "f681f074a335f40cf355171ecd05ebc8877642b0";
+ sha256 = "10cj12bv2m9x1fmwi6s0awgsq9bqmrjnrgxmyp203c6yp9gbhv74";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/44f4cb526556a4b58b7e67314002e73413a59a76/recipes/pcap-mode";
@@ -49449,12 +49959,12 @@
pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }:
melpaBuild {
pname = "pdf-tools";
- version = "20160525.920";
+ version = "20161018.353";
src = fetchFromGitHub {
owner = "politza";
repo = "pdf-tools";
- rev = "87690b7b568ae6145dfa4ffc9fc085b80ed039fa";
- sha256 = "14h8vybd0lns92mxv045mfcllhq8fj509bvf7i9vr190mxgnxv3s";
+ rev = "249cece6cf0746924715990283cefe1d9b1ae093";
+ sha256 = "0l0p9s88b2bi3hdm7w5h3jbgrv8170yijq0d4h9lhijsymjzmg98";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools";
@@ -49700,12 +50210,12 @@
persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "persp-mode";
- version = "20161001.533";
+ version = "20161024.704";
src = fetchFromGitHub {
owner = "Bad-ptr";
repo = "persp-mode.el";
- rev = "8d66aa2f9f16d64ab6808e80c25dd9baf7c9e754";
- sha256 = "0ax2yap12jicgdfvgzvn0vzrdn3k1xn06g3qj4rparkw4wl890zn";
+ rev = "f6327c5052e1efa392353b6398cdc4b12c4fe17a";
+ sha256 = "01902jlmin93j5wzhbl0dmzp836q7mrq4yvx01rggjbzd51pijw4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode";
@@ -50456,12 +50966,12 @@
pivotal-tracker = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pivotal-tracker";
- version = "20151203.1150";
+ version = "20161017.2054";
src = fetchFromGitHub {
owner = "jxa";
repo = "pivotal-tracker";
- rev = "93f2b45b373bf6972dcc4b16814ef23e1a6c16f5";
- sha256 = "1sbwqrk9nciqwm53sfbq3nr9f9zzpz79dmxs8yp005dk7accdlls";
+ rev = "1d43a5908a21853d595cae79c58caadf2c7c0a07";
+ sha256 = "19sf59f888pp8m11j9xbsrckw3750c7894nr4dcacwv90i0qwpw0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/793d86ec68fc10d4f23eca4ffef162e920d9fc42/recipes/pivotal-tracker";
@@ -50621,22 +51131,22 @@
license = lib.licenses.free;
};
}) {};
- plantuml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ plantuml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "plantuml-mode";
- version = "20160928.900";
+ version = "20161018.1025";
src = fetchFromGitHub {
- owner = "zwz";
+ owner = "skuro";
repo = "plantuml-mode";
- rev = "fa3e2e96e1a96516ad9b8ae7a55548556e4ed603";
- sha256 = "0rkfdbw5mhlb41y879nnkqf3j5063nha56klgn8bcidjfg4qq8hs";
+ rev = "2b7d79688608a5f328b95610edcdd871278fbd29";
+ sha256 = "1pmnz01k3n4jjkl1p31lcfh8j6g3zpr78p8f2wazdlgcl14g7pjz";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/cad28f1bb83685ca355e230b46f1e0eebe2f7bb1/recipes/plantuml-mode";
- sha256 = "14imiqfgc2j9kjr3aqwzlw8xr1w5hb8i7d4ch709qky036i3lsci";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a658eb8085f2bf413c276af19c77597132cf569b/recipes/plantuml-mode";
+ sha256 = "03srbg34512vxcqn95q4r7h2aqbqq0sd5c9ffnbx2a75vsblqc6h";
name = "plantuml-mode";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/plantuml-mode";
license = lib.licenses.free;
@@ -50670,8 +51180,8 @@
src = fetchFromGitHub {
owner = "brocode";
repo = "play-routes-mode";
- rev = "2fa89d0796772714447a93552936f4cb861e8754";
- sha256 = "1yl6hmb4y156lxh809z0h26ybzykdhsc3y0w42jqfpxsnawd6nv6";
+ rev = "325ce59b0b3cb27ddbbde9949a16f6a749ffbd3f";
+ sha256 = "0jn4mcwaws92lsj5hp67zlx03qwcxbqacy3rigy1b183ksqqf26i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/740cef8687232eb0e2186e8df956c2d4f39575cf/recipes/play-routes-mode";
@@ -50869,12 +51379,12 @@
podcaster = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "podcaster";
- version = "20160930.433";
+ version = "20161020.835";
src = fetchFromGitHub {
owner = "lujun9972";
repo = "podcaster";
- rev = "d216120ee920715ae783245dc54e823f6a2cf7f4";
- sha256 = "0wflg2r7l1701vm7hn5iarbf1aw7d9h643l9ln24b42g8fwfpml1";
+ rev = "9854517025deb5d556168a68955fb7b662239f5c";
+ sha256 = "06ag0idz7cf6i9kg7kqr03js9b6cw6my1jzd1x3wkgazx5slqk4q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2649dc294f40d00f3bf1b1cf09879c2ef0d3e43b/recipes/podcaster";
@@ -51055,12 +51565,12 @@
ponylang-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ponylang-mode";
- version = "20160527.541";
+ version = "20161008.1423";
src = fetchFromGitHub {
owner = "SeanTAllen";
repo = "ponylang-mode";
- rev = "ed7ccf6d62a06e07eeec7020a931c0af62d8ae4d";
- sha256 = "0ks1g381sx8if93hg6ndsc1lnv1msrd8f7zf8ykk1jrsfy9mn48h";
+ rev = "1f4ce183e11f4908173cea16685020f2acb818ae";
+ sha256 = "1lxzl5ks4lydn8zzvkc0jz6p1zjz7hfm4fs9dlyjxi6fn2bvj5kw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7d51adec3c6519d6ffe9b3f7f8a86b4dbc2c9817/recipes/ponylang-mode";
@@ -51866,8 +52376,8 @@
version = "20110206.1230";
src = fetchhg {
url = "https://bitbucket.com/piranha/project-root";
- rev = "fcd9df2eadca";
- sha256 = "08dd2y6hdsj1rxcqa2hnjypnn9c2z43y7z2hz0fi4vny547qybz8";
+ rev = "843ca1f4ab2b";
+ sha256 = "0nw02f5lmbqdfnw93d3383sdxx1d31szk23zvjlrmmdwv2124281";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/project-root";
@@ -51883,12 +52393,12 @@
projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
melpaBuild {
pname = "projectile";
- version = "20160926.1133";
+ version = "20161008.47";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "projectile";
- rev = "5ad4275672beff1404ebead240836e0697cea4b2";
- sha256 = "0v8pbnrs9bi5nv4mg51968s8lsm161rk164x84dv9lwh4hsk1sms";
+ rev = "44f75e3ceceeebac7111954e6f33cda50d4793d5";
+ sha256 = "1av32m99fczdmilxci8r8ni73f3x4kmvm99jjjjx4dnpg4siv35d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile";
@@ -52013,8 +52523,8 @@
src = fetchFromGitHub {
owner = "anshulverma";
repo = "projectile-speedbar";
- rev = "2b9758fbf0b9c314a939630438822fbe2b538524";
- sha256 = "0383rg1zh03r8jbrm898lf0fxs74rgsivlvclr3lidf9h7har2yg";
+ rev = "93561bbe264b23958b72f951d2f0701450ad01e9";
+ sha256 = "1cn5wvagbgn4snrv8f6y6sgq7l51bd0l5z0ns3vs4753wx2y5dxw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eda8cb5a175258404c347ffa30fca002504467a0/recipes/projectile-speedbar";
@@ -52223,8 +52733,8 @@
src = fetchFromGitHub {
owner = "google";
repo = "protobuf";
- rev = "4d8752780715582aec3011e40a45778959acbe24";
- sha256 = "1bcnim7lj1r57a04h3j1pwzkx16nbrd89cvdl75n07iz47pkzpiz";
+ rev = "58580da37357941d502805be3ae520441be77728";
+ sha256 = "1kbh8km3zgs7znj88wq6zsk6gj7i2c4qz4520m2ycy3ba2wsxs6n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -52240,12 +52750,12 @@
psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "psc-ide";
- version = "20160926.619";
+ version = "20161012.143";
src = fetchFromGitHub {
owner = "epost";
repo = "psc-ide-emacs";
- rev = "49d021de7fcba3717904f15d164524c754297726";
- sha256 = "1v4jj5qgiz74skg40q9wwsgqfawzf06q2pplaa2gbnl0ghsx9473";
+ rev = "756bead9d5153a6ed47e4f86f42be0c49c95cace";
+ sha256 = "0mkvnhyl5lxbzjks8769pgzzafhi9z1sr768c67zmgbzz6fl0rmi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8189f4e7d6742d72fb22acf61a9d7eb0bffb2d93/recipes/psc-ide";
@@ -52384,27 +52894,6 @@
license = lib.licenses.free;
};
}) {};
- puml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "puml-mode";
- version = "20160719.36";
- src = fetchFromGitHub {
- owner = "skuro";
- repo = "puml-mode";
- rev = "ae1cd8eb21d3af33bc60d4bfa39a90b8f49b7011";
- sha256 = "12csnmas5n0r356hwrqgx4lb72ns4mdbfkh5dw5jss377akv12gr";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/c0c28ccef208035fd0bdd648771825c1d10f42ff/recipes/puml-mode";
- sha256 = "131ghjq6lsbhbx5hdg36swnkqijdb9bx6zg73hg0nw8qk0z742vn";
- name = "puml-mode";
- };
- packageRequires = [ emacs ];
- meta = {
- homepage = "https://melpa.org/#/puml-mode";
- license = lib.licenses.free;
- };
- }) {};
punctuality-logger = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "punctuality-logger";
@@ -52471,16 +52960,16 @@
puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
melpaBuild {
pname = "puppet-mode";
- version = "20160416.936";
+ version = "20161020.309";
src = fetchFromGitHub {
- owner = "lunaryorn";
+ owner = "voxpupuli";
repo = "puppet-mode";
- rev = "3321cd25f742bcb4466f4a736d936e9da773a83c";
- sha256 = "1ly7gkxlkfgx3nzw35f7rwx7x9w6jrhql15jgsrh9slcw3q2rksl";
+ rev = "efb67ed6e1c528d4fd76d7eb7e9cff2e0b819383";
+ sha256 = "0r0j8fzpmd33jskyz577ry6w0ld0dbpwpwfkp3z97akjl97kgzp6";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/ca67e3241b3fe5037b8d6a8e4f1104d9a46a01b1/recipes/puppet-mode";
- sha256 = "1s2hap6fs6rg5q80dmzhaf4qqaf5sglhs8p896i3i5hq51w0ciyc";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode";
+ sha256 = "1qn71j6fkwnrsq1s6fhfcxhic3rbspg5cy9n7jv451ji7ywyhakf";
name = "puppet-mode";
};
packageRequires = [ emacs pkg-info ];
@@ -52492,12 +52981,12 @@
purescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "purescript-mode";
- version = "20150316.1828";
+ version = "20161013.911";
src = fetchFromGitHub {
owner = "dysinger";
repo = "purescript-mode";
- rev = "1390bf6a2ddd0764a5ee7f5cac4e88980cf44eaf";
- sha256 = "0k2plyvd6842yryzrfadbf4h7a9hrjvkcvixclbca2bkvfik3864";
+ rev = "96c5ce0b22023ff6e2944d43ffeb34a34dd57db6";
+ sha256 = "0znwimxdh0jc3z0y1b9lrv680wi0ixlnmhm5i5xypkxis65n2yrb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/77175fa470e517fa134751fbb38e144eb5b979ff/recipes/purescript-mode";
@@ -52957,8 +53446,8 @@
src = fetchFromGitHub {
owner = "PyCQA";
repo = "pylint";
- rev = "05cc9a7dc82afeb32a315f5cbe2a132a2dac513e";
- sha256 = "1lhfsy29fxr1r9c5qygiwmj9a48l5vnrmm5cl3pdd1hdcmsdphnz";
+ rev = "bbffb9b1d160f4d7aacdfe5d3d729abd06766371";
+ sha256 = "0ghkslnx07iz0xd1dqgm47imy6030wrwrq99zgnqp8b1ylyz5vmh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -52974,12 +53463,12 @@
pytest = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "pytest";
- version = "20160330.647";
+ version = "20161014.815";
src = fetchFromGitHub {
owner = "ionrock";
repo = "pytest-el";
- rev = "b3574f81c372ebf84a1f9092187c6611d374410c";
- sha256 = "0bg8pqqia9l39ac3s9xrnlyrg1pj2w00vc742qpjdk5349lazdl6";
+ rev = "91d8b7fe568527f51c172d6caadaad4f49e53bdd";
+ sha256 = "1s2s8bf0r1nidypmqiawj8i6jwb3y3wslgrhr8nzbz8c7lf626s3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/33a854a27adbaf57d344340199f90d52747b8450/recipes/pytest";
@@ -53100,12 +53589,12 @@
python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "python-mode";
- version = "20160911.1032";
+ version = "20161009.2250";
src = fetchFromGitLab {
owner = "python-mode-devs";
repo = "python-mode";
- rev = "a9cf4f5183228a6c6a31f676e3f5a47d7322a213";
- sha256 = "1yisakjmzd75mbdq2wrwdq06dkvyfzxkqg02llwv9wg8s2pbbn30";
+ rev = "a4295abe5e9bc115ffbdcb332266abbc51456ba8";
+ sha256 = "1jwg3180ixkhbqv5zf4g9557mcxxsh2ls6kx2vs5m2w95pd9mhdj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
@@ -53121,12 +53610,12 @@
python-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "python-test";
- version = "20160924.1013";
+ version = "20161020.1139";
src = fetchFromGitHub {
owner = "emacs-pe";
repo = "python-test.el";
- rev = "38fd3d63b810d3f82624224354ea3f0d5a3327f1";
- sha256 = "1w8xl3h34b34q8ar1rrp5jmssqzj5dnz11dzg0cj9iwszw1kgpcy";
+ rev = "6f1881dc2a79873713fdd854e1af8157035a4278";
+ sha256 = "1zf3k6g6jddah9dfxv0vv388xfrw1pp785zk80gyczxx1912s7f5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0ea68b3aa9c057e81a3e90a359a38ac16cb26c2f/recipes/python-test";
@@ -53226,12 +53715,12 @@
qml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "qml-mode";
- version = "20160108.704";
+ version = "20161015.1731";
src = fetchFromGitHub {
owner = "coldnew";
repo = "qml-mode";
- rev = "efb465917f260b4b18c30bd45c58bc291c8246f0";
- sha256 = "1mlka59gyylj4cabi1b552h11qx54kjqwx3bkmsdngjrd4da222a";
+ rev = "6c5f33ba88ae010bf201a80ee8095e20a724558c";
+ sha256 = "1sncsvzjfgmhp4m8w5jd4y51k24n2jfpgvrkd64wlhhzbj3wb947";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f3abc88ddbb6b8ecafa45e75ceba9a1294ad88d4/recipes/qml-mode";
@@ -53457,12 +53946,12 @@
racer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }:
melpaBuild {
pname = "racer";
- version = "20161003.1655";
+ version = "20161017.1829";
src = fetchFromGitHub {
owner = "racer-rust";
repo = "emacs-racer";
- rev = "47a29c4420f9b80b2b0dda87c34b4300df50a59e";
- sha256 = "0gc3ji639h93yawbbyj0w7cb9rnapyhgif33gpl3dqpgwv12bk28";
+ rev = "05ce76e8e331d37755b25ac7ac23bfb75880c880";
+ sha256 = "1vvaq76jahayx3nps9mz96xz47rnq8dfxnxmj8w5j1mv69lkhxlb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer";
@@ -53478,12 +53967,12 @@
racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "racket-mode";
- version = "20160923.851";
+ version = "20161022.1923";
src = fetchFromGitHub {
owner = "greghendershott";
repo = "racket-mode";
- rev = "2dbceb055495e95a2a2a9d2abdc7f2a5eed47187";
- sha256 = "1mbbmcaqpli83za1d5imy9mw50wv5p0wsinhvmi1i4q9gk3fkg1k";
+ rev = "5279cda4a9385130cf7cc97bbdd33260deb0720d";
+ sha256 = "0bjskvkcy1m2k436dwc3aa25pkiqgbl0z86bsm9jaxhcq0122vq0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode";
@@ -54448,8 +54937,8 @@
src = fetchFromGitHub {
owner = "RedPRL";
repo = "sml-redprl";
- rev = "80e9ce1f30594b342a04e06abad0065604a5e5fc";
- sha256 = "0ja7cs0byziwzqdrpwcx02jpzrqjqk6xik46yjwa47zfcpwsaxcw";
+ rev = "e4b6e1e482c1a82cade511956b2453b18c50bf26";
+ sha256 = "17p07i8z5y2bp923i9sbplq9jn6p5kwscdf6725d7721n0ablpaj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -54824,8 +55313,8 @@
src = fetchFromGitHub {
owner = "davidshepherd7";
repo = "replace-pairs";
- rev = "ef6f2719aab7714f6cb209fd3dd6d2e720681b3c";
- sha256 = "169p85rmgashm0g26apkxynmypqk9ndh76kvh572db5kqb8ix0c6";
+ rev = "1e49071e2ef46a458a28f77681e313a63db5663c";
+ sha256 = "1nl1g6fi7mkr0h3p4xa6czqpihnzdwpj9hg7d6qvlvih001hcc16";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2c578f574bc13edf45330a2836c02dece163688d/recipes/replace-pairs";
@@ -54901,12 +55390,12 @@
req-package = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, log4e, melpaBuild, use-package }:
melpaBuild {
pname = "req-package";
- version = "20160603.401";
+ version = "20161012.427";
src = fetchFromGitHub {
owner = "edvorg";
repo = "req-package";
- rev = "fea6f96c3b98939c1273ece962b8af5c4bd6f752";
- sha256 = "03yvgb2iiqp90jncrh5ji5l3v5q86rcqb757x1n2x4xkpjjsxa19";
+ rev = "f0a81e86ede9896b4653839d5b3ca23f784d3678";
+ sha256 = "1mk9wl63yhk0pjnbpsk0awvgxh31r6k98jik1b96adid77jxqj76";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f58a801f0791566d0c39493a5f82ff0d15d7ab41/recipes/req-package";
@@ -55378,12 +55867,12 @@
ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ripgrep";
- version = "20160928.9";
+ version = "20161008.51";
src = fetchFromGitHub {
owner = "nlamirault";
repo = "ripgrep.el";
- rev = "77e8aa61b5b893c037d87117943a164514c6145f";
- sha256 = "1xs8h2g02jdb05c07bk9qfvxvfchgzhccj5yhkxbnpxqmxpcskdc";
+ rev = "47f4451c497588de4a198f271f4121572e7db1af";
+ sha256 = "0nrn60nr30a0dqvd1aiwm9mwlkcn21qz62ziq25n5ixjy1hv8p5j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e8d789818876e959a1a59690f1dd7d4efa6d608b/recipes/ripgrep";
@@ -55403,8 +55892,8 @@
src = fetchFromGitHub {
owner = "AdamNiederer";
repo = "riscv-mode";
- rev = "bfd7b91d25748158923c2194242e344df2f708a8";
- sha256 = "1kcl64klksvxjk0zrgn6w4647r7xwa3xinl5jlvi46wync54hivj";
+ rev = "e8425b71443a2decbe70cc5892e72ce2ceb17570";
+ sha256 = "035hv8dpc6rk4b22mw4ch9yzf4wq14h8bba765fxg87grpi0mwg4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0853b4b678be7d1906a2f7946bfa1072590faf72/recipes/riscv-mode";
@@ -55630,12 +56119,12 @@
rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rtags";
- version = "20160926.1010";
+ version = "20161018.1119";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "7b7a39429eca2a48c5c6e08aeed5623ce0198ba1";
- sha256 = "03qzg5mymr73x1aaxsm6xiqmn7l9s05bph2ahlrn77x8llrlcvfj";
+ rev = "5f5c617b1b58fa63c852c9170c040274d28d694d";
+ sha256 = "0qhj3xysq4xzi6bgsnn484r1h4s8zdym0l98znlf0jml9bzczr74";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags";
@@ -55672,12 +56161,12 @@
rubocop = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rubocop";
- version = "20151123.2137";
+ version = "20161015.1200";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "rubocop-emacs";
- rev = "c54905256410ce2aed6725d5b5f7ed61d4ddc956";
- sha256 = "1y5z0kr4qwd4fyvhk0rhpbbp6dw2jpzrawx62jid5539wrdjcabk";
+ rev = "42198901d3bc0a3170b403dc194203f7c07bdb13";
+ sha256 = "0vwnn087h0fgr5wr2c4qa3lwzprd2hyip5vkix7hr79linp2qnzl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/00f2cf3e8e28bce5c26c86aba54390ffff48d7da/recipes/rubocop";
@@ -55696,7 +56185,7 @@
version = "20160911.333";
src = fetchsvn {
url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
- rev = "56336";
+ rev = "56485";
sha256 = "12w256fbx4xmwn96s0f66mvlczkmqdbi6w622l1b2sr3zbfh6wg8";
};
recipeFile = fetchurl {
@@ -55776,7 +56265,7 @@
version = "20150424.752";
src = fetchsvn {
url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
- rev = "56336";
+ rev = "56485";
sha256 = "12w256fbx4xmwn96s0f66mvlczkmqdbi6w622l1b2sr3zbfh6wg8";
};
recipeFile = fetchurl {
@@ -56063,6 +56552,27 @@
license = lib.licenses.free;
};
}) {};
+ ryo-modal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ryo-modal";
+ version = "20161007.1633";
+ src = fetchFromGitHub {
+ owner = "Kungsgeten";
+ repo = "ryo-modal";
+ rev = "83de15288751ca985a668a9f57a113cb107a6229";
+ sha256 = "1631lsqwvgy7zbgdrfyfbhsa0n7qp28m8h5ima7siy5f9clfdvlz";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a4d9f86140b0ee95742c3a66dfbc063b5f87fb3a/recipes/ryo-modal";
+ sha256 = "019r1k14mhdv1x06fd5q4l0l4jnjy330b078qvpxrqv1fnwh1q51";
+ name = "ryo-modal";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/ryo-modal";
+ license = lib.licenses.free;
+ };
+ }) {};
s = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "s";
@@ -56126,22 +56636,22 @@
license = lib.licenses.free;
};
}) {};
- sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "sage-shell-mode";
- version = "20161002.122";
+ version = "20161019.446";
src = fetchFromGitHub {
owner = "sagemath";
repo = "sage-shell-mode";
- rev = "7f7bafe83ddeac11e30c9c10524f176b6d70200b";
- sha256 = "10zr6fq9skqyw8mj9862b94s4k9yc40iq8dzk15sa43nsblmripi";
+ rev = "ef0c1d2a7e8c162a18c27787ee8cde5b61586e70";
+ sha256 = "0jl0qwcbjkhnic91qwglaryddsc60cip24bsh2f5dpjsics7nh0g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode";
sha256 = "0ivqiigmp9cf88j4xapzanjpbx692r70wb4i25mnppqsi3jlwxdv";
name = "sage-shell-mode";
};
- packageRequires = [ cl-lib deferred emacs ];
+ packageRequires = [ cl-lib deferred emacs let-alist ];
meta = {
homepage = "https://melpa.org/#/sage-shell-mode";
license = lib.licenses.free;
@@ -56192,12 +56702,12 @@
sass-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, haml-mode, lib, melpaBuild }:
melpaBuild {
pname = "sass-mode";
- version = "20160506.2045";
+ version = "20161006.2326";
src = fetchFromGitHub {
owner = "nex3";
repo = "sass-mode";
- rev = "7f0df85fd1b90e40e019a0f2e4ea6661169ceb65";
- sha256 = "1zvsv2j3hqrj9vlm4mspfnm9nwah0lhizamyx43xykd7xk0z8hkw";
+ rev = "37105f46f6ea3592039f2ea7d0463ae7f042616e";
+ sha256 = "0gd0n5mh2f1gr2aq65d94zmvc2d04z2yb1baw24m0c11fai4y710";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/sass-mode";
@@ -56315,22 +56825,22 @@
license = lib.licenses.free;
};
}) {};
- sbt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sbt-mode";
- version = "20160914.818";
+ version = "20161006.622";
src = fetchFromGitHub {
owner = "ensime";
repo = "emacs-sbt-mode";
- rev = "420044bc305bd4fe38d2f3af1f76b29172b06ff9";
- sha256 = "02h71mh0w8g9gz1pslgqmk40b5fb5q3g6jl5150cq608m4apyk75";
+ rev = "4e21f0673d39231fec070abfb24ab0c18948eb5c";
+ sha256 = "1ymkph8ikcsall9waq3vxac8jkji2bl9676pchydqr4ajc3aw8xm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode";
sha256 = "0v0n70czgkdijnw5jd4na41vlrmqcshvr8gdpv0bv55ilqhiihc8";
name = "sbt-mode";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/sbt-mode";
license = lib.licenses.free;
@@ -56343,8 +56853,8 @@
src = fetchFromGitHub {
owner = "openscad";
repo = "openscad";
- rev = "7e0935d02c285a588152d373aed89b49d029c70d";
- sha256 = "0hj4brm8lfhlyp7p2qcncschbckr9inc59v3znazchz7clhpl2by";
+ rev = "cfd46eaa3ab17ff4d1f8cdc348f35d2f9b63c0ce";
+ sha256 = "1901y4faw2w29wws26zlhs2lq9md1pcmd1c57n4zjzsp65kdivjg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -56855,6 +57365,26 @@
license = lib.licenses.free;
};
}) {};
+ secretaria = callPackage ({ alert, emacs, f, fetchgit, fetchurl, lib, melpaBuild, org, s }:
+ melpaBuild {
+ pname = "secretaria";
+ version = "20161017.1345";
+ src = fetchgit {
+ url = "https://bitbucket.org/shackra/secretaria.el";
+ rev = "aae30bfc93fa5ea846bce086b22321c46b94ff7b";
+ sha256 = "18ad7q2a131gpvjj8923vp06zh0zfdy1589vs3f09v16aazbcfqc";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7b4c9ccbf2eeaa290f3b9d1e5eaaeb5b5547b365/recipes/secretaria";
+ sha256 = "1a8jf91wplzazssh0s8ld0g8rp57gdfvxlsyn643w3mbp3ny8ybv";
+ name = "secretaria";
+ };
+ packageRequires = [ alert emacs f org s ];
+ meta = {
+ homepage = "https://melpa.org/#/secretaria";
+ license = lib.licenses.free;
+ };
+ }) {};
seeing-is-believing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "seeing-is-believing";
@@ -57187,6 +57717,27 @@
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";
@@ -57976,12 +58527,12 @@
simple-call-tree = callPackage ({ anaphora, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "simple-call-tree";
- version = "20160609.1108";
+ version = "20161007.1913";
src = fetchFromGitHub {
owner = "vapniks";
repo = "simple-call-tree";
- rev = "3f6c2f8052d0c1609ee2452587dce3f0777df96e";
- sha256 = "1d29c2wrm0mmx2airr18b330h2c66rfk6a3ydx3z2xzcw2k888pb";
+ rev = "431206e9c2b88cbab9cfe9ebf3f6cb73f5e6740f";
+ sha256 = "1qwswf5i060j396gfsr60zid0lqwf5xkrq3q0c1s6nz9wxlhayjw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/316a5ffcb3080abd623bbe3065077809e6cbfb74/recipes/simple-call-tree";
@@ -58022,8 +58573,8 @@
src = fetchFromGitHub {
owner = "jorenvo";
repo = "simple-mpc";
- rev = "c920da63cc2c5cbc56fb8eb87f260dfffba163f9";
- sha256 = "1kaihrr2i2pcdyjh7qhz0x3clggf85ay5c4m5ld3r7dm3vv1yvmf";
+ rev = "b48bbcfe9a59941cfcc7e4a31200aada18ab9e05";
+ sha256 = "0gp39ay1viixk6x5hnaa09c73vbz8xx453rnkw79pqchhsnyh6va";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/62d762308c1ec0c1d8f7b4755b7deb285cbac018/recipes/simple-mpc";
@@ -58335,8 +58886,8 @@
src = fetchFromGitHub {
owner = "technomancy";
repo = "slamhound";
- rev = "f43dd49b63b2838081735ea1988f70de05389692";
- sha256 = "108zcb7hdaaq3sxjfr9nrwzqxx71q6aygzik7l3ab854xknkjfad";
+ rev = "0c9de69557cea66e056c7c3e0ffd5a4e82c82145";
+ sha256 = "04vrhv2dp1rq475ka43bhdh7c5gb5cyflf4w0ykxb9rbkahwm8fj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/54c191408ceb09ca21ef52df171f02d700aee5ba/recipes/slamhound";
@@ -58394,12 +58945,12 @@
slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }:
melpaBuild {
pname = "slime";
- version = "20160907.602";
+ version = "20161012.1531";
src = fetchFromGitHub {
owner = "slime";
repo = "slime";
- rev = "bad2acf672c33b913aabc1a7facb9c3c16a4afe9";
- sha256 = "0d0p03d368jmyz5kjwbrcvs5glq7b6k1yyang3ai8f08sjvkmh6h";
+ rev = "f54b0c445065ba42f8abb8519a44ba2dadd9a68c";
+ sha256 = "1s015n4z7mxbw1dv317v7w3mdl0z6p0xwcd20a5prz6yk78yw0gk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime";
@@ -59062,12 +59613,12 @@
smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "smartparens";
- version = "20161001.704";
+ version = "20161015.1227";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "smartparens";
- rev = "9ae8d4f5ce471d4cf53231e085c52d46ece4aa14";
- sha256 = "0pnyyrc0fdnjrf87qcb8k1hy8ac5j3xcj5wq3isr1zwyxxhsfw4l";
+ rev = "768ad1a44e9b4aa49a8539a8353087cbe99eff21";
+ sha256 = "0y4gwsdrmxwy017cmabfkmc8q2va13kjxw2zhmn4nz7ykih2pq1h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -59289,6 +59840,27 @@
license = lib.licenses.free;
};
}) {};
+ smmry = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "smmry";
+ version = "20161024.201";
+ src = fetchFromGitHub {
+ owner = "microamp";
+ repo = "smmry.el";
+ rev = "b7ee765337fa627a6c59eb4f2a91df5d280ac6df";
+ sha256 = "0hzs8xi7n3bsqwm3nlm3vk8p2p33ydwxpwk9wp3325g03jl921in";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ba2d4be4dd4d6c378eabd833f05a944afa21817b/recipes/smmry";
+ sha256 = "05ikcvyr74jy3digd0ad443h5kf11w29hgnmb71bclm3mfslh5wn";
+ name = "smmry";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/smmry";
+ license = lib.licenses.free;
+ };
+ }) {};
smooth-scroll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "smooth-scroll";
@@ -59415,27 +59987,48 @@
license = lib.licenses.free;
};
}) {};
- snapshot-timemachine = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ snapshot-timemachine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "snapshot-timemachine";
- version = "20160222.132";
+ version = "20161004.122";
src = fetchFromGitHub {
owner = "mrBliss";
repo = "snapshot-timemachine";
- rev = "7a1ebd73e9da146f1a9f258c5d2a7b54660f87a4";
- sha256 = "0m5j1v9br7vp9m2km8xccy5vv8gis0mcgwjxfc6qhnv7kbx0sx2k";
+ rev = "ceeb0e559d0f25974493c35b580381959633c219";
+ sha256 = "19w4shkhxwx9k5x6abcanh9xln779axwvg8i7363lgixkqdyx05f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/69376b802f0687227a78838877d89163b2893c5b/recipes/snapshot-timemachine";
sha256 = "0pvh1ilzv0ambc5cridyhjcxs58wq92bxjkisqv42yar3h3z6f8p";
name = "snapshot-timemachine";
};
- packageRequires = [ cl-lib emacs ];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/snapshot-timemachine";
license = lib.licenses.free;
};
}) {};
+ snapshot-timemachine-rsnapshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq, snapshot-timemachine }:
+ melpaBuild {
+ pname = "snapshot-timemachine-rsnapshot";
+ version = "20161008.305";
+ src = fetchFromGitHub {
+ owner = "NicolasPetton";
+ repo = "snapshot-timemachine-rsnapshot";
+ rev = "4ff6b96219f4da576141e376b0348813c1c25615";
+ sha256 = "0krb1ziyjldyq27sp0phmygm1p9lssp251ycj08gdczbbfpw4lsa";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/94358fb8d1486491903c331d9e90ba5198117aa8/recipes/snapshot-timemachine-rsnapshot";
+ sha256 = "0fxijd94p961ab0p4ddmhja4bfrif2d87v32g4c41amc1klyf25r";
+ name = "snapshot-timemachine-rsnapshot";
+ };
+ packageRequires = [ seq snapshot-timemachine ];
+ meta = {
+ homepage = "https://melpa.org/#/snapshot-timemachine-rsnapshot";
+ license = lib.licenses.free;
+ };
+ }) {};
snippet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "snippet";
@@ -59523,12 +60116,12 @@
solarized-theme = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "solarized-theme";
- version = "20160901.334";
+ version = "20161009.838";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "solarized-emacs";
- rev = "1fe6b5e8486a8f346198c70804a62c9e0885659b";
- sha256 = "1i6zv1yy1b25qjvjhv968nav4zw94jdccgq5a34z0h5n9dgfv2hh";
+ rev = "43d25005f8c06cd145b9fe55c7f9c4b626293b1b";
+ sha256 = "19hl3pfr04l3pli0dnall9gbymh0k17m9r5dzm36dx3a7m5v3j4l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme";
@@ -59544,12 +60137,12 @@
solidity-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "solidity-mode";
- version = "20160926.409";
+ version = "20161017.1506";
src = fetchFromGitHub {
owner = "ethereum";
repo = "emacs-solidity";
- rev = "f62b7ff83420b0459c4f26b2e4c050ac94421f50";
- sha256 = "1cmxj6hd454lz82z17kxh1sabh6v7xh3bwy1zav9pg13sdxwr9qz";
+ rev = "db392f96f8e892b7788ebe25819a8ec195bb376d";
+ sha256 = "1x1ljbmrn06pbdcb7kjivbh2f2m29ivwa1ifl4lgi2rh884s27ma";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bb9df5ec0692352b6494d435d11166f4ea26c99e/recipes/solidity-mode";
@@ -59562,22 +60155,22 @@
license = lib.licenses.free;
};
}) {};
- sonic-pi = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, osc }:
+ sonic-pi = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, osc }:
melpaBuild {
pname = "sonic-pi";
- version = "20150919.330";
+ version = "20161024.313";
src = fetchFromGitHub {
owner = "repl-electric";
repo = "sonic-pi.el";
- rev = "3d88a784bf7883ec56fbef5923c4e1b50d2b9b09";
- sha256 = "1ga35d3rhdf6ffd36q58ay6380gjvkmaiid4vscga3v7ca0dkhl1";
+ rev = "0a14120e004565ec294c31c601131be7cc010c19";
+ sha256 = "0sfrgqvyw9z6rw8pjbfn1yvxxg3aznyc2kwp024g0w7ybb1a38li";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f0536c7e32ef145546e4014a1d418cbac8673eb5/recipes/sonic-pi";
sha256 = "07qxm1rkw2cbxf4g2vqk3s7xnqldqkdm2zw1qh2kqjscg5gwpkqp";
name = "sonic-pi";
};
- packageRequires = [ cl-lib dash emacs osc ];
+ packageRequires = [ cl-lib dash emacs highlight osc ];
meta = {
homepage = "https://melpa.org/#/sonic-pi";
license = lib.licenses.free;
@@ -59670,12 +60263,12 @@
sotlisp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sotlisp";
- version = "20160509.1504";
+ version = "20161012.1217";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "speed-of-thought-lisp";
- rev = "325c21e0718aebf0d6929f67da2476dd53ab95bb";
- sha256 = "01n943kycazsw9znk7cj17qjlar91i5r25p3cmxcxh75wnh4h1vj";
+ rev = "fffe8d0b42b143a2e7df0470d9049fa57b6ecac5";
+ sha256 = "0j5zwb1ypqps30126w2684lmjh8ia4qxg8inlajcbv8i3pbai7k6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/sotlisp";
@@ -59800,6 +60393,27 @@
license = lib.licenses.free;
};
}) {};
+ sourcerer-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "sourcerer-theme";
+ version = "20161014.925";
+ src = fetchFromGitHub {
+ owner = "gilbertw1";
+ repo = "sourcerer-emacs";
+ rev = "c7f8e665d53bb48fb72f95f706710d53d24bd407";
+ sha256 = "06bxsbjyrn4grp9i17p90cs4x50cmw62k6a2c6gapkw8f1xbv7xv";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8532e062b1830d8cf4e7f72518131a1f32762b37/recipes/sourcerer-theme";
+ sha256 = "0xikcln8sz3cic5a77cdvq2aazy1csf1qfxgmcavpqz54ps14j1z";
+ name = "sourcerer-theme";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/sourcerer-theme";
+ license = lib.licenses.free;
+ };
+ }) {};
sourcetalk = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
melpaBuild {
pname = "sourcetalk";
@@ -59845,12 +60459,12 @@
spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }:
melpaBuild {
pname = "spaceline";
- version = "20160914.711";
+ version = "20161018.1249";
src = fetchFromGitHub {
owner = "TheBB";
repo = "spaceline";
- rev = "679bdaa22b4155d515c9cc1bc42f793cf53adcc8";
- sha256 = "0xdkk1ig70ys4hs68fg5wa4pqjr2nf07jc0ckdlfvs3r1fafs7a3";
+ rev = "3da3396fea7f1dd178e8b807775ef92e46939be9";
+ sha256 = "0y3d4s10yri78pkpwra0c7jnkq8hmps486kz8jldsyj84iw21anl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/46e4c876aeeb0bb0d0e81dcbb8363a5db9c3ff61/recipes/spaceline";
@@ -59866,12 +60480,12 @@
spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "spacemacs-theme";
- version = "20160909.445";
+ version = "20161023.535";
src = fetchFromGitHub {
owner = "nashamri";
repo = "spacemacs-theme";
- rev = "e339866186a6687e9ae63db927ba3cc4bc75e88e";
- sha256 = "0hkygs57xybwx1shhjm2650aw36plskfvf8h24zah91xjnnsadn6";
+ rev = "db781c348b2ecdf871445986ef1cb2783c867ea0";
+ sha256 = "0zwap27k3gqkzbdg3wsysb34gc540imimagy38l6gin7g0a315ja";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme";
@@ -59950,12 +60564,12 @@
sparql-mode = callPackage ({ async, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sparql-mode";
- version = "20160728.1000";
+ version = "20161015.1256";
src = fetchFromGitHub {
owner = "ljos";
repo = "sparql-mode";
- rev = "22d1f80176e4ac57ec489d4aa3d243212060843d";
- sha256 = "1v1wcbvbymg0vlwpis706ps5w9bscypqp8zpbk52lcny2lshqmik";
+ rev = "6f1bcf7a6a03e53de24d3d1c49d4186525764f0f";
+ sha256 = "15xq91qyj5nw03zr343s0r5x60p4a702bdv9k0pgm85787jrfr86";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode";
@@ -60507,12 +61121,12 @@
srefactor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "srefactor";
- version = "20160420.33";
+ version = "20161008.238";
src = fetchFromGitHub {
owner = "tuhdo";
repo = "semantic-refactor";
- rev = "a12eecfab02c10a6b8090df6fa376c1d98a1b9dc";
- sha256 = "02jr9cgar2r71rrrx13rj83nd19bxajmzzgj4awzn0d93i4l5qkc";
+ rev = "88e8ad5af2b9da89947aa75c9252163dbc917b35";
+ sha256 = "0sqy1w1sda2n116xrfnblysjykg914ax9yqsj5vh40q9wdmyqjaw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e23115ab231ab108678608f2ad0a864f896cd0f2/recipes/srefactor";
@@ -60654,12 +61268,12 @@
stan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "stan-mode";
- version = "20160626.1518";
+ version = "20161023.1958";
src = fetchFromGitHub {
owner = "stan-dev";
repo = "stan-mode";
- rev = "62109483b39c6dc20e1b55bd833c9f8ea38e7118";
- sha256 = "0jnfhb49hi6fydffhdj1kkhrsc45zjsnm43djbsgzdnd6abbfhnr";
+ rev = "45b8242611fe0437fcff48f5f4f7d8f0552531ac";
+ sha256 = "14yv57grsw3zyjcqasaanx8g2skix0i3w1f5r1fng3sgwclwbkdw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/67a44a0abe675238b10decdd612b67e418caf34b/recipes/stan-mode";
@@ -60675,12 +61289,12 @@
stan-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, stan-mode, yasnippet }:
melpaBuild {
pname = "stan-snippets";
- version = "20160626.1518";
+ version = "20161023.1958";
src = fetchFromGitHub {
owner = "stan-dev";
repo = "stan-mode";
- rev = "62109483b39c6dc20e1b55bd833c9f8ea38e7118";
- sha256 = "0jnfhb49hi6fydffhdj1kkhrsc45zjsnm43djbsgzdnd6abbfhnr";
+ rev = "45b8242611fe0437fcff48f5f4f7d8f0552531ac";
+ sha256 = "14yv57grsw3zyjcqasaanx8g2skix0i3w1f5r1fng3sgwclwbkdw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eda8539b7d8da3a458a38f7536ed03580f9088c3/recipes/stan-snippets";
@@ -60700,8 +61314,8 @@
src = fetchFromGitHub {
owner = "lueck";
repo = "standoff-mode";
- rev = "c55e80ff0e939f3d2cd6bda50b1121a54c08231c";
- sha256 = "0cjqd0cgn0n5mlf8iva70y228day58inly7929p2hw28fndy51gy";
+ rev = "a1ad5b3823bf43242dfc54cfd8cd1b09bee286d8";
+ sha256 = "1bakh0rwq0kxy6k6yjrywbcvj0hszq44z9v1gny2cf824shqa3r9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/98858a45f72c28eec552b119a66479ea99b60f93/recipes/standoff-mode";
@@ -60759,12 +61373,12 @@
state = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "state";
- version = "20160422.550";
+ version = "20161008.535";
src = fetchFromGitHub {
owner = "thisirs";
repo = "state";
- rev = "4a5fa2e37186408df3e98d936514387ceef80bd5";
- sha256 = "1rjp1zsbh476njjznbsxr47x4lqs4i887yi9xvwvpcb2wcwfly81";
+ rev = "ff38227310347ed088fe34ff781037774cc7456b";
+ sha256 = "0hanisrni8i0bbq7f2flvfla990nyv8238nb9dfjpvimkw7rjbsg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/82e955112089569c775e11888d9811119f84a4f8/recipes/state";
@@ -61355,12 +61969,12 @@
suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }:
melpaBuild {
pname = "suggest";
- version = "20160928.1741";
+ version = "20161021.2159";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "suggest.el";
- rev = "c0c43412f21db464a542f5cab6de7e9ca66547aa";
- sha256 = "1bnf6s6bam6j6inhscy1zlq7rnvlwh8wcbpiliwzl3gxg3mnn1c6";
+ rev = "3bca9f0d011dde62936daca4feaf51070bf86e07";
+ sha256 = "16hi592ibxshrmai7sj73d2fgdwsr9131y9gz67kb6b1rw7pbpjv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest";
@@ -61685,12 +62299,12 @@
swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "swift-mode";
- version = "20161002.506";
+ version = "20161016.709";
src = fetchFromGitHub {
owner = "chrisbarrett";
repo = "swift-mode";
- rev = "ea77cf9157ed2a2bbf6874b6fbd15c2ca776f775";
- sha256 = "0x0v57a6f3lxbafb3slcl782vga7vrq2rci66hhabzrgs2k3lh7j";
+ rev = "58f31cc50ee8fac236f5aa3936152e6e70ee3ce5";
+ sha256 = "0ncz4bcnbh64p3iqbr65g6b1p8lfpqviszpz80909izi8awjgbgf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode";
@@ -61727,12 +62341,12 @@
swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "swiper";
- version = "20160921.138";
+ version = "20161011.747";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "9b2892724be0cadb6afaf7bf8ae72f0feabe37b5";
- sha256 = "1xrc3z2w133g13xm017zcrnib43iw8ymkkwlxmga9sibscrrgsa4";
+ rev = "714cb8c140faa2c019fe1816ac9fe6bb8fbef1a1";
+ sha256 = "0r3ni9c8pmcpfgikyindr1yaia59vgil5bdwf02hc6gb0albmffr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -62394,12 +63008,12 @@
tango-plus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tango-plus-theme";
- version = "20140425.1511";
+ version = "20161016.322";
src = fetchFromGitHub {
owner = "tmalsburg";
repo = "tango-plus-theme";
- rev = "99c3484eeb4e6f7f62a6dacfd665a4d46f4cbdaf";
- sha256 = "1gfn1yyyb9p2fi17wra1yf2j96cfjw0sifgk3c0vl63h3vmiyvjf";
+ rev = "ef8510d75c60459a7c3bce8aaf686280faf71663";
+ sha256 = "0k7mmffr73i14brh7zf0bdzw0m8g3ljff8q4vi5fnxzrr4k99z8l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b069fa60d3bbf41168b938f71f4903e313b2c6ac/recipes/tango-plus-theme";
@@ -62475,6 +63089,27 @@
license = lib.licenses.free;
};
}) {};
+ tblui = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, tablist }:
+ melpaBuild {
+ pname = "tblui";
+ version = "20161007.1212";
+ src = fetchFromGitHub {
+ owner = "Yuki-Inoue";
+ repo = "tblui.el";
+ rev = "bb29323bb3e27093d50cb42db3a9329a096b6e4d";
+ sha256 = "1pja9v4h3abqc2iydm7wwjxrg7ni1pn94yb4azrgjq5qc0fsgn7a";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/f4dd6e9dcc73c57f93371ba16b15f2d98d805dae/recipes/tblui";
+ sha256 = "1m0zhk5zyialklnil5az974yz6g1zksw02453cxc0xpn5pf0a3xa";
+ name = "tblui";
+ };
+ packageRequires = [ cl-lib dash magit-popup tablist ];
+ meta = {
+ homepage = "https://melpa.org/#/tblui";
+ license = lib.licenses.free;
+ };
+ }) {};
tbx2org = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "tbx2org";
@@ -62646,12 +63281,12 @@
term-alert = callPackage ({ alert, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, term-cmd }:
melpaBuild {
pname = "term-alert";
- version = "20160517.348";
+ version = "20161022.428";
src = fetchFromGitHub {
owner = "CallumCameron";
repo = "term-alert";
- rev = "3e8b39ed4d960933ffdf0308f9bf0d5ce63648e9";
- sha256 = "195jghl1c8ncl15nix275r4x61zlii90pnwgx4m9q2bnbwsz3ycm";
+ rev = "8a0842a614aa005f97536142c14279abf0562690";
+ sha256 = "11n8sna82gnnfpp4l0gbkqb16afvhydddm8kqa66ln620k8nlw1l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0d77aee0b1b2eb7834436bdfa339f95cb97da140/recipes/term-alert";
@@ -62688,12 +63323,12 @@
term-manager = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "term-manager";
- version = "20160922.1302";
+ version = "20161013.127";
src = fetchFromGitHub {
owner = "IvanMalison";
repo = "term-manager";
- rev = "c6d2810a3c9fc3e6d7f018127a12846607e6ed6e";
- sha256 = "17aw0jnihncf3scjynii7idpbczrf24cf0pq8r0bfqs4hw0k0qn8";
+ rev = "f023c857459d6b7436907f626aa59929336f7b61";
+ sha256 = "024yqz3g9m3vpw9r9p58sz4gakkv59q2hs208v6rlbfsd5y75zpi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0b2f7d8c8fcbb535432f8e70729d69a572e49a1a/recipes/term-manager";
@@ -62776,8 +63411,8 @@
src = fetchFromGitHub {
owner = "IvanMalison";
repo = "term-manager";
- rev = "c6d2810a3c9fc3e6d7f018127a12846607e6ed6e";
- sha256 = "17aw0jnihncf3scjynii7idpbczrf24cf0pq8r0bfqs4hw0k0qn8";
+ rev = "f023c857459d6b7436907f626aa59929336f7b61";
+ sha256 = "024yqz3g9m3vpw9r9p58sz4gakkv59q2hs208v6rlbfsd5y75zpi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5260876280148fae28a459f07932cebb059b560e/recipes/term-projectile";
@@ -62839,8 +63474,8 @@
src = fetchFromGitHub {
owner = "ternjs";
repo = "tern";
- rev = "a36a20c36265430c36235371957f07c8c89fee44";
- sha256 = "1q25ln12b25al2vfwbsxrv5bg4a9qpyj8p1as9hkcmaszj2z7d41";
+ rev = "e26299182e30c6e997c0cc53c1c9c51a9489cbe5";
+ sha256 = "05gqhcjr35nn612pj58pypwy1hl45fd53wg0nh25yn4sjkwaim3v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern";
@@ -62860,8 +63495,8 @@
src = fetchFromGitHub {
owner = "ternjs";
repo = "tern";
- rev = "a36a20c36265430c36235371957f07c8c89fee44";
- sha256 = "1q25ln12b25al2vfwbsxrv5bg4a9qpyj8p1as9hkcmaszj2z7d41";
+ rev = "e26299182e30c6e997c0cc53c1c9c51a9489cbe5";
+ sha256 = "05gqhcjr35nn612pj58pypwy1hl45fd53wg0nh25yn4sjkwaim3v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete";
@@ -62961,12 +63596,12 @@
test-kitchen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "test-kitchen";
- version = "20160516.1348";
+ version = "20161021.844";
src = fetchFromGitHub {
owner = "jjasghar";
repo = "test-kitchen-el";
- rev = "ddbcb964ac4700973eaf30ae366f086e3319e51f";
- sha256 = "004rd6jkaklsbgka9mf2zi5qzxsl2shwl1kw0vgb963xkmk9zaz8";
+ rev = "139bddc527d0165db14d52973635f2e8c4ff2212";
+ sha256 = "0x9yggqb4ibi6yzr50a09h6yi28f2b81ykx3wq0bi99mqy3qn9jb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/420d18c76f593338fb28807fcbe3b884be5b1634/recipes/test-kitchen";
@@ -63183,10 +63818,10 @@
}) {};
thingatpt-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "thingatpt-plus";
- version = "20160906.1018";
+ version = "20161004.640";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/thingatpt+.el";
- sha256 = "0k7nw25bs7a5zrgfw3anfv0ls5pq1lhrwg81x0j749djjhw3xk5p";
+ sha256 = "0p0sb5w646vlc623nk7qajfmywn281kabwaa8ha3la39a6sdd1xh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thingatpt+";
@@ -63269,8 +63904,8 @@
src = fetchFromGitHub {
owner = "apache";
repo = "thrift";
- rev = "b0dadbde6aad1f5a09d47e3d1f2c713c76cd915f";
- sha256 = "0yv0nssydryipa43w5vfpdaqg4h2z5n8hxln6fhp4gdcbk9p65v0";
+ rev = "59cb6661bcee265d39ad524154472ebe27760f1e";
+ sha256 = "1dsl3m2l8qh3qp7nnavmxmp50cib8zf6vmd28i9s31cxbm479x90";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -63326,12 +63961,12 @@
tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
melpaBuild {
pname = "tide";
- version = "20160929.357";
+ version = "20161004.2019";
src = fetchFromGitHub {
owner = "ananthakumaran";
repo = "tide";
- rev = "de8937514494cb6b849be24a7b935e9c6bd08bfb";
- sha256 = "1lw5q3crhiyf6p5fm9ssxs4c4vm1ma8ibkpwhbb67jw8z8lnir0m";
+ rev = "a8fc3e8223a40243616347e875cfa1151be9a794";
+ sha256 = "0nvdz0v11baxsnhhi6hmv9ikrxgi0a4351r787plrdb2qz7zpmrl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -63617,12 +64252,12 @@
toc-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "toc-org";
- version = "20160711.25";
+ version = "20161004.320";
src = fetchFromGitHub {
owner = "snosov1";
repo = "toc-org";
- rev = "08ed3f0883b0937bb17b7373c84ac7b8744aa8ae";
- sha256 = "0zr5j0n3xr6310zwd3wss34g77k0dfmmq7mm1a5pa8b7llvm1qbq";
+ rev = "a0e8ca05e806e5074b8603985da7f18b92c15856";
+ sha256 = "1sv9y5dln4ai9w3mgg8p4a3s05hflfqh0k7k8isjqikydbv85m2k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1305d88eca984a66039444da1ea64f29f1950206/recipes/toc-org";
@@ -63803,12 +64438,12 @@
tomatinho = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tomatinho";
- version = "20160531.1328";
+ version = "20161023.1853";
src = fetchFromGitHub {
owner = "konr";
repo = "tomatinho";
- rev = "858c640ceda033f3c2d86d2d523ffce6b47e5024";
- sha256 = "1rp866s1b9ycjiv3h0jzrwr6p5ssfr0l8ry38kzi090c9hk84z0p";
+ rev = "7c301d343ecf7feac7348d1146075b2d9ba7d77a";
+ sha256 = "0kgd932857id83xdwpwf9x3ald1alx0s71dkkq84mj9yscxnz01p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe20de5b2b5e5abe5be7468cea7c87f5b26b237/recipes/tomatinho";
@@ -64003,15 +64638,15 @@
license = lib.licenses.free;
};
}) {};
- traad = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, python-environment, request, request-deferred }:
+ traad = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, request, request-deferred, virtualenvwrapper }:
melpaBuild {
pname = "traad";
- version = "20151225.2334";
+ version = "20161010.152";
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-traad";
- rev = "bcf9260fb8b9216ec1c455f673270049be7ccb38";
- sha256 = "1yh9dxf986dl74sgn71qxwxsg67lr0yg1z7b9h2254lmxq0mgni6";
+ rev = "d96da54c87cba247306b4519295cc4d4df7cc33c";
+ sha256 = "1hx6d4r20irs8zdimsfw17kwpwrdcjhkvf1zf7k4cr9bmkj4bvz5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2b3eb31c077fcaff94b74b757c1ce17650333943/recipes/traad";
@@ -64021,9 +64656,9 @@
packageRequires = [
deferred
popup
- python-environment
request
request-deferred
+ virtualenvwrapper
];
meta = {
homepage = "https://melpa.org/#/traad";
@@ -64037,8 +64672,8 @@
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "circe";
- rev = "0564dfae13590d183889950724a7ef2e8df5b1df";
- sha256 = "1nwdbm9dnybghcv2rjw9c8783k5r060cmxzklsn9by4l7i1x9k2r";
+ rev = "85d8c18cacbf9c006deb331867cde65fad90b47f";
+ sha256 = "0skbqd38lb0xh55xfd13c80s6xn70sqg67cpvdx6qck644apg4af";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking";
@@ -64138,12 +64773,12 @@
transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "transmission";
- version = "20160731.1035";
+ version = "20161021.904";
src = fetchFromGitHub {
owner = "holomorph";
repo = "transmission";
- rev = "79008abc3f328c1b24434ffb5ea9e5bc8821ed4d";
- sha256 = "0yf982js9f1hpkn6ydvnzc7x3jwfga5dpyn3ca8ffvzn76iws0vi";
+ rev = "a84c48b3c3fbbd56aa990f1807670f5cdb28c0ef";
+ sha256 = "0fppkpy5brxx79gglga510swnd0fiw43i87zisvc9ivykbigiys1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
@@ -64339,6 +64974,27 @@
license = lib.licenses.free;
};
}) {};
+ ts-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ts-comint";
+ version = "20161006.1034";
+ src = fetchFromGitHub {
+ owner = "josteink";
+ repo = "ts-comint";
+ rev = "2e71708dcd6f3af62501912904c85075d70edc7c";
+ sha256 = "1m8rcz6yj8j49jxyjg330bgw3d6mqmzf3f1ja1ngjsfhpkl27v99";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/84e7004395083b66fce7ff4676af818bc798058a/recipes/ts-comint";
+ sha256 = "18swvzkzcwn0wks58flsjpn9dddzcznij67xifyz6009l4fgdrzd";
+ name = "ts-comint";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/ts-comint";
+ license = lib.licenses.free;
+ };
+ }) {};
tss = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, json-mode, lib, log4e, melpaBuild, yaxception }:
melpaBuild {
pname = "tss";
@@ -64880,12 +65536,12 @@
ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ujelly-theme";
- version = "20160722.1850";
+ version = "20161024.353";
src = fetchFromGitHub {
owner = "marktran";
repo = "color-theme-ujelly";
- rev = "c0082c1b5ab9ff1c04a334a25566ccb40929a71e";
- sha256 = "1gayz9y2i0h2v62gczrzd81cw5w8wnj2bgscc3j05v12piamjggb";
+ rev = "8c67c84d0486f3398653d7d4f5ed6e0059854b85";
+ sha256 = "0vksd0zay5wp9hmq1xrqb18fqyqgnmp1yp6fgqx9miacfasg18qf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme";
@@ -64961,12 +65617,12 @@
undercover = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, shut-up }:
melpaBuild {
pname = "undercover";
- version = "20160329.737";
+ version = "20161016.2358";
src = fetchFromGitHub {
owner = "sviridov";
repo = "undercover.el";
- rev = "f96c6033db6ff316fb6ba31db9c0d60736d35e5f";
- sha256 = "1860hnsbvndaahqs233adk8piz7nyj8v3b0gziv1lrnq864hrq5i";
+ rev = "6026118ea2030fa69688dfff294843a865ddf3a3";
+ sha256 = "0slml92b2i3cphjmqm738rbwk0brsxg22a8wpz6cdgm62hhxr1zd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d58ad9eb863494f609114e3c6af8c14c891b83a5/recipes/undercover";
@@ -65003,11 +65659,11 @@
undo-tree = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "undo-tree";
- version = "20160922.853";
+ version = "20161012.701";
src = fetchgit {
url = "http://www.dr-qubit.org/git/undo-tree.git";
- rev = "8afead161b5bfd167eab39f06f16a86c2dd36e29";
- sha256 = "1hnh2mnmw179gr094r561w6cw1haid0lpvpqvkc24wpj82vphzpa";
+ rev = "4cba00bb049cfaa2ee6821a9e347209a88a740b5";
+ sha256 = "0qawh5cr0ahdg1rks96g9fbva2nfkz8mbl82jnps6axqdf57gm38";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/undo-tree";
@@ -65430,12 +66086,12 @@
use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "use-package";
- version = "20160815.1137";
+ version = "20161017.1640";
src = fetchFromGitHub {
owner = "jwiegley";
repo = "use-package";
- rev = "ca736c378404d66e9ff0df27969bad2b921c8d08";
- sha256 = "1133n9rgclqyyqba91cc8n1hfhcqxkzh67c6nq5szwy30zjqpzy1";
+ rev = "b9117844856b72d0ac331813ca6ae0f1abca9fc6";
+ sha256 = "1fxb3sc5k82mjjds45fwcva8z7fdmpyjvl2pciq96g72md9is8kk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package";
@@ -65476,8 +66132,8 @@
src = fetchFromGitHub {
owner = "diml";
repo = "utop";
- rev = "d8905336751ab1a3065d128fb4e13bbcf54d0e2e";
- sha256 = "0hyfk565cy2h1rhs4azx2g6bwpjhh6yz59qlnlrirjpsnjya6f9k";
+ rev = "a7e716dd7e9778268337f2f9142f7d658f985511";
+ sha256 = "0x2ag7amkqq8bgiz5ma31fpcwfpzx0qqs7cr6ia8rxzwiwnyb06k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop";
@@ -65829,12 +66485,12 @@
vdirel = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, org-vcard, seq }:
melpaBuild {
pname = "vdirel";
- version = "20151215.2255";
+ version = "20161009.224";
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "vdirel";
- rev = "6154343b8265d7e8cc6629f28aa4c3d28d3708cf";
- sha256 = "1lh8nv0ayl9ipl2aqc8npzz84g5q7w6v60l14v61mmk34fc23lnc";
+ rev = "4232676e93ca5ace8e51f6605bec223c3205beea";
+ sha256 = "0jdjg50f6my9952frl6asi8zk0i8b4hva26wm7pi8zk423pydr30";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/72b5ea3f4444c3de73d986a28e1d12bf47c40246/recipes/vdirel";
@@ -65955,12 +66611,12 @@
vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }:
melpaBuild {
pname = "vhdl-tools";
- version = "20160916.1421";
+ version = "20161010.239";
src = fetchFromGitHub {
owner = "csantosb";
repo = "vhdl-tools";
- rev = "c93d080df2e47702a7952420101cf2d1d3b38bfd";
- sha256 = "12rbhgx350x46lj7777rgjv8akfjs59x86bfm95dwsq4mva7q2cl";
+ rev = "a3a7fa4a84c6117e618ed771c7327f413e1a021b";
+ sha256 = "114jyzx6asxr0r3xqi11wz10aij3h2rpyk9ga5xwzw47f7sayw64";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools";
@@ -66249,12 +66905,12 @@
visual-regexp = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "visual-regexp";
- version = "20160806.610";
+ version = "20161017.1713";
src = fetchFromGitHub {
owner = "benma";
repo = "visual-regexp.el";
- rev = "96dea5e40a2f904da8efb7cff968d770550b9fb8";
- sha256 = "1482pk12fb23dv97lvp9wkmsa5pybsvc3d2yn5223kwxdy6yg922";
+ rev = "4ab9426a831cf0620f49ba227fd10b9c71672274";
+ sha256 = "0c8z1brxsxz175fd887nmpyclswv3yablkscfcjpc8f66a7k53qp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/visual-regexp";
@@ -66435,12 +67091,12 @@
vue-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }:
melpaBuild {
pname = "vue-mode";
- version = "20160411.2054";
+ version = "20161009.1916";
src = fetchFromGitHub {
owner = "CodeFalling";
repo = "vue-mode";
- rev = "28e2cc06f8ba8e0ac7027b33300b999493e73505";
- sha256 = "1d9rwgyvizn1zas8v98v86g5kck0m567cprpcakdawwamn155k49";
+ rev = "3847c3132dc743932507b622dadb83bed935b6f9";
+ sha256 = "0m541ib25fcva8kzbpxi3bwyimdqzzx3w6m9m4yz90cxc3hzvl9i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode";
@@ -66535,12 +67191,12 @@
wakatime-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "wakatime-mode";
- version = "20161003.729";
+ version = "20161019.602";
src = fetchFromGitHub {
owner = "wakatime";
repo = "wakatime-mode";
- rev = "75fff3baaa405d0a19998bdfd76c2d8e06eb5169";
- sha256 = "0q1lfs9lm773lfq11zdv21z7kkrnfzp2wq5508wnh9q3swgwp1vq";
+ rev = "4a99c5ad1e25135a086cab63ad797fae9b03afbb";
+ sha256 = "0y4ydwqvjnkf8iav0c08zpmqm1zja7r5c6cjwnk07rsnb5zhpzjw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a46036a0e53afbebacafd3bc9545c99af79ccfcc/recipes/wakatime-mode";
@@ -66598,12 +67254,12 @@
wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }:
melpaBuild {
pname = "wanderlust";
- version = "20160912.242";
+ version = "20161018.938";
src = fetchFromGitHub {
owner = "wanderlust";
repo = "wanderlust";
- rev = "f7bb1a662893b5aacd3f358f927c05ee47d08a5e";
- sha256 = "1kpz8501w8axr0p0r5p2yl06n5kwjc7712g90fkdcxxcw39lsjm6";
+ rev = "5de8cfb87e6e5ed953aa229de0bf19a965367735";
+ sha256 = "1rwsi9d4lik5jx9y9fbknjkjqjpky2mc8piyziihcq3hk16vdkgr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust";
@@ -66829,12 +67485,12 @@
web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "web-mode";
- version = "20161003.1327";
+ version = "20161023.1219";
src = fetchFromGitHub {
owner = "fxbois";
repo = "web-mode";
- rev = "f7ecb126c1ecd43815fdaef7878678562360fa13";
- sha256 = "0wnspvmq8shfscf2a0ddp7sby9pq3q1r65yq137vz9n2rbaqmh5j";
+ rev = "fda08e84567f62ea02b8a4893c745c237eb6b5b9";
+ sha256 = "18jdsh4l7ygdvhfh0jyd5alsshvbx4pfx47impi3i2fy4rbkxljm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -66888,15 +67544,36 @@
license = lib.licenses.free;
};
}) {};
+ webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+ melpaBuild {
+ pname = "webpaste";
+ version = "20161010.1100";
+ src = fetchFromGitHub {
+ owner = "etu";
+ repo = "webpaste.el";
+ rev = "c57cd53b6036e8f9d128ffb1d80cdd898d52c2e8";
+ sha256 = "1sjczh4z4fd6mlpqvd8qbkyc1pphkx1s7d953msqqfy1lvwd2v6j";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
+ sha256 = "1pqqapslb5wxfrf1ykrj5jxcl43pix17lawgdqrqkv5fyxbhmfpm";
+ name = "webpaste";
+ };
+ packageRequires = [ cl-lib emacs request ];
+ meta = {
+ homepage = "https://melpa.org/#/webpaste";
+ license = lib.licenses.free;
+ };
+ }) {};
websocket = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "websocket";
- version = "20160720.2051";
+ version = "20161022.2054";
src = fetchFromGitHub {
owner = "ahyatt";
repo = "emacs-websocket";
- rev = "567555360443f5de0a6426c5e2d88ba037c33855";
- sha256 = "1svgsgyiw16pgk16px0a21gfh6d94sgn01wmq5i7v4gdaf1xqfbc";
+ rev = "f7d3fb5409aed9f5cdb745f0e61a0c43c097588c";
+ sha256 = "1dl6yirbrqhsci3wvigvcghx645slh7bb2q3hb66rcdp5j5m41zf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/websocket";
@@ -67122,12 +67799,12 @@
which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "which-key";
- version = "20160911.1302";
+ version = "20161005.1154";
src = fetchFromGitHub {
owner = "justbur";
repo = "emacs-which-key";
- rev = "c493e0b4bb53c524d99c6ad071ba0a22259f8f38";
- sha256 = "0gngmryqhkhsd6wjvg24fcxdmag3sp6mvp3r6swz1hg2j905lrf7";
+ rev = "a6a9f352e735f3d7faf45d0e8f23f3a346c04f9c";
+ sha256 = "06h2yc73z4vj2pzf16v78whh83zrvv1zsl6hvhwylgys1vn2ssk5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key";
@@ -67312,8 +67989,8 @@
src = fetchFromGitHub {
owner = "foretagsplatsen";
repo = "emacs-js";
- rev = "3cc7e8c4f4781db4f838531a7ba225865f74977f";
- sha256 = "0i97z8czrfva60i4iikcnkr45fc3bgmsk5i8x2bb63pbla9q4l6i";
+ rev = "046a815ce570f65cfd79ed9f7dd73087b985aef5";
+ sha256 = "1bmx2brynga0hv4cxc7n9skxi9gmhz3rjbfgxrsf1kc8yfpk56yq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs";
@@ -67410,12 +68087,12 @@
win-switch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "win-switch";
- version = "20150208.1911";
+ version = "20161009.927";
src = fetchFromGitHub {
owner = "genovese";
repo = "win-switch";
- rev = "a0da96c23e8775a2dfdbe55ed3ec5b57f1ebb26a";
- sha256 = "0ib20zl8l1fs69ca9rry27qz69sgf6ws1ca5nhm5llvpkjcgv53i";
+ rev = "954eb5e4c5737f0c06368c42a7f1c3dd374d782f";
+ sha256 = "1xpx4sc1g1w8w0yc39k2dys83m8skrpvi745bfrzdl47jngrf54h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/win-switch";
@@ -67572,12 +68249,12 @@
window-purpose = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, imenu-list, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "window-purpose";
- version = "20160927.744";
+ version = "20161017.433";
src = fetchFromGitHub {
owner = "bmag";
repo = "emacs-purpose";
- rev = "38d8dd513d5de18572d4c2b58a5e6feceb6bcb4b";
- sha256 = "1iar8f0qgjha4kr8gnjf7p3cbxbb6avlm8wk8nkx0x1vm5wzab87";
+ rev = "3ccfb8dfbd5970d6b0d64142e586459f38f21d79";
+ sha256 = "0waf5imivhgzqp38rwhjqhy2y13dar7gqm52kbh71bvfwakgnkfd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5813120ab674f6db7d0a486433d8faa6cfec1727/recipes/window-purpose";
@@ -67659,8 +68336,8 @@
version = "20160419.1232";
src = fetchhg {
url = "https://bitbucket.com/ArneBab/wisp";
- rev = "a55b6dd96558";
- sha256 = "1n0a99v2gwr12dhgg0yw42lm7ggcq9b85qn1c29k66l7jz637mfp";
+ rev = "b9e861ccb52d";
+ sha256 = "0gk1nclvkwdx20m2cnhfyb4l9jfxkvya8fifvfgry8swzbmab9h2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -67697,12 +68374,12 @@
with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "with-editor";
- version = "20160930.1603";
+ version = "20161009.917";
src = fetchFromGitHub {
owner = "magit";
repo = "with-editor";
- rev = "19201be2c59a7762da97835f7efc11f86191b676";
- sha256 = "0xqvk56dpafqqnglkyy9y95g3gik6jwyq6cqynmyg0wbqz48biza";
+ rev = "1a6c49bfdef5aacce14b76f06adda3b66d1f3847";
+ sha256 = "1ignivq4df5a716p7n4cm6jbv9zly9b1ssn39a49wzvy9ch5m76q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor";
@@ -67757,6 +68434,27 @@
license = lib.licenses.free;
};
}) {};
+ wolfram = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "wolfram";
+ version = "20161017.127";
+ src = fetchFromGitHub {
+ owner = "hsjunnesson";
+ repo = "wolfram.el";
+ rev = "c66e9daa644856e02990f6a775e7b54f4e969e18";
+ sha256 = "1iswap3aqj0ykd2d62xfb4fgp5r1arkgln6fzl2b4dji399b2xyy";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/785b5b1ec73e6376f2f2bb405707a1078398fa3a/recipes/wolfram";
+ sha256 = "02xp1916v9rydh0586jkx71v256qdg63f87s3m0agc2znnrni9h4";
+ name = "wolfram";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/wolfram";
+ license = lib.licenses.free;
+ };
+ }) {};
wolfram-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "wolfram-mode";
@@ -68016,8 +68714,8 @@
src = fetchFromGitHub {
owner = "josteink";
repo = "wsd-mode";
- rev = "d1ee33397f9914834b9dd7208198b69ba46d3a11";
- sha256 = "0maxswk4pih27znq276q0aw0z5b9cj51m95ml5ap3qy7fsq9czdv";
+ rev = "cdbdf48f60900cedca2805a8b0875327a3a81f19";
+ sha256 = "1ms30d1vz4nd90q6nypz5vixw1s3x6c68lm3l9zgq2ls6bw3kz93";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/wsd-mode";
@@ -68159,12 +68857,12 @@
xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-css-mode";
- version = "20161002.932";
+ version = "20161017.1807";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-css-mode";
- rev = "b597757761418a974c3d5e61e0f8e21a2d4ba818";
- sha256 = "0d7a4mgwpi0mxcpiilv7flld5d24gvwmqxv0dzypr5y9kw3r2aki";
+ rev = "33805b3ec7c8881c32584cdbfb1e4b2719b53d7e";
+ sha256 = "1ja8aqg01s9i5sa2prfr7f809ak42ic63jldw022z3jjag0qn7jm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57c2e2112c4eb50ee6ebddef9c3d219cc5ced804/recipes/xah-css-mode";
@@ -68180,12 +68878,12 @@
xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-elisp-mode";
- version = "20160924.753";
+ version = "20161024.900";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-elisp-mode";
- rev = "9e3c379e6fddaee086b0bba62066839aca9f02b9";
- sha256 = "07r5y1fpkpxg7pwcqbj23lps6nid2589hr1gja7r49mp2qrna006";
+ rev = "a225039d38e5bb61ae89066e4528ca7c2d792984";
+ sha256 = "0qa6c498sm2sdh0pjci0hqpihp4ccs8hj1p7h3wks6kz3c3xr42a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode";
@@ -68222,12 +68920,12 @@
xah-fly-keys = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-fly-keys";
- version = "20161003.1702";
+ version = "20161016.459";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-fly-keys";
- rev = "db0821ee98f98b169b5c9e26f5db715a6bba0d20";
- sha256 = "1v3a53w8wpynm406j0nf247b2ncly5zpb7rq2ci8x9w3l8vqg664";
+ rev = "f9849ddd3b128628e4e9632e1e21edb8c904cb38";
+ sha256 = "14dc0lwmh4zf8whj3m65nsxvadqqmhr6kiymrx6vykwbsj4lzfiq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys";
@@ -68243,12 +68941,12 @@
xah-get-thing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-get-thing";
- version = "20150712.1430";
+ version = "20161019.2018";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-get-thing-or-selection";
- rev = "d2dadc54417468cc42da72c4e02fd23e3fd0584a";
- sha256 = "0abknznp2si80zq5pc0hqr3w3pca2vrv3msm6jz1s8l8zi2hwx72";
+ rev = "4a831ad9e5d1c96a045ba505424c041fb4361413";
+ sha256 = "12bgj8b3haldc6ixpm86cq6xwb75gbq81dfpy1xyid6x29a7rail";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9e8dc32a5317f0ff0e72fa87220243dd742eb1ef/recipes/xah-get-thing";
@@ -68282,36 +68980,15 @@
license = lib.licenses.free;
};
}) {};
- xah-math-input = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "xah-math-input";
- version = "20160711.1326";
- src = fetchFromGitHub {
- owner = "xahlee";
- repo = "xah-math-input";
- rev = "188b3195344e8204a6d0e3f30c6b439d27b7c024";
- sha256 = "02k95lkmwid1mr2g1vd4wppwpjfik76zm5x9zd5gmj0dzdgihi8g";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/95d57e33e6d60dc20d6452b407ea1486604ba23a/recipes/xah-math-input";
- sha256 = "1afikjk46sjf97fb5fc8h63h7b9af010wxhsbpnmabsb4j72rx5a";
- name = "xah-math-input";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/xah-math-input";
- license = lib.licenses.free;
- };
- }) {};
xah-replace-pairs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-replace-pairs";
- version = "20160913.1512";
+ version = "20161005.1847";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-replace-pairs";
- rev = "d26e73bdefd6e0a53559c433b576aa663008308c";
- sha256 = "1gvdx1nvmxxvbbkr4hz4ar7k52cyyc77vcbm1yqw4r167i468knf";
+ rev = "9b518378fe204737301a8c206d915ce19f2b9b5d";
+ sha256 = "1289ylz3dmyjv4z6yssb9c84a3wa794kd10xf5gwqlpmdlp7x1yc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0e7de2fe0e55b1a546f105aa1aac44fde46c8f44/recipes/xah-replace-pairs";
@@ -68642,12 +69319,12 @@
xterm-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xterm-color";
- version = "20160802.1752";
+ version = "20161013.1627";
src = fetchFromGitHub {
owner = "atomontage";
repo = "xterm-color";
- rev = "f7c197f64e3aded540faefc6b7686cc959cdd948";
- sha256 = "0d4njs7bk3kh8qjqc7mhj245ca1ckd7yq8vhdwl4njx587ikldvy";
+ rev = "9c850434b398f5e758b0e6ff6d9ce8f7351521f0";
+ sha256 = "14h46z8hqyx4135adj3lqbfpkaxlnvky7x4sfsnxbx82zqlcqnac";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b34a42f1bf5641871da8ce2b688325023262b643/recipes/xterm-color";
@@ -69080,16 +69757,16 @@
yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yasnippet";
- version = "20160801.1142";
+ version = "20161022.646";
src = fetchFromGitHub {
- owner = "capitaomorte";
+ owner = "joaotavora";
repo = "yasnippet";
- rev = "9cf92085e53f579af997f43540a26b4377f07678";
- sha256 = "0v7xzjhp87v1ahgzlvpf44b5qk5xfby80nbryla4d5afhahn8s0n";
+ rev = "eaaec309b19ea704dddb265bcd3d9e09c9996265";
+ sha256 = "1ckj1d053v74m2kchd2lbr3qrdmn0d7p9l0lwnpjl63yzvhkfjid";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/489687c6c41399a3bca8148a62d25581726a847d/recipes/yasnippet";
- sha256 = "1j6hcpzxljz1axh0xfbwr4ysbixkwgxawsvsgicls8r8kl2xvjvf";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
+ sha256 = "1r37vz5b8nj6hr6c2ki9fdbrs3kkb4zwimh8r4ixm10kdkk5jqds";
name = "yasnippet";
};
packageRequires = [ cl-lib ];
@@ -69164,12 +69841,12 @@
ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, request, request-deferred, s }:
melpaBuild {
pname = "ycmd";
- version = "20160922.525";
+ version = "20161018.2336";
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-ycmd";
- rev = "a8ca68b508c448f6ac5ed6fa35ee3fe0a4771098";
- sha256 = "0v8by6y25sl7528vvrb1xsmm184xbqivqvllykx3kmaxpdh5hvih";
+ rev = "adda8765e1c1819bcf63feefea805bd8c0b00335";
+ sha256 = "1bm0kagq6aanybc0rrsfq296sd1485f4lvkz84hxamkfm329illm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
@@ -69215,12 +69892,12 @@
yoshi-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yoshi-theme";
- version = "20160608.1423";
+ version = "20161006.1632";
src = fetchFromGitHub {
owner = "ryuslash";
repo = "yoshi-theme";
- rev = "660b9368f448372330722985d1c869966c034652";
- sha256 = "13p1rzi9l4k6gjvdsls0kg0c8rdkwinfrl2ns9y5fn4pbr2lwba5";
+ rev = "09ce91530896f6443b5b45409bd67b5a449651c9";
+ sha256 = "19kfjaqd1p1v777zgr76zpyc33i8rn7v7f5wq59cnnnswi01m8m9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6e9a549e31c4097ee24b4bff12ec5d20d3beac68/recipes/yoshi-theme";
@@ -69236,12 +69913,12 @@
youdao-dictionary = callPackage ({ chinese-word-at-point, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names, popup }:
melpaBuild {
pname = "youdao-dictionary";
- version = "20150913.2344";
+ version = "20161017.829";
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "youdao-dictionary.el";
- rev = "5b4f716ca41fa0cdb18a4949ac5cdcd470182c57";
- sha256 = "0016qff7hdnd0xkyhxakfzzscwlwkpzppvc4wxfw0iacpjkz1fnr";
+ rev = "30cf46170168f8fec95a5504861a4d9aad314883";
+ sha256 = "06q0xdxl5wcm8pza42vc8k64fyms32x976mwiy2sl9qvvynfa2k3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/712bdf83f71c2105754f9b549a889ffc5b7ba565/recipes/youdao-dictionary";
@@ -69340,12 +70017,12 @@
zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "zenburn-theme";
- version = "20160914.135";
+ version = "20161018.437";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "zenburn-emacs";
- rev = "e20756e1b78de58d3f82ba4a9d7c0772cb37482d";
- sha256 = "0mm4qx9c6v9r708p6yq6spzznbjy43qpn5k2479plnxixp8dh664";
+ rev = "8715e379b00a788bfb6a1025e7ebc69e3aeca0d6";
+ sha256 = "02hkrisv2lk0ncq84rciq4l6az9yvk9wpd2617nvfijws4avgh02";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme";
@@ -69402,12 +70079,12 @@
zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild, powerline, s }:
melpaBuild {
pname = "zerodark-theme";
- version = "20161003.855";
+ version = "20161014.1000";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "zerodark-theme";
- rev = "cfd030d61347681566a06c119ac294d26cd17f91";
- sha256 = "08q64b7brdqi53vkb56dbz0agpjnyp0815qfkzd5m2qk6p4bsx7l";
+ rev = "166998e69a83535618dc4e79715e203fc340d513";
+ sha256 = "1ac5vqg9v6qj37xjw3xjlv47iyh5wwy59xwzah9pdi587224jcfv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme";
@@ -69507,12 +70184,12 @@
zone-nyan = callPackage ({ esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "zone-nyan";
- version = "20160928.2303";
+ version = "20161014.154";
src = fetchFromGitHub {
owner = "wasamasa";
repo = "zone-nyan";
- rev = "52f7e0a374fb7b4c1a69ad8b215fa8126063ba06";
- sha256 = "05yyin9y376zhha084zvfxj565s1qhy22yycc3wg3gs41xm0hrk1";
+ rev = "0ec6328ee58d7d140c8c7be84822c07741f3ad2b";
+ sha256 = "106sppnp1jd5qcp2ydb180fbhfld90jvfimy8316qvrgk5xc2q57";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/38262704e1045c21ee73ca9dc87656936382004a/recipes/zone-nyan";
@@ -69653,8 +70330,8 @@
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-zoom-window";
- rev = "95cd0c74bd63c9163148914fe1faecce7716be3c";
- sha256 = "1gddjvvl5pnh3q9x8q3q92d9l0rg9kksxqq84gi2hcyhvix5ghmz";
+ rev = "1c39773c69b9833382c26101c6ff60bfa218cc09";
+ sha256 = "08yw2ibn5zc40f8l3bnpp87w3nf5zzlzhi0f61a6px4ix2mqlsv4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8a55cc66cc0deb1c24023f638b8e920c9d975859/recipes/zoom-window";
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 67198297485..aa9547d4b7b 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -884,12 +884,12 @@
aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "aggressive-indent";
- version = "1.8.1";
+ version = "1.8.3";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "aggressive-indent-mode";
- rev = "8438ff5e71ca040e7a1e325d608a3f5ea050503f";
- sha256 = "03mpg4ksvcc5zs540rgnf3gssyx97aiiv60lwdn3934al4125vnq";
+ rev = "998407f56009f441a7cb83d678118d4d8e68f661";
+ sha256 = "0brggqlij0nacx0yjk10rkn045nk0z03r8llmnqkangjm47ffksr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/aggressive-indent";
@@ -1028,22 +1028,22 @@
license = lib.licenses.free;
};
}) {};
- all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }:
melpaBuild {
pname = "all-the-icons";
- version = "2.0.0";
+ version = "2.1.0";
src = fetchFromGitHub {
owner = "domtronn";
repo = "all-the-icons.el";
- rev = "21b2e084a8779a6eb2e800add37671e21e5fc5d8";
- sha256 = "1zw6mkayf9dqxkk6pfb6niarkxk1jcwdln45jp7q7n8vq3cqg6rp";
+ rev = "9266eeb6ab2eef04389850422d7da059c707380e";
+ sha256 = "169g2dk3m0f7z64pjxcs918r6j5g2pzphrylr2vm40kppigy8gmw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
sha256 = "00ba4gkfvg38l4s0gsb4asvv1hfw9yjl2786imybzy7bkg9f9x3q";
name = "all-the-icons";
};
- packageRequires = [ dash emacs ];
+ packageRequires = [ dash emacs font-lock-plus ];
meta = {
homepage = "https://melpa.org/#/all-the-icons";
license = lib.licenses.free;
@@ -1082,12 +1082,12 @@
anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
melpaBuild {
pname = "anaconda-mode";
- version = "0.1.5";
+ version = "0.1.6";
src = fetchFromGitHub {
owner = "proofit404";
repo = "anaconda-mode";
- rev = "359c9d62649ad3f2cb007c4d8871e5b051d695f6";
- sha256 = "1kwn5lln7l754x5l3glij7ci3r2g6p9sapc43bm2gmwbgxa9fgis";
+ rev = "3f473150009f86dac68edb02e2f22850788289a5";
+ sha256 = "16c2q6c44qc3bdaxq835rrbyq49z6rd3h6cgss50p4gqwfwxfxn7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode";
@@ -1187,12 +1187,12 @@
annotate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "annotate";
- version = "0.4.6";
+ version = "0.4.7";
src = fetchFromGitHub {
owner = "bastibe";
repo = "annotate.el";
- rev = "9616c55812c4b6f11365e0f4e90f9357c95280ff";
- sha256 = "0wkdvmszabx1rcwqbm6rw07niwd7n4bdb9h2iav2miljwy68s40x";
+ rev = "e6af7f8ef7d241fdc9f866d57dce24beb4bb6b87";
+ sha256 = "19a419rnqqsmvrcl2vwy3gl7mvbfg669vyin2h2xpm56rxsinvy1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae88b8e3b080501195d291012deab31aaf35f7/recipes/annotate";
@@ -1292,12 +1292,12 @@
ansible-vault = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ansible-vault";
- version = "0.3.1";
+ version = "0.3.2";
src = fetchFromGitHub {
owner = "zellio";
repo = "ansible-vault-mode";
- rev = "8b4cdebb817c979b13eab625e3bbeebb08ddf026";
- sha256 = "1gqga59qinmkjalk1jkbh8w70sqvb3p033sbx69qljc2mivs8rh8";
+ rev = "57fd8017ab93cc6a1f9bbc795d494a069557a1cb";
+ sha256 = "04sdgg98z9gydgx8sf4nfmkwazm799gyvywssfa0mkcvza2z7s21";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2bff0da29a9b883e53a3d211c5577a3e0bc263a0/recipes/ansible-vault";
@@ -1690,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.1.0";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "auth-password-store";
- rev = "7b399fd7eb4a19f32d93ec6dc0eb3a344d2687aa";
- sha256 = "021iqwn4lwpsx02m3ns8l3bn5dvssii5sk9vg32mh56fjpbi2dkj";
+ rev = "5ca6a838489c1175de3df7af025751559eb13cb3";
+ sha256 = "10y6grxwp8sw24fv8i9f50lc83qcdxnkw2bm1v983fw6di4i3a8w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store";
@@ -2410,12 +2410,12 @@
bind-key = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bind-key";
- version = "2.2";
+ version = "2.3";
src = fetchFromGitHub {
owner = "jwiegley";
repo = "use-package";
- rev = "27fdfba5b05fd51345dc2b947ae6342266fdb22b";
- sha256 = "1dzkvinp1h1w48lx44x9bn1b54c83m1wl5v8h99l76fh1y0jw7b4";
+ rev = "cd58b268a8a025451c11c3cb1ba18d4f27f245da";
+ sha256 = "14x01dg7fgj4icf8l8w90pksazc0sn6qrrd0k3xjr2zg1wzdcang";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key";
@@ -2494,12 +2494,12 @@
bm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bm";
- version = "201608";
+ version = "201610";
src = fetchFromGitHub {
owner = "joodland";
repo = "bm";
- rev = "b91f87c8f78d2430edc376830d5ba15f45d28637";
- sha256 = "1ggqg0lgvxg2adq91damvh55m36qsa23n3z6zyf5z6855ilzaa4x";
+ rev = "c77ea49f5632b5d987243eddb4b36e84b870bf42";
+ sha256 = "0jfi24kck1ag19lfcfzbivwb1zhid173p7f8chc01cz68l1pp7jw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/bm";
@@ -2764,6 +2764,27 @@
license = lib.licenses.free;
};
}) {};
+ bui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "bui";
+ version = "1.0";
+ src = fetchFromGitHub {
+ owner = "alezost";
+ repo = "bui.el";
+ rev = "c08d91b2d314b52c9ca5c2d5be7a7b2367b68162";
+ sha256 = "104q089cyy0m0hkdnvblss884npc4bv5xf03qr35x3s3573lxh4a";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/38b7c9345de75a707b4a73e8bb8e2f213e4fd739/recipes/bui";
+ sha256 = "0a4g55k02hi3cwvk4d35lk2x5kc4fabskl2025i83hx0rqw4w3f1";
+ name = "bui";
+ };
+ packageRequires = [ dash emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/bui";
+ license = lib.licenses.free;
+ };
+ }) {};
bundler = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
melpaBuild {
pname = "bundler";
@@ -3439,12 +3460,12 @@
cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
melpaBuild {
pname = "cider";
- version = "0.13.0";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "cider";
- rev = "b8932a37b936a34b923ce4e356379ea76108ec6d";
- sha256 = "07xb09csppk2rbffbyiy22mx4s7cd5h48nx428dag7q13fvarc31";
+ rev = "f3c396ff8cf4baf331b0e19e18e33b795b66ee3e";
+ sha256 = "1np4bh7fxv6xkvdg1nyd596p2yjkrh5msw2wsfyidl0xb1jdnj9c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -3807,12 +3828,12 @@
clojure-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "clojure-snippets";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchFromGitHub {
owner = "mpenet";
repo = "clojure-snippets";
- rev = "30cd52379b856cf80eab2b541c32b1bcdcff3db2";
- sha256 = "1p0w83m9j4a6va4g68a4gcfbdkp8nic0q8cm28l8nr7czd5s0yl6";
+ rev = "83785faa607884308a42b81f160854f2cecfd098";
+ sha256 = "1sdgf1avfw7w3m3i7nqb9m9nhqk8lr0bri686lrkq23ds2b44454";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4898fc6746b30b0d0453b3b56d02479bfb0f70b9/recipes/clojure-snippets";
@@ -3891,12 +3912,12 @@
cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cmake-mode";
- version = "3.6.2";
+ version = "3.7.0pre2";
src = fetchFromGitHub {
owner = "Kitware";
repo = "CMake";
- rev = "c5dcd31e92c0a09009a340e3fe23ced4f6190b64";
- sha256 = "0k40czfgxwdn4yavkl10ab5ls57mdr7smxjjld20mfrjnfbmv0fc";
+ rev = "876da11858ab6649bb088c4bb7758fc84910ba20";
+ sha256 = "179925wbpnfiazqizw5zrhcdb5pi5a8x2x9m5wp0mvw9gxvmnwvn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -4479,12 +4500,12 @@
company-ngram = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-ngram";
- version = "0.7.7";
+ version = "0.7.8";
src = fetchFromGitHub {
owner = "kshramt";
repo = "company-ngram";
- rev = "11323ca12ddd5f706d5a855a3a7824013cf3cca6";
- sha256 = "1gq2q6bjnaji53gdaqy4gadiydrvl0ddg0l8xhxj0v1w3sk81b08";
+ rev = "1d43d7df4c5d7a58e1176c7c57a8dce60dba2e8a";
+ sha256 = "1isfyzjik8a5fr8sfy7462hpv5zh5bgbm8zc7d0lk50ggrazz7l5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/937e6a23782450525c4a90392c414173481e101b/recipes/company-ngram";
@@ -4611,12 +4632,12 @@
company-tern = callPackage ({ cl-lib ? null, company, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tern }:
melpaBuild {
pname = "company-tern";
- version = "0.2.0";
+ version = "0.3.0";
src = fetchFromGitHub {
owner = "proofit404";
repo = "company-tern";
- rev = "9a2cb8427a1a93c9c5021c01df1b47c69d79e176";
- sha256 = "11cinjsyf24d4a682ikniprxd1vkwn6mynsp5dzab6yzq09np78i";
+ rev = "b20b3e490bf277c8480712210e3c92ea489859ef";
+ sha256 = "1l4b54rqwsb32r8zwwrag7s35zc3kpviafdrqkq8r1nyshg2yccm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/company-tern";
@@ -5302,12 +5323,12 @@
darcula-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "darcula-theme";
- version = "1.0";
+ version = "1.1";
src = fetchFromGitLab {
owner = "fommil";
repo = "emacs-darcula-theme";
- rev = "202a5affe59a5e1ac1d33a7e518d1df772bf2100";
- sha256 = "1gdh4izwhyly6dyrmh7lfpd12gnb8hpnafj8br51ksijsssrf21f";
+ rev = "834202004507221c3bdf49457219a56760b13d22";
+ sha256 = "1j2g94cz9b3ivv0w88gw1hcf236kc0c7hnrf13yyspxjm5jfdmd5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/23c8f10205187babb17e3abc3dc40eb1938e6640/recipes/darcula-theme";
@@ -5323,12 +5344,12 @@
darktooth-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "darktooth-theme";
- version = "0.1.49";
+ version = "0.1.60";
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "emacs-theme-darktooth";
- rev = "825a61d8d65dbbe9fca44f865dc0a57dbd6bf3db";
- sha256 = "1b2i5fvg3q4fwg5inp08ivznv97cvz2x073i21pv82rk1p8f39q7";
+ rev = "1a5d0dc5ae9c57bcb07085ded6fa82c3512ff80f";
+ sha256 = "0hz3hhkyg6m2wvffanpclc2wq7y8n63sgz726kg87iqgq2lfa096";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme";
@@ -5449,12 +5470,12 @@
datetime = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "datetime";
- version = "0.1";
+ version = "0.2";
src = fetchFromGitHub {
owner = "doublep";
repo = "datetime";
- rev = "dd38546d80a8aa30b9e259490ab82c337e851f54";
- sha256 = "1w8qzj8qrgkygprb3ibyx28j951lv7k1frbpdwz69cg23whi3s30";
+ rev = "6585b2dcb0b3871a2a63656d01baa0c9a300d457";
+ sha256 = "07rb8r3j8293h0ffpwhf7mxnshqi08pb63swhmdzb34hn57cx4jg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fff9f0748b0ef76130b24e85ed109325256f956e/recipes/datetime";
@@ -5783,12 +5804,12 @@
dim-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dim-autoload";
- version = "1.2.0";
+ version = "1.2.1";
src = fetchFromGitHub {
owner = "tarsius";
repo = "dim-autoload";
- rev = "ac04fade74a50fd2aac48fc298e4d21d8427f737";
- sha256 = "0jn3hwnqg455fz85m79mbwsiv93ps4sfr1fcfjfwj3qhhbhq7d82";
+ rev = "3a9b7f6c5a2b71149c4cdda7e4b4ea3bd729baa5";
+ sha256 = "0jp3rps3ps8mh7zsn1y9367l1gh26hhmbz61l1dcv3sk4jrw46mw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/66b1a81dfd09a2859ae996d5d8e3d704857a340f/recipes/dim-autoload";
@@ -5906,6 +5927,27 @@
license = lib.licenses.free;
};
}) {};
+ dired-icon = callPackage ({ cl-lib ? null, fetchFromGitLab, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "dired-icon";
+ version = "0.2";
+ src = fetchFromGitLab {
+ owner = "xuhdev";
+ repo = "dired-icon";
+ rev = "68b7b7cf593e4e511eb78cdf83fefdb77ba4ebde";
+ sha256 = "0a7j40rw5wpxlw822ishgbcx7lk1pr4v6qqg4b5y1v5xvwaj7ciy";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c6d0947148441ed48f92f4cfaaf39c2a9aadda48/recipes/dired-icon";
+ sha256 = "1fl12pbncvq80la3bjgq1wlbpmf32mq76sq61mbnwcimi3nj27na";
+ name = "dired-icon";
+ };
+ packageRequires = [ cl-lib ];
+ meta = {
+ homepage = "https://melpa.org/#/dired-icon";
+ license = lib.licenses.free;
+ };
+ }) {};
dired-imenu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-imenu";
@@ -6220,22 +6262,30 @@
license = lib.licenses.free;
};
}) {};
- docker = callPackage ({ dash, 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 = "0.4.0";
+ version = "0.5.1";
src = fetchFromGitHub {
owner = "Silex";
repo = "docker.el";
- rev = "57c5f4edb7139cbf78055a1ceb7a9f8b4b299a8a";
- sha256 = "1wkgb6wq3crnpnd747ilwl2kbz5fjk5q5z1xza8j4bf1ic2aybb8";
+ rev = "1ee7b78d22807326bb30e45137bc36cb2ccef93f";
+ sha256 = "03cbcmyqyrsafml9x497h8c4pw5rj5g02rr97ch87nbkzrih1kal";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker";
sha256 = "10x05vli7lg1w3fdbkrl34y4mwbhp2c7nqdwnbdy53i81jisw2lk";
name = "docker";
};
- packageRequires = [ dash 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;
@@ -6286,12 +6336,12 @@
doom-themes = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "doom-themes";
- version = "1.1.0";
+ version = "1.1.2";
src = fetchFromGitHub {
owner = "hlissner";
repo = "emacs-doom-theme";
- rev = "cf58400f74e88ed2ec519428a16b5668aaa60842";
- sha256 = "01dmy7723wss3cvxi127ki75v7ssxb4cs09d34akcmynrgh4x92s";
+ rev = "dbe6ed4b4cf27ab676843505cb7c5edba50b455b";
+ sha256 = "0npzshc9mv1zy8dmghz34nwdjlpgxxd4iiv2zp3l6qa0m78j52ri";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes";
@@ -6325,6 +6375,27 @@
license = lib.licenses.free;
};
}) {};
+ dr-racket-like-unicode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "dr-racket-like-unicode";
+ version = "1.1.0";
+ src = fetchFromGitHub {
+ owner = "david-christiansen";
+ repo = "dr-racket-like-unicode";
+ rev = "4953f1c8a68472e157a0dcd0a7e35a4ec2577133";
+ sha256 = "1i7k7d2gnzd2izplhdmjbkcxvkwnc3y3y0hrcp2rq60bjpkcl1gv";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6e612ede00c4b44ace741d2b6baabc61571af15c/recipes/dr-racket-like-unicode";
+ sha256 = "0cqcbn4hmv99d8z03xc0rqw4yh5by6g09y33h75dhl9nh95rybgf";
+ name = "dr-racket-like-unicode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/dr-racket-like-unicode";
+ license = lib.licenses.free;
+ };
+ }) {};
dracula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dracula-theme";
@@ -6499,8 +6570,8 @@
version = "0.3";
src = fetchhg {
url = "https://bitbucket.com/harsman/dyalog-mode";
- rev = "2664661b55eb";
- sha256 = "1yawkav0hdsn41lx9q33lxsfpjy7fiwk0f5xlly5vswsn2va9zlv";
+ rev = "6ff00cc2f12b";
+ sha256 = "1sjpwgjimrmh8s8lzbjrhhqvhrfcvs36l8ls75qmrrz5rvp386l3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode";
@@ -6807,27 +6878,6 @@
license = lib.licenses.free;
};
}) {};
- ecb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "ecb";
- version = "2.24";
- src = fetchFromGitHub {
- owner = "alexott";
- repo = "ecb";
- rev = "1e9ddf472d7b6006dc92684b82de22e6148f38b4";
- sha256 = "1s9r1qj7cjsjvvphdpyjff6y598xpbrm9qjv5ncq15w6ac7yxzvc";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/c0a4c225c05166572de4538f7ee9e4e0d088a409/recipes/ecb";
- sha256 = "097hdskhfh255znrqamcssx4ns1sgkxchlbc7pjqwzpflsi0fx89";
- name = "ecb";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/ecb";
- license = lib.licenses.free;
- };
- }) {};
eclim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eclim";
@@ -6915,12 +6965,12 @@
ede-php-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ede-php-autoload";
- version = "0.4.1";
+ version = "0.4.2";
src = fetchFromGitHub {
owner = "stevenremot";
repo = "ede-php-autoload";
- rev = "682cf38c3ba7c0da21171826a655003c0f1d8349";
- sha256 = "0gi8095rib20bggrjz8a52y0v3wh6jidjjab1yfr21gyl6i885w7";
+ rev = "c748354c6398aa7e5d3f00ee4c5422f4eca09a91";
+ sha256 = "1imr45s2a1lilqfgfccgxasqlmh1nkc1ivf5iq01w31wik2hii0z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8ee9f7fd9cbc3397cd9af34b08b75c3d9d8bc551/recipes/ede-php-autoload";
@@ -7152,8 +7202,8 @@
sha256 = "1dljb6pd35l5mv51fm0bjfw4g6d19fj5sc1yag7jir6nmx0k992m";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/3201516c0158c47d0226ef9c5d324d29ac7b088b/recipes/ein";
- sha256 = "1nksj1cpf4d9brr3rb80bgp2x05qdq9xmlp8mwbic1s27mw80bpp";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
+ sha256 = "14blq1cbrp00rq0ilk7z9qppqfj0r4n3jidw3abcpchvh5ln086r";
name = "ein";
};
packageRequires = [ cl-generic request websocket ];
@@ -7375,12 +7425,12 @@
electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
melpaBuild {
pname = "electric-operator";
- version = "0.2";
+ version = "1.0.0";
src = fetchFromGitHub {
owner = "davidshepherd7";
repo = "electric-operator";
- rev = "96a3696851abc47d369f8985bf6f790e68a4a9aa";
- sha256 = "1ji6rdbqwk8j0nl6yk3rdqrpgxir99lj9pf6i9rx55l63qyrdfc4";
+ rev = "16df9e16da8efe25d410ba17165d7f5c1ad4e043";
+ sha256 = "010zr6dgix6bf8xshs8kascpzcrg83vqd1w71qin9anw6rf3z4d4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator";
@@ -7393,6 +7443,27 @@
license = lib.licenses.free;
};
}) {};
+ elf-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "elf-mode";
+ version = "0.1.0";
+ src = fetchFromGitHub {
+ owner = "abo-abo";
+ repo = "elf-mode";
+ rev = "cd280d683cd3341d8bb31af6db7e3b74a133e6ab";
+ sha256 = "0cbvjbk2893ag1iy8ggixpirfiyhssm7fii96hb9jqdz874cdl0k";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/368d1ff91f310e5ffe68f872ab0a91584a41a66e/recipes/elf-mode";
+ sha256 = "0xwpaqg4mc0a0d8a4dxbd1sqzvi01gfhwr75f7i3sjzx0fj8vcwd";
+ name = "elf-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/elf-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elfeed";
@@ -7501,12 +7572,12 @@
elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
melpaBuild {
pname = "elm-mode";
- version = "0.19.5";
+ version = "0.19.6";
src = fetchFromGitHub {
owner = "jcollard";
repo = "elm-mode";
- rev = "2f7f0c3e42d137aaefd12bc28383807d35a2a290";
- sha256 = "137189r1rba5l9m82qj3zba8x0gkm0c3xc9df1vri4wsbz4df7nm";
+ rev = "750bb9ced539db9dfdbd143bb2624aea54eb1e16";
+ sha256 = "12s8pphf6wigaaarapp78srisqdkk2wk7myhxkidrna38pq1ad5b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode";
@@ -7522,12 +7593,12 @@
elmacro = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "elmacro";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchFromGitHub {
owner = "Silex";
repo = "elmacro";
- rev = "10eb7d70188ed1d49763920ecbc584b71864e8ba";
- sha256 = "0f0k9ais7bmjidv2mqr1whrv6rhq4jkig5h2y4h9npxyyb2nrz3q";
+ rev = "d712c8efc01646117097e061e1b14933b822b9c7";
+ sha256 = "00fry1gjsrx4dv9d9rjf5pd8w3709mn0052al0l948vhwz4wys9z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/566cc5bc0f71c5a4191ad93b917dc268f6e1a2da/recipes/elmacro";
@@ -8187,12 +8258,12 @@
engine-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "engine-mode";
- version = "1.0.0";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "hrs";
repo = "engine-mode";
- rev = "9e8b10b029f63bc0399f8975a28247eaa78dfcbc";
- sha256 = "1dsa3r39ip20ddbw0m9vq8z3r4ahrxvb37adyqi4mbdgyr6fq6sw";
+ rev = "243d04691475b47a4453ad7106d8268ca14d9f28";
+ sha256 = "02xas46nl28mascqsyr1zcd4hn15bh0fjv2xlxv1kmrj0pis94ml";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ea1b5dfb6628cf17e77369f25341835aad425f54/recipes/engine-mode";
@@ -8548,22 +8619,22 @@
license = lib.licenses.free;
};
}) {};
- ergoemacs-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }:
+ ergoemacs-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }:
melpaBuild {
pname = "ergoemacs-mode";
- version = "5.14.7.3.1";
+ version = "5.16.10.12";
src = fetchFromGitHub {
owner = "ergoemacs";
repo = "ergoemacs-mode";
- rev = "295ce7a4a5341d9e144a06e91befeebfac1239d9";
- sha256 = "19m6chwc2awbsk5z03q1yhq84m481pff2609a8bxymcvm6yaamvf";
+ rev = "ac70b2563fb6e3d69ea382fddc87b5721c20c292";
+ sha256 = "0ydxyylijdd6da4n9by441352shphrpfyk2631ld5aq3gz27z9gi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode";
sha256 = "0h99m0n3q41lw5fm33pc1405lrxyc8rzghnc6c7j4a6gr1d82s62";
name = "ergoemacs-mode";
};
- packageRequires = [ emacs undo-tree ];
+ packageRequires = [ cl-lib emacs undo-tree ];
meta = {
homepage = "https://melpa.org/#/ergoemacs-mode";
license = lib.licenses.free;
@@ -8572,16 +8643,16 @@
erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "erlang";
- version = "19.1.1";
+ version = "19.1.5";
src = fetchFromGitHub {
owner = "erlang";
repo = "otp";
- rev = "310b00b7fc18b5883f5f2cb1b992deb1dd6c9a65";
- sha256 = "0vgnv517ljhkgmrljvxinm3x72c2mf4y83vpyhlb0cwl2q0gmc4d";
+ rev = "926391fbb8761d5833b3a6f5c9e523fcda373c6d";
+ sha256 = "1bbwnpam05rcsivmrh13mkcyb04a08d1fyb4y5w0y0gdpbzn7jq9";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/erlang";
- sha256 = "1gmrdkfanivb9l5lmkl0853snlhl62w34537r82w11z2fbk9lxhc";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
+ sha256 = "1cs768xxbyrr78ln50k4yknmpbcc1iplws3k07r0gx5f3ca73iaq";
name = "erlang";
};
packageRequires = [];
@@ -8799,6 +8870,27 @@
license = lib.licenses.free;
};
}) {};
+ eshell-up = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "eshell-up";
+ version = "0.0.3";
+ src = fetchFromGitHub {
+ owner = "peterwvj";
+ repo = "eshell-up";
+ rev = "653121392acd607d5dfbca0832927e06806a2d39";
+ sha256 = "05mfwp8zira7p2ip1rmqa08arlbkv7w1mbx7s5saj655scg7jaq3";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/4d033b20d047db8ddd42bdfa2fcf190de559f706/recipes/eshell-up";
+ sha256 = "0v26dqaszdg57brg8sls9ddmfwxzf98wkp471q1cqw75ss4999jd";
+ name = "eshell-up";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/eshell-up";
+ license = lib.licenses.free;
+ };
+ }) {};
eshell-z = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eshell-z";
@@ -8844,12 +8936,12 @@
ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
melpaBuild {
pname = "ess";
- version = "16.4";
+ version = "16.10";
src = fetchFromGitHub {
owner = "emacs-ess";
repo = "ESS";
- rev = "81d34db66301e78e59ea79e4ae7b9600f1378641";
- sha256 = "039iqrxd8nc52n2j9qjhfmb5f276h2ikvn2lagjbzk15mvg26va4";
+ rev = "abacd7538e1bbfdd6ef2b5f11d4f5f4cc74782ee";
+ sha256 = "0fbprkjb9cjkjyc1yxn9b1znc4w1im9akl4f9ma2ddgl8fzmi7p7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess";
@@ -9284,12 +9376,12 @@
evil-matchit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-matchit";
- version = "2.1.5";
+ version = "2.1.6";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "evil-matchit";
- rev = "b01763bf766a7449626e6216c2d360ae1e80e5c1";
- sha256 = "197ycwx02mjlvck5xraw2jwlsv3ham5jm2yv8133i4cq8dszcfaa";
+ rev = "51d46747e39dc247ea4b72839421b85f53d487be";
+ sha256 = "15fr19gv2rf8pvns7r0jmy1z2f08bjprqxz3hj1fzn9wgc42iwg7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit";
@@ -9305,12 +9397,12 @@
evil-multiedit = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }:
melpaBuild {
pname = "evil-multiedit";
- version = "1.3.0";
+ version = "1.3.3";
src = fetchFromGitHub {
owner = "hlissner";
repo = "evil-multiedit";
- rev = "a14dbfdd41d2baa789fbfbbf3b8148056c11b969";
- sha256 = "118a9bkj2i95xi4axa39mwm3nh519jzznzahbvlncf2279v8mrzr";
+ rev = "5f263a9388dd3593b5acefe9f523c819bd3b338f";
+ sha256 = "0bsdyy5jw8adj26p85831n4f34d0sv4rrv9xlhjqkzx9gsr4h7d1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/997f5a6999d1add57fae33ba8eb3e3bc60d7bb56/recipes/evil-multiedit";
@@ -9365,6 +9457,27 @@
license = lib.licenses.free;
};
}) {};
+ evil-opener = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, opener }:
+ melpaBuild {
+ pname = "evil-opener";
+ version = "0.2.1";
+ src = fetchFromGitHub {
+ owner = "0robustus1";
+ repo = "opener.el";
+ rev = "ad3c65a5a748230bf07c18f56b1998ac03e3807a";
+ sha256 = "178h7sbpgsn0xl93j7375f2ahmqcszmbl3f7mfb6vgjmm791q03p";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/da8d4e5bf23985632f993336b9183fe9f480addc/recipes/evil-opener";
+ sha256 = "08vcf9i0rplw2p6gjl7zzrc7kxdl5yv2rggj2ihgdnnfpc4sl33h";
+ name = "evil-opener";
+ };
+ packageRequires = [ evil opener ];
+ meta = {
+ homepage = "https://melpa.org/#/evil-opener";
+ license = lib.licenses.free;
+ };
+ }) {};
evil-org = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "evil-org";
@@ -9683,12 +9796,12 @@
expand-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "expand-region";
- version = "0.10.0";
+ version = "0.11.0";
src = fetchFromGitHub {
owner = "magnars";
repo = "expand-region.el";
- rev = "90c4e959ac8bf0bbd857dd679f38a121c592bf7a";
- sha256 = "0rvkhjfkhamr3ys9iarblfwvwq7n4wishdjgnwj1lx7m80h1hzbg";
+ rev = "0bc14fc7fbbcca5da4fdd9695cfd7cbd36eb3b96";
+ sha256 = "0h40dhc3kn8fq86xnwi5lz7ql8my8737y7wkqr897p15y90swr35";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/expand-region";
@@ -10320,12 +10433,12 @@
flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
melpaBuild {
pname = "flycheck";
- version = "29";
+ version = "30";
src = fetchFromGitHub {
owner = "flycheck";
repo = "flycheck";
- rev = "38f88da0b6531bde5a7fcb6ebad9c502503ebd51";
- sha256 = "0vxhj5lqaj0fmwr6i55gcap44b3x37kbsaz9qg48wjk6gxz91006";
+ rev = "9c063965e893f0cc7c97fabb810ac41ec22f82fb";
+ sha256 = "1vyncqicafmy9av2nsawywn56ay50zdyjba9r55vv11baklabg8w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -10611,22 +10724,22 @@
license = lib.licenses.free;
};
}) {};
- flycheck-package = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ flycheck-package = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, package-lint }:
melpaBuild {
pname = "flycheck-package";
- version = "0.9";
+ version = "0.11";
src = fetchFromGitHub {
owner = "purcell";
repo = "flycheck-package";
- rev = "d2366c27a342e2040903b9c7a016c7309b299611";
- sha256 = "1gblp39k20qkwybpwlb1xl72281hjz4ymcynqc7dg2nv1gh89dv3";
+ rev = "cf561bf9896d3e7b6bdcdb7801de6cb9f548b573";
+ sha256 = "124ahlxpkcb5mcndmg8k8rdxx0piis6372zllxk6ywmgxz9mlgy1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d17ec69c9f192625e74dfadf03b11d0d7dc575e7/recipes/flycheck-package";
sha256 = "0068kpia17rsgjdmzsjnw0n6x5z9jvfxggxlzkszvwsx73mvcs2d";
name = "flycheck-package";
};
- packageRequires = [ cl-lib emacs flycheck ];
+ packageRequires = [ flycheck package-lint ];
meta = {
homepage = "https://melpa.org/#/flycheck-package";
license = lib.licenses.free;
@@ -10674,6 +10787,27 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-rebar3 = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flycheck-rebar3";
+ version = "1.0.1";
+ src = fetchFromGitHub {
+ owner = "joedevivo";
+ repo = "flycheck-rebar3";
+ rev = "534df87b0c2197fa15057f1e1a19763411c59220";
+ sha256 = "1sai968p20g7yiyrnmq52lxlwxdls80drjw4f1abkr99awzffsb3";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2acff5eea030b91e457df8aa75243993c87ca00e/recipes/flycheck-rebar3";
+ sha256 = "1ml9k61n5vy4c2q6c10q9j10ky0iqkinx21bl7hip1r6b5b1kmmc";
+ name = "flycheck-rebar3";
+ };
+ packageRequires = [ flycheck ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-rebar3";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-status-emoji = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-status-emoji";
@@ -11475,12 +11609,12 @@
fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fountain-mode";
- version = "2.2.1";
+ version = "2.2.2";
src = fetchFromGitHub {
owner = "rnkn";
repo = "fountain-mode";
- rev = "a31c19e88f403a8ebb2e6a5d27eef39fca595ba4";
- sha256 = "1sxr79gcj2xkh8qfp0h4r6iqmhm27qkibsk8l78gi2n3790sbnxk";
+ rev = "4e88b7525c2f39c3d25f689b394b0ece7c6eed6d";
+ sha256 = "1vcc8sdm0b3kss3g47wggc6mv28pr474559d3786fhncp5mxl1qq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode";
@@ -11851,12 +11985,12 @@
geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "geiser";
- version = "0.8.1";
+ version = "0.9";
src = fetchFromGitHub {
owner = "jaor";
repo = "geiser";
- rev = "c6f17b25200e36f80d812684a2127b451fc11817";
- sha256 = "1667zln7bav0bdhrc4b5z36n8rn36xvwh4y9ffgns67zfgwi64kk";
+ rev = "8ef6a9321d81ff478cfd376023eb84b8a819a991";
+ sha256 = "08aha9lxdxix1jq0vc3am9wsyivj6vjpfs8frm797aca3bwaam0j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser";
@@ -12271,12 +12405,12 @@
git-link = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "git-link";
- version = "0.4.3";
+ version = "0.4.5";
src = fetchFromGitHub {
owner = "sshaw";
repo = "git-link";
- rev = "b9e197419b1d71c7190c2e7cb14b89d9e6759ab2";
- sha256 = "0f10qqmjaxy29qw86a85kjshyj8wc5dldymm8i89l3hb9s9iv260";
+ rev = "efd2a9a40b07e93cd5030d8b409d380c77fca88b";
+ sha256 = "0yhk4r5fdlmiw7n0cpdbjqcsm2vkm37qwwvkb7xz9046mkdag6gy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1385443585e628e3d4efb3badb7611e9d653e0c9/recipes/git-link";
@@ -12754,12 +12888,12 @@
go-add-tags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "go-add-tags";
- version = "0.2";
+ version = "0.3";
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-go-add-tags";
- rev = "a6a879889729d579297935598d26b985f900ef29";
- sha256 = "1s4jwpwxlqxi9h5qqjcvxz3i8rgfrs874rpadp6lhizdhpjjp82y";
+ rev = "facff8dbb65fb56874d63a63edfd072eceed7904";
+ sha256 = "14bflgc9s9hslwisf4id0pc3asr5qvppwn1w14vvij3plal4mfhi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/55d3b893bd68d3d2d86ecdbb4ed442edd256516a/recipes/go-add-tags";
@@ -12888,8 +13022,8 @@
sha256 = "0g0vjm125wmw5nd38r3d7gc2h4pg3a9yskcbk1mzg9vf6gbhr0hx";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/8a9d94efc1a0cedaaa0a1acd1227b2530efefca2/recipes/go-mode";
- sha256 = "1852zjxandmq0cpbf7m56ar3rbdi7bx613gdgsf1bg8hsdvkgzfx";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode";
+ sha256 = "0ghqm4lbkfla79plqiyb1lzf5kbz0380h9vf8px15zal00xrv0bl";
name = "go-mode";
};
packageRequires = [];
@@ -12919,6 +13053,27 @@
license = lib.licenses.free;
};
}) {};
+ godoctor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "godoctor";
+ version = "0.0.5";
+ src = fetchFromGitHub {
+ owner = "microamp";
+ repo = "godoctor.el";
+ rev = "de7f838af320c87f10cba17619492e072000c47e";
+ sha256 = "1f9xfpyza23763pamknnpcvcxm7dcwk8dpj5a1mm7brg764yis2z";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0e23e1362ff7d477ad9ce6cfff694db989dfb87b/recipes/godoctor";
+ sha256 = "0k734hry9npsr6zhsplcvmcjqw6jdf79pv4k9dw0xvd598hkpazz";
+ name = "godoctor";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/godoctor";
+ license = lib.licenses.free;
+ };
+ }) {};
golden-ratio = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "golden-ratio";
@@ -13006,12 +13161,12 @@
gotest = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }:
melpaBuild {
pname = "gotest";
- version = "0.12.0";
+ version = "0.13.0";
src = fetchFromGitHub {
owner = "nlamirault";
repo = "gotest.el";
- rev = "c7ead398b69ab25db695f5dab73ceaa0aba572fa";
- sha256 = "1idhnsl8vkq3v3nbvhkmxmvgqp97aycxvmkj7894mj9hvhib68l9";
+ rev = "2ae187078beb5d9672ca14cb636b6b4021de4230";
+ sha256 = "1pq9zjfs7gp7bz3jq11fx75m4zcx9p772lja5jicz535khpgxw7f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/gotest";
@@ -13090,12 +13245,12 @@
govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
melpaBuild {
pname = "govc";
- version = "0.9.0";
+ version = "0.10.0";
src = fetchFromGitHub {
owner = "vmware";
repo = "govmomi";
- rev = "f9184c1d704efa615d419dd8d1dae1ade94701d1";
- sha256 = "1q86wklz73qmyif04fv5y42imly3yab5bjc8ymka8xkc5lh71mwm";
+ rev = "bb498f73762deb009468da8c3bd93b7c6002a63e";
+ sha256 = "0vqrqv0fdlw3z3402y9vmkr5lpf40nsf2nl5gi5gwr06fzcrv1dg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -13237,12 +13392,12 @@
graphene = callPackage ({ company, dash, exec-path-from-shell, fetchFromGitHub, fetchurl, flycheck, graphene-meta-theme, ido-ubiquitous, lib, melpaBuild, ppd-sr-speedbar, smartparens, smex, sr-speedbar, web-mode }:
melpaBuild {
pname = "graphene";
- version = "0.9.5";
+ version = "0.9.6";
src = fetchFromGitHub {
owner = "rdallasgray";
repo = "graphene";
- rev = "dcc0e34c6c4632d5d5445ec023f5b1ca04c7d1b7";
- sha256 = "1f34bhjxmbf2jjrkpdvqg2gwp83ka6d5vrxmsxdl3r57yc6rbrwa";
+ rev = "47c5a194f81796eface2e2f062144c17ee3cfdb7";
+ sha256 = "0xx3cnwbbil6d7y15d61wkp777w4j5rsdm7gwd5gpcr8910405n2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0206d6adcb7855c2174c3cd506b71c21def1209b/recipes/graphene";
@@ -13474,6 +13629,27 @@
license = lib.licenses.free;
};
}) {};
+ gruvbox-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "gruvbox-theme";
+ version = "0.17";
+ src = fetchFromGitHub {
+ owner = "Greduan";
+ repo = "emacs-theme-gruvbox";
+ rev = "89b060abf49791cad2639f234b230dc4882bdc39";
+ sha256 = "0bhg2za2a67r6hkb0628zvzxx65rcj7cm3kq3m44wls8q8cr2jxj";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme";
+ sha256 = "042mnwlmixygk2mf24ygk7rkv1rfavc5a36hs9x8b68jnf3khj32";
+ name = "gruvbox-theme";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/gruvbox-theme";
+ license = lib.licenses.free;
+ };
+ }) {};
gscholar-bibtex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gscholar-bibtex";
@@ -13917,12 +14093,12 @@
helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
melpaBuild {
pname = "helm";
- version = "2.2.0";
+ version = "2.3.1";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "2b91583c4f183b505d4870b4e6d3441d57637eae";
- sha256 = "0fbhfzy3karvdbfk49wp4pil5c2xncs8lpw5n9l4nv5yyvc4i2md";
+ rev = "b8193725f2c3ab20f2907171374ee762e397739d";
+ sha256 = "13hwwihiy05dszhwb2zxzjqsgf7589zdirdmfxqsw0l224p0hcdd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -13959,12 +14135,12 @@
helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-ag";
- version = "0.56";
+ version = "0.57";
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-helm-ag";
- rev = "8e652e426f1cb285b35920cfba6a586da624c060";
- sha256 = "0hyrladvqf4vn7wliajh33jippfih3rj5jbpx73kcpwqpcg15s0a";
+ rev = "49e1f66fa80674513ca898e32d62d6dad875cb90";
+ sha256 = "0vzgiix2c8jwpk2hhxvz9gqb78glmd4dk1myrgvxs9fhsj54dkk3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-ag";
@@ -14148,12 +14324,12 @@
helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "helm-core";
- version = "2.2.0";
+ version = "2.3.1";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "2b91583c4f183b505d4870b4e6d3441d57637eae";
- sha256 = "0fbhfzy3karvdbfk49wp4pil5c2xncs8lpw5n9l4nv5yyvc4i2md";
+ rev = "b8193725f2c3ab20f2907171374ee762e397739d";
+ sha256 = "13hwwihiy05dszhwb2zxzjqsgf7589zdirdmfxqsw0l224p0hcdd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -14229,6 +14405,27 @@
license = lib.licenses.free;
};
}) {};
+ helm-dired-history = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+ melpaBuild {
+ pname = "helm-dired-history";
+ version = "1.1";
+ src = fetchFromGitHub {
+ owner = "jixiuf";
+ repo = "helm-dired-history";
+ rev = "75416fa6ca9c5e113cca409ef63518266b4d8d56";
+ sha256 = "17z84dx3z48mx2ssdhlhgzaqrxlzdy9mx3d14qlm0rcrmc0sck8i";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/56036d496c2a5fb1a6b32cdfcd1814944618e652/recipes/helm-dired-history";
+ sha256 = "1k0021wn6x7in4wi9lri2c9wl06pvprv950hgdwgra8m155qjfp1";
+ name = "helm-dired-history";
+ };
+ packageRequires = [ cl-lib helm ];
+ meta = {
+ homepage = "https://melpa.org/#/helm-dired-history";
+ license = lib.licenses.free;
+ };
+ }) {};
helm-firefox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-firefox";
@@ -14295,12 +14492,12 @@
helm-ghq = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-ghq";
- version = "1.6.0";
+ version = "1.7.0";
src = fetchFromGitHub {
owner = "masutaka";
repo = "emacs-helm-ghq";
- rev = "db37bfe290b234ed3f39dcce24667072172ded41";
- sha256 = "0y379qap3mssz9nslb08vfzq5ihqcm156fbx0dszgz9d6xgkpdhw";
+ rev = "21ccdb537a3be3d9351e01c6365df8e804e8bc56";
+ sha256 = "1v3h6dszj223yvlkrjj6r4jwiyaj3iswbcl5d4ffwgaf72cxm4gn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e94eec646def7c77b15f6a6ac1841200848e62c7/recipes/helm-ghq";
@@ -14313,22 +14510,22 @@
license = lib.licenses.free;
};
}) {};
- helm-git-grep = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+ helm-git-grep = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
melpaBuild {
pname = "helm-git-grep";
- version = "0.8.0";
+ version = "0.9.0";
src = fetchFromGitHub {
owner = "yasuyk";
repo = "helm-git-grep";
- rev = "456ea8324eb811f099dad993ae94c8837368b23a";
- sha256 = "13p8dbfln8kcvi6iwj9mlb7vy6bda4285gagsng01j3nfrw0ck9x";
+ rev = "6ca2fcd44510305cf019815d61bf65eca200c238";
+ sha256 = "0qmxccwpv7l5lbhv9n7ylikzcggdr99qzci868ghf33p4zhqyrj5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/338d28c3fe201a7b2f15793be6d540f44819f4d8/recipes/helm-git-grep";
sha256 = "1ww6a4q78w5hnwikq7y93ic2b7x070c27r946lh6p8cz1k4b8vqi";
name = "helm-git-grep";
};
- packageRequires = [ helm ];
+ packageRequires = [ helm-core ];
meta = {
homepage = "https://melpa.org/#/helm-git-grep";
license = lib.licenses.free;
@@ -15492,12 +15689,12 @@
hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hl-todo";
- version = "1.7.1";
+ version = "1.7.2";
src = fetchFromGitHub {
owner = "tarsius";
repo = "hl-todo";
- rev = "215ff60d7a4097b5104edaf2784f9a3257db4403";
- sha256 = "1f7dz1r42qy3dwsqx7x802m7v4jfnmfp2q4678gs8d0scgxxfqb4";
+ rev = "3ef6c978011ffd01d3de060cfbde8c91d4b269f2";
+ sha256 = "0lssxnxg0dknmmrp0fri2d4wbpshnkk5zfnfbc2c9jii6bvg4982";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7/recipes/hl-todo";
@@ -15912,12 +16109,12 @@
ido-describe-bindings = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ido-describe-bindings";
- version = "0.0.9";
+ version = "0.0.11";
src = fetchFromGitHub {
owner = "danil";
repo = "ido-describe-bindings";
- rev = "1f5c78bf56f2cab137a323ec426e906f2215bf7f";
- sha256 = "0055dda1la7yah33xsi19j4hcdmqp17ily2dvkipm4y6d3ww8yqa";
+ rev = "a142ff1c33df23ed9665497d0dcae2943b3c706a";
+ sha256 = "0967709jyp9s04i6gi90axgqzhz03cdf1j1w39yrkds6q1b6v7jw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/31b8e255630f1348a5b5730f7b624ad550d219ad/recipes/ido-describe-bindings";
@@ -16455,22 +16652,22 @@
license = lib.licenses.free;
};
}) {};
- inflections = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ inflections = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inflections";
- version = "2.3";
+ version = "2.4";
src = fetchFromGitHub {
owner = "eschulte";
repo = "jump.el";
- rev = "fb7355615276f00397b15182076bf472336448a9";
- sha256 = "1fm69g4mrmdchvxr062bk7n1jvs2rrscddb02cldb5bgdrcw8g6j";
+ rev = "fb3dd59f21f77016742de40028aee92176c0917a";
+ sha256 = "1alncmx4q2szvlzg57332zmqm6rsgzf12kfg9l1vb5s9vgd1ki5p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/392c7616d27bf12b29ef3c2ea71e42ffaea81cc6/recipes/inflections";
sha256 = "0f02bhm2a5xiaxnf2c2hlpa4p121xfyyj3c59fy0yldipdxhvw70";
name = "inflections";
};
- packageRequires = [];
+ packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://melpa.org/#/inflections";
license = lib.licenses.free;
@@ -16643,6 +16840,27 @@
license = lib.licenses.free;
};
}) {};
+ intellij-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "intellij-theme";
+ version = "1.0";
+ src = fetchFromGitLab {
+ owner = "fommil";
+ repo = "emacs-intellij-theme";
+ rev = "c4b4a7ecdad6ed57545c114b40da9f76371f566e";
+ sha256 = "1wz6j7szb271g1baf6jj4k4kw1dfiz8l677vrazx4wyqdpmzlk0c";
+ };
+ 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;
+ };
+ }) {};
interleave = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "interleave";
@@ -16980,12 +17198,12 @@
jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
melpaBuild {
pname = "jade";
- version = "0.20";
+ version = "0.23";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "jade";
- rev = "856846322ea8077ffe6215b54f2f3676db5ccf61";
- sha256 = "03ckvamv61hpk1lcw6z66wsyg471qy979vm3wf8brq9zwapfknia";
+ rev = "67174f42c38eeeda73cfed62197abf59f19b3b9c";
+ sha256 = "080dvzxymbrnaazx64lbvigd982z237a8427myi4mg5wnk68q1wg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade";
@@ -17442,12 +17660,12 @@
jump = callPackage ({ fetchFromGitHub, fetchurl, findr, inflections, lib, melpaBuild }:
melpaBuild {
pname = "jump";
- version = "2.3";
+ version = "2.4";
src = fetchFromGitHub {
owner = "eschulte";
repo = "jump.el";
- rev = "fb7355615276f00397b15182076bf472336448a9";
- sha256 = "1fm69g4mrmdchvxr062bk7n1jvs2rrscddb02cldb5bgdrcw8g6j";
+ rev = "fb3dd59f21f77016742de40028aee92176c0917a";
+ sha256 = "1alncmx4q2szvlzg57332zmqm6rsgzf12kfg9l1vb5s9vgd1ki5p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f0c791aebccc08b770b3969ce5d2e82cbe26f80e/recipes/jump";
@@ -17925,12 +18143,12 @@
kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "kurecolor";
- version = "1.2.2";
+ version = "1.2.4";
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "kurecolor";
- rev = "c8c72cea04e51f57701d2dd9be7dba5f3412e2f3";
- sha256 = "0da4y9pf6vq0i6w7bmvrszg9bji3ylhr44hmyrmxvah28pigb2fz";
+ rev = "eb894bcb0769ce73404734f14f7582661abe02c8";
+ sha256 = "118csp4pi1dxm9grmd006d9wmdplnx8gnk02hbfrl639k7hnnd8z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/58a5ebdbf82e83e6602161bca049d468887abe02/recipes/kurecolor";
@@ -18114,12 +18332,12 @@
less-css-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "less-css-mode";
- version = "0.20";
+ version = "0.21";
src = fetchFromGitHub {
owner = "purcell";
repo = "less-css-mode";
- rev = "d59a3ff4031ae75fbbe77b6cfce7843205394c28";
- sha256 = "1w6mbk4gc63sh2p9rsy851x2kid0dp2ja4ai5badkr5prxkcpfdn";
+ rev = "59bf174c4e9f053ec2a7ef8c8a8198490390f6fb";
+ sha256 = "1rkjamdy2a80w439vb2hhr7vqjj47wi2azlr7yq2xdz9851xsx9f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/less-css-mode";
@@ -18583,12 +18801,12 @@
logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "logview";
- version = "0.5";
+ version = "0.5.2";
src = fetchFromGitHub {
owner = "doublep";
repo = "logview";
- rev = "cd63640f3ab15e9a50f4cf250f6828e428fbb345";
- sha256 = "0a3cx96nv64xxsvvxca966kmwd3hacvday936kd1yfdf2bmgiw6z";
+ rev = "9b2f610a32557937e704b32e97f4b61abdec6845";
+ sha256 = "0w1csjcgvl1jfhjpfj19hzrd6f055iaiq0qafpgjlyn6dd4sf9gj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview";
@@ -18926,12 +19144,12 @@
magit-rockstar = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "magit-rockstar";
- version = "1.0.4";
+ version = "1.0.5";
src = fetchFromGitHub {
owner = "tarsius";
repo = "magit-rockstar";
- rev = "47780d27141ba50f225f0bd8109f92ba6d1db8d5";
- sha256 = "075gxm4shbh5zfr17zpfn35w8ndgz9aqz6y3wws23wa4ff2n8kdc";
+ rev = "bccce1ac8e012f52e29470c1c7d815f9bb1a192b";
+ sha256 = "0z411x2w6ldy3b8qbavfvfgvkbjd1rl0m1plr44ynp55awrhj0k2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7a20b539cbd38ffa546c1b56b9fac78c0b9457f6/recipes/magit-rockstar";
@@ -19535,12 +19753,12 @@
meghanada = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "meghanada";
- version = "0.2.2";
+ version = "0.2.4";
src = fetchFromGitHub {
owner = "mopemope";
repo = "meghanada-emacs";
- rev = "f80811e4f1efa712eabfa42fd995990d02fc1e5a";
- sha256 = "0w2ij8zh30qs19vwnqifg3p5cvk94akig03cv2f6mx14clvrwckn";
+ rev = "86820f22cd1ebf4c2f8cae5b64bc8ff3964ea221";
+ sha256 = "0nn6p5r760hb3ffrv4lb3ny75np6ps0gscp1a20sdsfrz6fbv6dg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -19598,12 +19816,12 @@
merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "merlin";
- version = "2.5.0";
+ version = "2.5.1";
src = fetchFromGitHub {
owner = "the-lambda-church";
repo = "merlin";
- rev = "b2926cf6235827c0242797775188b8f0420386c5";
- sha256 = "0xfmvicagqccscxf45n04c25c7fqsnfk8mp8s90rnzlyr66gdck1";
+ rev = "6480e585a0e9d036d11aaf28bcee97e8e9b77c2e";
+ sha256 = "0p3hqxawp18q43ws6506cnndi49f3gxzmai0x2qch7h42dgh1cb8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin";
@@ -20143,12 +20361,12 @@
morlock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "morlock";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchFromGitHub {
owner = "tarsius";
repo = "morlock";
- rev = "185e3679ebeef3dc58555301e0958e864de775e5";
- sha256 = "0kjqdm6kzhgjmfdj4n95ivffw1wqf4r3gk62fvhfi4w29g7wd16j";
+ rev = "5845b60c705e8db88ce790b0b12cd8b917e1e5a5";
+ sha256 = "1a6kwpanwcnipsq0dc99r4iiz9xa2k883syj0kbk544dxgf338xj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b6ef53bbc80edda12a90a8a9705fe14415972833/recipes/morlock";
@@ -20161,6 +20379,27 @@
license = lib.licenses.free;
};
}) {};
+ mosey = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "mosey";
+ version = "0.1";
+ src = fetchFromGitHub {
+ owner = "alphapapa";
+ repo = "mosey.el";
+ rev = "4d28bf359242477a45994336c2ce37243965c65e";
+ sha256 = "1xakw1q5m3iahvj7xapyi008pr2nrl3msgdfdfsk561ci7bc2008";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/76a9a43eea68db9f82c07677235c481a6f243aa2/recipes/mosey";
+ sha256 = "0zprzr5aqv77kmg1ki9w6fw1nc2ap6yqjl4ak05a1i9cq8g6nf3m";
+ name = "mosey";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/mosey";
+ license = lib.licenses.free;
+ };
+ }) {};
move-dup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "move-dup";
@@ -20395,12 +20634,12 @@
multi-line = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
melpaBuild {
pname = "multi-line";
- version = "0.1.4";
+ version = "0.1.5";
src = fetchFromGitHub {
owner = "IvanMalison";
repo = "multi-line";
- rev = "329551143764c4106e717bce77a493bd20b72cb8";
- sha256 = "1bvz3h394mmnc3r4k121nnks5ha15wlz53708hda993cs6r8dqvb";
+ rev = "778c7510b7f066f53cf1f96a6ad1079fda5dc1f7";
+ sha256 = "0lr1i2a4fw40iz8qz2zqch63ci9pwvrri219phv22kn76jqn39mh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8eee6798a0ba71d437a1cbf82e360a5b60eafb/recipes/multi-line";
@@ -20539,6 +20778,27 @@
license = lib.licenses.free;
};
}) {};
+ nameless = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "nameless";
+ version = "1.0.2";
+ src = fetchFromGitHub {
+ owner = "Malabarba";
+ repo = "Nameless";
+ rev = "ab1a5c589378334eafca105af1a17f73b9065423";
+ sha256 = "107q1rximjnag9r9vgwh0iv687i3rsscbdnjc46f8l16j6vi4n7d";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8e4ee4dae5f32a8d445dc0cc2455c1f7075c9b3d/recipes/nameless";
+ sha256 = "14agx54h2vqfb0656n12z761ywyxsdskd6xa1ccar70l9vwj85vq";
+ name = "nameless";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/nameless";
+ license = lib.licenses.free;
+ };
+ }) {};
names = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "names";
@@ -20752,12 +21012,12 @@
neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "neotree";
- version = "0.2.1";
+ version = "0.5";
src = fetchFromGitHub {
owner = "jaypei";
repo = "emacs-neotree";
- rev = "c4f32b489fb1f5f00897a7dbb58a27ee704f5493";
- sha256 = "1gmi0xxwkh33w5gxc8488m1vv6ycizqhlw1kpn81zhqdzzq3s06n";
+ rev = "ba1f4bacd97c99d55ad37e5940bd7567d2ae50d4";
+ sha256 = "1a8riwz37sws2g2992zj6y8q4ypr76gxfwril6vnfig367anv4js";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree";
@@ -20773,12 +21033,12 @@
nginx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nginx-mode";
- version = "1.1.4";
+ version = "1.1.6";
src = fetchFromGitHub {
owner = "ajc";
repo = "nginx-mode";
- rev = "8a296e30b01adbc40d1aa9ccde369a972ac5ceab";
- sha256 = "08bpyk0brx0x2l0y8hn8zpkaxb2ndmxz22kzxxypj6hdz303wf38";
+ rev = "304c9e2dbe884645661e3f133c11217a2b4d4274";
+ sha256 = "1i9yh55zi7ml4i9nfjgvyz62y7id3c9fszs0h41skdzjfs9x5p6j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/nginx-mode";
@@ -20836,12 +21096,12 @@
nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nix-buffer";
- version = "1.2.2";
+ version = "1.2.3";
src = fetchFromGitHub {
owner = "shlevy";
repo = "nix-buffer";
- rev = "eb28bf99c3562cfda07f312ca49e0b594f0ff81b";
- sha256 = "148iyy8ma1n5a3biyal5rafxpp0zzn81nyy06jlzrkzjy44iyzwi";
+ rev = "2e2324c7f3a3ef27c9cb9cc3945cd82bec6b7755";
+ sha256 = "18ys3ddla3z733r4jf2nnfkllclrq496i08pfiyvkj6l3jnghzx0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer";
@@ -20980,11 +21240,11 @@
}) {};
notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "notmuch";
- version = "0.23";
+ version = "0.23.1";
src = fetchgit {
url = "git://git.notmuchmail.org/git/notmuch";
- rev = "6cd6561aabcd24d033b592aa4503aaa3c06d241c";
- sha256 = "0hiw1da6zdcr47znmxm9mm7r1318va026bq6jqvby61rbhzj2ny7";
+ rev = "ad517e9195a29b26955999c6e11fc37c73dbc01e";
+ sha256 = "0g1xybi4ndhvmnxgzxbp3x8kwg69jp3idf8x1asljcfsm6qhvr5i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -21573,6 +21833,27 @@
license = lib.licenses.free;
};
}) {};
+ opener = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+ melpaBuild {
+ pname = "opener";
+ version = "0.2.1";
+ src = fetchFromGitHub {
+ owner = "0robustus1";
+ repo = "opener.el";
+ rev = "ad3c65a5a748230bf07c18f56b1998ac03e3807a";
+ sha256 = "178h7sbpgsn0xl93j7375f2ahmqcszmbl3f7mfb6vgjmm791q03p";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c5a448f1936f46176bc2462eb03955a0c19efb9e/recipes/opener";
+ sha256 = "0fhny4m7x19wnlnr19s4rkl04dkx95yppd51jzrkr96xiznw97s7";
+ name = "opener";
+ };
+ packageRequires = [ cl-lib emacs request ];
+ meta = {
+ homepage = "https://melpa.org/#/opener";
+ license = lib.licenses.free;
+ };
+ }) {};
opensource = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }:
melpaBuild {
pname = "opensource";
@@ -21681,12 +21962,12 @@
org-beautify-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-beautify-theme";
- version = "0.2";
+ version = "0.3.1";
src = fetchFromGitHub {
owner = "jonnay";
repo = "org-beautify-theme";
- rev = "152918e600c36400068b3d8849fb8b01882ce8c3";
- sha256 = "0414pi4yrzn87kfij83njwdw7aczx4ga6z7kq4miq2fh7cjq8bvj";
+ rev = "7b7a7cbd4f25f77e8bd81783f517b2b182220fd9";
+ sha256 = "0nqw4apv642vqbjjqbi960zim9lkbnaszrlasf25c9fnzdg1m134";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f55f1ee9890f720e058401a052e14c7411252967/recipes/org-beautify-theme";
@@ -22537,12 +22818,12 @@
orglink = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "orglink";
- version = "1.1.0";
+ version = "1.1.1";
src = fetchFromGitHub {
owner = "tarsius";
repo = "orglink";
- rev = "4e3e6d920a74fd32a57d5722f81293428e9d8a46";
- sha256 = "0yjnnrrcvbsq41dpw8cz8gv6q3jd626y1k4fgzsimyciz9l23w11";
+ rev = "3b617ba7290ee550caab1aa055a6bedabe33d6fd";
+ sha256 = "0d1i30jbfbv0hm77sf278ism28ds5lz7675ji8f1gf01rfkchjbn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/be9b8e97cda6af91d54d402887f225e3a0caf055/recipes/orglink";
@@ -22912,6 +23193,27 @@
license = lib.licenses.free;
};
}) {};
+ package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "package-lint";
+ version = "0.3";
+ src = fetchFromGitHub {
+ owner = "purcell";
+ repo = "package-lint";
+ rev = "93fdd7b51ad7456387b905ff4c9b104d0b3089a8";
+ sha256 = "17swzcd58zh7yf221pfk8pmz8yhx2dsi2ad1y6lb2xpxxc5csflm";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
+ sha256 = "0w7nkj4yz5yqmhr3mr7kxa6aqqfs75m3l2578s39940a5sdzirwy";
+ name = "package-lint";
+ };
+ packageRequires = [ cl-lib emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/package-lint";
+ license = lib.licenses.free;
+ };
+ }) {};
package-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "package-plus";
@@ -23186,12 +23488,12 @@
paren-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "paren-face";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchFromGitHub {
owner = "tarsius";
repo = "paren-face";
- rev = "7b115519d668301633f31a9f3d03b5e36d0541d7";
- sha256 = "0f128gqn170s6hl62n44i9asais75ns1mpvb4l8vzy1sc0v16c0k";
+ rev = "fd8b9a863f0e15e8feeab862d0f67ab35ef18be3";
+ sha256 = "08j4kgvbx7fr3f0243508chbgd3bh9i6dhbqkndqj93zmbxxdhcw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d398398d1d5838dc4985a06515ee668f0f566aab/recipes/paren-face";
@@ -23225,22 +23527,22 @@
license = lib.licenses.free;
};
}) {};
- parinfer = callPackage ({ aggressive-indent, cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "parinfer";
- version = "0.3.1";
+ version = "0.4.4";
src = fetchFromGitHub {
owner = "DogLooksGood";
repo = "parinfer-mode";
- rev = "710f203c3103016815c8d21369fe77e34103b0f9";
- sha256 = "1b92ksjpi3pzn97jgwx78vz10p3a6459j2mgcwb249zgzvb0lprx";
+ rev = "3831280b746049ab0dd76c4ab1facf35a7e91ff5";
+ sha256 = "14wj10yc0qg1g9sky8sgrlimc9a4fxk1jxvmacswb71s51vm906n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer";
sha256 = "05w4w7j6xyj19dm63073amd4n7fw4zm3qnn4x02fk2011iw8fq7i";
name = "parinfer";
};
- packageRequires = [ aggressive-indent cl-lib dash ];
+ packageRequires = [ cl-lib dash ];
meta = {
homepage = "https://melpa.org/#/parinfer";
license = lib.licenses.free;
@@ -23267,15 +23569,36 @@
license = lib.licenses.free;
};
}) {};
+ parsec = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "parsec";
+ version = "0.1.2";
+ src = fetchFromGitHub {
+ owner = "cute-jumper";
+ repo = "parsec.el";
+ rev = "34521c605fe525cc9b8f7b0e4ca991ca1eb25218";
+ sha256 = "1fylcg7m95naz377ia2g9iyysaj64zd2x0warqdzs8isbpwj3cmc";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/248aaf5ff9c98cd3e439d0a26611cdefe6b6c32a/recipes/parsec";
+ sha256 = "1p3364sv5r868xjj1411xqj4acxqmbzcdl900sd03585ql5wbypj";
+ name = "parsec";
+ };
+ packageRequires = [ cl-lib emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/parsec";
+ license = lib.licenses.free;
+ };
+ }) {};
pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }:
melpaBuild {
pname = "pass";
- version = "1.4";
+ version = "1.5";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "pass";
- rev = "6e5f557f3430934fdf78d99d93d2456c474e4bde";
- sha256 = "0crf97jjmhvnxc9d089qfi9m5qdbpxiv7ncacp7m3xasxy9sd7cb";
+ rev = "d89a0f82b9c606d59d6f3440825c1c0bb14b1455";
+ sha256 = "15mk90dbwq5qbb7yv1gliq156lhc3ha576nkly4n7jl44v2f3c23";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass";
@@ -23604,12 +23927,12 @@
persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "persp-mode";
- version = "2.9";
+ version = "2.9.2";
src = fetchFromGitHub {
owner = "Bad-ptr";
repo = "persp-mode.el";
- rev = "56bc86c345be1a9fcea8acdf340cf87fa1869400";
- sha256 = "1hcz5ld259vsfcx6mfqm8raksi0nrndh21bn712ij0bx6gmy7vq1";
+ rev = "6fd464a3f5038b34751ec3d07913575906f38ab1";
+ sha256 = "0v6abr2x4xnv6qi8az3ki330z7v5vc4b0ibxqzwlq9mzqlqhnpsl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode";
@@ -23979,6 +24302,27 @@
license = lib.licenses.free;
};
}) {};
+ plantuml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "plantuml-mode";
+ version = "1.1.0";
+ src = fetchFromGitHub {
+ owner = "skuro";
+ repo = "plantuml-mode";
+ rev = "2b7d79688608a5f328b95610edcdd871278fbd29";
+ sha256 = "1pmnz01k3n4jjkl1p31lcfh8j6g3zpr78p8f2wazdlgcl14g7pjz";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a658eb8085f2bf413c276af19c77597132cf569b/recipes/plantuml-mode";
+ sha256 = "03srbg34512vxcqn95q4r7h2aqbqq0sd5c9ffnbx2a75vsblqc6h";
+ name = "plantuml-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/plantuml-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
platformio-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
melpaBuild {
pname = "platformio-mode";
@@ -24148,12 +24492,12 @@
ponylang-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ponylang-mode";
- version = "0.0.7";
+ version = "0.0.8";
src = fetchFromGitHub {
owner = "SeanTAllen";
repo = "ponylang-mode";
- rev = "cab4db97aacb9b5e05d6f0175154039a6b068cff";
- sha256 = "0by7klp7imy7zgc37wsiil86y6i2h1wfwfyifc2cf0jn5dsvfikw";
+ rev = "bdc549e2658f4662f462e0c233b4825c761288cd";
+ sha256 = "0v55bdj3vhf260addgsim6q4rwfzyvhqswxan4qqcq6acgi1liw4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7d51adec3c6519d6ffe9b3f7f8a86b4dbc2c9817/recipes/ponylang-mode";
@@ -24508,8 +24852,8 @@
version = "0.7";
src = fetchhg {
url = "https://bitbucket.com/piranha/project-root";
- rev = "fcd9df2eadca";
- sha256 = "08dd2y6hdsj1rxcqa2hnjypnn9c2z43y7z2hz0fi4vny547qybz8";
+ rev = "843ca1f4ab2b";
+ sha256 = "0nw02f5lmbqdfnw93d3383sdxx1d31szk23zvjlrmmdwv2124281";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/project-root";
@@ -24795,27 +25139,6 @@
license = lib.licenses.free;
};
}) {};
- puml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "puml-mode";
- version = "0.6.6";
- src = fetchFromGitHub {
- owner = "skuro";
- repo = "puml-mode";
- rev = "ae1cd8eb21d3af33bc60d4bfa39a90b8f49b7011";
- sha256 = "12csnmas5n0r356hwrqgx4lb72ns4mdbfkh5dw5jss377akv12gr";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/c0c28ccef208035fd0bdd648771825c1d10f42ff/recipes/puml-mode";
- sha256 = "131ghjq6lsbhbx5hdg36swnkqijdb9bx6zg73hg0nw8qk0z742vn";
- name = "puml-mode";
- };
- packageRequires = [ emacs ];
- meta = {
- homepage = "https://melpa.org/#/puml-mode";
- license = lib.licenses.free;
- };
- }) {};
punctuality-logger = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "punctuality-logger";
@@ -24863,14 +25186,14 @@
pname = "puppet-mode";
version = "0.3";
src = fetchFromGitHub {
- owner = "lunaryorn";
+ owner = "voxpupuli";
repo = "puppet-mode";
rev = "d943149691abd7b66c85d58aee9657bfcf822c02";
sha256 = "0xr3s56p6fbm6wgw17galsl3kqvv8c7l1l1qvbhbay39yzs4ff14";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/ca67e3241b3fe5037b8d6a8e4f1104d9a46a01b1/recipes/puppet-mode";
- sha256 = "1s2hap6fs6rg5q80dmzhaf4qqaf5sglhs8p896i3i5hq51w0ciyc";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode";
+ sha256 = "1qn71j6fkwnrsq1s6fhfcxhic3rbspg5cy9n7jv451ji7ywyhakf";
name = "puppet-mode";
};
packageRequires = [ cl-lib emacs pkg-info ];
@@ -26622,6 +26945,26 @@
license = lib.licenses.free;
};
}) {};
+ secretaria = callPackage ({ alert, emacs, f, fetchgit, fetchurl, lib, melpaBuild, org, s }:
+ melpaBuild {
+ pname = "secretaria";
+ version = "0.2.4";
+ src = fetchgit {
+ url = "https://bitbucket.org/shackra/secretaria.el";
+ rev = "aae30bfc93fa5ea846bce086b22321c46b94ff7b";
+ sha256 = "18ad7q2a131gpvjj8923vp06zh0zfdy1589vs3f09v16aazbcfqc";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7b4c9ccbf2eeaa290f3b9d1e5eaaeb5b5547b365/recipes/secretaria";
+ sha256 = "1a8jf91wplzazssh0s8ld0g8rp57gdfvxlsyn643w3mbp3ny8ybv";
+ name = "secretaria";
+ };
+ packageRequires = [ alert emacs f org s ];
+ meta = {
+ homepage = "https://melpa.org/#/secretaria";
+ license = lib.licenses.free;
+ };
+ }) {};
sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
melpaBuild {
pname = "sekka";
@@ -26772,12 +27115,12 @@
sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sexy-monochrome-theme";
- version = "1.0";
+ version = "1.5.2";
src = fetchFromGitHub {
owner = "nuncostans";
repo = "sexy-monochrome-theme";
- rev = "64570387a30ec5ac685cb11824ee24f8890572e1";
- sha256 = "0fbm7gqg17blfpb5lybqvqw9qifsqjiprw65ih3asvrgynrxh2ra";
+ rev = "dd582a45a4e13891935ab68f030d8c2d755fa6a5";
+ sha256 = "01jv7raxjyd37lipl05kl1892lz28ig292icik8l30y0p5gp8qgy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9a09ffb7d271773f6cfa7c7eeaba45a717a5bdca/recipes/sexy-monochrome-theme";
@@ -27297,12 +27640,12 @@
slamhound = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "slamhound";
- version = "1.5.4";
+ version = "1.5.5";
src = fetchFromGitHub {
owner = "technomancy";
repo = "slamhound";
- rev = "2f896d6ba15d09aae66b5fdecc0d855f6b03abc9";
- sha256 = "09ccdgg2wgw3xmlkpjsaqmnmf7f8rhjy4g6ypsn1sk5rgbgk8aj8";
+ rev = "7e38841ecdda7b3b569cca0b96c155ae2d3d433d";
+ sha256 = "1kiczjqa1jhs24lgvizcs355rivx59psxw0fixc9yj8fgld7r4xs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/54c191408ceb09ca21ef52df171f02d700aee5ba/recipes/slamhound";
@@ -27693,6 +28036,27 @@
license = lib.licenses.free;
};
}) {};
+ smmry = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "smmry";
+ version = "0.0.3";
+ src = fetchFromGitHub {
+ owner = "microamp";
+ repo = "smmry.el";
+ rev = "b7ee765337fa627a6c59eb4f2a91df5d280ac6df";
+ sha256 = "0hzs8xi7n3bsqwm3nlm3vk8p2p33ydwxpwk9wp3325g03jl921in";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ba2d4be4dd4d6c378eabd833f05a944afa21817b/recipes/smmry";
+ sha256 = "05ikcvyr74jy3digd0ad443h5kf11w29hgnmb71bclm3mfslh5wn";
+ name = "smmry";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/smmry";
+ license = lib.licenses.free;
+ };
+ }) {};
smooth-scroll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "smooth-scroll";
@@ -27756,6 +28120,27 @@
license = lib.licenses.free;
};
}) {};
+ snapshot-timemachine-rsnapshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq, snapshot-timemachine }:
+ melpaBuild {
+ pname = "snapshot-timemachine-rsnapshot";
+ version = "0.3";
+ src = fetchFromGitHub {
+ owner = "NicolasPetton";
+ repo = "snapshot-timemachine-rsnapshot";
+ rev = "4ff6b96219f4da576141e376b0348813c1c25615";
+ sha256 = "0krb1ziyjldyq27sp0phmygm1p9lssp251ycj08gdczbbfpw4lsa";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/94358fb8d1486491903c331d9e90ba5198117aa8/recipes/snapshot-timemachine-rsnapshot";
+ sha256 = "0fxijd94p961ab0p4ddmhja4bfrif2d87v32g4c41amc1klyf25r";
+ name = "snapshot-timemachine-rsnapshot";
+ };
+ packageRequires = [ seq snapshot-timemachine ];
+ meta = {
+ homepage = "https://melpa.org/#/snapshot-timemachine-rsnapshot";
+ license = lib.licenses.free;
+ };
+ }) {};
solarized-theme = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "solarized-theme";
@@ -27822,12 +28207,12 @@
sotlisp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sotlisp";
- version = "1.5.2";
+ version = "1.6.2";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "speed-of-thought-lisp";
- rev = "b67364d4825a9bf0a22261809ee9e9060b268198";
- sha256 = "0xykm4yayb8gw83arv5p205cx18j14q9407rqw3sbcj9cj5nbk34";
+ rev = "fffe8d0b42b143a2e7df0470d9049fa57b6ecac5";
+ sha256 = "0j5zwb1ypqps30126w2684lmjh8ia4qxg8inlajcbv8i3pbai7k6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/sotlisp";
@@ -28200,12 +28585,12 @@
stan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "stan-mode";
- version = "9.1.0";
+ version = "9.2.0";
src = fetchFromGitHub {
owner = "stan-dev";
repo = "stan-mode";
- rev = "62109483b39c6dc20e1b55bd833c9f8ea38e7118";
- sha256 = "0jnfhb49hi6fydffhdj1kkhrsc45zjsnm43djbsgzdnd6abbfhnr";
+ rev = "45b8242611fe0437fcff48f5f4f7d8f0552531ac";
+ sha256 = "14yv57grsw3zyjcqasaanx8g2skix0i3w1f5r1fng3sgwclwbkdw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/67a44a0abe675238b10decdd612b67e418caf34b/recipes/stan-mode";
@@ -28221,12 +28606,12 @@
stan-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, stan-mode, yasnippet }:
melpaBuild {
pname = "stan-snippets";
- version = "9.1.0";
+ version = "9.2.0";
src = fetchFromGitHub {
owner = "stan-dev";
repo = "stan-mode";
- rev = "62109483b39c6dc20e1b55bd833c9f8ea38e7118";
- sha256 = "0jnfhb49hi6fydffhdj1kkhrsc45zjsnm43djbsgzdnd6abbfhnr";
+ rev = "45b8242611fe0437fcff48f5f4f7d8f0552531ac";
+ sha256 = "14yv57grsw3zyjcqasaanx8g2skix0i3w1f5r1fng3sgwclwbkdw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eda8539b7d8da3a458a38f7536ed03580f9088c3/recipes/stan-snippets";
@@ -28530,22 +28915,22 @@
license = lib.licenses.free;
};
}) {};
- suggest = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }:
+ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }:
melpaBuild {
pname = "suggest";
- version = "0.1";
+ version = "0.2";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "suggest.el";
- rev = "785818164ce0823360409fd6e8d12e656409fdd3";
- sha256 = "17xmpr2ir30x9nzb8fcbss7vnk1496sa1bxa8q8q1x778sh4728c";
+ rev = "588ec8b9476c8d7f5f16018a7aaf90ee828fb4f5";
+ sha256 = "1ckvsckqlbdcw6nbsrh9xizbpkr7r88ks39av8dhn5n412c5jm4g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest";
sha256 = "12vvakqqzmmqq5yynpd4wf4lnb0yvcnz065kni996sy7rv7rh83q";
name = "suggest";
};
- packageRequires = [ dash f loop s ];
+ packageRequires = [ dash emacs f loop s ];
meta = {
homepage = "https://melpa.org/#/suggest";
license = lib.licenses.free;
@@ -28680,12 +29065,12 @@
swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "swift-mode";
- version = "2.1.2";
+ version = "2.2";
src = fetchFromGitHub {
owner = "chrisbarrett";
repo = "swift-mode";
- rev = "92119801203e2991543cbf943cc101673bd190bd";
- sha256 = "182lzswrkrzihcd5vmcwq94aqn2aj1j38ra0j3vcgk114rayy6dk";
+ rev = "a07be7a34d4f677a28878f4b72a2095addc628fd";
+ sha256 = "14l8cm82fx0p1xcbf48a303llx2p9p0i17ly1vx8y5ff3a0i0l0h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode";
@@ -30259,12 +30644,12 @@
use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "use-package";
- version = "2.2";
+ version = "2.3";
src = fetchFromGitHub {
owner = "jwiegley";
repo = "use-package";
- rev = "27fdfba5b05fd51345dc2b947ae6342266fdb22b";
- sha256 = "1dzkvinp1h1w48lx44x9bn1b54c83m1wl5v8h99l76fh1y0jw7b4";
+ rev = "cd58b268a8a025451c11c3cb1ba18d4f27f245da";
+ sha256 = "14x01dg7fgj4icf8l8w90pksazc0sn6qrrd0k3xjr2zg1wzdcang";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package";
@@ -30406,12 +30791,12 @@
vdirel = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, org-vcard, seq }:
melpaBuild {
pname = "vdirel";
- version = "0.1.0";
+ version = "0.2.0";
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "vdirel";
- rev = "aab19692e2c2084a0d5b554a96a64a2e3e2a3d09";
- sha256 = "034475m2d2vlrlc2l88gdx0ga3krsdh08wkjxwnbb2dfyz3p8r9v";
+ rev = "4232676e93ca5ace8e51f6605bec223c3205beea";
+ sha256 = "0jdjg50f6my9952frl6asi8zk0i8b4hva26wm7pi8zk423pydr30";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/72b5ea3f4444c3de73d986a28e1d12bf47c40246/recipes/vdirel";
@@ -30906,6 +31291,27 @@
license = lib.licenses.free;
};
}) {};
+ webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+ melpaBuild {
+ pname = "webpaste";
+ version = "1.0.0";
+ src = fetchFromGitHub {
+ owner = "etu";
+ repo = "webpaste.el";
+ rev = "58f66efcb8f061d25bf474b14f3867ae856f6b1d";
+ sha256 = "0qczw7pdkjgqmjibwyw8psxhqy1bx183qzni832qx59sds15j13q";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
+ sha256 = "1pqqapslb5wxfrf1ykrj5jxcl43pix17lawgdqrqkv5fyxbhmfpm";
+ name = "webpaste";
+ };
+ packageRequires = [ cl-lib emacs request ];
+ meta = {
+ homepage = "https://melpa.org/#/webpaste";
+ license = lib.licenses.free;
+ };
+ }) {};
weechat = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tracking }:
melpaBuild {
pname = "weechat";
@@ -31182,12 +31588,12 @@
win-switch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "win-switch";
- version = "1.1";
+ version = "1.1.4";
src = fetchFromGitHub {
owner = "genovese";
repo = "win-switch";
- rev = "a0da96c23e8775a2dfdbe55ed3ec5b57f1ebb26a";
- sha256 = "0ib20zl8l1fs69ca9rry27qz69sgf6ws1ca5nhm5llvpkjcgv53i";
+ rev = "954eb5e4c5737f0c06368c42a7f1c3dd374d782f";
+ sha256 = "1xpx4sc1g1w8w0yc39k2dys83m8skrpvi745bfrzdl47jngrf54h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/win-switch";
@@ -31311,8 +31717,8 @@
version = "0.9.1";
src = fetchhg {
url = "https://bitbucket.com/ArneBab/wisp";
- rev = "a55b6dd96558";
- sha256 = "1n0a99v2gwr12dhgg0yw42lm7ggcq9b85qn1c29k66l7jz637mfp";
+ rev = "b9e861ccb52d";
+ sha256 = "0gk1nclvkwdx20m2cnhfyb4l9jfxkvya8fifvfgry8swzbmab9h2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -31349,12 +31755,12 @@
with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "with-editor";
- version = "2.5.5";
+ version = "2.5.7";
src = fetchFromGitHub {
owner = "magit";
repo = "with-editor";
- rev = "c05420c75edaca71b15326d1fba629be9054749f";
- sha256 = "1nblk82yxmfxqnjz87xyjcak9jg9rk68657bxajh0l8rlf918yd4";
+ rev = "1a6c49bfdef5aacce14b76f06adda3b66d1f3847";
+ sha256 = "1ignivq4df5a716p7n4cm6jbv9zly9b1ssn39a49wzvy9ch5m76q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor";
@@ -31727,12 +32133,12 @@
xref-js2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
melpaBuild {
pname = "xref-js2";
- version = "1.3";
+ version = "1.5";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "xref-js2";
- rev = "b4bd3b992220a9f8c38b313e4fbf4eeddc07176a";
- sha256 = "1kmlya0bwgm2krwc6j4gp80579sf5azz08l8d7pydw69rckv6ji0";
+ rev = "7e2bc6a8dad08a493d11d3554f6374584846b9e6";
+ sha256 = "1mmd27miv32sl8cj7qhy09yfh7v1zgw7rv4fdwk96msvd4qfdkqd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b5dab444ead98210b4ab3a6f9a61d013aed6d5b7/recipes/xref-js2";
@@ -31876,14 +32282,14 @@
pname = "yasnippet";
version = "0.10.0";
src = fetchFromGitHub {
- owner = "capitaomorte";
+ owner = "joaotavora";
repo = "yasnippet";
rev = "dc3e4ca3454e8ffcd9a9eae312dba5b3657f9b11";
sha256 = "16akdsqb74b4lriywidszmyyc8irq5dws8ya3mcja87kvih76148";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/489687c6c41399a3bca8148a62d25581726a847d/recipes/yasnippet";
- sha256 = "1j6hcpzxljz1axh0xfbwr4ysbixkwgxawsvsgicls8r8kl2xvjvf";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
+ sha256 = "1r37vz5b8nj6hr6c2ki9fdbrs3kkb4zwimh8r4ixm10kdkk5jqds";
name = "yasnippet";
};
packageRequires = [ cl-lib ];
@@ -32042,12 +32448,12 @@
zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild, powerline, s }:
melpaBuild {
pname = "zerodark-theme";
- version = "3.5";
+ version = "3.6";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "zerodark-theme";
- rev = "e9205855c61c9afbfef061c3fd3703c3f7b39095";
- sha256 = "1lfhr4hxbr522nfd7blx21k8kfrwawqrqg6s8hx2hcjzjabfssjz";
+ rev = "0c662244a7d619938ec3673c21c735c19ee4e659";
+ sha256 = "1c0r12dnhax5amiy01y0npm57r4wg8ln0ay4bick1f2jgc47g36k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme";
diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix
index d7ca335214f..822f9e5f1bd 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 = "20161003";
+ version = "20161024";
src = fetchurl {
- url = "http://orgmode.org/elpa/org-20161003.tar";
- sha256 = "1q59s9ir9x8ig4nfx6vbq3dj3ah01sjwvqax2x2dqxn2mk2igr4x";
+ url = "http://orgmode.org/elpa/org-20161024.tar";
+ sha256 = "0yph2wiwl426wn1vgbwxgnh8lr6x40swbpzzl87vfzfh5wjx4l1h";
};
packageRequires = [];
meta = {
@@ -14,10 +14,10 @@
}) {};
org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org-plus-contrib";
- version = "20161003";
+ version = "20161024";
src = fetchurl {
- url = "http://orgmode.org/elpa/org-plus-contrib-20161003.tar";
- sha256 = "0phi7jdkv7m4y7q7ilkz0dfw9g11d52dd34pv41dvawf032wvwn7";
+ url = "http://orgmode.org/elpa/org-plus-contrib-20161024.tar";
+ sha256 = "1pr4mnf8mrxnlnn61y3w1jkwf1d7wlf9v8j65vvs1c26rbnzms85";
};
packageRequires = [];
meta = {
diff --git a/pkgs/applications/editors/hecate/default.nix b/pkgs/applications/editors/hecate/default.nix
new file mode 100644
index 00000000000..8aea8508aef
--- /dev/null
+++ b/pkgs/applications/editors/hecate/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ version = "0.0.1";
+ name = "hecate-${version}";
+
+ src = fetchFromGitHub {
+ owner = "evanmiller";
+ repo = "hecate";
+ rev = "v${version}";
+ sha256 = "0ymirsd06z3qa9wi59k696mg8f4mhscw8gc5c5zkd0n3n8s0k0z8";
+ };
+
+ goPackagePath = "hecate";
+
+ goDeps = ./deps.nix;
+
+ meta = with stdenv.lib; {
+ inherit (src.meta) homepage;
+ description = "terminal hex editor";
+ longDescription = "The Hex Editor From Hell!";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ ramkromberg ];
+ platforms = with platforms; linux;
+ };
+}
diff --git a/pkgs/applications/editors/hecate/deps.nix b/pkgs/applications/editors/hecate/deps.nix
new file mode 100644
index 00000000000..c9d94934a44
--- /dev/null
+++ b/pkgs/applications/editors/hecate/deps.nix
@@ -0,0 +1,29 @@
+[
+ {
+ goPackagePath = "github.com/nsf/termbox-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/nsf/termbox-go";
+ rev = "b6acae516ace002cb8105a89024544a1480655a5";
+ sha256 = "0zf95qdd5bif9rw03hqk87x7d905p373bvsj0bl4gi16spqjbdil";
+ };
+ }
+ {
+ goPackagePath = "github.com/edsrzf/mmap-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/edsrzf/mmap-go";
+ rev = "935e0e8a636ca4ba70b713f3e38a19e1b77739e8";
+ sha256 = "11a63wrjwfnchjhwqjp6yd5j0370ysppjgv31l5bmvvwps7whq9d";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-runewidth";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-runewidth";
+ rev = "737072b4e32b7a5018b4a7125da8d12de90e8045";
+ sha256 = "09ni8bmj6p2b774bdh6mfcxl03bh5sqk860z03xpb6hv6yfxqkjm";
+ };
+ }
+]
diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 325345e8718..96ed8532eae 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -120,12 +120,12 @@ in
{
clion = buildClion rec {
name = "clion-${version}";
- version = "2016.2.2";
+ version = "2016.2.3";
description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
- sha256 = "06aq3lfccki9203gjvibzj3gn9d82pc6s5z0m3fnf049zxk58ndi";
+ sha256 = "1gcglxmffq815r97wyy2wx1jsv467qyys8c0m5dv3yjdxknccbqd";
};
wmClass = "jetbrains-clion";
};
@@ -156,12 +156,12 @@ in
idea-community = buildIdea rec {
name = "idea-community-${version}";
- version = "2016.2.4";
+ version = "2016.2.5";
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
- sha256 = "0hk7z402qvkaa6hkhh4wsqxki2bnai5qkd2r0ngvy8kd71svrldz";
+ sha256 = "0d1pssnrn36fibwsyjh30fsd5hn7qw3nljdnwg40q52skilcdk0v";
};
wmClass = "jetbrains-idea-ce";
};
@@ -192,24 +192,24 @@ in
idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
- version = "2016.2.4";
+ version = "2016.2.5";
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz";
- sha256 = "165nchdnbyp85r2w0riv87j77lb7r492dkwrvm8q7qjnlfgznh7r";
+ sha256 = "0g8v3fw3610gyi25x489vlb72200rgb3b4rwh0igr4w35gwdv91h";
};
wmClass = "jetbrains-idea";
};
ruby-mine = buildRubyMine rec {
name = "ruby-mine-${version}";
- version = "2016.2.2";
+ version = "2016.2.4";
description = "The Most Intelligent Ruby and Rails IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
- sha256 = "1ck4axjbrvq2n1j2rvf9a2f7dqvalg2b8sqy9n9qkzdn04szaqsl";
+ sha256 = "14c1afkmny78vj434y46nja3v9smzcqsfdkhr83bqic1a0h4g84w";
};
wmClass = "jetbrains-rubymine";
};
@@ -288,12 +288,12 @@ in
webstorm = buildWebStorm rec {
name = "webstorm-${version}";
- version = "2016.2.2";
+ version = "2016.2.4";
description = "Professional IDE for Web and JavaScript development";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
- sha256 = "0n2fvhjasklshyfcbwwn6wahzld8x65bid08245awdqv33p87bq6";
+ sha256 = "1h61l44xnbcdb26q8ylb25sj3rs43nxki203i2jra2i6j5jzxrvg";
};
wmClass = "jetbrains-webstorm";
};
diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index c380d05302e..341b8063f66 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -12,10 +12,10 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "nano-${version}";
- version = "2.7.0";
+ version = "2.7.1";
src = fetchurl {
url = "mirror://gnu/nano/${name}.tar.xz";
- sha256 = "08cmnca3s377z74yjw1afz59l2h9s40wsa9wxw5y4x5f2jaz6spq";
+ sha256 = "1kapx0fyp0a0pvsdd1n59pm3acrimdrp7ciglg098wqxhdlvwp6z";
};
nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
buildInputs = [ ncurses ];
@@ -34,7 +34,10 @@ stdenv.mkDerivation rec {
homepage = http://www.nano-editor.org/;
description = "A small, user-friendly console text editor";
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ joachifm ];
+ maintainers = with maintainers; [
+ jgeerds
+ joachifm
+ ];
platforms = platforms.all;
};
}
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index 19678d241e6..57a684d5572 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey
, libtool, libuv, luajit, luaPackages, man, ncurses, perl, pkgconfig
-, unibilium, makeWrapper, vimUtils, xsel
+, unibilium, makeWrapper, vimUtils, xsel, gperf
, withPython ? true, pythonPackages, extraPythonPackages ? []
, withPython3 ? true, python3Packages, extraPython3Packages ? []
@@ -18,13 +18,13 @@ let
# Note: this is NOT the libvterm already in nixpkgs, but some NIH silliness:
neovimLibvterm = stdenv.mkDerivation rec {
name = "neovim-libvterm-${version}";
- version = "2015-11-06";
+ version = "2016-10-07";
src = fetchFromGitHub {
owner = "neovim";
repo = "libvterm";
- rev = "487f21dbf65f1c28962fef3f064603f415fbaeb2";
- sha256 = "1fig6v0qk0ylr7lqqk0d6x5yywb9ymh85vay4spw5b5r5p0ky7yx";
+ rev = "e0a3d4dbd44a9534bf7437ee98ceb26dabebf3ad";
+ sha256 = "131mcnbdq4wvsf280v4az8vnakr78yrwlaihzgr5s1wmfjvf6knf";
};
buildInputs = [ perl ];
@@ -60,13 +60,13 @@ let
neovim = stdenv.mkDerivation rec {
name = "neovim-${version}";
- version = "0.1.5";
+ version = "0.1.6";
src = fetchFromGitHub {
owner = "neovim";
repo = "neovim";
rev = "v${version}";
- sha256 = "1ihlgm2h7147xyd5wrwg61vsnmkqc9j3ghsida4g2ilr7gw9c85y";
+ sha256 = "0s8vqf4aym1d1h8yi0znpqw5rv9v3z64y5aha9dmynbwxa58q7pp";
};
enableParallelBuilding = true;
@@ -80,6 +80,7 @@ let
unibilium
luajit
luaPackages.lua
+ gperf
] ++ optional withJemalloc jemalloc
++ lualibs;
diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix
index 10522f449ae..df98264d969 100644
--- a/pkgs/applications/editors/neovim/qt.nix
+++ b/pkgs/applications/editors/neovim/qt.nix
@@ -3,7 +3,7 @@
}:
let # not very usable ATM
- version = "0.2.1";
+ version = "0.2.3";
in
stdenv.mkDerivation {
name = "neovim-qt-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
owner = "equalsraf";
repo = "neovim-qt";
rev = "v${version}";
- sha256 = "0mqs2f7l05q2ayj77czr5fnpr7fa00qrmjdjxglbwxdxswcsz88n";
+ sha256 = "0ichqph7nfw3934jf0sp81bqd376xna3f899cc2xg88alb4f16dv";
};
# It tries to download libmsgpack; let's use ours.
diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix
index 289de0ad91a..a23c5242a24 100644
--- a/pkgs/applications/editors/netbeans/default.nix
+++ b/pkgs/applications/editors/netbeans/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper, makeDesktopItem
-, gawk, jdk, perl, python, unzip, which
+, jdk, perl, python, unzip, which
}:
let
@@ -13,18 +13,15 @@ let
};
in
stdenv.mkDerivation {
- name = "netbeans-8.1";
+ name = "netbeans-8.2";
src = fetchurl {
- url = http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201.zip;
- sha256 = "1aaf132mndpgfbd5v8izqzp37hjs5gwqwd6zrb519fx0viz9aq5r";
+ url = http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101.zip;
+ sha256 = "0j092qw7aqfc9vpnvr3ix1ii94p4ik6frcnw708iyv4s9crqi65d";
};
buildCommand = ''
# Unpack and perform some path patching.
unzip $src
- patch -p1 <${./path.patch}
- substituteInPlace netbeans/platform/lib/nbexec \
- --subst-var-by AWK ${gawk}/bin/awk
patchShebangs .
# Copy to installation directory and create a wrapper capable of starting
@@ -35,14 +32,14 @@ stdenv.mkDerivation {
--prefix PATH : ${stdenv.lib.makeBinPath [ jdk which ]} \
--prefix JAVA_HOME : ${jdk.home} \
--add-flags "--jdkhome ${jdk.home}"
-
+
# Create desktop item, so we can pick it from the KDE/GNOME menu
mkdir -p $out/share/applications
cp ${desktopItem}/share/applications/* $out/share/applications
'';
-
+
buildInputs = [ makeWrapper perl python unzip ];
-
+
meta = {
description = "An integrated development environment for Java, C, C++ and PHP";
maintainers = [ stdenv.lib.maintainers.sander ];
diff --git a/pkgs/applications/editors/netbeans/path.patch b/pkgs/applications/editors/netbeans/path.patch
deleted file mode 100644
index 57b5730e137..00000000000
--- a/pkgs/applications/editors/netbeans/path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/netbeans/platform/lib/nbexec 2015-09-29 21:26:39.282600903 -0700
-+++ b/netbeans/platform/lib/nbexec 2015-09-29 21:26:58.977697858 -0700
-@@ -198,7 +198,7 @@
- SunOS*) awk=nawk ;;
- *) awk=awk ;;
- esac
-- jdk_version=$("${jdkhome}/bin/java" -version 2>&1 | "/usr/bin/${awk}" -F '"' '/version/ {print substr($2, 1, 3)}')
-+ jdk_version=$("${jdkhome}/bin/java" -version 2>&1 | "@AWK@" -F '"' '/version/ {print substr($2, 1, 3)}')
- if [ "$jdk_version" = "1.7" ] ; then
- jargs="$jargs $launcher_args"
- fi
diff --git a/pkgs/applications/editors/nvpy/default.nix b/pkgs/applications/editors/nvpy/default.nix
index 58893d08589..c9d86561fe2 100644
--- a/pkgs/applications/editors/nvpy/default.nix
+++ b/pkgs/applications/editors/nvpy/default.nix
@@ -1,6 +1,8 @@
-{ pkgs, fetchurl, tk, pythonPackages }:
+{ pkgs, fetchurl, tk, python2Packages }:
-pythonPackages.buildPythonApplication rec {
+let
+ pythonPackages = python2Packages;
+in pythonPackages.buildPythonApplication rec {
version = "0.9.7";
name = "nvpy-${version}";
@@ -9,22 +11,21 @@ pythonPackages.buildPythonApplication rec {
sha256 = "1rd3vlaqkg16iz6qcw6rkbq0jmyvc0843wa3brnvn1nz0kla243f";
};
- buildInputs = [tk];
-
- propagatedBuildInputs = [
- pythonPackages.markdown
- pythonPackages.tkinter
- pythonPackages.docutils
+ propagatedBuildInputs = with pythonPackages; [
+ markdown
+ tkinter
+ docutils
];
+ # No tests
+ doCheck = false;
+
postInstall = ''
install -dm755 "$out/share/licenses/nvpy/"
install -m644 LICENSE.txt "$out/share/licenses/nvpy/LICENSE"
install -dm755 "$out/share/doc/nvpy/"
install -m644 README.rst "$out/share/doc/nvpy/README"
-
- wrapProgram $out/bin/nvpy --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}"
'';
meta = with pkgs.lib; {
diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix
index 69f03f39271..89ae2e04eac 100644
--- a/pkgs/applications/editors/texstudio/default.nix
+++ b/pkgs/applications/editors/texstudio/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "texstudio";
- version = "2.11.0";
+ version = "2.11.2";
name = "${pname}-${version}";
altname="Texstudio";
src = fetchurl {
url = "mirror://sourceforge/texstudio/${name}.tar.gz";
- sha256 = "170e6d68952251e8c64589b0d147cb7692005e135cc6fc14579c6fd593f54307";
+ sha256 = "1p6ja5y5902y814f3f5mafh0y8vj682ghrarx1pbm4r5ap8x9z82";
};
buildInputs = [ qt4 qmake4Hook poppler_qt4 zlib pkgconfig ];
diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix
index a28890e2466..f6760895b57 100644
--- a/pkgs/applications/editors/vis/default.nix
+++ b/pkgs/applications/editors/vis/default.nix
@@ -1,9 +1,9 @@
{ stdenv, fetchFromGitHub, pkgconfig, makeWrapper, makeDesktopItem
, ncurses, libtermkey, lpeg, lua
, acl ? null, libselinux ? null
-, version ? "2016-08-24"
-, rev ? "010dcd60ffda37027908f2a0b20c751b83ca975e"
-, sha256 ? "0bpbyi5yq50zw0hkh326pmdcnm91paf1yz4853dcq63y0ddv89jp"
+, version ? "2016-10-09"
+, rev ? "b0c9b0063d0b9ed9a7f93c69779749130b353ff1"
+, sha256 ? "0g3242g3r2w38ld3w71f79qp7zzy3zhanff2nhwkwmyq89js8s90"
}:
stdenv.mkDerivation rec {
diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index f69c9706e37..f7983f71385 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -1,20 +1,21 @@
-{ stdenv, lib, callPackage, fetchurl, unzip, atomEnv, makeDesktopItem }:
+{ stdenv, lib, callPackage, fetchurl, unzip, atomEnv, makeDesktopItem,
+ makeWrapper, libXScrnSaver }:
let
- version = "1.5.1";
- rev = "07d663dc1bd848161edf4cd4ce30cce410d3d877";
+ version = "1.6.1";
+ rev = "9e4e44c19e393803e2b05fe2323cf4ed7e36880e";
- 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"
+ sha256 = if stdenv.system == "i686-linux" then "1aks84siflpjbd2s9y1f0vvvf3nas4f50cimjf25lijxzjxrlivy"
+ else if stdenv.system == "x86_64-linux" then "05kbi081ih64fadj4k74grkk9ca3wga6ybwgs5ld0bal4ilw1q6i"
+ else if stdenv.system == "x86_64-darwin" then "00p2m8b0l3pkf5k74szw6kcql3j1fjnv3rwnhy24wfkg4b4ah2x9"
else throw "Unsupported system: ${stdenv.system}";
urlBase = "https://az764295.vo.msecnd.net/stable/${rev}/";
urlStr = if stdenv.system == "i686-linux" then
- urlBase + "code-stable-code_${version}-1473369468_i386.tar.gz"
+ urlBase + "code-stable-code_${version}-1476372351_i386.tar.gz"
else if stdenv.system == "x86_64-linux" then
- urlBase + "code-stable-code_${version}-1473370243_amd64.tar.gz"
+ urlBase + "code-stable-code_${version}-1476373175_amd64.tar.gz"
else if stdenv.system == "x86_64-darwin" then
urlBase + "VSCode-darwin-stable.zip"
else throw "Unsupported system: ${stdenv.system}";
@@ -32,15 +33,18 @@ in
name = "code";
exec = "code";
icon = "code";
- comment = "Visual Studio Code is a code editor redefined and optimized for building and debugging modern web and cloud applications";
+ comment = ''
+ Code editor redefined and optimized for building and debugging modern
+ web and cloud applications
+ '';
desktopName = "Visual Studio Code";
genericName = "Text Editor";
categories = "GNOME;GTK;Utility;TextEditor;Development;";
};
buildInputs = if stdenv.system == "x86_64-darwin"
- then [ unzip ]
- else [ ];
+ then [ unzip makeWrapper libXScrnSaver ]
+ else [ makeWrapper libXScrnSaver ];
installPhase = ''
mkdir -p $out/lib/vscode $out/bin
@@ -59,14 +63,22 @@ in
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${atomEnv.libPath}:$out/lib/vscode" \
$out/lib/vscode/code
+
+ wrapProgram $out/bin/code \
+ --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1
'';
meta = with stdenv.lib; {
- description = "Visual Studio Code is an open source source code editor developed by Microsoft for Windows, Linux and OS X.";
+ description = ''
+ Open source source code editor developed by Microsoft for Windows,
+ Linux and OS X
+ '';
longDescription = ''
- Visual Studio Code is an open source source code editor developed by Microsoft for Windows, Linux and OS X.
- It includes support for debugging, embedded Git control, syntax highlighting, intelligent code completion, snippets, and code refactoring.
- It is also customizable, so users can change the editor's theme, keyboard shortcuts, and preferences.
+ Open source source code editor developed by Microsoft for Windows,
+ Linux and OS X. It includes support for debugging, embedded Git
+ control, syntax highlighting, intelligent code completion, snippets,
+ and code refactoring. It is also customizable, so users can change the
+ editor's theme, keyboard shortcuts, and preferences
'';
homepage = http://code.visualstudio.com/;
downloadPage = https://code.visualstudio.com/Updates;
diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix
index 5773718b0a4..fb6c76be079 100644
--- a/pkgs/applications/gis/grass/default.nix
+++ b/pkgs/applications/gis/grass/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite pkgconfig cairo
readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.client blas ]
- ++ (with pythonPackages; [ python dateutil wxPython30 numpy sqlite3 ]);
+ ++ (with pythonPackages; [ python dateutil wxPython30 numpy ]);
configureFlags = [
"--with-proj-share=${proj}/share/proj"
diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix
index 4b380ed1886..b123dcade1d 100644
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ b/pkgs/applications/graphics/gimp/2.8.nix
@@ -1,10 +1,10 @@
{ 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
-, pythonPackages, libart_lgpl, libexif, gettext, xorg }:
+, python2Packages, libart_lgpl, libexif, gettext, xorg }:
let
- inherit (pythonPackages) pygtk wrapPython python;
+ inherit (python2Packages) pygtk wrapPython python;
in stdenv.mkDerivation rec {
name = "gimp-${version}";
version = "2.8.18";
diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix
index ac3840a12a7..8aa2cf8f9f1 100644
--- a/pkgs/applications/graphics/gthumb/default.nix
+++ b/pkgs/applications/graphics/gthumb/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, gnome3, itstool, libxml2, pkgconfig, intltool,
exiv2, libjpeg, libtiff, gstreamer, libraw, libsoup, libsecret,
libchamplain, librsvg, libwebp, json_glib, webkit, lcms2, bison,
- flex, wrapGAppsHook }:
+ flex, hicolor_icon_theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = with gnome3;
[ itstool libxml2 intltool glib gtk gsettings_desktop_schemas dconf
exiv2 libjpeg libtiff gstreamer libraw libsoup libsecret libchamplain
- librsvg libwebp json_glib webkit lcms2 bison flex ];
+ librsvg libwebp json_glib webkit lcms2 bison flex hicolor_icon_theme defaultIconTheme ];
enableParallelBuilding = true;
diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix
index 16a05607da3..e9a0dccd30a 100644
--- a/pkgs/applications/graphics/imv/default.nix
+++ b/pkgs/applications/graphics/imv/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "imv-${version}";
- version = "2.1.2";
+ version = "2.1.3";
src = fetchgit {
url = "https://github.com/eXeC64/imv.git";
- rev = "3e6402456b00e29f659baf26ced10f3d7205cf63";
- sha256 = "0fhc944g7b61jrkd4wn1piq6dkpabsbxpm80pifx9dqmj16sf0pf";
+ rev = "e59d0e9e120f1dbde9ab068748a190e93978e5b7";
+ sha256 = "0j48dk1bcbh5541522qkn487637wcx104zckrnxa5g3nirfqa7r7";
};
buildInputs = [ SDL2 SDL2_ttf freeimage fontconfig ];
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index ce8a22fd90f..06b2fa63c7f 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, perlXMLParser, libXft
, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2
, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool
-, gsl, python, poppler, imagemagick, libwpg, librevenge
+, gsl, python2, poppler, imagemagick, libwpg, librevenge
, libvisio, libcdr, libexif, unzip, automake114x, autoconf
, boxMakerPlugin ? false # boxmaker plugin
}:
let
- pythonEnv = python.withPackages(ps: with ps; [ pyxml numpy lxml ]);
+ python2Env = python2.withPackages(ps: with ps; [ numpy lxml ]);
boxmaker = fetchurl {
# http://www.inkscapeforum.com/viewtopic.php?f=11&t=10403
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
# Python is used at run-time to execute scripts, e.g., those from
# the "Effects" menu.
- propagatedBuildInputs = [ pythonEnv ];
+ propagatedBuildInputs = [ python2Env ];
buildInputs = [
pkgconfig perl perlXMLParser libXft libpng zlib popt boehmgc
diff --git a/pkgs/applications/graphics/kipi-plugins/5.x.nix b/pkgs/applications/graphics/kipi-plugins/5.x.nix
new file mode 100644
index 00000000000..2f6cc8e4ece
--- /dev/null
+++ b/pkgs/applications/graphics/kipi-plugins/5.x.nix
@@ -0,0 +1,34 @@
+{
+ stdenv, fetchurl,
+ ecm,
+ karchive, kconfig, ki18n, kiconthemes, kio, kservice, kwindowsystem, kxmlgui,
+ libkipi, qtbase, qtsvg, qtxmlpatterns
+}:
+
+stdenv.mkDerivation rec {
+ name = "kipi-plugins-${version}";
+ version = "5.2.0";
+
+ src = fetchurl {
+ url = "http://download.kde.org/stable/digikam/digikam-${version}.tar.xz";
+ sha256 = "0q4j7iv20cxgfsr14qwzx05wbp2zkgc7cg2pi7ibcnwba70ky96g";
+ };
+
+ prePatch = ''
+ cd extra/kipi-plugins
+ '';
+
+ nativeBuildInputs = [ ecm ];
+ buildInputs = [
+ karchive kconfig ki18n kiconthemes kio kservice kwindowsystem kxmlgui libkipi
+ qtbase qtsvg qtxmlpatterns
+ ];
+
+ meta = {
+ description = "Plugins for KDE-based image applications";
+ license = stdenv.lib.licenses.gpl2;
+ homepage = http://www.digikam.org;
+ maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix
index c88c3337c92..20c01f77bbf 100644
--- a/pkgs/applications/graphics/mcomix/default.nix
+++ b/pkgs/applications/graphics/mcomix/default.nix
@@ -9,7 +9,7 @@ python27Packages.buildPythonApplication rec {
sha256 = "0fzsf9pklhfs1rzwzj64c0v30b74nk94p93h371rpg45qnfiahvy";
};
- propagatedBuildInputs = with python27Packages; [ pygtk pillow sqlite3 ];
+ propagatedBuildInputs = with python27Packages; [ pygtk pillow ];
meta = {
description = "Image viewer designed to handle comic books";
diff --git a/pkgs/applications/graphics/mtpaint/default.nix b/pkgs/applications/graphics/mtpaint/default.nix
new file mode 100644
index 00000000000..e8c22b37638
--- /dev/null
+++ b/pkgs/applications/graphics/mtpaint/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub
+, pkgconfig
+, freetype, giflib, gtk2, lcms2, libjpeg, libpng, libtiff, openjpeg, gifsicle
+}:
+
+stdenv.mkDerivation rec {
+ p_name = "mtPaint";
+ ver_maj = "3.49";
+ ver_min = "12";
+ name = "${p_name}-${ver_maj}.${ver_min}";
+
+ src = fetchFromGitHub {
+ owner = "wjaguar";
+ repo = p_name;
+ rev = "6aed1b0441f99055fc7d475942f8bd5cb23c41f8";
+ sha256 = "0bvf623g0n2ifijcxv1nw0z3wbs2vhhdky4n04ywsbjlykm44nd1";
+ };
+
+ buildInputs = [
+ pkgconfig
+ freetype giflib gtk2 lcms2 libjpeg libpng libtiff openjpeg gifsicle
+ ];
+
+ meta = {
+ description = "A simple GTK+1/2 painting program";
+ longDescription = ''
+ mtPaint is a simple GTK+1/2 painting program designed for
+ creating icons and pixel based artwork. It can edit indexed palette
+ or 24 bit RGB images and offers basic painting and palette manipulation
+ tools. It also has several other more powerful features such as channels,
+ layers and animation.
+ Due to its simplicity and lack of dependencies it runs well on
+ GNU/Linux, Windows and older PC hardware.
+ '';
+ homepage = "http://mtpaint.sourceforge.net/";
+ license = stdenv.lib.licenses.gpl3;
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.vklquevs ];
+ };
+}
+
diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix
new file mode 100644
index 00000000000..8fef29fa107
--- /dev/null
+++ b/pkgs/applications/graphics/unigine-valley/default.nix
@@ -0,0 +1,104 @@
+{ stdenv, fetchurl
+
+# Build-time dependencies
+, makeWrapper
+, file
+
+# Runtime dependencies
+, fontconfig
+, freetype
+, libX11
+, libXext
+, libXinerama
+, libXrandr
+, libXrender
+, openal}:
+
+let
+ version = "1.0";
+ pkgversion = "1";
+
+ arch = if stdenv.system == "x86_64-linux" then
+ "x64"
+ else if stdenv.system == "i686-linux" then
+ "x86"
+ else
+ abort "Unsupported platform";
+
+in
+ stdenv.mkDerivation {
+ name = "unigine-valley-${version}-${pkgversion}";
+
+ src = fetchurl {
+ url = "http://assets.unigine.com/d/Unigine_Valley-${version}.run";
+ sha256 = "5f0c8bd2431118551182babbf5f1c20fb14e7a40789697240dcaf546443660f4";
+ };
+
+ sourceRoot = "Unigine_Valley-${version}";
+
+ buildInputs = [file makeWrapper];
+
+ libPath = stdenv.lib.makeLibraryPath [
+ stdenv.cc.cc # libstdc++.so.6
+ fontconfig
+ freetype
+ libX11
+ libXext
+ libXinerama
+ libXrandr
+ libXrender
+ openal
+ ];
+
+ unpackPhase = ''
+ cp $src extractor.run
+ chmod +x extractor.run
+ ./extractor.run --target $sourceRoot
+ '';
+
+ # The executable loads libGPUMonitor_${arch}.so "manually" (i.e. not through the ELF interpreter).
+ # However, it still uses the RPATH to look for it.
+ patchPhase = ''
+ # Patch ELF files.
+ elfs=$(find bin -type f | xargs file | grep ELF | cut -d ':' -f 1)
+ for elf in $elfs; do
+ echo "Patching $elf"
+ patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 $elf || true
+ done
+ '';
+
+ configurePhase = "";
+ buildPhase = "";
+
+ installPhase = ''
+ instdir=$out/opt/unigine/valley
+
+ # Install executables and libraries
+ mkdir -p $instdir/bin
+ install -m 0755 bin/browser_${arch} $instdir/bin
+ install -m 0755 bin/libApp{Stereo,Surround,Wall}_${arch}.so $instdir/bin
+ install -m 0755 bin/libGPUMonitor_${arch}.so $instdir/bin
+ install -m 0755 bin/libQt{Core,Gui,Network,WebKit,Xml}Unigine_${arch}.so.4 $instdir/bin
+ install -m 0755 bin/libUnigine_${arch}.so $instdir/bin
+ install -m 0755 bin/valley_${arch} $instdir/bin
+ install -m 0755 valley $instdir
+
+ # Install other files
+ cp -R data documentation $instdir
+
+ # Install and wrap executable
+ mkdir -p $out/bin
+ install -m 0755 valley $out/bin/valley
+ wrapProgram $out/bin/valley \
+ --run "cd $instdir" \
+ --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:$instdir/bin:$libPath
+ '';
+
+ meta = {
+ description = "The Unigine Valley GPU benchmarking tool";
+ homepage = "http://unigine.com/products/benchmarks/valley/";
+ license = stdenv.lib.licenses.unfree; # see also: /nix/store/*-unigine-valley-1.0/opt/unigine/valley/documentation/License.pdf
+ maintainers = [ stdenv.lib.maintainers.kierdavis ];
+ platforms = ["x86_64-linux" "i686-linux"];
+ };
+ }
diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/pkgs/applications/graphics/zgrviewer/default.nix
index 85b05dd3b0a..03ffa8af370 100644
--- a/pkgs/applications/graphics/zgrviewer/default.nix
+++ b/pkgs/applications/graphics/zgrviewer/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
cp -r target/* "$out/share/java/zvtm/"
echo '#!/bin/sh' > "$out/bin/zgrviewer"
- echo "java -jar '$out/share/java/zvtm/zgrviewer-${version}.jar'" >> "$out/bin/zgrviewer"
+ echo "${jre}/lib/openjdk/jre/bin/java -jar '$out/share/java/zvtm/zgrviewer-${version}.jar' \"\$@\"" >> "$out/bin/zgrviewer"
chmod a+x "$out/bin/zgrviewer"
'';
meta = {
diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix
index 84a122d6fd7..e67480fb3c7 100644
--- a/pkgs/applications/misc/bleachbit/default.nix
+++ b/pkgs/applications/misc/bleachbit/default.nix
@@ -22,7 +22,7 @@ pythonPackages.buildPythonApplication rec {
substituteInPlace $out/bin/bleachbit --replace "#!/usr/bin/env python" "#!${pythonPackages.python.interpreter}"
'';
- propagatedBuildInputs = with pythonPackages; [ pygtk sqlite3 ];
+ propagatedBuildInputs = with pythonPackages; [ pygtk ];
meta = {
homepage = "http://bleachbit.sourceforge.net";
diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix
index 8fb4af6d53e..85d3c4e49f9 100644
--- a/pkgs/applications/misc/buku/default.nix
+++ b/pkgs/applications/misc/buku/default.nix
@@ -1,21 +1,22 @@
{ stdenv, pythonPackages, fetchFromGitHub,
}:
-pythonPackages.buildPythonApplication rec {
- version = "2.4";
+with pythonPackages; buildPythonApplication rec {
+ version = "2.5";
name = "buku-${version}";
src = fetchFromGitHub {
owner = "jarun";
repo = "buku";
rev = "v${version}";
- sha256 = "0rmvlpp1pzzgn1hf87ksigj9kp60gfwkvxymb4wiz7dqa57b1q0n";
+ sha256 = "0m6km37zylinsblwm2p8pm760xlsf9m82xyws3762xs8zxbnfmsd";
};
buildInputs = [
- pythonPackages.cryptography
- pythonPackages.beautifulsoup4
+ cryptography
+ beautifulsoup4
];
+ propagatedBuildInputs = [ beautifulsoup4 ];
phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index d2e618b105b..7b47b9fb3cb 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
}:
stdenv.mkDerivation rec {
- version = "2.68.0";
+ version = "2.70.0";
name = "calibre-${version}";
src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
- sha256 = "0mn6wdws1xxc4yvhp5vdzb5i5c9dsmamyms1njdzs5fv754rszpm";
+ sha256 = "18iv1c2nx93gkfqa3k2m42dk4p59b9zp08fggb6imc1xqh2icfch";
};
inherit python;
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
python pyqt5 sip poppler_utils libpng imagemagick libjpeg
fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils
] ++ (with pythonPackages; [
- apsw beautifulsoup cssselect cssutils dateutil lxml mechanize netifaces pillow sqlite3
+ apsw beautifulsoup cssselect cssutils dateutil lxml mechanize netifaces pillow
# the following are distributed with calibre, but we use upstream instead
chardet cherrypy html5lib odfpy routes
]);
diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix
index 4198a9f32b2..43e41284f14 100644
--- a/pkgs/applications/misc/cherrytree/default.nix
+++ b/pkgs/applications/misc/cherrytree/default.nix
@@ -11,9 +11,6 @@ stdenv.mkDerivation rec {
sha256 = "45f1cee4067598cf2ca8ae6f89d03789b86f9e3bf196236119868653420d7cdd";
};
- propagatedBuildInputs = with pythonPackages;
- [ sqlite3 ];
-
buildInputs = with pythonPackages;
[ python gettext wrapPython pygtk dbus-python pygtksourceview ];
diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix
index e77dd0e8c8a..469da1f6ec4 100644
--- a/pkgs/applications/misc/chirp/default.nix
+++ b/pkgs/applications/misc/chirp/default.nix
@@ -2,15 +2,15 @@
, python, pyserial, pygtk
}:
let
- version = "0.4.1";
+ version = "20161018";
in
stdenv.mkDerivation rec {
- name = "chirp-${version}";
+ name = "chirp-daily-${version}";
inherit version;
src = fetchurl {
- url = "http://chirp.danplanet.com/download/0.4.1/chirp-${version}.tar.gz";
- sha256 = "17iihghqjprn2hld193qw0yl1kkrf6m0fp57l7ibkflxr0nnb7cc";
+ url = "http://trac.chirp.danplanet.com/chirp_daily/daily-${version}/chirp-daily-${version}.tar.gz";
+ sha256 = "0f3r919az4vvcgxzqmxvhrxa2byzk5algy7srzzs15ihkvyxcwkb";
};
buildInputs = [
diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix
index e62236e7ae2..06ebaa7c12d 100644
--- a/pkgs/applications/misc/clipit/default.nix
+++ b/pkgs/applications/misc/clipit/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, intltool, pkgconfig, gtk2, xdotool }:
+{ fetchurl, stdenv, intltool, pkgconfig, gtk2, xdotool, hicolor_icon_theme }:
stdenv.mkDerivation rec {
name = "clipit-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0jrwn8qfgb15rwspdp1p8hb1nc0ngmpvgr87d4k3lhlvqg2cfqva";
};
- buildInputs = [ intltool pkgconfig gtk2 xdotool ];
+ buildInputs = [ intltool pkgconfig gtk2 xdotool hicolor_icon_theme ];
meta = with stdenv.lib; {
description = "Lightweight GTK+ Clipboard Manager";
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 9e4afc0ae90..bc562b7d577 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -2,11 +2,11 @@
pythonPackages.buildPythonApplication rec {
name = "electrum-${version}";
- version = "2.6.4";
+ version = "2.7.11";
src = fetchurl {
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
- sha256 = "0rpqpspmrmgm0bhsnlnhlwhag6zg8hnv5bcw5vkqmv86891kpd9a";
+ sha256 = "0qy2ynyw57jgi7fw3xzsyy608yk4bhsda7qfw0j26zqinv52mrsb";
};
propagatedBuildInputs = with pythonPackages; [
@@ -33,14 +33,13 @@ pythonPackages.buildPythonApplication rec {
# amodem
];
- preInstall = ''
- mkdir -p $out/share
- sed -i 's@usr_share = .*@usr_share = os.getenv("out")+"/share"@' setup.py
+ preBuild = ''
+ sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py
pyrcc4 icons.qrc -o gui/qt/icons_rc.py
'';
- doCheck = true;
- checkPhase = ''
+ doInstallCheck = true;
+ installCheckPhase = ''
$out/bin/electrum help >/dev/null
'';
diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix
index 9dbfa960544..5f8d00ce996 100644
--- a/pkgs/applications/misc/font-manager/default.nix
+++ b/pkgs/applications/misc/font-manager/default.nix
@@ -1,17 +1,17 @@
{ stdenv, fetchFromGitHub, makeWrapper, automake, autoconf, libtool,
pkgconfig, file, intltool, libxml2, json_glib , sqlite, itstool,
- vala_0_32, gnome3, wrapGAppsHook
+ librsvg, vala_0_34, gnome3, wrapGAppsHook
}:
stdenv.mkDerivation rec {
name = "font-manager-${version}";
- version = "2016-06-04";
+ version = "0.7.3";
src = fetchFromGitHub {
owner = "FontManager";
repo = "master";
- rev = "07b47c153494f19ced291c84437349253c5bde4d";
- sha256 = "13pjmvx31fr8fqhl5qwawhawfl7as9c50qshzzig8n5g7vb5v1i0";
+ rev = version;
+ sha256 = "0qwi1mn2sc2q5cs28rga8i3cn34ylybs949vjnh97dl2rvlc0x06";
};
nativeBuildInputs = [
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
automake autoconf libtool
file
intltool
- vala_0_32
+ vala_0_34
gnome3.yelp_tools
wrapGAppsHook
];
@@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
json_glib
sqlite
itstool
+ librsvg
gnome3.gtk
gnome3.gucharmap
gnome3.libgee
@@ -40,7 +41,6 @@ stdenv.mkDerivation rec {
preConfigure = ''
NOCONFIGURE=true ./autogen.sh
- chmod +x configure;
substituteInPlace configure --replace "/usr/bin/file" "${file}/bin/file"
'';
diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix
index 543f84bdfbc..efe39e5d8b7 100644
--- a/pkgs/applications/misc/gnuradio/default.nix
+++ b/pkgs/applications/misc/gnuradio/default.nix
@@ -4,7 +4,7 @@
# python wrappers
, python, swig2, numpy, scipy, matplotlib
# grc - the gnu radio companion
-, cheetahTemplate, pygtk
+, cheetah, pygtk
# gr-wavelet: collection of wavelet blocks
, gsl
# gr-qtgui: the Qt-based GUI
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
];
propagatedBuildInputs = [
- cheetahTemplate numpy scipy matplotlib pyqt4 pygtk wxPython pyopengl
+ cheetah numpy scipy matplotlib pyqt4 pygtk wxPython pyopengl
];
enableParallelBuilding = true;
diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix
index d750aea01ef..4dcb5be8a21 100644
--- a/pkgs/applications/misc/gramps/default.nix
+++ b/pkgs/applications/misc/gramps/default.nix
@@ -17,7 +17,7 @@ in buildPythonApplication rec {
sha256 = "0jdps7yx2mlma1hdj64wssvnqd824xdvw0bmn2dnal5fn3h7h060";
};
- pythonPath = with pythonPackages; [ pygobject3 pycairo bsddb ] ++ [ pango ];
+ pythonPath = with pythonPackages; [ pygobject3 pycairo ] ++ [ pango ];
# Same installPhase as in buildPythonApplication but without --old-and-unmanageble
# install flag.
diff --git a/pkgs/applications/misc/hamster-time-tracker/default.nix b/pkgs/applications/misc/hamster-time-tracker/default.nix
index 3191c00e9ec..b8bd514c9ff 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; [ pygobject2 pygtk pyxdg gnome_python dbus-python sqlite3 ];
+ propagatedBuildInputs = with pythonPackages; [ pygobject2 pygtk pyxdg gnome_python dbus-python ];
configurePhase = ''
python waf configure --prefix="$out"
diff --git a/pkgs/applications/misc/hyperterm/default.nix b/pkgs/applications/misc/hyper/default.nix
similarity index 72%
rename from pkgs/applications/misc/hyperterm/default.nix
rename to pkgs/applications/misc/hyper/default.nix
index 59cd9ac2696..310f8feb2fd 100644
--- a/pkgs/applications/misc/hyperterm/default.nix
+++ b/pkgs/applications/misc/hyper/default.nix
@@ -11,11 +11,11 @@ let
];
in
stdenv.mkDerivation rec {
- version = "0.7.6";
- name = "hyperterm-${version}";
+ version = "0.8.3";
+ name = "hyper-${version}";
src = fetchurl {
- url = https://github.com/zeit/hyperterm/releases/download/v0.7.1/hyperterm-0.7.1.deb;
- sha256 = "1xdwhmzlkg1ly1xgsbv99xk4x1g1x270vx1b12dvf10ck5x9v63a";
+ url = "https://github.com/zeit/hyper/releases/download/${version}/hyper-${version}-amd64.deb";
+ sha256 = "1683gc0fhifn89l9h67yz02pk1xz7p5l3qpiyddr9w21qr9h3lhq";
};
buildInputs = [ dpkg ];
unpackPhase = ''
@@ -25,16 +25,16 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
mkdir -p "$out/bin"
- ln -s "$out/opt/HyperTerm/HyperTerm" "$out/bin/HyperTerm"
mv opt "$out/"
- patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:\$ORIGIN" "$out/opt/HyperTerm/HyperTerm"
- patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" "$out/opt/HyperTerm/resources/app/node_modules/child_pty/build/Release/exechelper"
+ ln -s "$out/opt/Hyper/Hyper" "$out/bin/Hyper"
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:\$ORIGIN" "$out/opt/Hyper/Hyper"
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" "$out/opt/Hyper/resources/app/node_modules/child_pty/build/Release/exechelper"
mv usr/* "$out/"
'';
dontPatchELF = true;
meta = with lib; {
description = "A terminal built on web technologies";
- homepage = https://hyperterm.org/;
+ homepage = https://hyper.is/;
maintainers = with maintainers; [ puffnfresh ];
license = licenses.mit;
platforms = [ "i686-linux" "x86_64-linux" ];
diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/applications/misc/keepassx/2.0.nix
index b76d59c30e1..030b1d326e1 100644
--- a/pkgs/applications/misc/keepassx/2.0.nix
+++ b/pkgs/applications/misc/keepassx/2.0.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "keepassx2-${version}";
- version = "2.0.2";
+ version = "2.0.3";
src = fetchurl {
url = "https://www.keepassx.org/releases/${version}/keepassx-${version}.tar.gz";
- sha256 = "1f1nlbd669rmpzr52d9dgfgclg4jcaq2jkrby3b8q1vjkksdqjr0";
+ sha256 = "1ia7cqx9ias38mnffsl7da7g1f66bcbjsi23k49sln0c6spb9zr3";
};
buildInputs = [ cmake libgcrypt qt4 xorg.libXtst ];
diff --git a/pkgs/applications/misc/keepassx/2.0-http.nix b/pkgs/applications/misc/keepassx/reboot.nix
similarity index 60%
rename from pkgs/applications/misc/keepassx/2.0-http.nix
rename to pkgs/applications/misc/keepassx/reboot.nix
index b3a84d36b1e..f6ed251601a 100644
--- a/pkgs/applications/misc/keepassx/2.0-http.nix
+++ b/pkgs/applications/misc/keepassx/reboot.nix
@@ -1,23 +1,23 @@
{ stdenv, fetchFromGitHub, cmake, libgcrypt, qt5, zlib, libmicrohttpd, libXtst }:
stdenv.mkDerivation rec {
- name = "keepassx2-http-unstable-${version}";
- version = "2016-05-27";
+ name = "keepassx-reboot-${version}";
+ version = "2.0.3";
src = fetchFromGitHub {
- owner = "droidmonkey";
- repo = "keepassx_http";
- rev = "bb2e1ee8da3a3245c3ca58978a979dd6b5c2472a";
- sha256 = "1rlbjs0i1kbrkksliisnykhki8f15g09xm3fwqlgcfc2czwbv5sv";
+ owner = "keepassxreboot";
+ repo = "keepassx";
+ rev = "${version}-http";
+ sha256 = "0pj3mirhw87hk9nlls9hgfx08xrr8ln7d1fqi3fcm519qjr72lmv";
};
buildInputs = [ cmake libgcrypt zlib qt5.full libXtst libmicrohttpd ];
meta = {
description = "Fork of the keepassX password-manager with additional http-interface to allow browser-integration an use with plugins such as PasslFox (https://github.com/pfn/passifox). See also keepassX2.";
- homepage = http://www.keepassx.org/;
+ homepage = https://github.com/keepassxreboot/keepassx;
license = stdenv.lib.licenses.gpl2;
- maintainers = with stdenv.lib.maintainers; [ s1lvester ];
+ maintainers = with stdenv.lib.maintainers; [ s1lvester jonafato ];
platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index 305c5863626..0e93418255e 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -4,12 +4,12 @@ with python3Packages;
buildPythonApplication rec {
# Reenable tests for 0.9.0, they are broken at the moment: #15981
- version = "0.8.2";
+ version = "0.8.4";
name = "khal-${version}";
src = fetchurl {
url = "mirror://pypi/k/khal/khal-${version}.tar.gz";
- sha256 = "0ihclh3jsxhvq7azgdxbdzwbl7my30cdcg3g5ss5bpm4ivskrzzj";
+ sha256 = "03vy4dp9n43w51mwqjjy08dr5nj7wxqnb085visz3j43vzm42p1f";
};
LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/applications/misc/loxodo/default.nix
index 7a877afb0c3..291e225d6c4 100644
--- a/pkgs/applications/misc/loxodo/default.nix
+++ b/pkgs/applications/misc/loxodo/default.nix
@@ -12,7 +12,7 @@ py.buildPythonApplication rec {
sha256 = "1cg0dfcv57ps54f1a0ksib7hgkrbdi9q699w302xyyfyvjcb5dd2";
};
- propagatedBuildInputs = with py; [ wxPython python.modules.readline ];
+ propagatedBuildInputs = with py; [ wxPython ];
postInstall = ''
mv $out/bin/loxodo.py $out/bin/loxodo
diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix
index 9fa112375c5..9da087d4969 100644
--- a/pkgs/applications/misc/mlterm/default.nix
+++ b/pkgs/applications/misc/mlterm/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
harfbuzz fribidi m17n_lib openssl libssh2
];
+ patches = [ ./x_shortcut.c.patch ]; #fixes numlock in 3.7.2. should be safe to remove by 3.7.3 since it's already in the trunk: https://bitbucket.org/arakiken/mlterm/commits/4820d42c7abfe1760a5ea35492c83be469c642b3
+
#bad configure.ac and Makefile.in everywhere
preConfigure = ''
sed -ie 's;-L/usr/local/lib -R/usr/local/lib;;g' \
@@ -91,7 +93,7 @@ stdenv.mkDerivation rec {
};
meta = with stdenv.lib; {
- homepage = https://sourceforge.net/projects/mlterm/;
+ homepage = http://mlterm.sourceforge.net/;
license = licenses.bsd2;
maintainers = with maintainers; [ vrthra ramkromberg ];
platforms = with platforms; linux;
diff --git a/pkgs/applications/misc/mlterm/x_shortcut.c.patch b/pkgs/applications/misc/mlterm/x_shortcut.c.patch
new file mode 100644
index 00000000000..f0f929b7965
--- /dev/null
+++ b/pkgs/applications/misc/mlterm/x_shortcut.c.patch
@@ -0,0 +1,26 @@
+--- mlterm-3.7.2/xwindow/x_shortcut.c
++++ mlterm-3.7.2/xwindow/x_shortcut.c
+@@ -292,6 +292,11 @@
+ /* ingoring except these masks */
+ state &= (ModMask|ControlMask|ShiftMask|CommandMask|button_mask) ;
+
++ if( state & button_mask)
++ {
++ state &= ~Mod2Mask ; /* XXX NumLock */
++ }
++
+ if( shortcut->map[func].ksym == ksym &&
+ shortcut->map[func].state ==
+ ( state |
+@@ -318,6 +323,11 @@
+ /* ingoring except these masks */
+ state &= (ModMask|ControlMask|ShiftMask|CommandMask|button_mask) ;
+
++ if( state & button_mask)
++ {
++ state &= ~Mod2Mask ; /* XXX NumLock */
++ }
++
+ for( count = 0 ; count < shortcut->str_map_size ; count ++)
+ {
+ if( shortcut->str_map[count].ksym == ksym &&
diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix
index 0a32fdf748e..048a7877362 100644
--- a/pkgs/applications/misc/ranger/default.nix
+++ b/pkgs/applications/misc/ranger/default.nix
@@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec {
sha256 = "0yaviybviwdvfg2a0pf2kk28g10k245499xmbpqlai7fv91f7xll";
};
- propagatedBuildInputs = [ pythonPackages.python.modules.curses file ];
+ propagatedBuildInputs = [ file ];
preConfigure = ''
substituteInPlace ranger/ext/img_display.py \
diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix
index d8f44ba5cdb..d07863df0e0 100644
--- a/pkgs/applications/misc/roxterm/default.nix
+++ b/pkgs/applications/misc/roxterm/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, docbook_xsl, dbus_libs, dbus_glib, expat, gettext
, gsettings_desktop_schemas, gdk_pixbuf, gtk2, gtk3, hicolor_icon_theme
, imagemagick, itstool, librsvg, libtool, libxslt, lockfile, makeWrapper
-, pkgconfig, pythonFull, pythonPackages, vte }:
+, pkgconfig, python, pythonPackages, vte }:
# TODO: Still getting following warning.
# WARNING **: Error retrieving accessibility bus address: org.freedesktop.DBus.Error.ServiceUnknown: The name org.a11y.Bus was not provided by any .service files
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
buildInputs =
[ docbook_xsl expat imagemagick itstool librsvg libtool libxslt
- makeWrapper pkgconfig pythonFull pythonPackages.lockfile ];
+ makeWrapper pkgconfig python pythonPackages.lockfile ];
propagatedBuildInputs =
[ dbus_libs dbus_glib gdk_pixbuf gettext gsettings_desktop_schemas gtk2 gtk3 hicolor_icon_theme vte ];
@@ -29,8 +29,8 @@ in stdenv.mkDerivation rec {
"-I${dbus_libs.lib}/lib/dbus-1.0/include" ];
# Fix up python path so the lockfile library is on it.
- PYTHONPATH = stdenv.lib.makeSearchPathOutput "lib" pythonFull.sitePackages [
- pythonPackages.curses pythonPackages.lockfile
+ PYTHONPATH = stdenv.lib.makeSearchPathOutput "lib" python.sitePackages [
+ pythonPackages.lockfile
];
buildPhase = ''
@@ -58,5 +58,6 @@ in stdenv.mkDerivation rec {
'';
maintainers = with maintainers; [ cdepillabout ];
platforms = platforms.linux;
+ broken = true; # https://github.com/NixOS/nixpkgs/issues/19579
};
}
diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix
index 399951b6bfe..8488a8e6842 100644
--- a/pkgs/applications/misc/rtv/default.nix
+++ b/pkgs/applications/misc/rtv/default.nix
@@ -17,7 +17,6 @@ pythonPackages.buildPythonApplication rec {
six
praw
kitchen
- python.modules.curses
praw
] ++ lib.optional (!pythonPackages.isPy3k) futures;
diff --git a/pkgs/applications/misc/tnef/tnef/default.nix b/pkgs/applications/misc/tnef/tnef/default.nix
deleted file mode 100644
index 3256ed1a570..00000000000
--- a/pkgs/applications/misc/tnef/tnef/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ fetchurl, lib }:
-
-stdenv.mkDerivation rec {
- version = "1.4.12";
- name = "tnef-${version}";
-
- src = fetchFromGitHub {
- owner = "verdammelt";
- repo = "tnef";
- rev = "${version}";
- sha256 = "0ssi2wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i";
- };
-
- doCheck = true;
-
- meta = with lib; {
- description = "Unpacks MIME attachments of type application/ms-tnef";
- longDescription = ''
- TNEF is a program for unpacking MIME attachments of type "application/ms-tnef". This is a Microsoft only attachment.
-
- Due to the proliferation of Microsoft Outlook and Exchange mail servers, more and more mail is encapsulated into this format.
-
- The TNEF program allows one to unpack the attachments which were encapsulated into the TNEF attachment. Thus alleviating the need to use Microsoft Outlook to view the attachment.
- '';
- homepage = https://github.com/verdammelt/tnef;
- license = licenses.gpl2;
- maintainers = [ maintainers.DamienCassou ];
- platforms = platforms.all;
- };
-}
diff --git a/pkgs/applications/misc/zk-shell/default.nix b/pkgs/applications/misc/zk-shell/default.nix
index 9f090e60823..ec8deadf9f5 100644
--- a/pkgs/applications/misc/zk-shell/default.nix
+++ b/pkgs/applications/misc/zk-shell/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, buildPythonApplication, fetchFromGitHub, pythonPackages }:
+{ stdenv, fetchFromGitHub, pythonPackages }:
-buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
version = "1.0.0";
name = "zk-shell-" + version;
@@ -12,7 +12,7 @@ buildPythonApplication rec {
};
propagatedBuildInputs = (with pythonPackages; [
- ansi kazoo nose six tabulate twitter readline
+ ansi kazoo nose six tabulate twitter
]);
#requires a running zookeeper, don't know how to fix that for the moment
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index c0e26af4274..8a561e75f79 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -7,7 +7,7 @@
, xdg_utils, yasm, minizip, libwebp
, libusb1, pciutils, nss
-, python, pythonPackages, perl, pkgconfig
+, python2Packages, perl, pkgconfig
, nspr, systemd, kerberos
, utillinux, alsaLib
, bison, gperf
@@ -38,6 +38,8 @@ buildFun:
with stdenv.lib;
let
+ inherit (python2Packages) python gyp ply jinja2;
+
# The additional attributes for creating derivations based on the chromium
# source tree.
extraAttrs = buildFun base;
@@ -119,7 +121,7 @@ let
glib gtk2 dbus_glib
libXScrnSaver libXcursor libXtst mesa
pciutils protobuf speechd libXdamage
- pythonPackages.gyp pythonPackages.ply pythonPackages.jinja2
+ gyp ply jinja2
] ++ optional gnomeKeyringSupport libgnome_keyring3
++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
++ optional enableSELinux libselinux
diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index 057468d7fd6..9d895a383e1 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 = "49.0";
+ version = "49.0.2";
sources = [
- { 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"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ach/firefox-49.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "34e58b3394e51a48e168513e73d916e76ff8cbb733cb85483c3f71076b31fb2d2fd72cc19994339cc23ec84989caf23514e84a393946ecbd2765ac388672ae27"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ach/firefox-49.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "fb640df0aa14ddf92db3f8cf94598b7321b2b9f6a0360de20a2c8a70e697e3a0e6f13b13704ce766766c8a7a428e4601e8cdc3044d64558976c81e34cb5b1a2d"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/af/firefox-49.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "8772744f9ef9ad3a0f37fcdddb90b08a105d65f347e6e1fdf66955a95a3e12e5e18dae2b1f75895fa73914744c0a9d98556e84c6a1813f4dc9d22d7633749688"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/af/firefox-49.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "475ad078d26386336954a747ca32722422122638632c75d8f8302875b5d3ae9c6271352e700ebfbf7bd226fa5d740c6eb4aeda83e6df712aa03583d54e7cfedc"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/an/firefox-49.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "782e1a0d98506a66413f4420609e51ef8b49ff711b89345b806f243414fdbb1d179b1ad3e74f25e0aeeac0103ca75fb497cb2a6a94e1b138f98c593350a34c85"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/an/firefox-49.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "2130aefd45506e9dfa56183955dae528edca747bbd186b108a5fc31cd0271017ec9d8d2f88ac061e2de94b3c235876d6c20f65c11c4a6ae95625db3633553d74"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ar/firefox-49.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "aa3d9ac9cb446b63d1275a4bc2172a127a002f07a2c98771fe09e5585e2617a9bf8bd3171dfec839a47ffae10b47a65c9c76403449207b745e8b587d5356ba10"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ar/firefox-49.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "4e1649a2feeafedd73f3b7a137105dc6fde8cd83e49b1ca58c65367e262e9abbe3b2be73e0b778503b33458dccc99a9ca8bb3f9a6a01a7989c20ac8a262f7bf8"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/as/firefox-49.0.2.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "db178c3bdcff6f2c8166d28a380bf47c457c53bebb5d0bdd811af96d41b2233c7e487ac17a61a479979f494dca78800c289ce4e1f00a371bbd4e1478ecafedbe"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/as/firefox-49.0.2.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "bc37a83dcfc488a32421a784559f6c236230c3ce189888c695ee2f476024f5d60dbf83782eac5f41824a63cf6d9c7e2f775717dd664ab311b1c4337c0a9489c6"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ast/firefox-49.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "7699c57014e5a8545fafe2a11c8dfb066d5f0c9fa3257264df78d2926b86cdf5dd44846ff3ce755eb13f9e34b60a78777b9ae5d0799890ad93bd390109ca055a"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ast/firefox-49.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "a2f0af3df56a3a99afa9f8144760545724f48ea454f84d51988773003d3550340402736a592cea1bfc3b4b728f8d38eee53fd22aadb6fc032902b14a5692b153"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/az/firefox-49.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "20f5911c186a9e11ac9f1913bbb4a5c4d6cdf99e4225c8025df0967420b18452cc10f8bc1d6508607b27ba067b2e9dfbeb68bf3ed08469d87997121363990705"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/az/firefox-49.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "85fa4add0e7dfcb5209c36a56438aa1480462bbaef29340fc76f710de81a419a3d6a58ccfc28592ffecc0464bae51b75cf0e658d078d7a18251849d5333a98e9"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/be/firefox-49.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; sha512 = "b93544226bca7eac5220878f34b23e1a9a740dc2bfeef4bec90057bd0197d77e6eec142e04f072f227d379a085660f3d19e112e3f55233dd82ad59e9e91f6635"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/be/firefox-49.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; sha512 = "fe752476db9babd70882ba947b860a810f76dfb9f2dde8ccdefe72ce960a7676440fbefc261c3b70a6d6ded6874166b81c34ad62c159b1e55101b804e93b02e0"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/bg/firefox-49.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "b0436dc79fd6064e5d455d6ecd5f835b6b1cd855aa147675502468c9a332698b4d91e505eb92a45bf2aaa8479074eeda745c7340852a071a4ebe4b19a6e9ded4"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/bg/firefox-49.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "892af8626ee894bdf6408ebeae6c5239b5531a52b0f107cf7f207f4f87225a0f3d690aab233e0e6db9628b29cc572d65fbb4ed3f3ba0c15b54c54fca195929fe"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/bn-BD/firefox-49.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "371dcf9a6cffa6fa5a505d390e082d6703a4ca906be8870a07d28d47a00f94808ee456409e24d50d1ac75affffcb2b1f341aed638a0c6d54407f7d7bf1484e07"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/bn-BD/firefox-49.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "866629e3b07bfc6884c6974d411b553f48edb18ab3b01d2d8b74e72b2d0c1bec4d8ccf451c00dc3567f939d78f7b16837c8b9c54e875a987294f7c9e88d85395"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/bn-IN/firefox-49.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "a87004782631b26012dbac62f6a3c2dd5303a65e1c3a23113e9a20419f280450a4bbc7008d3e78448db65f6bcd670011e27a76dc5f930d96e480e1fc6e8a3e3b"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/bn-IN/firefox-49.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "4195e49bd40edf6aa3767be6c706d66e5d2a22c6e8effb57d101684934f5497d01abdc7f897c296e9129710365d0b34cb3f6f595a244d03bf0b25cd725433c11"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/br/firefox-49.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "a2977e3e4d926cc21e2dea941f34a7b75f0d99d454ae9de6a97f95e31277402420fb3efbf606098feac0832355b7ab36e2da90ca7b85cfcc3a9065bcbcc90c55"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/br/firefox-49.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "7c26ed2e7b9e37c97e4186fa02610205e4b4b4540a29efe0ecaa0851e65ffbbeca3b26b47ae99b8f87baf2212a8c5b6ab69cbc51ee4d3ef6805cd37cb8a936bb"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/bs/firefox-49.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "08f93fb2c29e2f090702570a9390088954328f22a69d50a2eabccc3893e1f28ecde95011b3c0ee1f2082a447d61f86d4417b5e54b39858b666c69b6ea546257e"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/bs/firefox-49.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "1b4d4e9f74532974f7cf0382c2e4ca6cbee1dda11037df203f5a643305876e9bb33965ecbf68935b9ad626e77f86886b3deeebfd9326251f3dfe2b11a70c24fd"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ca/firefox-49.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "e9b270bd2b2b2e48dace759ea61d0c78e4b0eaa4f9e44d418e37c55fb8ca96ca16304649b1d57b30a31575c2dc3abc4b4e40d89ac32fcf8beedba055bd38049d"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ca/firefox-49.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "d44b1c0b434f92bff6edc4c514d5263f2d48e31a741ab10f8ca3a29c831b24058c1952ec09d4f2e2318d0b851281b0d228ee7941fd07e4828939b7652d86f08e"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/cak/firefox-49.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "6b687dd14de728612de1ac96534a57ee1a82bb5e069cb1a5715ca688d19f33fe00079339a7fd93e13674c3fecd645ffebb36ba84bc597ed047ff4f3e51d9aa68"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/cak/firefox-49.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "35a68ed2b047a70253af24112554e733274bd531b5cf85bd82893d8abae19f56eb9e712b564ea44a3c72fcd9887338a314a02f9dfec747d5eb51fcc5b91e8e7f"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/cs/firefox-49.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "c206bd2c38e38ceb7722aeaa607f29ecefde9c9a7dce67f3685948e2bd347e18807398b050d65a0a0f7aa75af28eb360733a2b55a1004845d24ca00276f8894e"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/cs/firefox-49.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "7b0a0236d16b6443cd701b6b87347839d218e458a99b62cb8a85e47fad46d7dbcc778042906db189532e37f4392fcdc08c150e81baf838e47af1894a9a3f03b7"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/cy/firefox-49.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "0d1a025f349ab6a87d82fdcedb2b5d5227fadde3b071d54347e66e4cfb9200b9a3e689898b286d5d9e92d05989e817c75e8ee633026a81e2c36fbfd89bd63ebb"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/cy/firefox-49.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "e52b74c7ed70df4d9d182ddf43d3aa385f8d9d3020a51553b2abf03ba1e1002c56571b199f8e96155eef25bcd296add90c59eb389e5f96b9b671a67819532a42"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/da/firefox-49.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "9760bc438dbf5d318d34767898e4c585435694ba051fc3e88b9c21fe64d2513ae306d30655c021af6feb43de62576630dabbdf84dc379978ad7f27293206863c"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/da/firefox-49.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "cbaa47308c0718da93615fff7fddd026d9396dba581b9a095bb86025a63e0eafa900aef6ef306888cb6c8371d9c5d5fca7f8facfc3f603746d17b3acfabbdd54"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/de/firefox-49.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "5bbfafea2170467dd84a297dc3308d73b01b41c89bac3fccde203205bd8a2ef6b699d239df22938d4edc71e6074b4d797f4ecebe6140ecf28e75e07a35bd86c0"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/de/firefox-49.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "2b86397fa086b15afb255f733ae12e821ab57b5045e3cb5e47bda703bfa170ef879c966049c2bca5c15f76136af250489c49e313674e878e1d0815d02e5e5d84"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/dsb/firefox-49.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "e761e49fe6d38ff37688b6b700c943ef5461e99990ddddb6b642403b9ed99cd815286860907245d27c3561f1e26d16b757a631ebc13de05df61b86bcba272f1a"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/dsb/firefox-49.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "ce65e525200dc1b6890c1ee5c847e2c720680b28221c700367d373f0eb262f10aee1831348c27b03af9218cfc14b40106130d62005107c674b5e4e89bd8183f0"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/el/firefox-49.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "559e97300b603e1159beefc3d58715b437a9741cfef77f8c36955825e103d3510a88617601e95ab230b7dc27185b6ac091aa7659b7fb059a6c4780ed5efd3977"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/el/firefox-49.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "ddfdce0ad9215c2a41e659c8bcb0aa7f04bd4906e5420ea47c64158a15ab111f8cb4bb410fcbaa2a747e74621dc8fd13fcb63861f5bce06bb045c4170501bad4"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/en-GB/firefox-49.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "cc32b9418874f1fb60d2103a03a99bf56d2565be31e530e19ffdc4fa3f855d6baf8ee6e03363b1ad3beef624c9865774abae8563c7744e995ab13a3c4b50ca3d"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/en-GB/firefox-49.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "85b3f54f69de86a3461e977934a21ce1226af04c3df07635e592b1531c06084a31d5fe50687990d982994cea747c1a32e4f6ee65c90954752c05494c5a144583"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/en-US/firefox-49.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "fc7309f05662a2bed24566076047a7ab328bd098c3764c7b8ac8f58388be7225a26d9e917542b712338b29cfc06a603569750d607818946e2880f66aee8a892c"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/en-US/firefox-49.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "cad0ee863c3362e3e2798ad9c3026d5ea5ed8f46ad9409922fcd8e4a9fff9fa7d383bd32d7e0e13aed98116f85463060a99044398a7673fd2015a97eea06ed1f"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/en-ZA/firefox-49.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "1f5411b427384132e5a4922249d1cc5596942840ddb3225864e888651dc50dcc601de59d52caae242e3c09733113955162a061446181ab85a582047baef019dd"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/en-ZA/firefox-49.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "7846e2db723636407eaff1f7d8327f683ed2e76600e0b2ff4cdbf4a2f5ffbb54bc7f8004a4604abe128fe15809f7ac257cb4c895c5a8d434e20fa896f73881c2"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/eo/firefox-49.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "71544335b093db847bbb75d95d85ce79fca7ef628172fae7a4aaa42f1860ec700472e75cb42b5cd7ecaddd62e86cf99cd105b2afb03f6a523cf8ab430398101b"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/eo/firefox-49.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "1712059dd0583535706f91819aa664732120b9771a2db9c19374b82dd99c3b08c5f96747936c4e004182e5a4c7226e38aa567385a91810b2d6569080881defb4"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/es-AR/firefox-49.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "7641053300343cae1ba6167cec8f35f02f7536b1d711dbe3522a52c3de841d4a1ad8798295ebf01805a7897118797c641cef380fcb00b59ccc6c609023df242c"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/es-AR/firefox-49.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "1c25707e13c94039cbd2f05c72c8cff35c26f31566a89f238d27c5277362a4c9b26f57c85b35ca9740b14a8771c9dfd54346b1db8d843827d61184d9ad7063d2"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/es-CL/firefox-49.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "d9a10289461272833bdc1423b0e943633edb352ec3db52511f64c35b9f36c8a9b807432799ad140d6086a839992bdacfd864f0110756d5991f288abf1e9060f8"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/es-CL/firefox-49.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "e96dbfeb2c5d17f0e174d7975e57ec964c8dc6c4322b510a1819eabc081f371f43b63bc85085c8ff0bb0380afc9c2583ae4bc0aa4224dad99e0134746b96019f"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/es-ES/firefox-49.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "db99c4ccdb514ee68291fc41f38a0c0fca22bd235831b4c079a649e6e5b5a6b87dbd7512ba44c72dec31a173d128907298866b4855ab7259168402e3709e4114"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/es-ES/firefox-49.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "0f2497e1dd719905494e2290f2dd09ac51b51058fbc27b65a23eac3e2d5e49adbb88a845e51393154ba69e2d5e67d7cd1911753efaf43838587ad417f39da251"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/es-MX/firefox-49.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "d612e453d1f952c65a5352f54f52189cb8b92ccbb7bf8a191efaa7f919748dc8538f07152b3182839ccb3f66171d7e1d48a1927a3a346e51dd23018d144b0453"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/es-MX/firefox-49.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "f1c47ebab9dc88932ccb93b24b7411080dde9ebb335b1d8f56041d1841f8425d104d0c1cb765f01222325ca5be10208f8b3326ad5aaae474ccee3c828648b4a4"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/et/firefox-49.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "683ec0c1eb4716b9b8ae897052a1208492a24ca6803ce890d5ad4044fbca57a6d8c58581c54faff5753134b6144d157202d047e0b80cda1125df0d9e495e7457"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/et/firefox-49.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "a3da302a585a4cad943a71a8f6fa9376821e4ab4953acd56ffd3f3993fd9e8971bc0ac1b2e5c37a8ade28a0fdaa0b47b277abed18f38246cb1885de532186afa"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/eu/firefox-49.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "988a8c2411dc43e4599c9db2a94e220738049e2cca4fc59ca073e2c215a71598809d5102356fa36132b5ab0e5a552183252ecc17688ad83a76eefe726f62e7c7"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/eu/firefox-49.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "873ace38cbcdcd022f932c1753eb9b4c9124a41b2589e89a84f050f90383483b6fa8d793a830d79860fe6f20295b5a8971775136e70877256f9b23900c7b236f"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/fa/firefox-49.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "0a1119a749db6cc2b277f4c1037d8163b6f35a0bd76ac0c121941502a821ea9c698822096037c242f29ffe85aa58fe97da821eed0b8995ef8f94f373567cef95"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/fa/firefox-49.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "68aba1cc55f22c39af1c68e4e77e5f8eed5005a1f7c4903b03a3cd711a9583a99042cf82d2dbdeb74b897ea1d840888ef7a417d9f6142b626d8c2f3654e01794"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ff/firefox-49.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "9cbef7bc67fe071cf40734eeaa64be8ee0b7f3c5428cfeaf5b81eb4eef5c4fb38e36af6de389164b2b0a65f2cfa0d14b2e933883d343cef1212f03f6da9c1801"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ff/firefox-49.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "d8b5362bea1305546da3681c98452594c5b15ccb57945efdb7b6971cfd07b7b940c9952a8db8143ab9bc8ef55f034ef9c8a162ea9b8dd4a82af033f99c34d9cf"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/fi/firefox-49.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "4f07573325b6def42bbe66e7dac08396520b66eea71230fcb432724cd6187c11d21325ae6084ed6c8c416b31f2a582fbb0efdf98905c566cebfdfae002875714"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/fi/firefox-49.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "f5dd198d264426ca8e759eef8801e31d90f628788451ea4802397a525938790a7b83a68fdba6839ff669239c79915f9596cc7f0ed48454fa528833041d9b7e85"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/fr/firefox-49.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "135da7e143fda33c6821002a0153cee11dff432bb75036731af68296142558f371d595f448dcb74b848b5e7a9318e80f2d0627c1554d9fb47de6143b5d2fd046"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/fr/firefox-49.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "b57bcc4602433cd703ec660b57b3b7d72c5e859b69d8b12c77a8250a09c6148fcbbfbc3bba59a984d8dc3ab284c11dab9cec1ea67e9d1f56e5f0b177e11358bf"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/fy-NL/firefox-49.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "901833140bdb0eaa7375fb9f83a395fb62de11df2b094b65e4fdf9c1c1b55e1fbc61330fab861214c843bdca5722f1f0f5c25765b15c883434fbc571d86768e5"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/fy-NL/firefox-49.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "3aadc1c35a8d498b336fc9f6300a467efc1d51161dc15099fe8d588deb4eb6f4255d2730ac21c9cbb98b136ac5f31993458368892969d0bd00423e778fcc09ea"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ga-IE/firefox-49.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "42f85212a3826f2a80c957ab717e918b0f3ca622cd057ef091f5ad749bc6b3173db3e8d0029ad1cd79d33b1d0b88eaa2b8e3de22ff76895cf1abe3f166610c83"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ga-IE/firefox-49.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "e2103c5af60b6d318f8f009418811f0f7c27933ccf1b72ca998b8e66dcd61c3e833a8b3a9f078f0ec212202cafdba25f8054cb13f999a8aae88310ca6439b797"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/gd/firefox-49.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "b00d74f2f954395027d48a1c91325ac21c0bbfc2d20a44242f5bd8f74780d6e2fa46e4344113592b5b4f6c8d106406eb62d2373f3b8adb042cc8fcebc3237f98"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/gd/firefox-49.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "fd1c042d586a59ba35d77095cc8f9a72a74a68c3e90318050854433f74b79a62019535f0baa63e33c7687cef401ab1668694ad1fa54a6dd731c77ccad66f599e"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/gl/firefox-49.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "e339859eaf9b2bdd8b4c09e2b3c22f35a8b72bf9a5c3fe4756576c34318cd1219c663190596196801acc09652e8710c8133e91e9abf30a1fd9e4c2721a9270db"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/gl/firefox-49.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "3beb1c6cdd6372615283af42074c4356009addc9ad41d98b01d008896182831c6275dc2398dbd477b9befacfd88a84415d2a45ef2f03d4748de8c5837fa4e7c8"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/gn/firefox-49.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "dbf599e7eb564146977cc59587b40bcf02c0e6b0e853ab71715635884d883e0427fd53df6950e7da9bcecd979bcf5f9c5a08cde9894e8b68d6faf42467baa020"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/gn/firefox-49.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "0e6f7818fa7c22483ef976684730b93e5793cbbcf79ff96645f9527b41d1bdbec8b0c25aba7ef5a3c4895888a9374dbb259ffa7ee95a1c3eb3633d46848711a5"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/gu-IN/firefox-49.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "c439babad0a48b8eb495b65510f33879038b950ff11820f7cf9fc7363092e761a95c9e9b7b9b51b7621efd4b39ae4ba45bdbd0ecf9fa14aa2bcba656a38a1106"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/gu-IN/firefox-49.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "48d9c9233115365bbdd5fcc4d5a59f5e254394b030387f4338086552734376bd77a7d4405ba75807e78b332d49fc04dbe4f2ce9c4d4fc625eeaf5ccf2cf29a14"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/he/firefox-49.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "a74cf826abb5ad09b4ad76e5292eed081c904560fa7579c8ea2663bace3e23f630f7410782e47b44bb123693b5a053513e07e3377b36770d3deee4bbf8334b4e"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/he/firefox-49.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "0266dbce27dbd09262b892d4bb6f8179cc5f710ad27618c6f3fc2f4a4850d715c12162729d17b87b60327b057fcf5e8ce0e8d64c7fdfcd56f41f0396e34ff5f2"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/hi-IN/firefox-49.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "ffe0bfc30861ffbbc50fac77fff688bc716e4485c11134757c6ea1096ab6a76311d69480f47bbb6ee9d67b6c00061436d8d402b31e3c97b86283cf0a027d1b49"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/hi-IN/firefox-49.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "9ade7154bd38c9fac3291574d0ba956ef39c47d49d24c4a0006ff28b6065ee020074287e093742bc073b3d5f9e32ca517f84054ae5df72e513a7c4dd1da05903"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/hr/firefox-49.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "0d1d75e61fd2e70e09168e1cfef9a936868d49c31a0df036b15a98f5eec353c122748369eca9ccbf696621702ec3e2521b76ce92a6c9ee0cc4ac7e20ab6beae5"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/hr/firefox-49.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "da7ba8fbb68ea0028408ceadb328fdd59b2df2514948cabf14da56ae548441b697598eb199772e65fd6fa001ce5e116fe8bdff9818c54110dd4a9574a021400e"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/hsb/firefox-49.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "f3bb00b3725fb8c5817923a2a40af5e21abe9b85304be2787987132822af9318cb7b1c7f1f9657543e1b8e07f09870411e00c061ddcf293c5ea0634784197390"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/hsb/firefox-49.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "7119d7730d4231d2e1a9c3da810fa1f030afd4fcfdd19df2e7879ce294bc114468324bec41126aa3a234604d30d4fa7517028ceb9c4258b470b4c45b6e796131"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/hu/firefox-49.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "41f68050eab542a96482f63769b3cd760b5a61ef06c5e11af78be7428d287d06e61bc5367b9cbf30a96cd33e785c21f939639e64071ed1828e0a2e9bd834b584"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/hu/firefox-49.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "295f9f02994d40c658f70819d42ed9e5066b55675acf4f639ffa88b5b922d586b9bede8a20608a4c6e7533b206dfbd5b4c78d933d05c0d45e6d248c7e8ede611"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/hy-AM/firefox-49.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "80a2f18d1f2a306005761c7df5a7eac3d5c1a0ddf8a556e9ad641ae1d0f099c359d9950a1e29f9444c191d27659242935b8ce760d80118096c4334047ef4c3a3"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/hy-AM/firefox-49.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "318767607dff10d4ddc5b18e77756eef267a49c5a8d866c88f971cd126577632c9385c7f9981282f2720af82a7c050db098312e07c5d8e7f442d6610fa93f935"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/id/firefox-49.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "33355c4b3a5bfc0737bf8d473bfa0b91eab12ebf1f7960f2c06e2b70940e928712398147eafed5e3e72ebd1cae3ed0df262bdd3fbd9b8314f52afeae1540ccb9"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/id/firefox-49.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "dcf596d4013b5d370802b0f717e327d2cd2c6fad377e77e3230d2d1f9b9cb081bcd6af514a56aa06bec625c5fc55213022eec4ed6fc45289dcd459205deffead"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/is/firefox-49.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "4e8bc5fcf1dd6e059bb1aa79955040f3a59c814b3bd3812c59df83a9ae7e07d0b9bec64c14ae33ee9f6688ad027e3545d54a435fda8a340f11f4bdb96200b5f0"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/is/firefox-49.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "5368d47f4676eb165b91bed0d9e53f0f0e9bfb4b0edd821e17b689267b90d7932c84b8668c1e5f06f7ee3dc6a66fffa2516446f1ad40faaa87d7fd521053085c"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/it/firefox-49.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "23d8b1e901f213a84123192796cc314ef6bcf664f31c15aecbf1112911a4df76aad41b93806067437cbd40c0722b54ee1139911b32057efa2f783819d39fa2e7"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/it/firefox-49.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "378e7765f081bb2abd25bff5bb3a89046a9f2bf09390c2830f916f8c7e811d32359cbaea832d433062fdd31b9251242361483851e91a15070b0420cc7a5d6344"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ja/firefox-49.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "f20fb6d3bc76c5ae40b11547ee1f4542460f781bc19a88fdd70dd95e5fb74de2adc3e642283d2baa7ef26cc49e5574addadbb5b18a804dd77b9c83900c15809a"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ja/firefox-49.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "aec4ba1d3c33bd586649b219a1fcd7beae8e51bdab1b44c311414cf141f452550a41e6a5044fb2ed9a184938f49e2196f97bda93e0cf5c7400463222da1e920e"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/kk/firefox-49.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "b7e72ef90953825ef50d98acdb0040b9a452e5e7f3661dd1e574eb045cf8679375afdf6695e866a9e70eb2d46c38d3eea5918b8373bddd6956ea42fcc3c50a3a"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/kk/firefox-49.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "c2c03344eb5cbfdc3555221fd66b245c38ee9fb5df40806ca475b1b5a94ac7c488816d18946c7cea0b8a556519d4d40d39224ee327ec59fd399c3c8e761fe575"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/km/firefox-49.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "1f79fd7893de0c5c773912ce5c96ccd81f29fa5ff879ff882d96dfd778b12c05f9476fa8e01a2f84d35dafbb53aeaeeb53f9a06a7abeb0b93482dd8c430891b6"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/km/firefox-49.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "ccd6987dc3bcb13f483c12015933801b6e4e85d0de1f9179e7e959ee7f6d75bee79de67551bde5ade7c5d0afdd58aa9367fef13f9caf0f31c9626742e20f03ba"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/kn/firefox-49.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "c63724966e962bd383ae8ba0dca744c547c9a794f0f96f1a51bb2bad04a786ae3f00a09a39d679c28db254c37a99795f474042fb8dee46754ddfb0a7c50297bb"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/kn/firefox-49.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "8916c80f522578152783af409b5df23ea554f4d711a1d85de1445678372eb856a2798263b2e638d72a5dedf3870fbde5c23ebefe7d051bc5c781f0363447a112"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ko/firefox-49.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "da33a16e3f8b414cc32b9dd3b4993d8c3645fae0066e92f50d659dda50de664ce6a15c0959f0b3883c7ddb23e14620e5d045fc0961da4c6c57bf638ef238e871"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ko/firefox-49.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "fba1f0fd69974d679c52246b9977f4d03d70c32ef4c77831d3305eaa30c4e19cca36692bee92aaa5195a4db34b162b909dd4b56370a4391aed33897b7f36463c"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/lij/firefox-49.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "28879f30f4db7f26f5bccf9219dcefcbf79437dcbe84d2ba7a27406d4ea4e6b4f3941bf2944400952c37df861f65db98ba60581df33a49a3b513c260ec33afca"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/lij/firefox-49.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "d0eea75c2bcf8f1040025807ff496c7e48b0949b633d475367b9721cf6c3447d2a30137afcdd54217f1d226cd67e3e5413d348eab9b63f95f3bb96b43e5fa5b4"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/lt/firefox-49.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "0991e328fc606eea0c7b67dca5a19c2c94a925d20e998994bee262a90fd69ba592936f29fe88ace97607c1bc3207f5f30ffafb5044a6e088967dbc2880bab154"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/lt/firefox-49.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "eaa6aeabf0f1c00cbd08d69e2a03d332ac9b022711aca0b09794ead8989fcc714313e8157de1884cdd3364b1fbeeaf62d31d61aab9baf34bfe97b5f56a55682b"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/lv/firefox-49.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "113b76cc2e5f0467b7cf02091857dc60bdb1fcb965089ad8a7196dbb15494642d161836d79035c26c09aade1ea1eb5cd734dc23ff80402b5b1b45efae9770892"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/lv/firefox-49.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "531f667d61dbf8b6cd90c918464e8456f907c964899b5819ac91fa6493b446ced18ada61c5a2227cc7bc044851142e03388e1b924cfc135cf5d61d1642369104"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/mai/firefox-49.0.2.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "42ba06b3c89c9702574f89f225663dc438bf4d2c8cdc698e80e46bcbb292814fec2487b540a3b4e4cfb484c146a34bedfe3cde0af504b9453ee7f7dea6688c29"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/mai/firefox-49.0.2.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "6dd7fac8a46343a0abf3958a044e534e0669894f30611aeb753a77cbb0da607f240672d1912490a3d05f312179d02ca96339e92f104298b9ccad45ab076bdd3e"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/mk/firefox-49.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "fbe110a9ba35be23b38511d5caffd2d1d0d365d881403b287980727987fe2b40ada8d6fa656faabc4eea4bd798f13ccc00de90091bf14cdc3dd4cacb28349f6d"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/mk/firefox-49.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "831d7f10a08bb9e6bb5ca163c8e172f9a4855b2062fca66c4832192eda45b20d64585f88ddb08268328e00f2d678b943e5d961f630cbd9730fd788997101ce8a"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ml/firefox-49.0.2.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "5b7e6f3c8ae0dccff269c97b8efc3a77e0468f0689a90afa61cddf8e88c3f3f4c3d9bf5ca0100376dc7d23f4d676739a2582235edee8bea836366cd38a4f4fc4"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ml/firefox-49.0.2.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "0a6ed3141038fdbd9c4a68dbac0178a3735d6777b60cbab679d6115e4c3b382bb59c6fe964924695a23975b44c064ad997d3f2f053b76dd8a0f241f157a86a54"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/mr/firefox-49.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "ab8d8f2984e94a37116a49453e0662a56fb83b981ef15627f5e328dc7d2bb595f09d6efa51d8840ea351be48aef311c177ddb24238bee6a5b7bc3996f7f888ba"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/mr/firefox-49.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "7bb1f611b4304f514183cb445b2bdd8d74140a4758b4c3a9664d7f62137540db191eecedb52287e45c269198f3d952c3e617d3bdbce2606dcce3f12efa59f5de"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ms/firefox-49.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "c6ff426bd09681209a36776e2a4b4282f3c4d50b3c9509b1e964da536527e03ece806b6d615e035a8f7425752d4796f11bbeb51cf8ce10b7c4b2770096366d94"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ms/firefox-49.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "dc7ab98a4d65df6a7e3496bc4ed37db622c8c26f790a2072f869cae8e4232ca2a3a7e299af25e7bfd855516e2de41745ef2cfdf2452e4d98bd60881c0845f44e"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/nb-NO/firefox-49.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "e4a2cb87bdd925faf6518e38fc7ccfed781e679df22c5456239cc5aec0afb5aa48f774225ee6fdaf82c6de56ef53c8738f8396c76a133c5eeefbac6a9ab96af7"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/nb-NO/firefox-49.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "5f0e719b40e67832968a1e8c9df8c3ddf7890b3e82ed555a3a2369637202e5f4c9f2a0b8faf7a2f6aa6719b033e3ad4f27dae3d6b5b0f0333615a8bb636320d4"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/nl/firefox-49.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "cfc57c748e0f940ba164b13c64d1129263d890e489ec0753900696947f869ecb1793f69a1f8b2cd986eecdd857ff7e94c28985248950f6a15f6ab15acd9046ca"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/nl/firefox-49.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "e7bdfd3976ae41a5f9fbfbd6b177f5f6815e68d9069e8916123574afdacfd28e0032211e7b1760275bded18bd3602ebf5697702edf89990c3ebac3efac381861"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/nn-NO/firefox-49.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "85fd914b626e27727461dc269c125539793e1a1c6001ea035c636bfee62d42ade799fb89bfba0bd4a915c5b33f6dd4569845cce3f189df1cb31ed2052fb90c30"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/nn-NO/firefox-49.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "6a478dd27c868c5e5ec0cda838044ca132eb89d93dee8556591c5651ad9ef8a6d89522498dd5d004e8e84d7ae40c09c69faac63591270b211a60b37667196a6a"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/or/firefox-49.0.2.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "335e08ee71febcca07e7d11310ed407a888aeb840c2cfc960a13706ce7ef1ecffcf6f8a21f65e1ae1606e88a3b383f9f3bb8d3110a8f3ae768c0c4277d3cf5fa"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/or/firefox-49.0.2.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "e4c4708c363346af1e7e58664baff9003e890aa934ccbdebaf682ec4b140bed7ab9b93cf657440401672ef1cfb79916d63f164066cc8ead18546de4718aed9ad"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/pa-IN/firefox-49.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "67a60e43ef5670dc2d669efc62101b87a1caa97c8bf8052c66396efa75c11dd90717b78b7dbac17cb8207549d26ea41d8bdb2965ea249618258de5892c4a40b3"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/pa-IN/firefox-49.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "c77dbfb443da63d0503a9c3586d01517b463071bfa8b739397b070ce80b8fde2a6ae86ba4552a2efe995eb7eb47cef7f6e2688526c7455c9d308dfdbd229ae6f"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/pl/firefox-49.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "85f6e5525f0e1b6d691613903f1646c84bcb7758092101c5b64e2190221e5d041e66938845c97877dc79c72aacaf9da6d6009bfaf9745d7138b58bf957591880"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/pl/firefox-49.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "0dfccd89d0c8a58a37b66e3034491139ad5fb16102f229c45f5ffcfabe77fc2f6a3a5d01f38c2471a770a1c8c8cf884e3a65cc793efe298366098280eab9da71"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/pt-BR/firefox-49.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "8b4ac20ae1fc5a7370199c6dd1e56f2bdb8f394b84e61410d4d33916de3aaab13d1c36d9944f8d6676895838aaf5e8a8beb0d5eadc82429a827214f528968aab"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/pt-BR/firefox-49.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "2c34abddecd5a2b83d8abef842b165ebcf601b7b90ffb8dc80a265b5297ab33da193ba450210be025d9ac8f826b7b4227063d66c9624bbcee06f01c787406a91"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/pt-PT/firefox-49.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "e5a1618114152348b19bc88f7e584d8bad09fedc893ccda0b38b55a1c449ec7f53f74dbae5901414edf74e4f3946e997e79da1ee597db29ff2f884460c2596a2"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/pt-PT/firefox-49.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "6cce28d554977a263c4d38675f88bfaccd4272c75ab82543b023f57ab503dcc806cb4f824681aef47dc788ed9fe85d54b0b1026cb0dcc4031267715929269fa7"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/rm/firefox-49.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "f06f72078658dc8f28fe376af8459980b1ef0470c7fd9557afb3cb4052a14e4e57d6e6131b5f158859ff53efa76ddccb10b95a5731a3c42654907bb8e776db85"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/rm/firefox-49.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "73b537df635d7278f8251ee0de6ddaceb1f9f843187d7b5ec5f0a7ccb8670cf97020a4ad9d22a4479b12dd0e81c36b94f557fc99f45dc70e6efe1914395d788e"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ro/firefox-49.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "8ce0260f462af9e2035987af36d90bf3b410d450cc69baada0326962b8a682c5b0e905c7d8a4d30875e4a6f09ca21a04c38db21955d3834c7edd3b5b72758e8b"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ro/firefox-49.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "d195066b01b39292121e4016a93d5e2ca02e0f8c3941f371a8033bcfaa4bef2966244ab0def982b1d8814b8d4af95be14b3e4ca3b900401f142aba9376e9387a"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ru/firefox-49.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "5860019163bd0bbb2f2a45396f74618358f294bc0a18cfdef148c28dde288050432bd4e1f68cab46b1d08e822f8850f5d940e6ab153a929052e5569199cfc2db"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ru/firefox-49.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "67c6e5e5fa32458db4fb4849796dc042a3f8f8a681c7cea52160f21841776dde9b746a068b090dd21d8db790b37d2306d344fcfc173a92291f73dd0b5d28b293"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/si/firefox-49.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "b218ca70de786cc046146d237283b808f54896c5efb8ca3a9ed2f5b6bc3201abba3ce0d01e3af453b097035b5a19ede69e8ce2543a84efd836d72cbdd3f60070"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/si/firefox-49.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "531f00041cb3eadf78b21f4bfef4429462b4bb3c497209724af5cfd75b879e2dfcf0f64135c79f6be1fa4c9b61a8735f18d6b74d4d6ffab0c252c2e02eb88ab9"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/sk/firefox-49.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "cefc02bb41d10e463af03b086da872e1cb191c5c44da2b69d0b3005c04d994cfd7c9a05205c2a74b46cf4fd920e12c3fd439da85b6ea8301a04ba07f0387b80a"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/sk/firefox-49.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "8334ff7e81e83e2a478705e1306fa8d1fe30edace143b5e84ddfafbb8d1b21fcb6875fcab4b36fc7f264fd738dac2821d21c0abffe71899691092ec67403ffe5"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/sl/firefox-49.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "2bb22102e3597987f81d02f0f162b94505d191c580016af1ad425d7722ec3913ed17d86292eef094d3631d4e0bb8adfcafc5372dbf6c17ce4fd73f4ce8695742"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/sl/firefox-49.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "97c9d25d58f0fa546237e9f10ecf9faf52e98242aa233e105233fb36ef97de76719588032d1fcd6b85cf2bb2f096e158a3c02774eac7cb026788d6e336cb5015"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/son/firefox-49.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "8ceeced6f4800f66499a30a2ec2275f70006ab875a7f1c14c095da0400cc7b9e93251da2156df07f2c861f5ce30adf5cbd3c263b6173ba71cb201d0dcfb28aba"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/son/firefox-49.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "8808edd0aced9810f191ea4e160aa316db12dfa663e6e085d848cbe2379d664a7c9005d5f9ee024d441398f47a87978d5182dc1b4b69bb9fc5a3b8be83f44457"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/sq/firefox-49.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "cf278fecf4a9c7a2590ca4484643c0e430e2f696479d3c50f06068b8191d2353b93c254385c59bed7b077aa83718561c0b387890093f2f026133362a5f2c45d2"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/sq/firefox-49.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "5b89d98d4bd5f618472bf0531839a5faed960fcb4ecbfd03f894f1aada0f73126a6f9351e1096379e606c6e7ed1665457da9eec05132b5838340be254c091873"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/sr/firefox-49.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "3a9549e949628d170e04e696db4f8b436ca240ecff99aff8cf7431391b73124b3278a04f5d758a1b3359de6fe264ba2552072582a8b385c797fc01049fbbd3c5"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/sr/firefox-49.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "45e4d83ebc97cd5da01e97a6bb083b3464d4b423dadc255ae49c927143be92843dc054357aafb6857f95fe004659833720453b049660f6dd6a75b4d433cde3f7"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/sv-SE/firefox-49.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "a203c9c80b4c64fec9ebef68279f70b23e1ddfe6a43ce5f6bcad48c9ccb3fbd1835b7a5783c1b4aec3e389301240007bd1fd402db692d2d9000dd5f28384feaf"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/sv-SE/firefox-49.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "8bdb4da9149743ec4e66f37e0346c46bd011105d09a6517ba8ec35eda4d47d06ea8763114f736cf98aa79b0dafec42e8c8f8285ae87ced63f51f60e2c7088cf6"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ta/firefox-49.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "b6d1fa74bcb003f2c5a3dd57c226ecf1a7a99d2874ccf89a525ca23ec5809f12f2d1fee20ebbe9096d9fdd13714d93a46b8ce83544c582a94cb9e39f80fe3ddc"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ta/firefox-49.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "0ed976141674b93154cd0f48cbeb70d5349a3642066bed36b53f9c9e8e78fd2c0409e4bff7de038d07480e0fed87fc96485296f4cda9a2a3b460c7dcab622ab7"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/te/firefox-49.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "60c4e8c2a1d61ec87a6ce0e0a77a61412d3f9e28dd3310666da0c8ca58ccd93765f20315e8c4866138ede58465626fd16fba5196808fd716dff9ed9ccecd0e95"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/te/firefox-49.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "85fedf1de1c5ceaef81765031e8d5e24145bf1851331d82a319ac54ab0b3abf7f896d69262c82615015e8854649321a9352037c59baf0827c2d3d2d7f40fdfba"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/th/firefox-49.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "cacc9b4ccee14f1bfb8c9828c69903933d92fcc73c8fe7b83eb5057e6636b4cc35d231746ecea4e319e7537f7af645fa0c0f8dc5bbc70a333f83ab06780a4ac5"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/th/firefox-49.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "88070db1c08bc68231fd32c4ee812ab4c225a3b53a09773bc55ad82381813b822d12fefccbb4dce6b41bb89cc57ab423caf8051b9ecdbb9b9f8e55025d90ec4a"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/tr/firefox-49.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "effa5261281a2c45549943d2ea757bd0f2a6100921566114bf6186695f906ee6a19a84992643f4ba5e434b397d4da976ef137cc3992965d269d3f8398def88e4"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/tr/firefox-49.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "759cdbed5de7367fb04a412122423b863095743f15e310ec4b4416f89aa8b76cb74fbdbd05524ab0d6ca8f420057d9fe937c7f44e44d5079d35afcf8835e11c7"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/uk/firefox-49.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "57937cd67abd7aca0e5ebfed3e890237dd305a45499dea46d31d8e4994195af0365e27981ba624068781df5b0f64437148564604dacf83f96ceb32448503ed41"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/uk/firefox-49.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "94ffa3c69613db6124278edeed6df2d11880a47941c8761eefd86b30eaa6f6b60e83d5fb5df25156613ab74f9f0491e58794042dc1df74909c14089b8cb3b232"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/uz/firefox-49.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "b5280fe0b3d5afcb37afc1c0d18d583f698eca1cd01abbe22ed9c3726db9327e9f758079856fedf23b533a9d64fd47ae9da733a1138ac715b4c0ff043618b89e"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/uz/firefox-49.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "d6c658a6c76606ee2861b89f109e1de707e32d1b3136bc92de9f60f2257286b271a0594517d53bcc727a86cb457d33a27bc9574de60c4059b2a203fdd5601a2d"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/vi/firefox-49.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "cbe65faa2d20a3740cf1ce97efa29f3e9e1697feef0f63f26d9f7577dc626114834f8435c3b7c7d3989bf3f985d5ac518ab59f6ba9eea4fa86b8f5a20dcf7cc2"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/vi/firefox-49.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "919f2fdbf20f39698264a7760ce8df4c7d979bbc91a44ac6a2a258c2ceafa62bcc945dd07a3fb4a4535f47c4e90dc34e06ac0d58165d6ea8edd451bf147aa818"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/xh/firefox-49.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "f8c3c5424bf6bb41ac9143b20a57bb1e78688ad9ba9ba35a5fe00c524354ca9e65db3e0d4dd2b3447c76a80332b9f4adc16fc5daeab61e35ecf868ea935228cc"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/xh/firefox-49.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "1d331b1b1c1bf3f84c7378189faa17ca112869b0fcaed57184d5f40d05c9d336a06fecd84bac2a2cbfff5494f0eab472fb4678a82af4541172b240f5baff68e7"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/zh-CN/firefox-49.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "0f59002f5d5ae044a07d3c6136a5db19d4c3d067da8617614b8e8b68f266475fdccc32e1bc59bfd3195dff3e475a4e3f1cc6d505b560b8322744277b5d88885d"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/zh-CN/firefox-49.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "1a18d792941b4a0d49c1321cd53d397a9c667de62cac58c75229c0b10327cb4e39b7c5df294be378aec581647de1f52c17a309724689f010d37141aa5691cd2a"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/zh-TW/firefox-49.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "d58697f7898bf018958d5fc9389b4aa65c81c61fc104e51d758b0a15e19febf22c882b740f12536dfda3ba776019859637b66aa4e302735b31abcff098762175"; }
+ { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/zh-TW/firefox-49.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "4a53044f7e44e5239587256d24f8149ce0d4606bd53ac6a3f1ec48ca6950a67c1892036730ed7743ae53905ef3c33aa4e192805c8a279ced68c3202342439a77"; }
];
}
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 1f3b3977e8f..650f4a3006a 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -1,7 +1,7 @@
{ 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
+, yasm, mesa, sqlite, unzip, makeWrapper
, hunspell, libevent, libstartup_notification, libvpx
, cairo, gstreamer, gst_plugins_base, icu, libpng, jemalloc, libpulseaudio
, autoconf213, which
@@ -34,7 +34,7 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec {
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
- xorg.libXScrnSaver xorg.scrnsaverproto pysqlite
+ xorg.libXScrnSaver xorg.scrnsaverproto
xorg.libXext xorg.xextproto sqlite unzip makeWrapper
hunspell libevent libstartup_notification libvpx /* cairo */
icu libpng jemalloc
@@ -141,8 +141,8 @@ in {
firefox-unwrapped = common {
pname = "firefox";
- version = "49.0.1";
- sha512 = "0b1lmsxazd32xxlbbzg01xam7qc9m7abv6fnl1ixv4dz0xpfc88l1zikskghhdk9snzglyl3lidgnbkli9039g3gf9m06yv77gasmkg";
+ version = "49.0.2";
+ sha512 = "e9daa62c8e645ec034f1435afb579ddb5c503db313ea0cc3e48b7508f8368028979de07ca1426cc4c0f3ae82756f39dcb3b349712d520b8503a34afbd443fb1e";
};
firefox-esr-unwrapped = common {
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
index 6f8e327a6c3..c33bff60e01 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
@@ -17,11 +17,11 @@ in
stdenv.mkDerivation rec {
name = "bluejeans-${version}";
- version = "2.160.66.8";
+ version = "2.180.71.8";
src = fetchurl {
url = "https://swdl.bluejeans.com/skinny/bjnplugin_${version}-1_amd64.deb";
- sha256 = "1wf9jgd2717gfzm2wb0hxj4i76kczhgnwfhhpiy15zkqdcsmczsr";
+ sha256 = "1fgjgzss0ghk734xpfidazyknfdn11pmyw77pc3wigl83dvx4nb2";
};
phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
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 81fca6614a5..4d598bbb3a9 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@@ -70,11 +70,11 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-${version}";
- version = "11.2.202.637";
+ version = "11.2.202.643";
src = fetchurl {
url = "https://fpdownload.macromedia.com/pub/flashplayer/installers/archive/fp_${version}_archive.zip";
- sha256 = "0xp1pxhrnam4yi8wfwaifqx7m2im0zx2xv8xgbdm0llrzbkc57mh";
+ sha256 = "02imhdzhali42m8d1rw3bqscvi70707mssss7c43dm2kf67z6y8s";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index fe7cb477371..0c6d36b3818 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -1,91 +1,125 @@
-{ stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libXt
-, freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp
-, libuuid, cups, xz
-, gstreamer, gst_plugins_base, libxml2
-, gtkSupport ? true, glib, gtk2, pango, gdk_pixbuf, cairo, atk
-, kdeSupport ? false, qt4, kdelibs
+{ alsaLib
+, atk
+, cairo
+, cups
+, curl
+, dbus
+, dpkg
+, expat
+, fetchurl
+, fontconfig
+, freetype
+, gdk_pixbuf
+, glib
+, gnome2
+, gtk2
+, libX11
+, libXScrnSaver
+, libXcomposite
+, libXcursor
+, libXdamage
+, libXext
+, libXfixes
+, libXi
+, libXrandr
+, libXrender
+, libXtst
+, libnotify
+, libpulseaudio
+, nspr
+, nss
+, pango
+, stdenv
+, systemd
}:
-assert stdenv.isLinux && stdenv.cc.isGNU && stdenv.cc.libc != null;
-
let
- mirror = http://get.geo.opera.com/pub/opera;
-in
-stdenv.mkDerivation rec {
- name = "opera-12.16-1860";
+ mirror = https://get.geo.opera.com/pub/opera/desktop;
+ version = "40.0.2308.90";
+
+ rpath = stdenv.lib.makeLibraryPath [
+
+ # These provide shared libraries loaded when starting. If one is missing,
+ # an error is shown in stderr.
+ alsaLib.out
+ atk.out
+ cairo.out
+ cups.out
+ curl.out
+ dbus.lib
+ expat.out
+ fontconfig.lib
+ freetype.out
+ gdk_pixbuf.out
+ glib.out
+ gnome2.GConf.out
+ gtk2.out
+ libX11.out
+ libXScrnSaver.out
+ libXcomposite.out
+ libXcursor.out
+ libXdamage.out
+ libXext.out
+ libXfixes.out
+ libXi.out
+ libXrandr.out
+ libXrender.out
+ libXtst.out
+ libnotify.out
+ nspr.out
+ nss.out
+ pango.out
+ stdenv.cc.cc.lib
+
+ # This is a little tricky. Without it the app starts then crashes. Then it
+ # brings up the crash report, which also crashes. `strace -f` hints at a
+ # missing libudev.so.0.
+ systemd.lib
+
+ # Works fine without this except there is no sound.
+ libpulseaudio.out
+ ];
+
+in stdenv.mkDerivation {
+
+ name = "opera-${version}";
src =
if stdenv.system == "i686-linux" then
fetchurl {
- url = "${mirror}/linux/1216/${name}.i386.linux.tar.xz";
- sha256 = "df640656a52b7c714faf25de92d84992116ce8f82b7a67afc1121eb3c428489d";
+ url = "${mirror}/${version}/linux/opera-stable_${version}_i386.deb";
+ sha256 = "1fqbxbn4531yv9figgg8xxr63swimrgpamqrphcg8jq5q3smrk4k";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
- url = "${mirror}/linux/1216/${name}.x86_64.linux.tar.xz";
- sha256 = "b3b5cada3829d2b3b0e2da25e9444ce9dff73dc6692586ce72cfd4f6431e639e";
+ url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb";
+ sha256 = "12imzjxwip9r7bjyfnrpdsxyxb0cjn92s3b7ajdlbqccxxmc6k6g";
}
else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";
- dontStrip = 1;
-
- phases = "unpackPhase installPhase fixupPhase";
+ unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";
installPhase = ''
- ./install --unattended --prefix $out
- '';
-
- buildInputs =
- [ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE
- libXft freetype fontconfig libXrender libuuid expat
- gstreamer libxml2 gst_plugins_base
- ]
- ++ stdenv.lib.optionals gtkSupport [ glib gtk2 pango gdk_pixbuf cairo atk ]
- ++ stdenv.lib.optionals kdeSupport [ kdelibs qt4 ];
-
- libPath = stdenv.lib.makeLibraryPath buildInputs
- + stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
- (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs);
-
- preFixup =
- ''
- rm $out/bin/uninstall-opera
- find $out/lib/opera -type f | while read f; do
- type=$(readelf -h "$f" 2>/dev/null | sed -n 's/ *Type: *\([A-Z]*\).*/\1/p' || true)
- if [ -z "$type" ]; then
- :
- elif [ $type == "EXEC" ]; then
- echo "patching $f executable <<"
- patchelf \
- --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath "${libPath}" \
- "$f"
- elif [ $type == "DYN" ]; then
- echo "patching $f library <<"
- patchelf --set-rpath "${libPath}" "$f"
- else
- echo "Unknown type $type"
- exit 1
- fi
- done
- '';
+ mkdir --parent $out
+ mv * $out/
+ mv $out/lib/*/opera/*.so $out/lib/
+ '';
postFixup = ''
- oldRPATH=`patchelf --print-rpath $out/lib/opera/opera`
- patchelf --set-rpath $oldRPATH:${cups.out}/lib $out/lib/opera/opera
-
- # This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command
- # It have no reasons to exist in a redistribuable package
- rm $out/share/icons/hicolor/icon-theme.cache
- '';
+ find $out -executable -type f \
+ | while read f
+ do
+ patchelf \
+ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath "$out/lib:${rpath}" \
+ "$f"
+ done
+ '';
meta = {
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/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 8509140552e..df08fadfbdf 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -11,15 +11,15 @@
let
version = "1.4";
- build = "589.29-1";
+ build = "589.38-1";
fullVersion = "stable_${version}.${build}";
info = if stdenv.is64bit then {
arch = "amd64";
- sha256 = "14sb58qrqnqcpkzacwnwfln558p018zargppxq21p5ic8s92v1g6";
+ sha256 = "08qdpl5dkb2snpqlk3rsqlyl9rfas9v6bbcw2p4kzazhinak5hv3";
} else {
arch = "i386";
- sha256 = "0c4l9ji5xlxwzcjsrvxjkx53j76y777fj6hh7plfkkanlrfkryac";
+ sha256 = "0wpaglc1aaam5bqxgvf5zwcbr0xll8yj63l19q792l51j1vkv56q";
};
in stdenv.mkDerivation rec {
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 75083409ba7..860ecd1d078 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -1,55 +1,69 @@
-{ stdenv, fetchFromGitHub, which, go, makeWrapper, iptables, rsync, utillinux, coreutils, e2fsprogs, procps-ng }:
+{ stdenv, lib, fetchFromGitHub, which, go, go-bindata, makeWrapper, rsync
+, iptables, coreutils
+, components ? [
+ "cmd/kubectl"
+ "cmd/kubelet"
+ "cmd/kube-apiserver"
+ "cmd/kube-controller-manager"
+ "cmd/kube-proxy"
+ "plugin/cmd/kube-scheduler"
+ "cmd/kube-dns"
+ "federation/cmd/federation-apiserver"
+ "federation/cmd/federation-controller-manager"
+ ]
+}:
+
+with lib;
stdenv.mkDerivation rec {
name = "kubernetes-${version}";
- version = "1.2.4";
+ version = "1.4.0";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
- sha256 = "1a3y0f1l008ywkwwygg9vn2rb722c54i3pbgqks38gw1yyvgbiih";
+ sha256 = "0q7xwdjsmfrz7pnmylkbkr2yxsl2gzzy17aapfznl2hb1ms81kys";
};
- buildInputs = [ makeWrapper which go iptables rsync ];
+ buildInputs = [ makeWrapper which go rsync go-bindata ];
- buildPhase = ''
- GOPATH=$(pwd):$(pwd)/Godeps/_workspace
- mkdir -p $(pwd)/Godeps/_workspace/src/k8s.io
- ln -s $(pwd) $(pwd)/Godeps/_workspace/src/k8s.io/kubernetes
+ outputs = ["out" "man""pause"];
+ postPatch = ''
substituteInPlace "hack/lib/golang.sh" --replace "_cgo" ""
patchShebangs ./hack
- hack/build-go.sh --use_go_build
-
- (cd cluster/addons/dns/kube2sky && go build ./kube2sky.go)
'';
+ WHAT="--use_go_build ${concatStringsSep " " components}";
+
+ postBuild = "(cd build/pause && gcc pause.c -o pause)";
+
installPhase = ''
- mkdir -p "$out/bin" "$out"/libexec/kubernetes/cluster
- cp _output/local/go/bin/{kube*,hyperkube} "$out/bin/"
- cp cluster/addons/dns/kube2sky/kube2sky "$out/bin/"
- cp cluster/saltbase/salt/helpers/safe_format_and_mount "$out/libexec/kubernetes"
- cp -R hack "$out/libexec/kubernetes"
- cp cluster/update-storage-objects.sh "$out/libexec/kubernetes/cluster"
- makeWrapper "$out"/libexec/kubernetes/cluster/update-storage-objects.sh "$out"/bin/kube-update-storage-objects \
- --prefix KUBE_BIN : "$out/bin"
+ mkdir -p "$out/bin" "$man/share/man" "$pause/bin"
+
+ cp _output/local/go/bin/* "$out/bin/"
+ cp build/pause/pause "$pause/bin/pause"
+ cp -R docs/man/man1 "$man/share/man"
'';
preFixup = ''
wrapProgram "$out/bin/kube-proxy" --prefix PATH : "${iptables}/bin"
- wrapProgram "$out/bin/kubelet" --prefix PATH : "${stdenv.lib.makeBinPath [ utillinux procps-ng ]}"
- chmod +x "$out/libexec/kubernetes/safe_format_and_mount"
- wrapProgram "$out/libexec/kubernetes/safe_format_and_mount" --prefix PATH : "${stdenv.lib.makeBinPath [ e2fsprogs utillinux ]}"
- substituteInPlace "$out"/libexec/kubernetes/cluster/update-storage-objects.sh \
- --replace KUBE_OUTPUT_HOSTBIN KUBE_BIN
+ wrapProgram "$out/bin/kubelet" --prefix PATH : "${coreutils}/bin"
+
+ # Remove references to go compiler
+ while read file; do
+ cat $file | sed "s,${go},$(echo "${go}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" > $file.tmp
+ mv $file.tmp $file
+ chmod +x $file
+ done < <(find $out/bin $pause/bin -type f 2>/dev/null)
'';
- meta = with stdenv.lib; {
+ meta = {
description = "Production-Grade Container Scheduling and Management";
license = licenses.asl20;
homepage = http://kubernetes.io;
maintainers = with maintainers; [offline];
- platforms = [ "x86_64-linux" ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index d6ae08444bc..bbceca88ae8 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.5";
+ version = "0.7.7";
rev = "v${version}";
goPackagePath = "github.com/hashicorp/terraform";
@@ -11,7 +11,7 @@ buildGoPackage rec {
inherit rev;
owner = "hashicorp";
repo = "terraform";
- sha256 = "1s338zhynn8wmhsqhq58njgxv6mwic7d8yxb7zcj2x4b78i7hqa0";
+ sha256 = "0wza5ladh406lf8hd4fbh4ri82qbcf91lif82357ldy78ghsi5g7";
};
postInstall = ''
@@ -27,6 +27,9 @@ buildGoPackage rec {
description = "Tool for building, changing, and versioning infrastructure";
homepage = "https://www.terraform.io/";
license = licenses.mpl20;
- maintainers = with maintainers; [ zimbatm ];
+ maintainers = with maintainers; [
+ jgeerds
+ zimbatm
+ ];
};
}
diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix
index 3f1b5dad727..826452016e7 100644
--- a/pkgs/applications/networking/drive/default.nix
+++ b/pkgs/applications/networking/drive/default.nix
@@ -1,18 +1,25 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "drive-${version}";
- version = "20151025-${stdenv.lib.strings.substring 0 7 rev}";
- rev = "6dc2f1e83032ea3911fa6147b846ee93f18dc544";
+ version = "0.3.8.1";
goPackagePath = "github.com/odeke-em/drive";
subPackages = [ "cmd/drive" ];
- src = fetchgit {
- inherit rev;
- url = "https://github.com/odeke-em/drive";
- sha256 = "07s4nhfcr6vznf1amvl3a4wq2hn9zq871rcppfi4i6zs7iw2ay1v";
+ src = fetchFromGitHub {
+ owner = "odeke-em";
+ repo = "drive";
+ rev = "v${version}";
+ sha256 = "1b9cgc148rg5irg4jas10zv9i2km75x1zin25hld340dmpjcpi82";
};
goDeps = ./deps.nix;
+
+ meta = with lib; {
+ homepage = https://github.com/odeke-em/drive;
+ description = "Google Drive client for the commandline";
+ license = licenses.asl20;
+ platforms = platforms.linux;
+ };
}
diff --git a/pkgs/applications/networking/drive/deps.nix b/pkgs/applications/networking/drive/deps.nix
index ad5a8f7c4e6..ca132288bd6 100644
--- a/pkgs/applications/networking/drive/deps.nix
+++ b/pkgs/applications/networking/drive/deps.nix
@@ -1,47 +1,12 @@
+# This file was generated by go2nix.
[
{
- 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";
+ goPackagePath = "cloud.google.com/go";
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";
+ rev = "7450882a75c8d2600748666d1ed16e0a5afa532d";
+ sha256 = "1hl2lsf9m1imdszf5mww4h6qrcjfdjghwh6l2kqsy85d32vbkjgd";
};
}
{
@@ -49,8 +14,8 @@
fetch = {
type = "git";
url = "https://github.com/boltdb/bolt";
- rev = "957d850b5158a4eebf915476058e720f43459584";
- sha256 = "193adhhsqdy0kyq1l1fi8pg2n6pwyrw4h607qm78qyi26f8i7vzf";
+ rev = "074dffcc83e9f421e261526d297cd93f22a34080";
+ sha256 = "1kkmsby74n9czqx4mvng9x1cvnm4qgjl3dp6b4mfmg2b00fwbqnv";
};
}
{
@@ -58,8 +23,26 @@
fetch = {
type = "git";
url = "https://github.com/cheggaaa/pb";
- rev = "e648e12b78cedf14ebb2fc1855033f07b034cfbb";
- sha256 = "03k4cars7hcqqgdsd0minfls2p7gjpm8q6y8vknh1s68kvxd4xam";
+ rev = "ad4efe000aa550bb54918c06ebbadc0ff17687b9";
+ sha256 = "0w6dl2s0vzb64q85yfy1hd5z2fq2vzwygiwl65is6hwa4vkc7hi3";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-isatty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-isatty";
+ rev = "66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8";
+ sha256 = "17lf13ndnai9a6dlmykqkdyzf1z04q7kffs0l7kvd78wpv3l6rm5";
+ };
+ }
+ {
+ goPackagePath = "github.com/odeke-em/cache";
+ fetch = {
+ type = "git";
+ url = "https://github.com/odeke-em/cache";
+ rev = "baf8e436bc97557118cb0bf118ab8ac6aeeda381";
+ sha256 = "00nvrnp40w4m1ld89k3s3gwi9qcfjxwi8hnp62zggnvqqyc4fyz1";
};
}
{
@@ -72,12 +55,12 @@
};
}
{
- goPackagePath = "github.com/odeke-em/statos";
+ goPackagePath = "github.com/odeke-em/command";
fetch = {
type = "git";
- url = "https://github.com/odeke-em/statos";
- rev = "f27d6ab69b62abd9d9fe80d355e23a3e45d347d6";
- sha256 = "17cpks8bi9i7p8j38x0wy60jb9g39wbzszcmhx4hlq6yzxr04jvs";
+ url = "https://github.com/odeke-em/command";
+ rev = "91ca5ec5e9a1bc2668b1ccbe0967e04a349e3561";
+ sha256 = "1ghckzr8h99ckagpmb15p61xazdjmf9mjmlym634hsr9vcj84v62";
};
}
{
@@ -99,39 +82,21 @@
};
}
{
- goPackagePath = "github.com/odeke-em/meddler";
+ goPackagePath = "github.com/odeke-em/go-utils";
fetch = {
type = "git";
- url = "https://github.com/odeke-em/meddler";
- rev = "d2b51d2b40e786ab5f810d85e65b96404cf33570";
- sha256 = "0m0fqrn3kxy4swyk4ja1y42dn1i35rq9j85y11wb222qppy2342x";
+ url = "https://github.com/odeke-em/go-utils";
+ rev = "d915395a7a46a9fe73d93f4daeff5953eeac5ef2";
+ sha256 = "0c1z4vmz69vxak8ldw4qjcgwia5ph969gj80az7a3824gia7zhbh";
};
}
{
- goPackagePath = "github.com/odeke-em/xon";
+ goPackagePath = "github.com/odeke-em/go-uuid";
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";
+ url = "https://github.com/odeke-em/go-uuid";
+ rev = "b211d769a9aaba5b2b8bdbab5de3c227116f3c39";
+ sha256 = "086l4xmwkjl5qcylcb5iwy9ksk9k5g43xwfbkcgvmhpz5mq3wmz2";
};
}
{
@@ -143,6 +108,15 @@
sha256 = "059c933qjikxlvaywzpzljqnab19svymbv6x32pc7khw156fh48w";
};
}
+ {
+ 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/pretty-words";
fetch = {
@@ -152,13 +126,67 @@
sha256 = "1466wjhrg9lhqmzil1vf8qj16fxk32b5kxlcccyw2x6dybqa6pkl";
};
}
+ {
+ goPackagePath = "github.com/odeke-em/semalim";
+ fetch = {
+ type = "git";
+ url = "https://github.com/odeke-em/semalim";
+ rev = "9c88bf5f9156ed06ec5110a705d41b8580fd96f7";
+ sha256 = "0nq93dcl84cmlvg31rdk281ndlc2452zlh5s7i40hasi0z0kmn1k";
+ };
+ }
+ {
+ goPackagePath = "github.com/odeke-em/statos";
+ fetch = {
+ type = "git";
+ url = "https://github.com/odeke-em/statos";
+ rev = "6f7e4db337bc11fc46d9b0456a93836cbbfe5141";
+ sha256 = "1lijz3cxqxd78sl0nzfgvs675dg7q99jqwvhgisnk9n84ic4ffzj";
+ };
+ }
{
goPackagePath = "github.com/skratchdot/open-golang";
fetch = {
type = "git";
url = "https://github.com/skratchdot/open-golang";
- rev = "c8748311a7528d0ba7330d302adbc5a677ef9c9e";
- sha256 = "0qhn2d00v3m9fiqk9z7swdm599clc6j7rnli983s8s1byyp0x3ac";
+ rev = "75fb7ed4208cf72d323d7d02fd1a5964a7a9073c";
+ sha256 = "1b67imqbsdvg19vif1q1dfmapxy3v2anagacbql95fwnnw0v8jga";
+ };
+ }
+ {
+ 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 = "1e695b1c8febf17aad3bfa7bf0a819ef94b98ad5";
+ sha256 = "1sfgrc63jwslczkld7bsfipw1jm1rn06228dx0vc5gggd52155ys";
+ };
+ }
+ {
+ goPackagePath = "google.golang.org/api";
+ fetch = {
+ type = "git";
+ url = "https://code.googlesource.com/google-api-go-client";
+ rev = "eb84d1a029af1654777e7ba65c979085305c3e38";
+ sha256 = "0ldmzcx5lxa81lcr39djcvyhd0ls11jlswj5877rinq3505ayf5l";
};
}
]
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 90c6bce6506..9639fe9e74a 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 = "11.4.22";
+ version = "12.4.22";
sha256 =
{
- "x86_64-linux" = "1fpwknf8as2h6d8d11nb8i0q4ap5r6fvii919b3pj5d29jgfd25l";
- "i686-linux" = "1dv60ijb93464js34vk3l8hm8a57zdpkzhrfkv2kp3v3172cqj8s";
+ "x86_64-linux" = "1vmaddk19w9b9lg03v2jr532qpk6miw24rrprx6x6md9ll9asv8y";
+ "i686-linux" = "1pzxsdsi37fvk0gr69m2sa61q7afy5gcz8p78nsdr4i0gga1gxfr";
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
arch =
diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
index eb95647ff0f..12a85f5e1db 100644
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext
, pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }:
-let version = "3.20.1"; in
+let version = "3.22.1"; in
stdenv.mkDerivation {
name = "filezilla-${version}";
src = fetchurl {
url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
- sha256 = "0bcy0j89y2mpjyzwnz1qa33412n7yl0g8px2r4v7gla25r2x5qwa";
+ sha256 = "0pr8wj2dk5s5xxrsl0pb8y1bna0k1s3c18dh056c6qp02gba1a1f";
};
configureFlags = [
diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 8506b5f138b..3a08cd26292 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -4,7 +4,7 @@
, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, pango
, systemd, libXScrnSaver }:
-let version = "0.0.8"; in
+let version = "0.0.9"; in
stdenv.mkDerivation {
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://cdn-canary.discordapp.com/apps/linux/${version}/discord-canary-${version}.tar.gz";
- sha256 = "1g48jxiswpfvbgjs4dyywmzj9kncvrgpajhixk3acizdmfmsyqkk";
+ sha256 = "72f692cea62b836220f40d81d110846f9cde9a0fba7a8d47226d89e0980255b9";
};
libPath = stdenv.lib.makeLibraryPath [
diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index cc0c07daca4..e03b99aa171 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [
pythonPackages.pygobject2 pythonPackages.pyGtkGlade
- pythonPackages.sqlite3 pythonPackages.pyasn1
+ pythonPackages.pyasn1
pythonPackages.pyxdg
pythonPackages.nbxmpp
pythonPackages.pyopenssl pythonPackages.dbus-python
diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
index 9675b5d5315..ec4eb91d6ab 100644
--- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1f4h0yc1mfjnxzvxiv9hxgak59mgr3a5ykv50vlyiay82za20jax";
};
- buildInputs = with pythonPackages; [ python pyqt4 wrapPython sqlite3 ] ++ [ openssl ];
+ buildInputs = with pythonPackages; [ python pyqt4 wrapPython ] ++ [ openssl ];
preConfigure = ''
substituteInPlace Makefile \
diff --git a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix
new file mode 100644
index 00000000000..229e3497ea4
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchgit, python3Packages }:
+
+python3Packages.buildPythonPackage {
+ name = "scudcloud-1.35";
+ namePrefix = "";
+
+ # Version 1.35, branch 254-port-to-qt5
+ # https://github.com/raelgc/scudcloud/commit/6d924b5c23597c94d1a8e829a8a5d917806a5bc9
+ src = fetchgit {
+ url = https://github.com/raelgc/scudcloud/;
+ rev = "6d924b5c23597c94d1a8e829a8a5d917806a5bc9";
+ sha256 = "01k5am3067l3p1c91mdrh2fk3cgr20dhppa6flqi5b2ygzrc1i8q";
+ };
+
+ propagatedBuildInputs = with python3Packages; [ pyqt5 dbus-python ];
+
+ meta = with stdenv.lib; {
+ description = "Non-official desktop client for Slack";
+ homepage = "https://github.com/raelgc/scudcloud";
+ license = licenses.mit;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ volhovm ];
+ };
+}
diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix
index 79e2185f04e..0d018c9588f 100644
--- a/pkgs/applications/networking/ipfs/default.nix
+++ b/pkgs/applications/networking/ipfs/default.nix
@@ -1,22 +1,31 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub, fetchgx }:
buildGoPackage rec {
name = "ipfs-${version}";
- version = "i20160112--${stdenv.lib.strings.substring 0 7 rev}";
- rev = "7070b4d878baad57dcc8da80080dd293aa46cabd";
+ version = "0.4.4";
+ rev = "d905d485192616abaea25f7e721062a9e1093ab9";
goPackagePath = "github.com/ipfs/go-ipfs";
+ extraSrcPaths = [
+ (fetchgx {
+ inherit name src;
+ sha256 = "0mm1rs2mbs3rmxfcji5yal9ai3v1w75kk05bfyhgzmcjvi6lwpyb";
+ })
+ ];
+
src = fetchFromGitHub {
owner = "ipfs";
repo = "go-ipfs";
inherit rev;
- sha256 = "1b7aimnbz287fy7p27v3qdxnz514r5142v3jihqxanbk9g384gcd";
+ sha256 = "06iq7fmq7p0854aqrnmd0f0jvnxy9958wvw7ibn754fdfii9l84l";
};
meta = with stdenv.lib; {
description = "A global, versioned, peer-to-peer filesystem";
+ homepage = https://ipfs.io/;
license = licenses.mit;
- broken = true;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ fpletz ];
};
}
diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix
index bc1d0344490..4d7ebbfac2e 100644
--- a/pkgs/applications/networking/irc/hexchat/default.nix
+++ b/pkgs/applications/networking/irc/hexchat/default.nix
@@ -5,12 +5,12 @@
}:
stdenv.mkDerivation rec {
- version = "2.12.1";
+ version = "2.12.3";
name = "hexchat-${version}";
src = fetchurl {
url = "http://dl.hexchat.net/hexchat/${name}.tar.xz";
- sha256 = "0svwz9ldrry1sn35jywgpacjj1cf3xl3k74ynwn8rjvxs73b00aj";
+ sha256 = "1fpj2kk1p85snffchqxsz3sphhcgiripjw41mgzxi7ks5hvj4avg";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/networking/irc/quassel-webserver/default.nix b/pkgs/applications/networking/irc/quassel-webserver/default.nix
new file mode 100644
index 00000000000..4ca3d619aa6
--- /dev/null
+++ b/pkgs/applications/networking/irc/quassel-webserver/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, lib, fetchFromGitHub, callPackage, python, utillinux}:
+
+with lib;
+
+let
+ nodePackages = callPackage ../../../../top-level/node-packages.nix {
+ neededNatives = [ python ];
+ self = nodePackages;
+ generated = ./quassel-webserver.nix;
+ };
+
+in nodePackages.buildNodePackage rec {
+ name = "quassel-webserver-${version}";
+ version = "2.1.1";
+ src = fetchFromGitHub {
+ owner = "magne4000";
+ repo = "quassel-webserver";
+ rev = "dda457f38795d15565557a8629085063fa6a7378";
+ sha256 = "0syglfdmjnssxdiak1dw8cns5f736v58zmlsh81dvxww90gx3k7h";
+ };
+ buildInputs = nodePackages.nativeDeps."quassel-webserver" or [];
+ deps = [ nodePackages.by-spec."body-parser"."^1.15.2"
+ nodePackages.by-spec."commander"."^2.9.0"
+ nodePackages.by-spec."cookie-parser"."~1.4.3"
+ nodePackages.by-spec."express"."^4.14.0"
+ nodePackages.by-spec."jade"."~1.11.0"
+ nodePackages.by-spec."less"."^2.7.1"
+ nodePackages.by-spec."less-middleware"."^2.2.0"
+ nodePackages.by-spec."libquassel"."~2.0.5"
+ nodePackages.by-spec."morgan"."^1.7.0"
+ nodePackages.by-spec."net-browserify-alt"."^1.0.0"
+ nodePackages.by-spec."serve-favicon"."~2.3.0"
+ ];
+ peerDependencies = [];
+
+ meta = {
+ description = "A web server/client for Quassel";
+ license = licenses.mit;
+ homepage = "https://github.com/magne4000/quassel-webserver";
+ maintainers = with maintainers; [ uwap ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/networking/irc/quassel-webserver/quassel-webserver.nix b/pkgs/applications/networking/irc/quassel-webserver/quassel-webserver.nix
new file mode 100644
index 00000000000..954762dc46f
--- /dev/null
+++ b/pkgs/applications/networking/irc/quassel-webserver/quassel-webserver.nix
@@ -0,0 +1,2436 @@
+{ self, fetchurl, fetchgit ? null, lib }:
+
+{
+ by-spec."accepts"."~1.3.3" =
+ self.by-version."accepts"."1.3.3";
+ by-version."accepts"."1.3.3" = self.buildNodePackage {
+ name = "accepts-1.3.3";
+ version = "1.3.3";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz";
+ name = "accepts-1.3.3.tgz";
+ sha1 = "c3ca7434938648c3e0d9c1e328dd68b622c284ca";
+ };
+ deps = {
+ "mime-types-2.1.12" = self.by-version."mime-types"."2.1.12";
+ "negotiator-0.6.1" = self.by-version."negotiator"."0.6.1";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."acorn"."^1.0.1" =
+ self.by-version."acorn"."1.2.2";
+ by-version."acorn"."1.2.2" = self.buildNodePackage {
+ name = "acorn-1.2.2";
+ version = "1.2.2";
+ bin = true;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz";
+ name = "acorn-1.2.2.tgz";
+ sha1 = "c8ce27de0acc76d896d2b1fad3df588d9e82f014";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."acorn"."^2.1.0" =
+ self.by-version."acorn"."2.7.0";
+ by-version."acorn"."2.7.0" = self.buildNodePackage {
+ name = "acorn-2.7.0";
+ version = "2.7.0";
+ bin = true;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz";
+ name = "acorn-2.7.0.tgz";
+ sha1 = "ab6e7d9d886aaca8b085bc3312b79a198433f0e7";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."acorn-globals"."^1.0.3" =
+ self.by-version."acorn-globals"."1.0.9";
+ by-version."acorn-globals"."1.0.9" = self.buildNodePackage {
+ name = "acorn-globals-1.0.9";
+ version = "1.0.9";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz";
+ name = "acorn-globals-1.0.9.tgz";
+ sha1 = "55bb5e98691507b74579d0513413217c380c54cf";
+ };
+ deps = {
+ "acorn-2.7.0" = self.by-version."acorn"."2.7.0";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."align-text"."^0.1.1" =
+ self.by-version."align-text"."0.1.4";
+ by-version."align-text"."0.1.4" = self.buildNodePackage {
+ name = "align-text-0.1.4";
+ version = "0.1.4";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz";
+ name = "align-text-0.1.4.tgz";
+ sha1 = "0cd90a561093f35d0a99256c22b7069433fad117";
+ };
+ deps = {
+ "kind-of-3.0.4" = self.by-version."kind-of"."3.0.4";
+ "longest-1.0.1" = self.by-version."longest"."1.0.1";
+ "repeat-string-1.5.4" = self.by-version."repeat-string"."1.5.4";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."align-text"."^0.1.3" =
+ self.by-version."align-text"."0.1.4";
+ by-spec."amdefine".">=0.0.4" =
+ self.by-version."amdefine"."1.0.0";
+ by-version."amdefine"."1.0.0" = self.buildNodePackage {
+ name = "amdefine-1.0.0";
+ version = "1.0.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz";
+ name = "amdefine-1.0.0.tgz";
+ sha1 = "fd17474700cb5cc9c2b709f0be9d23ce3c198c33";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."array-flatten"."1.1.1" =
+ self.by-version."array-flatten"."1.1.1";
+ by-version."array-flatten"."1.1.1" = self.buildNodePackage {
+ name = "array-flatten-1.1.1";
+ version = "1.1.1";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz";
+ name = "array-flatten-1.1.1.tgz";
+ sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."asap"."~1.0.0" =
+ self.by-version."asap"."1.0.0";
+ by-version."asap"."1.0.0" = self.buildNodePackage {
+ name = "asap-1.0.0";
+ version = "1.0.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/asap/-/asap-1.0.0.tgz";
+ name = "asap-1.0.0.tgz";
+ sha1 = "b2a45da5fdfa20b0496fc3768cc27c12fa916a7d";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."asap"."~2.0.3" =
+ self.by-version."asap"."2.0.5";
+ by-version."asap"."2.0.5" = self.buildNodePackage {
+ name = "asap-2.0.5";
+ version = "2.0.5";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz";
+ name = "asap-2.0.5.tgz";
+ sha1 = "522765b50c3510490e52d7dcfe085ef9ba96958f";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."async"."~0.2.6" =
+ 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 = "https://registry.npmjs.org/async/-/async-0.2.10.tgz";
+ name = "async-0.2.10.tgz";
+ sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."basic-auth"."~1.0.3" =
+ self.by-version."basic-auth"."1.0.4";
+ by-version."basic-auth"."1.0.4" = self.buildNodePackage {
+ name = "basic-auth-1.0.4";
+ version = "1.0.4";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz";
+ name = "basic-auth-1.0.4.tgz";
+ sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."body-parser"."^1.15.2" =
+ self.by-version."body-parser"."1.15.2";
+ by-version."body-parser"."1.15.2" = self.buildNodePackage {
+ name = "body-parser-1.15.2";
+ version = "1.15.2";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/body-parser/-/body-parser-1.15.2.tgz";
+ name = "body-parser-1.15.2.tgz";
+ sha1 = "d7578cf4f1d11d5f6ea804cef35dc7a7ff6dae67";
+ };
+ deps = {
+ "bytes-2.4.0" = self.by-version."bytes"."2.4.0";
+ "content-type-1.0.2" = self.by-version."content-type"."1.0.2";
+ "debug-2.2.0" = self.by-version."debug"."2.2.0";
+ "depd-1.1.0" = self.by-version."depd"."1.1.0";
+ "http-errors-1.5.0" = self.by-version."http-errors"."1.5.0";
+ "iconv-lite-0.4.13" = self.by-version."iconv-lite"."0.4.13";
+ "on-finished-2.3.0" = self.by-version."on-finished"."2.3.0";
+ "qs-6.2.0" = self.by-version."qs"."6.2.0";
+ "raw-body-2.1.7" = self.by-version."raw-body"."2.1.7";
+ "type-is-1.6.13" = self.by-version."type-is"."1.6.13";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ "body-parser" = self.by-version."body-parser"."1.15.2";
+ by-spec."bytes"."2.4.0" =
+ self.by-version."bytes"."2.4.0";
+ by-version."bytes"."2.4.0" = self.buildNodePackage {
+ name = "bytes-2.4.0";
+ version = "2.4.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz";
+ name = "bytes-2.4.0.tgz";
+ sha1 = "7d97196f9d5baf7f6935e25985549edd2a6c2339";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."camelcase"."^1.0.2" =
+ self.by-version."camelcase"."1.2.1";
+ by-version."camelcase"."1.2.1" = self.buildNodePackage {
+ name = "camelcase-1.2.1";
+ version = "1.2.1";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz";
+ name = "camelcase-1.2.1.tgz";
+ sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."center-align"."^0.1.1" =
+ self.by-version."center-align"."0.1.3";
+ by-version."center-align"."0.1.3" = self.buildNodePackage {
+ name = "center-align-0.1.3";
+ version = "0.1.3";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz";
+ name = "center-align-0.1.3.tgz";
+ sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad";
+ };
+ deps = {
+ "align-text-0.1.4" = self.by-version."align-text"."0.1.4";
+ "lazy-cache-1.0.4" = self.by-version."lazy-cache"."1.0.4";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."character-parser"."1.2.1" =
+ self.by-version."character-parser"."1.2.1";
+ by-version."character-parser"."1.2.1" = self.buildNodePackage {
+ name = "character-parser-1.2.1";
+ version = "1.2.1";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/character-parser/-/character-parser-1.2.1.tgz";
+ name = "character-parser-1.2.1.tgz";
+ sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."clean-css"."^3.1.9" =
+ self.by-version."clean-css"."3.4.20";
+ by-version."clean-css"."3.4.20" = self.buildNodePackage {
+ name = "clean-css-3.4.20";
+ version = "3.4.20";
+ bin = true;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.20.tgz";
+ name = "clean-css-3.4.20.tgz";
+ sha1 = "c0d8963b5448e030f0bcd3ddd0dac4dfe3dea501";
+ };
+ deps = {
+ "commander-2.8.1" = self.by-version."commander"."2.8.1";
+ "source-map-0.4.4" = self.by-version."source-map"."0.4.4";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."cliui"."^2.1.0" =
+ self.by-version."cliui"."2.1.0";
+ by-version."cliui"."2.1.0" = self.buildNodePackage {
+ name = "cliui-2.1.0";
+ version = "2.1.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz";
+ name = "cliui-2.1.0.tgz";
+ sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1";
+ };
+ deps = {
+ "center-align-0.1.3" = self.by-version."center-align"."0.1.3";
+ "right-align-0.1.3" = self.by-version."right-align"."0.1.3";
+ "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."commander"."2.8.x" =
+ self.by-version."commander"."2.8.1";
+ by-version."commander"."2.8.1" = self.buildNodePackage {
+ name = "commander-2.8.1";
+ version = "2.8.1";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz";
+ name = "commander-2.8.1.tgz";
+ sha1 = "06be367febfda0c330aa1e2a072d3dc9762425d4";
+ };
+ deps = {
+ "graceful-readlink-1.0.1" = self.by-version."graceful-readlink"."1.0.1";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."commander"."^2.9.0" =
+ self.by-version."commander"."2.9.0";
+ by-version."commander"."2.9.0" = self.buildNodePackage {
+ name = "commander-2.9.0";
+ version = "2.9.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz";
+ name = "commander-2.9.0.tgz";
+ sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
+ };
+ deps = {
+ "graceful-readlink-1.0.1" = self.by-version."graceful-readlink"."1.0.1";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ "commander" = self.by-version."commander"."2.9.0";
+ by-spec."commander"."~2.6.0" =
+ self.by-version."commander"."2.6.0";
+ by-version."commander"."2.6.0" = self.buildNodePackage {
+ name = "commander-2.6.0";
+ version = "2.6.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz";
+ name = "commander-2.6.0.tgz";
+ sha1 = "9df7e52fb2a0cb0fb89058ee80c3104225f37e1d";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."constantinople"."~3.0.1" =
+ self.by-version."constantinople"."3.0.2";
+ by-version."constantinople"."3.0.2" = self.buildNodePackage {
+ name = "constantinople-3.0.2";
+ version = "3.0.2";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/constantinople/-/constantinople-3.0.2.tgz";
+ name = "constantinople-3.0.2.tgz";
+ sha1 = "4b945d9937907bcd98ee575122c3817516544141";
+ };
+ deps = {
+ "acorn-2.7.0" = self.by-version."acorn"."2.7.0";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."content-disposition"."0.5.1" =
+ self.by-version."content-disposition"."0.5.1";
+ by-version."content-disposition"."0.5.1" = self.buildNodePackage {
+ name = "content-disposition-0.5.1";
+ version = "0.5.1";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.1.tgz";
+ name = "content-disposition-0.5.1.tgz";
+ sha1 = "87476c6a67c8daa87e32e87616df883ba7fb071b";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."content-type"."~1.0.2" =
+ self.by-version."content-type"."1.0.2";
+ by-version."content-type"."1.0.2" = self.buildNodePackage {
+ name = "content-type-1.0.2";
+ version = "1.0.2";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz";
+ name = "content-type-1.0.2.tgz";
+ sha1 = "b7d113aee7a8dd27bd21133c4dc2529df1721eed";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."cookie"."0.3.1" =
+ self.by-version."cookie"."0.3.1";
+ by-version."cookie"."0.3.1" = self.buildNodePackage {
+ name = "cookie-0.3.1";
+ version = "0.3.1";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz";
+ name = "cookie-0.3.1.tgz";
+ sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."cookie-parser"."~1.4.3" =
+ self.by-version."cookie-parser"."1.4.3";
+ by-version."cookie-parser"."1.4.3" = self.buildNodePackage {
+ name = "cookie-parser-1.4.3";
+ version = "1.4.3";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.3.tgz";
+ name = "cookie-parser-1.4.3.tgz";
+ sha1 = "0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5";
+ };
+ deps = {
+ "cookie-0.3.1" = self.by-version."cookie"."0.3.1";
+ "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ "cookie-parser" = self.by-version."cookie-parser"."1.4.3";
+ by-spec."cookie-signature"."1.0.6" =
+ self.by-version."cookie-signature"."1.0.6";
+ by-version."cookie-signature"."1.0.6" = self.buildNodePackage {
+ name = "cookie-signature-1.0.6";
+ version = "1.0.6";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz";
+ name = "cookie-signature-1.0.6.tgz";
+ sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."css"."~1.0.8" =
+ self.by-version."css"."1.0.8";
+ by-version."css"."1.0.8" = self.buildNodePackage {
+ name = "css-1.0.8";
+ version = "1.0.8";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/css/-/css-1.0.8.tgz";
+ name = "css-1.0.8.tgz";
+ sha1 = "9386811ca82bccc9ee7fb5a732b1e2a317c8a3e7";
+ };
+ deps = {
+ "css-parse-1.0.4" = self.by-version."css-parse"."1.0.4";
+ "css-stringify-1.0.5" = self.by-version."css-stringify"."1.0.5";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."css-parse"."1.0.4" =
+ self.by-version."css-parse"."1.0.4";
+ by-version."css-parse"."1.0.4" = self.buildNodePackage {
+ name = "css-parse-1.0.4";
+ version = "1.0.4";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz";
+ name = "css-parse-1.0.4.tgz";
+ sha1 = "38b0503fbf9da9f54e9c1dbda60e145c77117bdd";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."css-stringify"."1.0.5" =
+ self.by-version."css-stringify"."1.0.5";
+ by-version."css-stringify"."1.0.5" = self.buildNodePackage {
+ name = "css-stringify-1.0.5";
+ version = "1.0.5";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz";
+ name = "css-stringify-1.0.5.tgz";
+ sha1 = "b0d042946db2953bb9d292900a6cb5f6d0122031";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."debug"."^2.2.0" =
+ 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 = "https://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"."~2.2.0" =
+ self.by-version."debug"."2.2.0";
+ by-spec."decamelize"."^1.0.0" =
+ self.by-version."decamelize"."1.2.0";
+ by-version."decamelize"."1.2.0" = self.buildNodePackage {
+ name = "decamelize-1.2.0";
+ version = "1.2.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz";
+ name = "decamelize-1.2.0.tgz";
+ sha1 = "f6534d15148269b20352e7bee26f501f9a191290";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."depd"."~1.1.0" =
+ self.by-version."depd"."1.1.0";
+ by-version."depd"."1.1.0" = self.buildNodePackage {
+ name = "depd-1.1.0";
+ version = "1.1.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz";
+ name = "depd-1.1.0.tgz";
+ sha1 = "e1bd82c6aab6ced965b97b88b17ed3e528ca18c3";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."destroy"."~1.0.4" =
+ self.by-version."destroy"."1.0.4";
+ by-version."destroy"."1.0.4" = self.buildNodePackage {
+ name = "destroy-1.0.4";
+ version = "1.0.4";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz";
+ name = "destroy-1.0.4.tgz";
+ sha1 = "978857442c44749e4206613e37946205826abd80";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."ee-first"."1.1.1" =
+ self.by-version."ee-first"."1.1.1";
+ by-version."ee-first"."1.1.1" = self.buildNodePackage {
+ name = "ee-first-1.1.1";
+ version = "1.1.1";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz";
+ name = "ee-first-1.1.1.tgz";
+ sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."encodeurl"."~1.0.1" =
+ self.by-version."encodeurl"."1.0.1";
+ by-version."encodeurl"."1.0.1" = self.buildNodePackage {
+ name = "encodeurl-1.0.1";
+ version = "1.0.1";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz";
+ name = "encodeurl-1.0.1.tgz";
+ sha1 = "79e3d58655346909fe6f0f45a5de68103b294d20";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."errno"."^0.1.1" =
+ self.by-version."errno"."0.1.4";
+ by-version."errno"."0.1.4" = self.buildNodePackage {
+ name = "errno-0.1.4";
+ version = "0.1.4";
+ bin = true;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz";
+ name = "errno-0.1.4.tgz";
+ sha1 = "b896e23a9e5e8ba33871fc996abd3635fc9a1c7d";
+ };
+ deps = {
+ "prr-0.0.0" = self.by-version."prr"."0.0.0";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."escape-html"."~1.0.3" =
+ self.by-version."escape-html"."1.0.3";
+ by-version."escape-html"."1.0.3" = self.buildNodePackage {
+ name = "escape-html-1.0.3";
+ version = "1.0.3";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz";
+ name = "escape-html-1.0.3.tgz";
+ sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."etag"."~1.7.0" =
+ self.by-version."etag"."1.7.0";
+ by-version."etag"."1.7.0" = self.buildNodePackage {
+ name = "etag-1.7.0";
+ version = "1.7.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz";
+ name = "etag-1.7.0.tgz";
+ sha1 = "03d30b5f67dd6e632d2945d30d6652731a34d5d8";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."eventemitter2"."^2.1.3" =
+ self.by-version."eventemitter2"."2.1.3";
+ by-version."eventemitter2"."2.1.3" = self.buildNodePackage {
+ name = "eventemitter2-2.1.3";
+ version = "2.1.3";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-2.1.3.tgz";
+ name = "eventemitter2-2.1.3.tgz";
+ sha1 = "bd7201f85c59548380e1e43b3f6a7286d4da7349";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."express"."^4.14.0" =
+ self.by-version."express"."4.14.0";
+ by-version."express"."4.14.0" = self.buildNodePackage {
+ name = "express-4.14.0";
+ version = "4.14.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/express/-/express-4.14.0.tgz";
+ name = "express-4.14.0.tgz";
+ sha1 = "c1ee3f42cdc891fb3dc650a8922d51ec847d0d66";
+ };
+ deps = {
+ "accepts-1.3.3" = self.by-version."accepts"."1.3.3";
+ "array-flatten-1.1.1" = self.by-version."array-flatten"."1.1.1";
+ "content-disposition-0.5.1" = self.by-version."content-disposition"."0.5.1";
+ "content-type-1.0.2" = self.by-version."content-type"."1.0.2";
+ "cookie-0.3.1" = self.by-version."cookie"."0.3.1";
+ "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
+ "debug-2.2.0" = self.by-version."debug"."2.2.0";
+ "depd-1.1.0" = self.by-version."depd"."1.1.0";
+ "encodeurl-1.0.1" = self.by-version."encodeurl"."1.0.1";
+ "escape-html-1.0.3" = self.by-version."escape-html"."1.0.3";
+ "etag-1.7.0" = self.by-version."etag"."1.7.0";
+ "finalhandler-0.5.0" = self.by-version."finalhandler"."0.5.0";
+ "fresh-0.3.0" = self.by-version."fresh"."0.3.0";
+ "merge-descriptors-1.0.1" = self.by-version."merge-descriptors"."1.0.1";
+ "methods-1.1.2" = self.by-version."methods"."1.1.2";
+ "on-finished-2.3.0" = self.by-version."on-finished"."2.3.0";
+ "parseurl-1.3.1" = self.by-version."parseurl"."1.3.1";
+ "path-to-regexp-0.1.7" = self.by-version."path-to-regexp"."0.1.7";
+ "proxy-addr-1.1.2" = self.by-version."proxy-addr"."1.1.2";
+ "qs-6.2.0" = self.by-version."qs"."6.2.0";
+ "range-parser-1.2.0" = self.by-version."range-parser"."1.2.0";
+ "send-0.14.1" = self.by-version."send"."0.14.1";
+ "serve-static-1.11.1" = self.by-version."serve-static"."1.11.1";
+ "type-is-1.6.13" = self.by-version."type-is"."1.6.13";
+ "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
+ "vary-1.1.0" = self.by-version."vary"."1.1.0";
+ "jade-1.11.0" = self.by-version."jade"."1.11.0";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ "express" = self.by-version."express"."4.14.0";
+ by-spec."finalhandler"."0.5.0" =
+ self.by-version."finalhandler"."0.5.0";
+ by-version."finalhandler"."0.5.0" = self.buildNodePackage {
+ name = "finalhandler-0.5.0";
+ version = "0.5.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz";
+ name = "finalhandler-0.5.0.tgz";
+ sha1 = "e9508abece9b6dba871a6942a1d7911b91911ac7";
+ };
+ deps = {
+ "debug-2.2.0" = self.by-version."debug"."2.2.0";
+ "escape-html-1.0.3" = self.by-version."escape-html"."1.0.3";
+ "on-finished-2.3.0" = self.by-version."on-finished"."2.3.0";
+ "statuses-1.3.0" = self.by-version."statuses"."1.3.0";
+ "unpipe-1.0.0" = self.by-version."unpipe"."1.0.0";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."forwarded"."~0.1.0" =
+ self.by-version."forwarded"."0.1.0";
+ by-version."forwarded"."0.1.0" = self.buildNodePackage {
+ name = "forwarded-0.1.0";
+ version = "0.1.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz";
+ name = "forwarded-0.1.0.tgz";
+ sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."fresh"."0.3.0" =
+ self.by-version."fresh"."0.3.0";
+ by-version."fresh"."0.3.0" = self.buildNodePackage {
+ name = "fresh-0.3.0";
+ version = "0.3.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz";
+ name = "fresh-0.3.0.tgz";
+ sha1 = "651f838e22424e7566de161d8358caa199f83d4f";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."graceful-fs"."^4.1.2" =
+ self.by-version."graceful-fs"."4.1.9";
+ by-version."graceful-fs"."4.1.9" = self.buildNodePackage {
+ name = "graceful-fs-4.1.9";
+ version = "4.1.9";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.9.tgz";
+ name = "graceful-fs-4.1.9.tgz";
+ sha1 = "baacba37d19d11f9d146d3578bc99958c3787e29";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."graceful-readlink".">= 1.0.0" =
+ self.by-version."graceful-readlink"."1.0.1";
+ by-version."graceful-readlink"."1.0.1" = self.buildNodePackage {
+ name = "graceful-readlink-1.0.1";
+ version = "1.0.1";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz";
+ name = "graceful-readlink-1.0.1.tgz";
+ sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."http-errors"."~1.5.0" =
+ self.by-version."http-errors"."1.5.0";
+ by-version."http-errors"."1.5.0" = self.buildNodePackage {
+ name = "http-errors-1.5.0";
+ version = "1.5.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/http-errors/-/http-errors-1.5.0.tgz";
+ name = "http-errors-1.5.0.tgz";
+ sha1 = "b1cb3d8260fd8e2386cad3189045943372d48211";
+ };
+ deps = {
+ "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+ "setprototypeof-1.0.1" = self.by-version."setprototypeof"."1.0.1";
+ "statuses-1.3.0" = self.by-version."statuses"."1.3.0";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."iconv-lite"."0.4.13" =
+ 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 = "https://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."image-size"."~0.5.0" =
+ self.by-version."image-size"."0.5.0";
+ by-version."image-size"."0.5.0" = self.buildNodePackage {
+ name = "image-size-0.5.0";
+ version = "0.5.0";
+ bin = true;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/image-size/-/image-size-0.5.0.tgz";
+ name = "image-size-0.5.0.tgz";
+ sha1 = "be7aed1c37b5ac3d9ba1d66a24b4c47ff8397651";
+ };
+ deps = {
+ };
+ 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 = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
+ name = "inherits-2.0.1.tgz";
+ sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."int64-buffer"."^0.1.4" =
+ self.by-version."int64-buffer"."0.1.9";
+ by-version."int64-buffer"."0.1.9" = self.buildNodePackage {
+ name = "int64-buffer-0.1.9";
+ version = "0.1.9";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/int64-buffer/-/int64-buffer-0.1.9.tgz";
+ name = "int64-buffer-0.1.9.tgz";
+ sha1 = "9e039da043b24f78b196b283e04653ef5e990f61";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."ipaddr.js"."1.1.1" =
+ self.by-version."ipaddr.js"."1.1.1";
+ by-version."ipaddr.js"."1.1.1" = self.buildNodePackage {
+ name = "ipaddr.js-1.1.1";
+ version = "1.1.1";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.1.1.tgz";
+ name = "ipaddr.js-1.1.1.tgz";
+ sha1 = "c791d95f52b29c1247d5df80ada39b8a73647230";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."is"."^3.1.0" =
+ self.by-version."is"."3.1.0";
+ by-version."is"."3.1.0" = self.buildNodePackage {
+ name = "is-3.1.0";
+ version = "3.1.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is/-/is-3.1.0.tgz";
+ name = "is-3.1.0.tgz";
+ sha1 = "2945d205d691cbfe4833e3f8a11c8ae94673f2a7";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."is-buffer"."^1.0.2" =
+ self.by-version."is-buffer"."1.1.4";
+ by-version."is-buffer"."1.1.4" = self.buildNodePackage {
+ name = "is-buffer-1.1.4";
+ version = "1.1.4";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz";
+ name = "is-buffer-1.1.4.tgz";
+ sha1 = "cfc86ccd5dc5a52fa80489111c6920c457e2d98b";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."is-promise"."^2.0.0" =
+ self.by-version."is-promise"."2.1.0";
+ by-version."is-promise"."2.1.0" = self.buildNodePackage {
+ name = "is-promise-2.1.0";
+ version = "2.1.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz";
+ name = "is-promise-2.1.0.tgz";
+ sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."is-promise"."~1" =
+ self.by-version."is-promise"."1.0.1";
+ by-version."is-promise"."1.0.1" = self.buildNodePackage {
+ name = "is-promise-1.0.1";
+ version = "1.0.1";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz";
+ name = "is-promise-1.0.1.tgz";
+ sha1 = "31573761c057e33c2e91aab9e96da08cefbe76e5";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."jade"."~1.11.0" =
+ self.by-version."jade"."1.11.0";
+ by-version."jade"."1.11.0" = self.buildNodePackage {
+ name = "jade-1.11.0";
+ version = "1.11.0";
+ bin = true;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jade/-/jade-1.11.0.tgz";
+ name = "jade-1.11.0.tgz";
+ sha1 = "9c80e538c12d3fb95c8d9bb9559fa0cc040405fd";
+ };
+ deps = {
+ "character-parser-1.2.1" = self.by-version."character-parser"."1.2.1";
+ "clean-css-3.4.20" = self.by-version."clean-css"."3.4.20";
+ "commander-2.6.0" = self.by-version."commander"."2.6.0";
+ "constantinople-3.0.2" = self.by-version."constantinople"."3.0.2";
+ "jstransformer-0.0.2" = self.by-version."jstransformer"."0.0.2";
+ "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+ "transformers-2.1.0" = self.by-version."transformers"."2.1.0";
+ "uglify-js-2.7.3" = self.by-version."uglify-js"."2.7.3";
+ "void-elements-2.0.1" = self.by-version."void-elements"."2.0.1";
+ "with-4.0.3" = self.by-version."with"."4.0.3";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ "jade" = self.by-version."jade"."1.11.0";
+ by-spec."jstransformer"."0.0.2" =
+ self.by-version."jstransformer"."0.0.2";
+ by-version."jstransformer"."0.0.2" = self.buildNodePackage {
+ name = "jstransformer-0.0.2";
+ version = "0.0.2";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jstransformer/-/jstransformer-0.0.2.tgz";
+ name = "jstransformer-0.0.2.tgz";
+ sha1 = "7aae29a903d196cfa0973d885d3e47947ecd76ab";
+ };
+ deps = {
+ "is-promise-2.1.0" = self.by-version."is-promise"."2.1.0";
+ "promise-6.1.0" = self.by-version."promise"."6.1.0";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."kind-of"."^3.0.2" =
+ self.by-version."kind-of"."3.0.4";
+ by-version."kind-of"."3.0.4" = self.buildNodePackage {
+ name = "kind-of-3.0.4";
+ version = "3.0.4";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/kind-of/-/kind-of-3.0.4.tgz";
+ name = "kind-of-3.0.4.tgz";
+ sha1 = "7b8ecf18a4e17f8269d73b501c9f232c96887a74";
+ };
+ deps = {
+ "is-buffer-1.1.4" = self.by-version."is-buffer"."1.1.4";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."lazy-cache"."^1.0.3" =
+ self.by-version."lazy-cache"."1.0.4";
+ by-version."lazy-cache"."1.0.4" = self.buildNodePackage {
+ name = "lazy-cache-1.0.4";
+ version = "1.0.4";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz";
+ name = "lazy-cache-1.0.4.tgz";
+ sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."less"."^2.7.1" =
+ self.by-version."less"."2.7.1";
+ by-version."less"."2.7.1" = self.buildNodePackage {
+ name = "less-2.7.1";
+ version = "2.7.1";
+ bin = true;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/less/-/less-2.7.1.tgz";
+ name = "less-2.7.1.tgz";
+ sha1 = "6cbfea22b3b830304e9a5fb371d54fa480c9d7cf";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ "errno-0.1.4" = self.by-version."errno"."0.1.4";
+ "graceful-fs-4.1.9" = self.by-version."graceful-fs"."4.1.9";
+ "image-size-0.5.0" = self.by-version."image-size"."0.5.0";
+ "mime-1.3.4" = self.by-version."mime"."1.3.4";
+ "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+ "promise-7.1.1" = self.by-version."promise"."7.1.1";
+ "source-map-0.5.6" = self.by-version."source-map"."0.5.6";
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ "less" = self.by-version."less"."2.7.1";
+ by-spec."less"."~2.7.1" =
+ self.by-version."less"."2.7.1";
+ by-spec."less-middleware"."^2.2.0" =
+ self.by-version."less-middleware"."2.2.0";
+ by-version."less-middleware"."2.2.0" = self.buildNodePackage {
+ name = "less-middleware-2.2.0";
+ version = "2.2.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/less-middleware/-/less-middleware-2.2.0.tgz";
+ name = "less-middleware-2.2.0.tgz";
+ sha1 = "c3e4d512c8403685204add7bdaad7398c535c674";
+ };
+ deps = {
+ "less-2.7.1" = self.by-version."less"."2.7.1";
+ "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+ "node.extend-1.1.6" = self.by-version."node.extend"."1.1.6";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ "less-middleware" = self.by-version."less-middleware"."2.2.0";
+ by-spec."libquassel"."~2.0.5" =
+ self.by-version."libquassel"."2.0.5";
+ by-version."libquassel"."2.0.5" = self.buildNodePackage {
+ name = "libquassel-2.0.5";
+ version = "2.0.5";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/libquassel/-/libquassel-2.0.5.tgz";
+ name = "libquassel-2.0.5.tgz";
+ sha1 = "faeba62e381b37527b1d6dea2e2c2f4c7a0f220f";
+ };
+ deps = {
+ "debug-2.2.0" = self.by-version."debug"."2.2.0";
+ "eventemitter2-2.1.3" = self.by-version."eventemitter2"."2.1.3";
+ "net-browserify-alt-1.0.0" = self.by-version."net-browserify-alt"."1.0.0";
+ "qtdatastream-0.6.6" = self.by-version."qtdatastream"."0.6.6";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ "libquassel" = self.by-version."libquassel"."2.0.5";
+ by-spec."longest"."^1.0.1" =
+ self.by-version."longest"."1.0.1";
+ by-version."longest"."1.0.1" = self.buildNodePackage {
+ name = "longest-1.0.1";
+ version = "1.0.1";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz";
+ name = "longest-1.0.1.tgz";
+ sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."media-typer"."0.3.0" =
+ self.by-version."media-typer"."0.3.0";
+ by-version."media-typer"."0.3.0" = self.buildNodePackage {
+ name = "media-typer-0.3.0";
+ version = "0.3.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz";
+ name = "media-typer-0.3.0.tgz";
+ sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."merge-descriptors"."1.0.1" =
+ self.by-version."merge-descriptors"."1.0.1";
+ by-version."merge-descriptors"."1.0.1" = self.buildNodePackage {
+ name = "merge-descriptors-1.0.1";
+ version = "1.0.1";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz";
+ name = "merge-descriptors-1.0.1.tgz";
+ sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."methods"."~1.1.2" =
+ self.by-version."methods"."1.1.2";
+ by-version."methods"."1.1.2" = self.buildNodePackage {
+ name = "methods-1.1.2";
+ version = "1.1.2";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz";
+ name = "methods-1.1.2.tgz";
+ sha1 = "5529a4d67654134edcc5266656835b0f851afcee";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."mime"."1.3.4" =
+ 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 = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz";
+ name = "mime-1.3.4.tgz";
+ sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."mime"."^1.2.11" =
+ self.by-version."mime"."1.3.4";
+ by-spec."mime-db"."~1.24.0" =
+ self.by-version."mime-db"."1.24.0";
+ by-version."mime-db"."1.24.0" = self.buildNodePackage {
+ name = "mime-db-1.24.0";
+ version = "1.24.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mime-db/-/mime-db-1.24.0.tgz";
+ name = "mime-db-1.24.0.tgz";
+ sha1 = "e2d13f939f0016c6e4e9ad25a8652f126c467f0c";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."mime-types"."~2.1.11" =
+ self.by-version."mime-types"."2.1.12";
+ by-version."mime-types"."2.1.12" = self.buildNodePackage {
+ name = "mime-types-2.1.12";
+ version = "2.1.12";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz";
+ name = "mime-types-2.1.12.tgz";
+ sha1 = "152ba256777020dd4663f54c2e7bc26381e71729";
+ };
+ deps = {
+ "mime-db-1.24.0" = self.by-version."mime-db"."1.24.0";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."minimist"."0.0.8" =
+ self.by-version."minimist"."0.0.8";
+ by-version."minimist"."0.0.8" = self.buildNodePackage {
+ name = "minimist-0.0.8";
+ version = "0.0.8";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+ name = "minimist-0.0.8.tgz";
+ sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."mkdirp"."^0.5.0" =
+ self.by-version."mkdirp"."0.5.1";
+ by-version."mkdirp"."0.5.1" = self.buildNodePackage {
+ name = "mkdirp-0.5.1";
+ version = "0.5.1";
+ bin = true;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
+ name = "mkdirp-0.5.1.tgz";
+ sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
+ };
+ deps = {
+ "minimist-0.0.8" = self.by-version."minimist"."0.0.8";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."mkdirp"."~0.5.0" =
+ self.by-version."mkdirp"."0.5.1";
+ by-spec."mkdirp"."~0.5.1" =
+ self.by-version."mkdirp"."0.5.1";
+ by-spec."morgan"."^1.7.0" =
+ self.by-version."morgan"."1.7.0";
+ by-version."morgan"."1.7.0" = self.buildNodePackage {
+ name = "morgan-1.7.0";
+ version = "1.7.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/morgan/-/morgan-1.7.0.tgz";
+ name = "morgan-1.7.0.tgz";
+ sha1 = "eb10ca8e50d1abe0f8d3dad5c0201d052d981c62";
+ };
+ deps = {
+ "basic-auth-1.0.4" = self.by-version."basic-auth"."1.0.4";
+ "debug-2.2.0" = self.by-version."debug"."2.2.0";
+ "depd-1.1.0" = self.by-version."depd"."1.1.0";
+ "on-finished-2.3.0" = self.by-version."on-finished"."2.3.0";
+ "on-headers-1.0.1" = self.by-version."on-headers"."1.0.1";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ "morgan" = self.by-version."morgan"."1.7.0";
+ 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 = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz";
+ name = "ms-0.7.1.tgz";
+ sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."negotiator"."0.6.1" =
+ self.by-version."negotiator"."0.6.1";
+ by-version."negotiator"."0.6.1" = self.buildNodePackage {
+ name = "negotiator-0.6.1";
+ version = "0.6.1";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz";
+ name = "negotiator-0.6.1.tgz";
+ sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."net-browserify-alt"."^1.0.0" =
+ self.by-version."net-browserify-alt"."1.0.0";
+ by-version."net-browserify-alt"."1.0.0" = self.buildNodePackage {
+ name = "net-browserify-alt-1.0.0";
+ version = "1.0.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/net-browserify-alt/-/net-browserify-alt-1.0.0.tgz";
+ name = "net-browserify-alt-1.0.0.tgz";
+ sha1 = "d85326b4940ba4630db5ea7644cc07c5551a0e7e";
+ };
+ deps = {
+ "body-parser-1.15.2" = self.by-version."body-parser"."1.15.2";
+ "ws-1.1.1" = self.by-version."ws"."1.1.1";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ "net-browserify-alt" = self.by-version."net-browserify-alt"."1.0.0";
+ by-spec."node.extend"."~1.1.5" =
+ self.by-version."node.extend"."1.1.6";
+ by-version."node.extend"."1.1.6" = self.buildNodePackage {
+ name = "node.extend-1.1.6";
+ version = "1.1.6";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/node.extend/-/node.extend-1.1.6.tgz";
+ name = "node.extend-1.1.6.tgz";
+ sha1 = "a7b882c82d6c93a4863a5504bd5de8ec86258b96";
+ };
+ deps = {
+ "is-3.1.0" = self.by-version."is"."3.1.0";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."on-finished"."~2.3.0" =
+ self.by-version."on-finished"."2.3.0";
+ by-version."on-finished"."2.3.0" = self.buildNodePackage {
+ name = "on-finished-2.3.0";
+ version = "2.3.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz";
+ name = "on-finished-2.3.0.tgz";
+ sha1 = "20f1336481b083cd75337992a16971aa2d906947";
+ };
+ deps = {
+ "ee-first-1.1.1" = self.by-version."ee-first"."1.1.1";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."on-headers"."~1.0.1" =
+ self.by-version."on-headers"."1.0.1";
+ by-version."on-headers"."1.0.1" = self.buildNodePackage {
+ name = "on-headers-1.0.1";
+ version = "1.0.1";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz";
+ name = "on-headers-1.0.1.tgz";
+ sha1 = "928f5d0f470d49342651ea6794b0857c100693f7";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."optimist"."~0.3.5" =
+ 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 = "https://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 = [ ];
+ };
+ by-spec."options".">=0.0.5" =
+ self.by-version."options"."0.0.6";
+ by-version."options"."0.0.6" = self.buildNodePackage {
+ name = "options-0.0.6";
+ version = "0.0.6";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/options/-/options-0.0.6.tgz";
+ name = "options-0.0.6.tgz";
+ sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."parseurl"."~1.3.0" =
+ self.by-version."parseurl"."1.3.1";
+ by-version."parseurl"."1.3.1" = self.buildNodePackage {
+ name = "parseurl-1.3.1";
+ version = "1.3.1";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz";
+ name = "parseurl-1.3.1.tgz";
+ sha1 = "c8ab8c9223ba34888aa64a297b28853bec18da56";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."parseurl"."~1.3.1" =
+ self.by-version."parseurl"."1.3.1";
+ by-spec."path-to-regexp"."0.1.7" =
+ self.by-version."path-to-regexp"."0.1.7";
+ by-version."path-to-regexp"."0.1.7" = self.buildNodePackage {
+ name = "path-to-regexp-0.1.7";
+ version = "0.1.7";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz";
+ name = "path-to-regexp-0.1.7.tgz";
+ sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."promise"."^6.0.1" =
+ self.by-version."promise"."6.1.0";
+ by-version."promise"."6.1.0" = self.buildNodePackage {
+ name = "promise-6.1.0";
+ version = "6.1.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/promise/-/promise-6.1.0.tgz";
+ name = "promise-6.1.0.tgz";
+ sha1 = "2ce729f6b94b45c26891ad0602c5c90e04c6eef6";
+ };
+ deps = {
+ "asap-1.0.0" = self.by-version."asap"."1.0.0";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."promise"."^7.1.1" =
+ self.by-version."promise"."7.1.1";
+ by-version."promise"."7.1.1" = self.buildNodePackage {
+ name = "promise-7.1.1";
+ version = "7.1.1";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/promise/-/promise-7.1.1.tgz";
+ name = "promise-7.1.1.tgz";
+ sha1 = "489654c692616b8aa55b0724fa809bb7db49c5bf";
+ };
+ deps = {
+ "asap-2.0.5" = self.by-version."asap"."2.0.5";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."promise"."~2.0" =
+ self.by-version."promise"."2.0.0";
+ by-version."promise"."2.0.0" = self.buildNodePackage {
+ name = "promise-2.0.0";
+ version = "2.0.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/promise/-/promise-2.0.0.tgz";
+ name = "promise-2.0.0.tgz";
+ sha1 = "46648aa9d605af5d2e70c3024bf59436da02b80e";
+ };
+ deps = {
+ "is-promise-1.0.1" = self.by-version."is-promise"."1.0.1";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."proxy-addr"."~1.1.2" =
+ self.by-version."proxy-addr"."1.1.2";
+ by-version."proxy-addr"."1.1.2" = self.buildNodePackage {
+ name = "proxy-addr-1.1.2";
+ version = "1.1.2";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.2.tgz";
+ name = "proxy-addr-1.1.2.tgz";
+ sha1 = "b4cc5f22610d9535824c123aef9d3cf73c40ba37";
+ };
+ deps = {
+ "forwarded-0.1.0" = self.by-version."forwarded"."0.1.0";
+ "ipaddr.js-1.1.1" = self.by-version."ipaddr.js"."1.1.1";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."prr"."~0.0.0" =
+ self.by-version."prr"."0.0.0";
+ by-version."prr"."0.0.0" = self.buildNodePackage {
+ name = "prr-0.0.0";
+ version = "0.0.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz";
+ name = "prr-0.0.0.tgz";
+ sha1 = "1a84b85908325501411853d0081ee3fa86e2926a";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."qs"."6.2.0" =
+ self.by-version."qs"."6.2.0";
+ by-version."qs"."6.2.0" = self.buildNodePackage {
+ name = "qs-6.2.0";
+ version = "6.2.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/qs/-/qs-6.2.0.tgz";
+ name = "qs-6.2.0.tgz";
+ sha1 = "3b7848c03c2dece69a9522b0fae8c4126d745f3b";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."qtdatastream"."^0.6.6" =
+ self.by-version."qtdatastream"."0.6.6";
+ by-version."qtdatastream"."0.6.6" = self.buildNodePackage {
+ name = "qtdatastream-0.6.6";
+ version = "0.6.6";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/qtdatastream/-/qtdatastream-0.6.6.tgz";
+ name = "qtdatastream-0.6.6.tgz";
+ sha1 = "c572113d4a2174acb4062e58c06644723b50e1c1";
+ };
+ deps = {
+ "debug-2.2.0" = self.by-version."debug"."2.2.0";
+ "int64-buffer-0.1.9" = self.by-version."int64-buffer"."0.1.9";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."range-parser"."~1.2.0" =
+ self.by-version."range-parser"."1.2.0";
+ by-version."range-parser"."1.2.0" = self.buildNodePackage {
+ name = "range-parser-1.2.0";
+ version = "1.2.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz";
+ name = "range-parser-1.2.0.tgz";
+ sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."raw-body"."~2.1.7" =
+ self.by-version."raw-body"."2.1.7";
+ by-version."raw-body"."2.1.7" = self.buildNodePackage {
+ name = "raw-body-2.1.7";
+ version = "2.1.7";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz";
+ name = "raw-body-2.1.7.tgz";
+ sha1 = "adfeace2e4fb3098058014d08c072dcc59758774";
+ };
+ deps = {
+ "bytes-2.4.0" = self.by-version."bytes"."2.4.0";
+ "iconv-lite-0.4.13" = self.by-version."iconv-lite"."0.4.13";
+ "unpipe-1.0.0" = self.by-version."unpipe"."1.0.0";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."repeat-string"."^1.5.2" =
+ self.by-version."repeat-string"."1.5.4";
+ by-version."repeat-string"."1.5.4" = self.buildNodePackage {
+ name = "repeat-string-1.5.4";
+ version = "1.5.4";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.4.tgz";
+ name = "repeat-string-1.5.4.tgz";
+ sha1 = "64ec0c91e0f4b475f90d5b643651e3e6e5b6c2d5";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."right-align"."^0.1.1" =
+ self.by-version."right-align"."0.1.3";
+ by-version."right-align"."0.1.3" = self.buildNodePackage {
+ name = "right-align-0.1.3";
+ version = "0.1.3";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz";
+ name = "right-align-0.1.3.tgz";
+ sha1 = "61339b722fe6a3515689210d24e14c96148613ef";
+ };
+ deps = {
+ "align-text-0.1.4" = self.by-version."align-text"."0.1.4";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."send"."0.14.1" =
+ self.by-version."send"."0.14.1";
+ by-version."send"."0.14.1" = self.buildNodePackage {
+ name = "send-0.14.1";
+ version = "0.14.1";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/send/-/send-0.14.1.tgz";
+ name = "send-0.14.1.tgz";
+ sha1 = "a954984325392f51532a7760760e459598c89f7a";
+ };
+ deps = {
+ "debug-2.2.0" = self.by-version."debug"."2.2.0";
+ "depd-1.1.0" = self.by-version."depd"."1.1.0";
+ "destroy-1.0.4" = self.by-version."destroy"."1.0.4";
+ "encodeurl-1.0.1" = self.by-version."encodeurl"."1.0.1";
+ "escape-html-1.0.3" = self.by-version."escape-html"."1.0.3";
+ "etag-1.7.0" = self.by-version."etag"."1.7.0";
+ "fresh-0.3.0" = self.by-version."fresh"."0.3.0";
+ "http-errors-1.5.0" = self.by-version."http-errors"."1.5.0";
+ "mime-1.3.4" = self.by-version."mime"."1.3.4";
+ "ms-0.7.1" = self.by-version."ms"."0.7.1";
+ "on-finished-2.3.0" = self.by-version."on-finished"."2.3.0";
+ "range-parser-1.2.0" = self.by-version."range-parser"."1.2.0";
+ "statuses-1.3.0" = self.by-version."statuses"."1.3.0";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."serve-favicon"."~2.3.0" =
+ self.by-version."serve-favicon"."2.3.0";
+ by-version."serve-favicon"."2.3.0" = self.buildNodePackage {
+ name = "serve-favicon-2.3.0";
+ version = "2.3.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.0.tgz";
+ name = "serve-favicon-2.3.0.tgz";
+ sha1 = "aed36cc6834069a6f189cc7222c6a1a811dc5b39";
+ };
+ deps = {
+ "etag-1.7.0" = self.by-version."etag"."1.7.0";
+ "fresh-0.3.0" = self.by-version."fresh"."0.3.0";
+ "ms-0.7.1" = self.by-version."ms"."0.7.1";
+ "parseurl-1.3.1" = self.by-version."parseurl"."1.3.1";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ "serve-favicon" = self.by-version."serve-favicon"."2.3.0";
+ by-spec."serve-static"."~1.11.1" =
+ self.by-version."serve-static"."1.11.1";
+ by-version."serve-static"."1.11.1" = self.buildNodePackage {
+ name = "serve-static-1.11.1";
+ version = "1.11.1";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/serve-static/-/serve-static-1.11.1.tgz";
+ name = "serve-static-1.11.1.tgz";
+ sha1 = "d6cce7693505f733c759de57befc1af76c0f0805";
+ };
+ deps = {
+ "encodeurl-1.0.1" = self.by-version."encodeurl"."1.0.1";
+ "escape-html-1.0.3" = self.by-version."escape-html"."1.0.3";
+ "parseurl-1.3.1" = self.by-version."parseurl"."1.3.1";
+ "send-0.14.1" = self.by-version."send"."0.14.1";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."setprototypeof"."1.0.1" =
+ self.by-version."setprototypeof"."1.0.1";
+ by-version."setprototypeof"."1.0.1" = self.buildNodePackage {
+ name = "setprototypeof-1.0.1";
+ version = "1.0.1";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.1.tgz";
+ name = "setprototypeof-1.0.1.tgz";
+ sha1 = "52009b27888c4dc48f591949c0a8275834c1ca7e";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."source-map"."0.4.x" =
+ self.by-version."source-map"."0.4.4";
+ by-version."source-map"."0.4.4" = self.buildNodePackage {
+ name = "source-map-0.4.4";
+ version = "0.4.4";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz";
+ name = "source-map-0.4.4.tgz";
+ sha1 = "eba4f5da9c0dc999de68032d8b4f76173652036b";
+ };
+ deps = {
+ "amdefine-1.0.0" = self.by-version."amdefine"."1.0.0";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."source-map"."^0.5.3" =
+ self.by-version."source-map"."0.5.6";
+ by-version."source-map"."0.5.6" = self.buildNodePackage {
+ name = "source-map-0.5.6";
+ version = "0.5.6";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz";
+ name = "source-map-0.5.6.tgz";
+ sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."source-map"."~0.1.7" =
+ self.by-version."source-map"."0.1.43";
+ by-version."source-map"."0.1.43" = self.buildNodePackage {
+ name = "source-map-0.1.43";
+ version = "0.1.43";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz";
+ name = "source-map-0.1.43.tgz";
+ sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346";
+ };
+ deps = {
+ "amdefine-1.0.0" = self.by-version."amdefine"."1.0.0";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."source-map"."~0.5.1" =
+ self.by-version."source-map"."0.5.6";
+ by-spec."statuses".">= 1.3.0 < 2" =
+ self.by-version."statuses"."1.3.0";
+ by-version."statuses"."1.3.0" = self.buildNodePackage {
+ name = "statuses-1.3.0";
+ version = "1.3.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz";
+ name = "statuses-1.3.0.tgz";
+ sha1 = "8e55758cb20e7682c1f4fce8dcab30bf01d1e07a";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."statuses"."~1.3.0" =
+ self.by-version."statuses"."1.3.0";
+ by-spec."transformers"."2.1.0" =
+ self.by-version."transformers"."2.1.0";
+ by-version."transformers"."2.1.0" = self.buildNodePackage {
+ name = "transformers-2.1.0";
+ version = "2.1.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz";
+ name = "transformers-2.1.0.tgz";
+ sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7";
+ };
+ deps = {
+ "promise-2.0.0" = self.by-version."promise"."2.0.0";
+ "css-1.0.8" = self.by-version."css"."1.0.8";
+ "uglify-js-2.2.5" = self.by-version."uglify-js"."2.2.5";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."type-is"."~1.6.13" =
+ self.by-version."type-is"."1.6.13";
+ by-version."type-is"."1.6.13" = self.buildNodePackage {
+ name = "type-is-1.6.13";
+ version = "1.6.13";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz";
+ name = "type-is-1.6.13.tgz";
+ sha1 = "6e83ba7bc30cd33a7bb0b7fb00737a2085bf9d08";
+ };
+ deps = {
+ "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
+ "mime-types-2.1.12" = self.by-version."mime-types"."2.1.12";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."uglify-js"."^2.4.19" =
+ self.by-version."uglify-js"."2.7.3";
+ by-version."uglify-js"."2.7.3" = self.buildNodePackage {
+ name = "uglify-js-2.7.3";
+ version = "2.7.3";
+ bin = true;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.3.tgz";
+ name = "uglify-js-2.7.3.tgz";
+ sha1 = "39b3a7329b89f5ec507e344c6e22568698ef4868";
+ };
+ deps = {
+ "async-0.2.10" = self.by-version."async"."0.2.10";
+ "source-map-0.5.6" = self.by-version."source-map"."0.5.6";
+ "uglify-to-browserify-1.0.2" = self.by-version."uglify-to-browserify"."1.0.2";
+ "yargs-3.10.0" = self.by-version."yargs"."3.10.0";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."uglify-js"."~2.2.5" =
+ self.by-version."uglify-js"."2.2.5";
+ by-version."uglify-js"."2.2.5" = self.buildNodePackage {
+ name = "uglify-js-2.2.5";
+ version = "2.2.5";
+ bin = true;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz";
+ name = "uglify-js-2.2.5.tgz";
+ sha1 = "a6e02a70d839792b9780488b7b8b184c095c99c7";
+ };
+ deps = {
+ "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
+ "optimist-0.3.7" = self.by-version."optimist"."0.3.7";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."uglify-to-browserify"."~1.0.0" =
+ self.by-version."uglify-to-browserify"."1.0.2";
+ by-version."uglify-to-browserify"."1.0.2" = self.buildNodePackage {
+ name = "uglify-to-browserify-1.0.2";
+ version = "1.0.2";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz";
+ name = "uglify-to-browserify-1.0.2.tgz";
+ sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."ultron"."1.0.x" =
+ self.by-version."ultron"."1.0.2";
+ by-version."ultron"."1.0.2" = self.buildNodePackage {
+ name = "ultron-1.0.2";
+ version = "1.0.2";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz";
+ name = "ultron-1.0.2.tgz";
+ sha1 = "ace116ab557cd197386a4e88f4685378c8b2e4fa";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."unpipe"."1.0.0" =
+ self.by-version."unpipe"."1.0.0";
+ by-version."unpipe"."1.0.0" = self.buildNodePackage {
+ name = "unpipe-1.0.0";
+ version = "1.0.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz";
+ name = "unpipe-1.0.0.tgz";
+ sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."unpipe"."~1.0.0" =
+ self.by-version."unpipe"."1.0.0";
+ by-spec."utils-merge"."1.0.0" =
+ self.by-version."utils-merge"."1.0.0";
+ by-version."utils-merge"."1.0.0" = self.buildNodePackage {
+ name = "utils-merge-1.0.0";
+ version = "1.0.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz";
+ name = "utils-merge-1.0.0.tgz";
+ sha1 = "0294fb922bb9375153541c4f7096231f287c8af8";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."vary"."~1.1.0" =
+ self.by-version."vary"."1.1.0";
+ by-version."vary"."1.1.0" = self.buildNodePackage {
+ name = "vary-1.1.0";
+ version = "1.1.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/vary/-/vary-1.1.0.tgz";
+ name = "vary-1.1.0.tgz";
+ sha1 = "e1e5affbbd16ae768dd2674394b9ad3022653140";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."void-elements"."~2.0.1" =
+ self.by-version."void-elements"."2.0.1";
+ by-version."void-elements"."2.0.1" = self.buildNodePackage {
+ name = "void-elements-2.0.1";
+ version = "2.0.1";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz";
+ name = "void-elements-2.0.1.tgz";
+ sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."window-size"."0.1.0" =
+ self.by-version."window-size"."0.1.0";
+ by-version."window-size"."0.1.0" = self.buildNodePackage {
+ name = "window-size-0.1.0";
+ version = "0.1.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz";
+ name = "window-size-0.1.0.tgz";
+ sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."with"."~4.0.0" =
+ self.by-version."with"."4.0.3";
+ by-version."with"."4.0.3" = self.buildNodePackage {
+ name = "with-4.0.3";
+ version = "4.0.3";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/with/-/with-4.0.3.tgz";
+ name = "with-4.0.3.tgz";
+ sha1 = "eefd154e9e79d2c8d3417b647a8f14d9fecce14e";
+ };
+ deps = {
+ "acorn-1.2.2" = self.by-version."acorn"."1.2.2";
+ "acorn-globals-1.0.9" = self.by-version."acorn-globals"."1.0.9";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."wordwrap"."0.0.2" =
+ self.by-version."wordwrap"."0.0.2";
+ by-version."wordwrap"."0.0.2" = self.buildNodePackage {
+ name = "wordwrap-0.0.2";
+ version = "0.0.2";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
+ name = "wordwrap-0.0.2.tgz";
+ sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
+ };
+ 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 = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz";
+ name = "wordwrap-0.0.3.tgz";
+ sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."ws"."^1.1.1" =
+ self.by-version."ws"."1.1.1";
+ by-version."ws"."1.1.1" = self.buildNodePackage {
+ name = "ws-1.1.1";
+ version = "1.1.1";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ws/-/ws-1.1.1.tgz";
+ name = "ws-1.1.1.tgz";
+ sha1 = "082ddb6c641e85d4bb451f03d52f06eabdb1f018";
+ };
+ deps = {
+ "options-0.0.6" = self.by-version."options"."0.0.6";
+ "ultron-1.0.2" = self.by-version."ultron"."1.0.2";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."yargs"."~3.10.0" =
+ self.by-version."yargs"."3.10.0";
+ by-version."yargs"."3.10.0" = self.buildNodePackage {
+ name = "yargs-3.10.0";
+ version = "3.10.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz";
+ name = "yargs-3.10.0.tgz";
+ sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1";
+ };
+ deps = {
+ "camelcase-1.2.1" = self.by-version."camelcase"."1.2.1";
+ "cliui-2.1.0" = self.by-version."cliui"."2.1.0";
+ "decamelize-1.2.0" = self.by-version."decamelize"."1.2.0";
+ "window-size-0.1.0" = self.by-version."window-size"."0.1.0";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+}
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 71358c806d8..911555fa6a6 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -1,6 +1,7 @@
{ stdenv, fetchurl, ncurses, openssl, aspell, gnutls
, zlib, curl , pkgconfig, libgcrypt
-, cmake, makeWrapper, libobjc, libiconv
+, cmake, makeWrapper, libobjc, libresolv, libiconv
+, asciidoctor # manpages
, guileSupport ? true, guile
, luaSupport ? true, lua5
, perlSupport ? true, perl
@@ -28,7 +29,13 @@ stdenv.mkDerivation rec {
sha256 = "0d1wcpsxx13clcf1ygcn5hsa1pjkck4xznbjbxphbdxd5whsbv3k";
};
- cmakeFlags = with stdenv.lib; []
+ outputs = [ "out" "doc" ];
+
+ enableParallelBuilding = true;
+ cmakeFlags = with stdenv.lib; [
+ "-DENABLE_MAN=ON"
+ "-DENABLE_DOC=ON"
+ ]
++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib" "-DCMAKE_FIND_FRAMEWORK=LAST"]
++ optional (!guileSupport) "-DENABLE_GUILE=OFF"
++ optional (!luaSupport) "-DENABLE_LUA=OFF"
@@ -41,8 +48,9 @@ stdenv.mkDerivation rec {
ncurses python openssl aspell gnutls zlib curl pkgconfig
libgcrypt pycrypto makeWrapper
cmake
- ]
- ++ optionals stdenv.isDarwin [ pync libobjc ]
+ asciidoctor
+ ]
+ ++ optionals stdenv.isDarwin [ pync libobjc libresolv ]
++ optional guileSupport guile
++ optional luaSupport lua5
++ optional perlSupport perl
@@ -52,7 +60,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}"
# Fix '_res_9_init: undefined symbol' error
- + (stdenv.lib.optionalString stdenv.isDarwin "-DBIND_8_COMPAT=1");
+ + (stdenv.lib.optionalString stdenv.isDarwin "-DBIND_8_COMPAT=1 -lresolv");
postInstall = with stdenv.lib; ''
NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages"
diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix
index bf3f6296acc..7720fd69eeb 100644
--- a/pkgs/applications/networking/mailreaders/mailnag/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, gettext, gtk3, pythonPackages
+{ stdenv, fetchurl, gettext, gtk3, python2Packages
, gdk_pixbuf, libnotify, gst_all_1
, libgnome_keyring3 ? null, networkmanager ? null
}:
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
name = "mailnag-${version}";
version = "1.1.0";
@@ -13,8 +13,8 @@ pythonPackages.buildPythonApplication rec {
};
buildInputs = [
- gettext gtk3 pythonPackages.pygobject3 pythonPackages.dbus-python
- pythonPackages.pyxdg gdk_pixbuf libnotify gst_all_1.gstreamer
+ gettext gtk3 python2Packages.pygobject3 python2Packages.dbus-python
+ python2Packages.pyxdg gdk_pixbuf libnotify gst_all_1.gstreamer
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-bad libgnome_keyring3 networkmanager
];
diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix
index be74e079691..031e835d3f7 100644
--- a/pkgs/applications/networking/mailreaders/mailpile/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix
@@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec {
propagatedBuildInputs = with pythonPackages; [
makeWrapper pillow jinja2 spambayes pythonPackages.lxml
- python.modules.readline pgpdump gnupg1orig
+ pgpdump gnupg1orig
];
postInstall = ''
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index ded4e66e366..d44c749a55a 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -13,7 +13,7 @@
enableOfficialBranding ? false
}:
-let version = "45.3.0"; in
+let version = "45.4.0"; in
let verName = "${version}"; in
stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://mozilla/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.xz";
- sha512 = "1226b35535d68b9c088ab8692f61120c99951e1ecbae4739ced711665a3237d248202831831f00536c724e2f6359db4601fa5c90f2793433eab4bd9dab0c1165";
+ sha512 = "9c601d9625b43103b64e111da3a88fccdc30d4a52aa8a66ee02120bc13f3c5600d24fa1cfd3817975a0e58be9078d192334dd3099aa462468d8ab0cd05a3bcd5";
};
buildInputs = # from firefox30Pkgs.xulrunner, without gstreamer and libvpx
@@ -113,6 +113,11 @@ stdenv.mkDerivation rec {
EOF
'';
+ postFixup =
+ ''
+ paxmark m $out/lib/thunderbird-${version}/thunderbird
+ '';
+
meta = with stdenv.lib; {
description = "A full-featured e-mail client";
homepage = http://www.mozilla.org/thunderbird/;
diff --git a/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix b/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix
index ddb37a3f64b..fc803fa2745 100644
--- a/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix
+++ b/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix
@@ -10,7 +10,6 @@ stdenv.mkDerivation rec {
};
buildInputs = with pythonPackages; [ python wrapPython ];
- pythonPath = [ pythonPackages.curses ];
installPhase = ''
install -D transmission-remote-cli $out/bin/transmission-remote-cli
diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix
index 210dbaf41c8..89027191654 100644
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/pkgs/applications/networking/p2p/tribler/default.nix
@@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
pythonPath = [
libtorrentRasterbar
pythonPackages.wxPython
- pythonPackages.curses
pythonPackages.apsw
pythonPackages.twisted
pythonPackages.gmpy
@@ -32,7 +31,6 @@ stdenv.mkDerivation rec {
pythonPackages.requests
pythonPackages.setuptools
pythonPackages.m2crypto
- pythonPackages.sqlite3
];
installPhase =
diff --git a/pkgs/applications/networking/pyload/default.nix b/pkgs/applications/networking/pyload/default.nix
new file mode 100644
index 00000000000..9be45e126a1
--- /dev/null
+++ b/pkgs/applications/networking/pyload/default.nix
@@ -0,0 +1,54 @@
+{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey }:
+pythonPackages.buildPythonApplication rec {
+ version = "0.4.9-next";
+ name = "pyLoad-" + version;
+
+ src = fetchFromGitHub {
+ owner = "pyload";
+ repo = "pyload";
+ rev = "03f3ad9e39da2b9a378987693c4a69720e4084c7";
+ sha256 = "0fgsz6yzxrlq3qvsyxsyzgmy4za35v1xh3i4drhispk9zb5jm1xx";
+ };
+
+ patches =
+ let
+ # gets merged in next release version of pyload
+ configParserPatch = fetchpatch {
+ url = "https://patch-diff.githubusercontent.com/raw/pyload/pyload/pull/2625.diff";
+ sha256 = "1bisgx78kcr5c0x0i3h0ch5mykns5wx5wx7gvjj0pc71lfzlxzb9";
+ };
+ setupPyPatch = fetchpatch {
+ url = "https://patch-diff.githubusercontent.com/raw/pyload/pyload/pull/2638.diff";
+ sha256 = "006g4qbl582262ariflbyfrszcx8ck2ac1cpry1f82f76p4cgf6z";
+ };
+ in [ configParserPatch setupPyPatch ];
+
+ buildInputs = [
+ unrar rhino spidermonkey gocr pythonPackages.paver
+ ];
+
+ propagatedBuildInputs = with pythonPackages; [
+ pycurl jinja2 beaker thrift simplejson pycrypto feedparser tkinter
+ beautifulsoup
+ ];
+
+ #remove this once the PR patches above are merged. Needed because githubs diff endpoint
+ #does not support diff -N
+ prePatch = ''
+ touch module/config/__init__.py
+ '';
+
+ preBuild = ''
+ paver generate_setup
+ '';
+
+ doCheck = false;
+
+ meta = {
+ description = "Free and open source downloader for 1-click-hosting sites";
+ homepage = https://github.com/pyload/pyload;
+ license = stdenv.lib.licenses.gpl3;
+ maintainers = [ stdenv.lib.maintainers.mahe ];
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix
index 90c80db0a02..2b157604f48 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/pkgs/applications/networking/remote/remmina/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, makeWrapper
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, wrapGAppsHook
, glib, gtk3, gettext, libxkbfile, libgnome_keyring, libX11
, freerdp, libssh, libgcrypt, gnutls, makeDesktopItem
, pcre, webkitgtk, libdbusmenu-gtk3, libappindicator-gtk3
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
sha256 = "07lj6a7x9cqcff18pwfkx8c8iml015zp6sq29dfcxpfg4ai578h0";
};
- buildInputs = [ cmake pkgconfig makeWrapper
+ buildInputs = [ cmake pkgconfig wrapGAppsHook
glib gtk3 gettext libxkbfile libgnome_keyring libX11
freerdp_git libssh libgcrypt gnutls
pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3
@@ -55,10 +55,15 @@ stdenv.mkDerivation {
cmakeFlags = "-DWITH_VTE=OFF -DWITH_TELEPATHY=OFF -DWITH_AVAHI=OFF -DWINPR_INCLUDE_DIR=${freerdp_git}/include/winpr2";
+ preFixup = ''
+ gappsWrapperArgs+=(
+ --prefix LD_LIBRARY_PATH : "${libX11.out}/lib"
+ )
+ '';
+
postInstall = ''
mkdir -pv $out/share/applications
cp ${desktopItem}/share/applications/* $out/share/applications
- wrapProgram $out/bin/remmina --prefix LD_LIBRARY_PATH : "${libX11.out}/lib"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 3d8733635ee..d7918b3b912 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, go }:
+{ stdenv, lib, fetchFromGitHub, go, pkgs }:
stdenv.mkDerivation rec {
version = "0.14.8";
@@ -25,11 +25,24 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
- mkdir -p $out/bin
+ mkdir -p $out/bin $out/etc/systemd/{system,user}
+
cp bin/* $out/bin
+ '' + lib.optionalString (stdenv.isLinux) ''
+ substitute etc/linux-systemd/system/syncthing-resume.service \
+ $out/etc/systemd/system/syncthing-resume.service \
+ --replace /usr/bin/pkill ${pkgs.procps}/bin/pkill
+
+ substitute etc/linux-systemd/system/syncthing@.service \
+ $out/etc/systemd/system/syncthing@.service \
+ --replace /usr/bin/syncthing $out/bin/syncthing
+
+ substitute etc/linux-systemd/user/syncthing.service \
+ $out/etc/systemd/user/syncthing.service \
+ --replace /usr/bin/syncthing $out/bin/syncthing
'';
- meta = {
+ meta = with stdenv.lib; {
homepage = https://www.syncthing.net/;
description = "Open Source Continuous File Synchronization";
license = stdenv.lib.licenses.mpl20;
diff --git a/pkgs/applications/networking/syncthing/inotify.nix b/pkgs/applications/networking/syncthing/inotify.nix
index ea8d73cb863..f1343d4a67e 100644
--- a/pkgs/applications/networking/syncthing/inotify.nix
+++ b/pkgs/applications/networking/syncthing/inotify.nix
@@ -15,12 +15,23 @@ buildGoPackage rec {
goDeps = ./inotify-deps.nix;
- meta = {
+ postInstall = ''
+ mkdir -p $bin/etc/systemd/{system,user}
+
+ substitute $src/etc/linux-systemd/system/syncthing-inotify@.service \
+ $bin/etc/systemd/system/syncthing-inotify@.service \
+ --replace /usr/bin/syncthing-inotify $bin/bin/syncthing-inotify
+
+ substitute $src/etc/linux-systemd/user/syncthing-inotify.service \
+ $bin/etc/systemd/user/syncthing-inotify.service \
+ --replace /usr/bin/syncthing-inotify $bin/bin/syncthing-inotify
+ '';
+
+ meta = with stdenv.lib; {
homepage = https://github.com/syncthing/syncthing-inotify;
description = "File watcher intended for use with Syncthing";
- license = stdenv.lib.licenses.mpl20;
- maintainers = with stdenv.lib.maintainers; [ joko ];
- platforms = with stdenv.lib.platforms; linux ++ freebsd ++ openbsd ++ netbsd;
+ license = licenses.mpl20;
+ maintainers = with maintainers; [ joko peterhoeg ];
+ platforms = platforms.unix;
};
-
}
diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix
index 73ab0baca25..bc75fb5f9a4 100644
--- a/pkgs/applications/networking/znc/default.nix
+++ b/pkgs/applications/networking/znc/default.nix
@@ -7,11 +7,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "znc-1.6.2";
+ name = "znc-1.6.3";
src = fetchurl {
url = "http://znc.in/releases/${name}.tar.gz";
- sha256 = "14q5dyr5zg99hm6j6g1gilcn1zf7dskhxfpz3bnkyhy6q0kpgwgf";
+ sha256 = "09xqi5fs40x6nj9gq99bnw1a7saq96bvqxknxx0ilq7yfvg4c733";
};
buildInputs = [ openssl pkgconfig ]
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Advanced IRC bouncer";
homepage = http://wiki.znc.in/ZNC;
- maintainers = with maintainers; [ viric ];
+ maintainers = with maintainers; [ viric schneefux ];
license = licenses.asl20;
platforms = platforms.unix;
};
diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix
index 492850bda1c..2923a30b2ef 100644
--- a/pkgs/applications/networking/znc/modules.nix
+++ b/pkgs/applications/networking/znc/modules.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchgit, znc }:
+{ stdenv, fetchurl, fetchFromGitHub, znc }:
let
zncDerivation = a@{
@@ -20,8 +20,9 @@ in rec {
version = "git-2015-08-27";
module_name = "clientbuffer";
- src = fetchgit {
- url = meta.repositories.git;
+ src = fetchFromGitHub {
+ owner = "jpnurmi";
+ repo = "znc-clientbuffer";
rev = "fe0f368e1fcab2b89d5c94209822d9b616cea840";
sha256 = "1s8bqqlwy9kmcpmavil558rd2b0wigjlzp2lpqpcqrd1cg25g4a7";
};
@@ -29,7 +30,6 @@ in rec {
meta = with stdenv.lib; {
description = "ZNC module for client specific buffers";
homepage = https://github.com/jpnurmi/znc-clientbuffer;
- repositories.git = https://github.com/jpnurmi/znc-clientbuffer.git;
license = licenses.asl20;
maintainers = with maintainers; [ hrdinka ];
};
@@ -40,8 +40,10 @@ in rec {
version = "git-2014-10-10";
module_name = "fish";
- src = fetchgit {
- url = meta.repositories.git;
+ src = fetchFromGitHub {
+ # this fork works with ZNC 1.6
+ owner = "jarrydpage";
+ repo = "znc-fish";
rev = "9c580e018a1a08374e814fc06f551281cff827de";
sha256 = "0yvs0jkwwp18qxqvw1dvir91ggczz56ka00k0zlsb81csdi8xfvl";
};
@@ -49,8 +51,6 @@ in rec {
meta = {
description = "ZNC FiSH module";
homepage = https://github.com/dctrwatson/znc-fish;
- # this fork works with ZNC 1.6
- repositories.git = https://github.com/jarrydpage/znc-fish.git;
maintainers = [ stdenv.lib.maintainers.offline ];
};
};
@@ -60,8 +60,9 @@ in rec {
version = "git-2015-08-04";
module_name = "playback";
- src = fetchgit {
- url = meta.repositories.git;
+ src = fetchFromGitHub {
+ owner = "jpnurmi";
+ repo = "znc-playback";
rev = "8691abf75becc1f3d7b5bb5ad68dad17cd21863b";
sha256 = "0mgfajljy035051b2sx70i8xrb51zw9q2z64kf85zw1lynihzyh4";
};
@@ -69,7 +70,6 @@ in rec {
meta = with stdenv.lib; {
description = "An advanced playback module for ZNC";
homepage = https://github.com/jpnurmi/znc-playback;
- repositories.git = https://github.com/jpnurmi/znc-playback.git;
license = licenses.asl20;
maintainers = with maintainers; [ hrdinka ];
};
@@ -80,8 +80,9 @@ in rec {
version = "git-2015-02-22";
module_name = "privmsg";
- src = fetchgit {
- url = meta.repositories.git;
+ src = fetchFromGitHub {
+ owner = "kylef";
+ repo = "znc-contrib";
rev = "9f1f98db56cbbea96d83e6628f657e0d62cd9517";
sha256 = "0n82z87gdxxragcaixjc80z8bw4bmfwbk0jrf9zs8kk42phlkkc2";
};
@@ -89,27 +90,26 @@ in rec {
meta = {
description = "ZNC privmsg module";
homepage = https://github.com/kylef/znc-contrib;
- repositories.git = https://github.com/kylef/znc-contrib.git;
};
};
push = zncDerivation rec {
name = "znc-push-${version}";
- version = "git-2015-12-07";
+ version = "git-2016-10-12";
module_name = "push";
- src = fetchgit {
- url = "https://github.com/jreese/znc-push.git";
- rev = "717a2b1741eee75456b0862ef76dbb5af906e936";
- sha256 = "1ih1hf11mqgi0cfh6v70v3b93xrw83xcb80psmijcqxi7kwjn404";
+ src = fetchFromGitHub {
+ owner = "jreese";
+ repo = "znc-push";
+ rev = "cf08b9e0f483f03c28d72dd78df932cbef141f10";
+ sha256 = "0xpwjw8csyrg736g1jc1n8d6804x6kbdkrvldzhk9ldj4iwqz7ay";
};
meta = {
description = "Push notification service module for ZNC";
homepage = https://github.com/jreese/znc-push;
- repositories.git = https://github.com/jreese/znc-push.git;
license = stdenv.lib.licenses.mit;
- maintainers = [ stdenv.lib.maintainers.offline ];
+ maintainers = with stdenv.lib.maintainers; [ offline schneefux ];
};
};
diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix
index ca003da9c46..3afb7ce4b10 100644
--- a/pkgs/applications/office/beancount/bean-add.nix
+++ b/pkgs/applications/office/beancount/bean-add.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "09xdsskk5rc3xsf1v1vq7nkdxrxy8w2fixx2vdv8c97ak6a4hrca";
};
- propagatedBuildInputs = with python3Packages; [ python readline ];
+ propagatedBuildInputs = with python3Packages; [ python ];
installPhase = ''
mkdir -p $out/bin/
diff --git a/pkgs/applications/office/beancount/default.nix b/pkgs/applications/office/beancount/default.nix
index 77fcb8ce7e9..2034c832294 100644
--- a/pkgs/applications/office/beancount/default.nix
+++ b/pkgs/applications/office/beancount/default.nix
@@ -1,14 +1,13 @@
{ stdenv, fetchhg, pkgs, pythonPackages }:
pythonPackages.buildPythonApplication rec {
- version = "2016-04-10-b5721f1c6f01bd168a5781652e5e3167f7f8ceb3";
+ version = "2.0b12";
name = "beancount-${version}";
namePrefix = "";
- src = fetchhg {
- url = "https://bitbucket.org/blais/beancount";
- rev = "b5721f1c6f01bd168a5781652e5e3167f7f8ceb3";
- sha256 = "10nv3p9cix7yp23a9hnq5163rpl8cfs3hv75h90ld57dc24nxzn2";
+ src = pkgs.fetchurl {
+ url = "mirror://pypi/b/beancount/${name}.tar.gz";
+ sha256 = "0n0wyi2yhmf8l46l5z68psk4rrzqkgqaqn93l0wnxsmp1nmqly9z";
};
buildInputs = with pythonPackages; [ nose ];
diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix
new file mode 100644
index 00000000000..5ed7d25667e
--- /dev/null
+++ b/pkgs/applications/office/fava/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, pkgs, fetchurl, python3Packages, fetchFromGitHub, fetchzip, python3, beancount }:
+
+python3Packages.buildPythonApplication rec {
+ version = "1.0";
+ name = "fava-${version}";
+
+ src = fetchFromGitHub {
+ owner = "aumayr";
+ repo = "fava";
+ rev = "v${version}";
+ sha256 = "0dm4x6z80m04r9qa55psvz7f41qnh13hnj2qhvxkrk22yqmkqrka";
+ };
+
+ assets = fetchzip {
+ url = "https://github.com/aumayr/fava/releases/download/v${version}/beancount-fava-${version}.tar.gz";
+ sha256 = "1vvidwfn5882dslz6qqkkd84m7w52kd34x10qph8yhipyjv1dimc";
+ };
+
+ buildInputs = with python3Packages; [ pytest_30 ];
+
+ checkPhase = ''
+ # pyexcel is optional
+ # the other 2 tests fail due non-unicode locales
+ PATH=$out/bin:$PATH pytest tests \
+ --ignore tests/test_util_excel.py \
+ --ignore tests/test_cli.py \
+ --ignore tests/test_translations.py \
+ '';
+
+ postInstall = ''
+ cp -r $assets/fava/static/gen $out/${python3.sitePackages}/fava/static
+ '';
+
+ propagatedBuildInputs = with python3Packages;
+ [ flask dateutil pygments wheel markdown2 flaskbabel tornado
+ click beancount ];
+
+ meta = {
+ homepage = https://github.com/aumayr/fava;
+ description = "Web interface for beancount";
+ license = stdenv.lib.licenses.mit;
+ maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ];
+ };
+}
+
diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix
index b1eb4ddf021..20ab6ce6f60 100644
--- a/pkgs/applications/office/homebank/default.nix
+++ b/pkgs/applications/office/homebank/default.nix
@@ -1,9 +1,9 @@
{ fetchurl, stdenv, gtk, pkgconfig, libofx, intltool, wrapGAppsHook
-, hicolor_icon_theme}:
+, hicolor_icon_theme, libsoup}:
let
download_root = "http://homebank.free.fr/public/";
- name = "homebank-5.0.6";
+ name = "homebank-5.1";
lastrelease = download_root + name + ".tar.gz";
oldrelease = download_root + "old/" + name + ".tar.gz";
in
@@ -13,10 +13,11 @@ stdenv.mkDerivation {
src = fetchurl {
urls = [ lastrelease oldrelease ];
- sha256 = "1r1rn8lgnqnlwkspx230gly5f4i90ij0a3ddrvw51kdc41xfylja";
+ sha256 = "1v6za6md5sjb1r3f5lc9k03v2q68cbx6g64vcn69666c42za2aq0";
};
- buildInputs = [ pkgconfig gtk libofx intltool hicolor_icon_theme wrapGAppsHook ];
+ buildInputs = [ pkgconfig gtk libofx intltool hicolor_icon_theme
+ wrapGAppsHook libsoup ];
meta = {
description = "Free, easy, personal accounting for everyone";
diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix
index 1422369d20e..1a4461e2f8c 100644
--- a/pkgs/applications/office/impressive/default.nix
+++ b/pkgs/applications/office/impressive/default.nix
@@ -1,8 +1,8 @@
-{ fetchurl, stdenv, pythonPackages, makeWrapper, lib
+{ fetchurl, stdenv, python2Packages, makeWrapper, lib
, xpdf, mesa, freeglut }:
let
- inherit (pythonPackages) python pyopengl pygame setuptools pillow;
+ inherit (python2Packages) python pyopengl pygame setuptools pillow;
version = "0.10.5";
in stdenv.mkDerivation {
# This project was formerly known as KeyJNote.
diff --git a/pkgs/applications/office/keepnote/default.nix b/pkgs/applications/office/keepnote/default.nix
index 3f3b5c2966c..b8d04baf356 100644
--- a/pkgs/applications/office/keepnote/default.nix
+++ b/pkgs/applications/office/keepnote/default.nix
@@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication {
sha256 = "0nhkkv1n0lqf3zn17pxg5cgryv1wwlj4hfmhixwd76rcy8gs45dh";
};
- propagatedBuildInputs = with pythonPackages; [ sqlite3 pyGtkGlade ];
+ propagatedBuildInputs = with pythonPackages; [ pyGtkGlade ];
# Testing fails.
doCheck = false;
diff --git a/pkgs/applications/office/marp/default.nix b/pkgs/applications/office/marp/default.nix
index 7c95bcafec5..9a59bef617b 100644
--- a/pkgs/applications/office/marp/default.nix
+++ b/pkgs/applications/office/marp/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "marp-${version}";
- version = "0.0.8";
+ version = "0.0.9";
src = fetchurl {
url = "https://github.com/yhatt/marp/releases/download/v${version}/${version}-Marp-linux-x64.tar.gz";
- sha256 = "0d7vvz34ik2jafwl3qjkdsvcva25gyrgrfg1gz1nk8f5dkl1wjcf";
+ sha256 = "142c35d88rkgjy85f4204givgx0p1qyfpipbrsa11lp3cb6jzhn2";
};
sourceRoot = ".";
diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix
index c45eb7d53d0..9e02377eaa5 100644
--- a/pkgs/applications/office/mmex/default.nix
+++ b/pkgs/applications/office/mmex/default.nix
@@ -1,16 +1,16 @@
-# To use this program, copy all that is in $out/opt/mmax into a writable directory,
-# and run it from there. This is the intended usage, as far as I understand.
+{ stdenv, fetchgit, sqlite, wxGTK30, gettext }:
-{ fetchsvn, stdenv, wxGTK }:
-let version = "0.9.5.1";
+let
+ version = "1.2.7";
in
stdenv.mkDerivation {
name = "money-manager-ex-${version}";
- src = fetchsvn {
- url = "https://moneymanagerex.svn.sourceforge.net/svnroot/moneymanagerex/tags/releases/${version}";
- sha256 = "0mby1p01fyxk5pgd7h3919q91r10zbfk16rfz1kbchqxqz87x4jq";
+ src = fetchgit {
+ url = "https://github.com/moneymanagerex/moneymanagerex.git";
+ rev = "refs/tags/v${version}";
+ sha256 = "0d6jcsj3m3b9mj68vfwr7dn67dws11p0pdys3spyyiv1464vmywi";
};
preConfigure = ''
@@ -18,19 +18,13 @@ in
export CXXFLAGS="$CFLAGS"
'';
- installPhase = ''
- mkdir -p $out/opt/mmex
- cp -r mmex runtime/{*.txt,*.png,*.db3,en,help,*.wav,*.ico} $out/opt/mmex
- '';
-
- buildInputs = [ wxGTK ];
+ buildInputs = [ sqlite wxGTK30 gettext ];
meta = {
description = "Easy-to-use personal finance software";
- homepage = http://www.codelathe.com/mmex;
+ homepage = http://www.moneymanagerex.org/;
license = stdenv.lib.licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
- broken = true;
};
}
diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix
index e1c80c50ee5..a6f0bccec96 100644
--- a/pkgs/applications/office/scribus/default.nix
+++ b/pkgs/applications/office/scribus/default.nix
@@ -1,8 +1,10 @@
{ stdenv, fetchurl, pkgconfig, freetype, lcms, libtiff, libxml2
-, libart_lgpl, qt4, pythonFull, cups, fontconfig, libjpeg
+, libart_lgpl, qt4, python2, cups, fontconfig, libjpeg
, zlib, libpng, xorg, cairo, podofo, aspell, boost, cmake }:
-stdenv.mkDerivation rec {
+let
+ pythonEnv = python2.withPackages(ps: [ps.tkinter]);
+in stdenv.mkDerivation rec {
name = "scribus-1.4.6";
src = fetchurl {
@@ -14,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = with xorg;
[ pkgconfig cmake freetype lcms libtiff libxml2 libart_lgpl qt4
- pythonFull cups fontconfig
+ pythonEnv 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/zim/default.nix b/pkgs/applications/office/zim/default.nix
index ec33388f086..cda8fc63a12 100644
--- a/pkgs/applications/office/zim/default.nix
+++ b/pkgs/applications/office/zim/default.nix
@@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec {
sha256 = "15pdq4fxag85qjsrdmmssiq85qsk5vnbp8mrqnpvx8lm8crz6hjl";
};
- propagatedBuildInputs = with pythonPackages; [ sqlite3 pyGtkGlade pyxdg pygobject2 ];
+ propagatedBuildInputs = with pythonPackages; [ pyGtkGlade pyxdg pygobject2 ];
preBuild = ''
export HOME=$TMP
diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix
index f495ee257ff..cf5114b4a41 100644
--- a/pkgs/applications/science/logic/yices/default.nix
+++ b/pkgs/applications/science/logic/yices/default.nix
@@ -2,24 +2,31 @@
stdenv.mkDerivation rec {
name = "yices-${version}";
- version = "2.3.1";
+ version = "2.5.1";
src = fetchurl {
- url = "http://yices.csl.sri.com/cgi-bin/yices2-newnewdownload.cgi?file=yices-2.3.1-src.tar.gz&accept=I+Agree";
+ url = "http://yices.csl.sri.com/cgi-bin/yices2-newnewdownload.cgi?file=yices-${version}-src.tar.gz&accept=I+Agree";
name = "yices-${version}-src.tar.gz";
- sha256 = "1da70n0cah0dh3pk7fcrvjkszx9qmhc0csgl15jqa7bdh707k2zs";
+ sha256 = "1wfq6hcm54h0mqmbs1ip63i0ywlwnciav86sbzk3gafxyzg1nd0c";
};
+ patchPhase = ''patchShebangs tests/regress/check.sh'';
+
configureFlags = [ "--with-static-gmp=${gmp-static.out}/lib/libgmp.a"
"--with-static-gmp-include-dir=${gmp-static.dev}/include"
];
buildInputs = [ gmp-static gperf autoreconfHook ];
- meta = {
+ enableParallelBuilding = true;
+ doCheck = true;
+
+ installPhase = ''make install LDCONFIG=true'';
+
+ meta = with stdenv.lib; {
description = "A high-performance theorem prover and SMT solver";
homepage = "http://yices.csl.sri.com";
- license = stdenv.lib.licenses.unfreeRedistributable;
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+ license = licenses.unfreeRedistributable;
+ platforms = platforms.linux ++ platforms.darwin;
+ maintainers = [ maintainers.thoughtpolice ];
};
}
diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix
index 43ce46b8e7a..0e43abdd681 100644
--- a/pkgs/applications/science/logic/z3/default.nix
+++ b/pkgs/applications/science/logic/z3/default.nix
@@ -1,6 +1,8 @@
-{ stdenv, fetchFromGitHub, python }:
+{ stdenv, fetchFromGitHub, python2 }:
-stdenv.mkDerivation rec {
+let
+ python = python2;
+in stdenv.mkDerivation rec {
name = "z3-${version}";
version = "4.4.1";
@@ -14,21 +16,21 @@ stdenv.mkDerivation rec {
buildInputs = [ python ];
enableParallelBuilding = true;
- configurePhase = "python scripts/mk_make.py --prefix=$out && cd build";
+ configurePhase = "${python.interpreter} scripts/mk_make.py --prefix=$out && cd build";
# z3's install phase is stupid because it tries to calculate the
# python package store location itself, meaning it'll attempt to
# write files into the nix store, and fail.
soext = if stdenv.system == "x86_64-darwin" then ".dylib" else ".so";
installPhase = ''
- mkdir -p $out/bin $out/lib/${python.libPrefix}/site-packages $out/include
+ mkdir -p $out/bin $out/${python.sitePackages} $out/include
cp ../src/api/z3*.h $out/include
cp ../src/api/c++/z3*.h $out/include
cp z3 $out/bin
cp libz3${soext} $out/lib
- cp libz3${soext} $out/lib/${python.libPrefix}/site-packages
- cp z3*.pyc $out/lib/${python.libPrefix}/site-packages
- cp ../src/api/python/*.py $out/lib/${python.libPrefix}/site-packages
+ cp libz3${soext} $out/${python.sitePackages}
+ cp z3*.pyc $out/${python.sitePackages}
+ cp ../src/api/python/*.py $out/${python.sitePackages}
'';
meta = {
diff --git a/pkgs/applications/science/logic/z3_opt/default.nix b/pkgs/applications/science/logic/z3_opt/default.nix
index b4d8fbc9529..1b989097758 100644
--- a/pkgs/applications/science/logic/z3_opt/default.nix
+++ b/pkgs/applications/science/logic/z3_opt/default.nix
@@ -1,8 +1,10 @@
-{ stdenv, fetchFromGitHub, python }:
+{ stdenv, fetchFromGitHub, python2 }:
# Copied shamelessly from the normal z3 .nix
-stdenv.mkDerivation rec {
+let
+ python = python2;
+in stdenv.mkDerivation rec {
name = "z3_opt-${version}";
version = "4.3.2";
@@ -16,21 +18,21 @@ stdenv.mkDerivation rec {
buildInputs = [ python ];
enableParallelBuilding = true;
- configurePhase = "python scripts/mk_make.py --prefix=$out && cd build";
+ configurePhase = "${python.interpreter} scripts/mk_make.py --prefix=$out && cd build";
# z3's install phase is stupid because it tries to calculate the
# python package store location itself, meaning it'll attempt to
# write files into the nix store, and fail.
soext = if stdenv.system == "x86_64-darwin" then ".dylib" else ".so";
installPhase = ''
- mkdir -p $out/bin $out/lib/${python.libPrefix}/site-packages $out/include
+ mkdir -p $out/bin $out/${python.sitePackages} $out/include
cp ../src/api/z3*.h $out/include
cp ../src/api/c++/z3*.h $out/include
cp z3 $out/bin
cp libz3${soext} $out/lib
- cp libz3${soext} $out/lib/${python.libPrefix}/site-packages
- cp z3*.pyc $out/lib/${python.libPrefix}/site-packages
- cp ../src/api/python/*.py $out/lib/${python.libPrefix}/site-packages
+ cp libz3${soext} $out/${python.sitePackages}
+ cp z3*.pyc $out/${python.sitePackages}
+ cp ../src/api/python/*.py $out/${python.sitePackages}
'';
meta = {
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 430c6629df2..dea095c834f 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -7,11 +7,11 @@
}:
stdenv.mkDerivation rec {
- name = "R-3.2.3";
+ name = "R-3.2.4";
src = fetchurl {
url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz";
- sha256 = "b93b7d878138279234160f007cb9b7f81b8a72c012a15566e9ec5395cfd9b6c1";
+ sha256 = "0l6k3l3cy6fa9xkn23zvz5ykpw10s45779x88yz3pzn2x5gl1zds";
};
buildInputs = [ bzip2 gfortran libX11 libXmu libXt
diff --git a/pkgs/applications/science/math/gfan/default.nix b/pkgs/applications/science/math/gfan/default.nix
new file mode 100644
index 00000000000..dbd28cf9e8c
--- /dev/null
+++ b/pkgs/applications/science/math/gfan/default.nix
@@ -0,0 +1,24 @@
+{stdenv, fetchurl, gmp, mpir, cddlib}:
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "gfan";
+ version = "0.5";
+ # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
+ src = fetchurl {
+ url = "http://home.math.au.dk/jensen/software/gfan/gfan${version}.tar.gz";
+ sha256 = "0adk9pia683wf6kn6h1i02b3801jz8zn67yf39pl57md7bqbrsma";
+ };
+ preBuild = ''
+ sed -e 's@static int i;@//&@' -i app_minkowski.cpp
+ '';
+ makeFlags = ''PREFIX=$(out)'';
+ buildInputs = [gmp mpir cddlib];
+ meta = {
+ inherit version;
+ description = ''A software package for computing Gröbner fans and tropical varieties'';
+ license = stdenv.lib.licenses.gpl2 ;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ homepage = "http://home.math.au.dk/jensen/software/gfan/gfan.html";
+ };
+}
diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix
index 4981767f21f..55443f90c6f 100644
--- a/pkgs/applications/science/math/maxima/default.nix
+++ b/pkgs/applications/science/math/maxima/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, sbcl, texinfo, perl, python, makeWrapper, rlwrap ? null, tk ? null, gnuplot ? null }:
+{ stdenv, fetchurl, sbcl, texinfo, perl, python, makeWrapper, rlwrap ? null,
+tk ? null, gnuplot ? null, ecl ? null, ecl-fasl ? false
+}:
let
name = "maxima";
@@ -6,9 +8,9 @@ let
searchPath =
stdenv.lib.makeBinPath
- (stdenv.lib.filter (x: x != null) [ sbcl rlwrap tk gnuplot ]);
+ (stdenv.lib.filter (x: x != null) [ sbcl ecl rlwrap tk gnuplot ]);
in
-stdenv.mkDerivation {
+stdenv.mkDerivation ({
name = "${name}-${version}";
src = fetchurl {
@@ -16,7 +18,8 @@ stdenv.mkDerivation {
sha256 = "1p6646rvq43hk09msyp0dk50cqpkh07mf4x0bc2fqisqmcv6b1hf";
};
- buildInputs = [sbcl texinfo perl python makeWrapper];
+ buildInputs = stdenv.lib.filter (x: x != null)
+ [sbcl ecl texinfo perl python makeWrapper];
postInstall = ''
# Make sure that maxima can find its runtime dependencies.
@@ -27,7 +30,11 @@ stdenv.mkDerivation {
mkdir -p $out/share/emacs $out/share/doc
ln -s ../maxima/${version}/emacs $out/share/emacs/site-lisp
ln -s ../maxima/${version}/doc $out/share/doc/maxima
- '';
+ ''
+ + (stdenv.lib.optionalString ecl-fasl ''
+ cp src/binary-ecl/maxima.fas* "$out/lib/maxima/${version}/binary-ecl/"
+ '')
+ ;
# Failures in the regression test suite won't abort the build process. We run
# the suite only so that potential errors show up in the build log. See also:
@@ -51,4 +58,8 @@ stdenv.mkDerivation {
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.peti ];
};
-}
+} // (stdenv.lib.optionalAttrs ecl-fasl {
+ preConfigure = ''
+ sed -e '/c::build-program "binary-ecl\/maxima"/i(c::build-fasl "binary-ecl\/maxima.fasl" :lisp-files obj :ld-flags (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*" (find-package "MAXIMA"))))) (if (and x (not (string= x ""))) (list x))))' -i src/maxima.system
+ '';
+}))
diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix
new file mode 100644
index 00000000000..7503c50c6d2
--- /dev/null
+++ b/pkgs/applications/science/math/nauty/default.nix
@@ -0,0 +1,24 @@
+{stdenv, fetchurl}:
+stdenv.mkDerivation rec {
+ name = "nauty-${version}";
+ version = "26r7";
+ src = fetchurl {
+ url = "http://pallini.di.uniroma1.it/nauty${version}.tar.gz";
+ sha256 = "1indcc1im7s5x89x0xn4699izw1wwars1aanpmf8jibnw66n9dcp";
+ };
+ buildInputs = [];
+ installPhase = ''
+ mkdir -p "$out"/{bin,share/doc/nauty}
+
+ cp $(find . -type f -perm -111 \! -name '*.*' ) "$out/bin"
+ cp [Rr][Ee][Aa][Dd]* COPYRIGHT This* [Cc]hange* "$out/share/doc/nauty"
+ '';
+ meta = {
+ inherit version;
+ description = ''Programs for computing automorphism groups of graphs and digraphs'';
+ license = stdenv.lib.licenses.asl20;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ homepage = "http://pallini.di.uniroma1.it/";
+ };
+}
diff --git a/pkgs/applications/science/math/pari/unstable.nix b/pkgs/applications/science/math/pari/unstable.nix
new file mode 100644
index 00000000000..2c1cc7d75d8
--- /dev/null
+++ b/pkgs/applications/science/math/pari/unstable.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, gmp, readline, perl }:
+
+stdenv.mkDerivation rec {
+ version = "2.8.1.beta";
+ name = "pari-unstable-${version}";
+
+ src = fetchurl {
+ url = "http://pari.math.u-bordeaux.fr/pub/pari/unstable/pari-${version}.tar.gz";
+ sha256 = "167dcqrqsblqrd7z5pb8jrs9xqm8138mik0s4ihlqcq6c3wndhv1";
+ };
+
+ buildInputs = [gmp readline];
+ nativeBuildInputs = [perl];
+
+ configureScript = "./Configure";
+ configureFlags =
+ "--with-gmp=${gmp.dev} " +
+ "--with-readline=${readline.dev}";
+
+ meta = with stdenv.lib; {
+ description = "Computer algebra system for high-performance number theory computations";
+ homepage = "http://pari.math.u-bordeaux.fr/";
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ ertes raskin ];
+ platforms = platforms.linux;
+
+ inherit version;
+ downloadPage = "http://pari.math.u-bordeaux.fr/download.html";
+ updateWalker = true;
+ };
+}
diff --git a/pkgs/applications/science/math/ratpoints/default.nix b/pkgs/applications/science/math/ratpoints/default.nix
new file mode 100644
index 00000000000..1e99b8782a9
--- /dev/null
+++ b/pkgs/applications/science/math/ratpoints/default.nix
@@ -0,0 +1,21 @@
+{stdenv, fetchurl, gmp}:
+stdenv.mkDerivation rec {
+ name = "ratpoints-${version}";
+ version = "2.1.3";
+ src = fetchurl {
+ url = "http://www.mathe2.uni-bayreuth.de/stoll/programs/ratpoints-${version}.tar.gz";
+ sha256 = "0zhad84sfds7izyksbqjmwpfw4rvyqk63yzdjd3ysd32zss5bgf4";
+ };
+ buildInputs = [gmp];
+ makeFlags = "INSTALL_DIR=$(out)";
+ preInstall = ''mkdir -p "$out"/{bin,share,lib,include}'';
+ meta = {
+ inherit version;
+ description = ''A program to find rational points on hyperelliptic curves'';
+ license = stdenv.lib.licenses.gpl2Plus;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ homepage = "http://www.mathe2.uni-bayreuth.de/stoll/programs/";
+ updateWalker = true;
+ };
+}
diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix
index a0fdf7c8239..6cd66c62a0a 100644
--- a/pkgs/applications/science/math/singular/default.nix
+++ b/pkgs/applications/science/math/singular/default.nix
@@ -1,30 +1,47 @@
-{ stdenv, fetchurl, gmp, bison, perl, autoconf, ncurses, readline, coreutils }:
+{ stdenv, fetchurl, gmp, bison, perl, autoconf, ncurses, readline, coreutils, pkgconfig
+, asLibsingular ? false
+}:
stdenv.mkDerivation rec {
name = "singular-${version}";
- version="3-1-2";
+ version="3-1-7";
src = fetchurl {
- url = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/${version}/${name}.tar.gz";
- sha256 = "04f9i1xar0r7qrrbfki1h9rrmx5y2xg4w7rrvlbx05v2dy6s8djv";
+ url = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/${version}/Singular-${version}.tar.gz";
+ sha256 = "1j4mcpnwzdp3h4qspk6ww0m67rmx4s11cy17pvzbpf70lm0jzzh2";
};
- buildInputs = [ gmp bison perl autoconf ncurses readline coreutils ];
+ buildInputs = [ gmp perl ncurses readline ];
+ nativeBuildInputs = [ autoconf bison pkgconfig ];
preConfigure = ''
find . -exec sed -e 's@/bin/rm@${coreutils}&@g' -i '{}' ';'
find . -exec sed -e 's@/bin/uname@${coreutils}&@g' -i '{}' ';'
+ ${stdenv.lib.optionalString asLibsingular ''NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DLIBSINGULAR"''}
'';
hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector";
- postInstall = ''
- rm -rf "$out/LIB"
- cp -r Singular/LIB "$out"
+ # The Makefile actually defaults to `make install` anyway
+ buildPhase = "true;";
+
+ installPhase = ''
+ mkdir -p "$out"
+ cp -r Singular/LIB "$out/LIB"
+ make install${stdenv.lib.optionalString asLibsingular "-libsingular"}
+
+ binaries="$(find "$out"/* \( -type f -o -type l \) -perm -111 \! -name '*.so' -maxdepth 1)"
+ ln -s "$out"/*/{include,lib} "$out"
mkdir -p "$out/bin"
- ln -s "$out/"*/Singular "$out/bin"
+ for b in $binaries; do
+ bbn="$(basename "$b")"
+ echo -e '#! ${stdenv.shell}\n"'"$b"'" "$@"' > "$out/bin/$bbn"
+ chmod a+x "$out/bin/$bbn"
+ done
'';
+ enableParallelBuild = true;
+
meta = with stdenv.lib; {
description = "A CAS for polynomial computations";
maintainers = with maintainers;
@@ -32,10 +49,6 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
license = licenses.gpl3; # Or GPLv2 at your option - but not GPLv4
homepage = "http://www.singular.uni-kl.de/index.php";
- };
- passthru = {
- updateInfo = {
- downloadPage = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/";
- };
+ downloadPage = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/";
};
}
diff --git a/pkgs/applications/science/math/symmetrica/default.nix b/pkgs/applications/science/math/symmetrica/default.nix
new file mode 100644
index 00000000000..0c87beb22df
--- /dev/null
+++ b/pkgs/applications/science/math/symmetrica/default.nix
@@ -0,0 +1,29 @@
+{stdenv, fetchurl}:
+stdenv.mkDerivation rec {
+ name = "symmetrica-${version}";
+ version = "2.0";
+ # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
+ src = fetchurl {
+ url = "http://www.algorithm.uni-bayreuth.de/en/research/SYMMETRICA/SYM2_0_tar.gz";
+ sha256 = "1qhfrbd5ybb0sinl9pad64rscr08qvlfzrzmi4p4hk61xn6phlmz";
+ name = "symmetrica-2.0.tar.gz";
+ };
+ buildInputs = [];
+ sourceRoot = ".";
+ installPhase = ''
+ mkdir -p "$out"/{lib,share/doc/symmetrica,include/symmetrica}
+ ar crs libsymmetrica.a *.o
+ ranlib libsymmetrica.a
+ cp libsymmetrica.a "$out/lib"
+ cp *.h "$out/include/symmetrica"
+ cp README *.doc "$out/share/doc/symmetrica"
+ '';
+ meta = {
+ inherit version;
+ description = ''A collection of routines for representation theory and combinatorics'';
+ license = stdenv.lib.licenses.publicDomain;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ homepage = "http://www.symmetrica.de/";
+ };
+}
diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix
index 808af776e28..45d7686b3e5 100644
--- a/pkgs/applications/science/misc/root/default.nix
+++ b/pkgs/applications/science/misc/root/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python
+{ stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2
, libX11, libXpm, libXft, libXext, zlib, lzma, gsl, Cocoa }:
stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "00f3v3l8nimfkcxpn9qpyh3h23na0mi4wkds2y5gwqh8wh3jryq9";
};
- buildInputs = [ cmake pcre pkgconfig python zlib lzma gsl ]
+ buildInputs = [ cmake pcre pkgconfig python2 zlib lzma gsl ]
++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext ]
++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa ]
;
@@ -69,5 +69,6 @@ stdenv.mkDerivation rec {
homepage = "https://root.cern.ch/";
description = "A data analysis framework";
platforms = stdenv.lib.platforms.unix;
+ maintainers = with stdenv.lib.maintainers; [ veprbl ];
};
}
diff --git a/pkgs/applications/science/physics/sacrifice/compat.patch b/pkgs/applications/science/physics/sacrifice/compat.patch
new file mode 100644
index 00000000000..c66b91b7628
--- /dev/null
+++ b/pkgs/applications/science/physics/sacrifice/compat.patch
@@ -0,0 +1,12 @@
+diff --git a/src/PythiaMain.cxx b/src/PythiaMain.cxx
+index 0e5ddd2..2b626ab 100644
+--- a/src/PythiaMain.cxx
++++ b/src/PythiaMain.cxx
+@@ -96,7 +96,6 @@ int main(int argc, char **argv){
+ HepMCConverter pythiaToHepMC;
+
+ pythiaToHepMC.set_store_pdf(true);
+- pythiaToHepMC.set_crash_on_problem(true);
+
+ if(photosHandler.isEnabled()){
+ photosHandler.initialise();
diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/applications/science/physics/sacrifice/default.nix
new file mode 100644
index 00000000000..d6aeeedc086
--- /dev/null
+++ b/pkgs/applications/science/physics/sacrifice/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, boost, hepmc, lhapdf, pythia }:
+
+stdenv.mkDerivation rec {
+ name = "sacrifice-${version}";
+ version = "1.0.0";
+
+ src = fetchurl {
+ url = "http://www.hepforge.org/archive/agile/Sacrifice-1.0.0.tar.gz";
+ sha256 = "10bvpq63kmszy1habydwncm0j1dgvam0fkrmvkgbkvf804dcjp6g";
+ };
+
+ buildInputs = [ boost hepmc lhapdf pythia ];
+
+ patches = [
+ ./compat.patch
+ ];
+
+ preConfigure = ''
+ substituteInPlace configure --replace HAVE_LCG=yes HAVE_LCG=no
+ ''
+ + stdenv.lib.optionalString stdenv.isDarwin ''
+ substituteInPlace configure --replace LIB_SUFFIX=\"so\" LIB_SUFFIX=\"dylib\"
+ '';
+
+ configureFlags = [
+ "--with-HepMC=${hepmc}"
+ "--with-pythia=${pythia}"
+ ];
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "A standalone contribution to AGILe for steering Pythia 8";
+ license = stdenv.lib.licenses.gpl2;
+ homepage = https://agile.hepforge.org/trac/wiki/Sacrifice;
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = with stdenv.lib.maintainers; [ veprbl ];
+ };
+}
diff --git a/pkgs/applications/science/robotics/yarp/default.nix b/pkgs/applications/science/robotics/yarp/default.nix
index 76ba871c4a1..5e4bda1aaa0 100644
--- a/pkgs/applications/science/robotics/yarp/default.nix
+++ b/pkgs/applications/science/robotics/yarp/default.nix
@@ -3,18 +3,29 @@
stdenv.mkDerivation rec {
name = "yarp-${version}";
- version = "2.3.65";
+ version = "2.3.66";
src = fetchFromGitHub {
owner = "robotology";
repo = "yarp";
- rev = "v${version}";
- sha256 = "003n0z1qrd7l8maa98aa49gsfsyy7w8gb2pprlgj92r0drk8zm02";
+ rev = "v${version}.1";
+ sha256 = "0hznysxhk6pd92fymcrnbbl8ah7rcwhcvb6n92v09zjv6yl5xpiq";
};
buildInputs = [ cmake ace ];
enableParallelBuilding = true;
+ cmakeFlags = [
+ "-DYARP_COMPILE_UNMAINTAINED:BOOL=ON"
+ "-DCREATE_YARPC:BOOL=ON"
+ "-DCREATE_YARPCXX:BOOL=ON"
+ ];
+
+ # since we cant expand $out in cmakeFlags
+ preConfigure = ''cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_LIBDIR=$out/lib"'';
+
+ postInstall = "mv ./$out/lib/*.so $out/lib/";
+
meta = {
description = "Yet Another Robot Platform";
homepage = http://yarp.it;
diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix
index 689daef45ef..a397acddbcf 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, fetchurl, python2Packages }:
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
version = "2.7";
release = ".0";
name = "bazaar-${version}${release}";
@@ -10,9 +10,6 @@ pythonPackages.buildPythonApplication rec {
sha256 = "1cysix5k3wa6y7jjck3ckq3abls4gvz570s0v0hxv805nwki4i8d";
};
- # Readline support is needed by bzrtools.
- propagatedBuildInputs = [ pythonPackages.python.modules.readline ];
-
doCheck = false;
# Bazaar can't find the certificates alone
diff --git a/pkgs/applications/version-management/bazaar/tools.nix b/pkgs/applications/version-management/bazaar/tools.nix
index 68b69f335b6..d6c65548c1f 100644
--- a/pkgs/applications/version-management/bazaar/tools.nix
+++ b/pkgs/applications/version-management/bazaar/tools.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, makeWrapper, python2, bazaar }:
+{ stdenv, fetchurl, makeWrapper, python2Packages, bazaar }:
-stdenv.mkDerivation rec {
+python2Packages.buildPythonApplication rec {
name = "bzr-tools-${version}";
version = "2.6.0";
@@ -9,12 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0n3zzc6jf5866kfhmrnya1vdr2ja137a45qrzsz8vz6sc6xgn5wb";
};
- buildInputs = [ makeWrapper python2 ];
+ doCheck = false;
- installPhase = ''
- ${python2}/bin/python ./setup.py install --prefix=$out
- '';
-
meta = {
description = "Bazaar plugins";
homepage = http://wiki.bazaar.canonical.com/BzrTools;
diff --git a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
index bb3bc806a68..474faa30467 100644
--- a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
mv *.py $l
for p in $out/bin/*.sh; do
wrapProgram $p \
- --prefix PYTHONPATH : "$(echo ${mercurial}/lib/python*/site-packages):$(echo ${mercurial.python}/lib/python*/site-packages)${stdenv.lib.concatMapStrings (x: ":$(echo ${x}/lib/python*/site-packages)") mercurial.pythonPackages}" \
+ --prefix PYTHONPATH : "$(echo ${mercurial}/lib/python*/site-packages):$(echo ${mercurial.python}/lib/python*/site-packages)${stdenv.lib.concatMapStrings (x: ":$(echo ${x}/lib/python*/site-packages)") mercurial.pythonPackages or []}" \
--prefix PATH : "$(dirname $(type -p python))":$l
done
'';
diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
index 77c2f45bbd5..cf7f6b82ce2 100644
--- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
@@ -1,16 +1,18 @@
-{ stdenv, fetchurl, python, pythonPackages, makeWrapper, gettext }:
+{ stdenv, fetchurl, pythonPackages, makeWrapper, gettext, git }:
-pythonPackages.buildPythonApplication rec {
+let
+ inherit (pythonPackages) buildPythonApplication pyqt4 sip pyinotify python mock;
+in buildPythonApplication rec {
name = "git-cola-${version}";
- version = "2.5";
+ version = "2.8";
src = fetchurl {
url = "https://github.com/git-cola/git-cola/archive/v${version}.tar.gz";
- sha256 = "0ybjmlwm1plnvqi20y91ci7sgldzwlwn86vyyn9a157h7lf4ngb8";
+ sha256 = "19ff7i0h5fznrkm17lp3xkxwkq27whhiil6y6bm16b1wny5hjqlr";
};
- buildInputs = [ makeWrapper gettext ];
- propagatedBuildInputs = with pythonPackages; [ pyqt4 sip pyinotify ];
+ buildInputs = [ git makeWrapper gettext ];
+ propagatedBuildInputs = [ pyqt4 sip pyinotify ];
# HACK: wrapPythonPrograms adds 'import sys; sys.argv[0] = "git-cola"', but
# "import __future__" must be placed above that. This removes the argv[0] line.
@@ -26,6 +28,8 @@ pythonPackages.buildPythonApplication rec {
}'
'';
+ doCheck = false;
+
meta = with stdenv.lib; {
homepage = https://github.com/git-cola/git-cola;
description = "A sleek and powerful Git GUI";
diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
index 579cb363702..d561f751cc9 100644
--- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, docutils, python }:
+{ stdenv, fetchFromGitHub, docutils, python2 }:
stdenv.mkDerivation rec {
name = "git-hub-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
owner = "sociomantic-tsunami";
};
- buildInputs = [ python ];
+ buildInputs = [ python2 ];
nativeBuildInputs = [ docutils ];
postPatch = ''
diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
index 68c680ca979..547f5f997b9 100644
--- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/git-remote-hg \
- --prefix PYTHONPATH : "$(echo ${mercurial}/lib/python*/site-packages):$(echo ${mercurial.python}/lib/python*/site-packages)${stdenv.lib.concatMapStrings (x: ":$(echo ${x}/lib/python*/site-packages)") mercurial.pythonPackages}"
+ --prefix PYTHONPATH : "$(echo ${mercurial}/lib/python*/site-packages):$(echo ${mercurial.python}/lib/python*/site-packages)${stdenv.lib.concatMapStrings (x: ":$(echo ${x}/lib/python*/site-packages)") mercurial.pythonPackages or []}"
'';
meta = with stdenv.lib; {
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 d80b48a8577..e432543df45 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -7,6 +7,7 @@
, withManual ? true
, pythonSupport ? true
, sendEmailSupport
+, darwin
}:
let
@@ -42,7 +43,9 @@ stdenv.mkDerivation {
buildInputs = [curl openssl zlib expat gettext cpio makeWrapper libiconv perl]
++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x
docbook_xsl docbook_xml_dtd_45 libxslt ]
- ++ stdenv.lib.optionals guiSupport [tcl tk];
+ ++ stdenv.lib.optionals guiSupport [tcl tk]
+ ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ];
+
# required to support pthread_cancel()
NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.cc.isClang) "-lgcc_s"
@@ -51,11 +54,17 @@ stdenv.mkDerivation {
# without this, git fails when trying to check for /etc/gitconfig existence
propagatedSandboxProfile = stdenv.lib.sandbox.allowDirectoryList "/etc";
- makeFlags = "prefix=\${out} sysconfdir=/etc/ PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} "
+ makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} "
+ (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1")
+ (if stdenv.isSunOS then " INSTALL=install NO_INET_NTOP= NO_INET_PTON=" else "")
- + (if stdenv.isDarwin then " NO_APPLE_COMMON_CRYPTO=1" else "");
+ + (if stdenv.isDarwin then " NO_APPLE_COMMON_CRYPTO=1" else " sysconfdir=/etc/ ");
+ # build git-credential-osxkeychain if darwin
+ postBuild = stdenv.lib.optionalString stdenv.isDarwin ''
+ pushd $PWD/contrib/credential/osxkeychain/
+ make
+ popd
+ '';
# FIXME: "make check" requires Sparse; the Makefile must be tweaked
# so that `SPARSE_FLAGS' corresponds to the current architecture...
@@ -63,6 +72,11 @@ stdenv.mkDerivation {
installFlags = "NO_INSTALL_HARDLINKS=1";
+ preInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+ mkdir -p $out/bin
+ mv $PWD/contrib/credential/osxkeychain/git-credential-osxkeychain $out/bin
+ '';
+
postInstall =
''
notSupported() {
@@ -157,7 +171,15 @@ stdenv.mkDerivation {
for prog in bin/gitk libexec/git-core/git-gui; do
notSupported "$out/$prog"
done
- '');
+ '')
+ + stdenv.lib.optionalString stdenv.isDarwin ''
+ # enable git-credential-osxkeychain by default if darwin
+ cat > $out/etc/gitconfig << EOF
+[credential]
+ helper = osxkeychain
+EOF
+ '';
+
enableParallelBuilding = true;
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 ff7c652c622..3d411a18324 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.10.0";
+ version = "1.10.2";
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "petervanderdoes";
repo = pname;
rev = version;
- sha256 = "1l67yizbcmgkhz8qn1zam2p04y8ha9b2gb2d89rff9y528b2m5z6";
+ sha256 = "1i8bwi83qcqvi8zrkjn4mp2v8v7y11fd520wpg2jgy5hqyz34chg";
};
preBuild = ''
diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix
index 0f92bcbe0ae..2aadfd21fb5 100644
--- a/pkgs/applications/version-management/gource/default.nix
+++ b/pkgs/applications/version-management/gource/default.nix
@@ -3,12 +3,12 @@
}:
stdenv.mkDerivation rec {
- version = "0.43";
+ version = "0.44";
name = "gource-${version}";
src = fetchurl {
url = "https://github.com/acaudwell/Gource/releases/download/${name}/${name}.tar.gz";
- sha256 = "1r5x9ai86f609hf584n0xaf5hxkbilj5qihn89v7ghpmwk40m945";
+ sha256 = "0z095zsf5pz8czh7nmlkdy29rm93w83sqyqspg2zsprh892cl116";
};
buildInputs = [
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 290d27b3736..034eb534423 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -4,26 +4,23 @@
let
# if you bump version, update pkgs.tortoisehg too or ping maintainer
- version = "3.9.1";
+ version = "3.9.2";
name = "mercurial-${version}";
- inherit (python2Packages) curses docutils hg-git dulwich python;
-in
-
-stdenv.mkDerivation {
+ inherit (python2Packages) docutils hg-git dulwich python;
+in python2Packages.mkPythonDerivation {
inherit name;
src = fetchurl {
url = "https://mercurial-scm.org/release/${name}.tar.gz";
- sha256 = "0x6zjl8za6nnlbmyxng4pfrr2h77zi3wbg985262ghjyx33lypk2";
+ sha256 = "1kw3cpcjygfapvi5c123limhpbkmg7is2i81pybk1s05gi16l139";
};
inherit python; # pass it so that the same version can be used in hg2git
- pythonPackages = [ curses ];
- buildInputs = [ python makeWrapper docutils unzip ];
+ buildInputs = [ makeWrapper docutils unzip ];
- propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin
- [ ApplicationServices cf-private ];
+ propagatedBuildInputs = [ hg-git dulwich ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices cf-private ];
makeFlags = "PREFIX=$(out)";
@@ -43,7 +40,6 @@ stdenv.mkDerivation {
''
for i in $(cd $out/bin && ls); do
wrapProgram $out/bin/$i \
- --prefix PYTHONPATH : "$(toPythonPath "$out ${curses}"):$(toPythonPath "$out ${hg-git}"):$(toPythonPath "$out ${dulwich}")" \
$WRAP_TK
done
diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix
index 754b7df5153..e5c704f71c7 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.9.1";
+ version = "3.9.2";
src = fetchurl {
url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz";
- sha256 = "12bqvkkwkb6m5hls7gipkxbnspfrk1k6l9l0fff0wp1zajnp4pnn";
+ sha256 = "17wcsf91z7dnb7c8vyagasj5vvmas6ms5lx1ny4pnm94qzslkfh2";
};
pythonPath = with pythonPackages; [ pyqt4 mercurial qscintilla iniparse ];
diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix
index e1ce841ede2..f87d81bd8fb 100644
--- a/pkgs/applications/version-management/yadm/default.nix
+++ b/pkgs/applications/version-management/yadm/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchFromGitHub }:
-let version = "1.04"; in
+let version = "1.05"; in
stdenv.mkDerivation {
name = "yadm-${version}";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
owner = "TheLocehiliosan";
repo = "yadm";
rev = "${version}";
- sha256 = "1g5nz4y63ccxlbz67klm78525ps41ynis8683iayakg4907vd898";
+ sha256 = "11bqgz28qzgb3iz8xvda9z0mh5r1a9m032pqm772ypiixsfz8hdd";
};
buildCommand = ''
diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix
index 1dbe34553b0..b8a16164988 100644
--- a/pkgs/applications/video/handbrake/default.nix
+++ b/pkgs/applications/video/handbrake/default.nix
@@ -12,7 +12,7 @@
# TODO: package and use libappindicator
{ stdenv, config, fetchurl,
- python, pkgconfig, yasm,
+ python2, pkgconfig, yasm,
autoconf, automake, libtool, m4,
libass, libsamplerate, fribidi, libxml2, bzip2,
libogg, libtheora, libvorbis, libdvdcss, a52dec, fdk_aac,
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
wrapGAppsHook
];
- nativeBuildInputs = [ python pkgconfig yasm autoconf automake libtool m4 ];
+ nativeBuildInputs = [ python2 pkgconfig yasm autoconf automake libtool m4 ];
buildInputs = [
fribidi fontconfig freetype hicolor_icon_theme
libass libsamplerate libxml2 bzip2
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 1926913c8d0..dccb8412733 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, makeWrapper
-, pkgconfig, cmake, gnumake, yasm, pythonFull
+, pkgconfig, cmake, gnumake, yasm, python2
, boost, avahi, libdvdcss, lame, autoreconfHook
, gettext, pcre-cpp, yajl, fribidi, which
, openssl, gperf, tinyxml2, taglib, libssh, swig, jre
@@ -54,7 +54,7 @@ in stdenv.mkDerivation rec {
buildInputs = [
makeWrapper libxml2 gnutls
- pkgconfig cmake gnumake yasm pythonFull
+ pkgconfig cmake gnumake yasm python2
boost libmicrohttpd autoreconfHook
gettext pcre-cpp yajl fribidi libva
openssl gperf tinyxml2 taglib libssh swig jre
@@ -107,7 +107,7 @@ in stdenv.mkDerivation rec {
postInstall = ''
for p in $(ls $out/bin/) ; do
wrapProgram $out/bin/$p \
- --prefix PATH ":" "${pythonFull}/bin" \
+ --prefix PATH ":" "${python2}/bin" \
--prefix PATH ":" "${glxinfo}/bin" \
--prefix PATH ":" "${xdpyinfo}/bin" \
--prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath
diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix
index 9e08f2fffb1..0652ac7e664 100644
--- a/pkgs/applications/video/miro/default.nix
+++ b/pkgs/applications/video/miro/default.nix
@@ -75,7 +75,7 @@ in buildPythonApplication rec {
];
propagatedBuildInputs = with pythonPackages; [
- pygobject2 pygtk pycurl sqlite3 mutagen pycairo dbus-python
+ pygobject2 pygtk pycurl 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/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 0d02377b714..0af19aeca95 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -10,13 +10,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "mkvtoolnix-${version}";
- version = "9.4.2";
+ version = "9.5.0";
src = fetchFromGitHub {
owner = "mbunkus";
repo = "mkvtoolnix";
rev = "release-${version}";
- sha256 = "1dyhlpik8d9z78dg47cha313r0dm9fcjg6hzkmzd2ng9yrq5pmdy";
+ sha256 = "1v6rqlb5srhwzad45b50pvfbi1c9n719ihi54hzbkzklj7h4s70h";
};
nativeBuildInputs = [ pkgconfig autoconf automake gettext ruby ];
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 88b2f9d0945..b41eae41a5c 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -77,13 +77,13 @@ let
};
in stdenv.mkDerivation rec {
name = "mpv-${version}";
- version = "0.20.0";
+ version = "0.21.0";
src = fetchFromGitHub {
owner = "mpv-player";
repo = "mpv";
rev = "v${version}";
- sha256 = "0zp852b505lr2gllqylg2xrc8sgw9b1xjn1c7px36hzddny15c16";
+ sha256 = "1v1qfppysi0qn40q9z7cx9gs7pcrz2hn1g44iynygvgj29h1gify";
};
patchPhase = ''
diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix
index d487f07e3d6..c2c64bfa496 100644
--- a/pkgs/applications/video/pitivi/default.nix
+++ b/pkgs/applications/video/pitivi/default.nix
@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
gst-plugins-base gst-plugins-good
gst-plugins-bad gst-plugins-ugly gst-libav gst-validate
]) ++ (with python3Packages; [
- python pygobject3 gst-python pyxdg numpy pycairo sqlite3 matplotlib
+ python pygobject3 gst-python pyxdg numpy pycairo matplotlib
dbus-python
]);
diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix
index cca1ed34f6d..f516c871f51 100644
--- a/pkgs/applications/video/streamlink/default.nix
+++ b/pkgs/applications/video/streamlink/default.nix
@@ -1,14 +1,14 @@
{ stdenv, pythonPackages, fetchFromGitHub, rtmpdump }:
pythonPackages.buildPythonApplication rec {
- version = "1.14.0-rc1";
+ version = "0.0.2";
name = "streamlink-${version}";
src = fetchFromGitHub {
owner = "streamlink";
repo = "streamlink";
- rev = "ffc099b16b9a9d2c0c44081d687c50ee2e935f29";
- sha256 = "0ix2k2yd2jzcazkjjb0iczr4bv7pgx873k7bhxgb9zwplklxpw1k";
+ rev = "${version}";
+ sha256 = "156b3smivs8lja7a98g3qa74bawqhc4mi8w8f3dscampbxx4dr9y";
};
propagatedBuildInputs = (with pythonPackages; [ pycrypto requests2 ]) ++ [ rtmpdump ];
diff --git a/pkgs/applications/virtualization/cbfstool/default.nix b/pkgs/applications/virtualization/cbfstool/default.nix
index 1a45dc3c44d..b7bbeb158c6 100644
--- a/pkgs/applications/virtualization/cbfstool/default.nix
+++ b/pkgs/applications/virtualization/cbfstool/default.nix
@@ -2,17 +2,16 @@
stdenv.mkDerivation rec {
name = "cbfstool-${version}";
- version = "git-2015-07-09";
+ version = "4.5";
src = fetchgit {
url = "http://review.coreboot.org/p/coreboot";
- rev = "5d866213f42fd22aed80abb5a91d74f6d485ac3f";
- sha256 = "1fki5670pmz1wb0yg0a0hb5cap78mgbvdhj8m2xly2kndwicg40p";
+ rev = "refs/tags/${version}";
+ sha256 = "0sc2h440x4sfp1lqnmh3xfgymf7j0rqfx00v6jqf0svfbp8a6cq5";
};
- buildInputs = [ iasl flex bison ];
-
- hardeningDisable = [ "fortify" ];
+ nativeBuildInputs = [ flex bison ];
+ buildInputs = [ iasl ];
buildPhase = ''
export LEX=${flex}/bin/flex
@@ -27,7 +26,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "CBFS tool";
+ description = "Management utility for CBFS formatted ROM images";
homepage = http://www.coreboot.org;
license = licenses.gpl2;
maintainers = [ maintainers.tstrobel ];
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 801b93a02de..921558a2d12 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -11,13 +11,13 @@ with lib;
stdenv.mkDerivation rec {
name = "docker-${version}";
- version = "1.12.1";
+ version = "1.12.3";
src = fetchFromGitHub {
owner = "docker";
repo = "docker";
rev = "v${version}";
- sha256 = "079786dyydjfc8vb6djxh140pc7v16fjl5x2h2q420qc3mrfz5zd";
+ sha256 = "0jifd35h22lgh36w1j2k97pgndjh5sppr3cwndlv0saf9618wx5k";
};
buildInputs = [
diff --git a/pkgs/applications/virtualization/openstack/glance.nix b/pkgs/applications/virtualization/openstack/glance.nix
index 3cfe8dc527c..f78e5da9a8c 100644
--- a/pkgs/applications/virtualization/openstack/glance.nix
+++ b/pkgs/applications/virtualization/openstack/glance.nix
@@ -1,7 +1,6 @@
+{ stdenv, fetchurl, python2Packages, sqlite, which, strace }:
-{ stdenv, fetchurl, pythonPackages, sqlite, which, strace }:
-
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
name = "glance-${version}";
version = "11.0.0";
namePrefix = "";
@@ -14,7 +13,7 @@ pythonPackages.buildPythonApplication rec {
};
# https://github.com/openstack/glance/blob/stable/liberty/requirements.txt
- propagatedBuildInputs = with pythonPackages; [
+ propagatedBuildInputs = with python2Packages; [
pbr sqlalchemy anyjson eventlet PasteDeploy routes webob sqlalchemy_migrate
httplib2 pycrypto iso8601 stevedore futurist keystonemiddleware paste
jsonschema keystoneclient pyopenssl six retrying semantic-version qpid-python
@@ -26,7 +25,7 @@ pythonPackages.buildPythonApplication rec {
MySQL_python
];
- buildInputs = with pythonPackages; [
+ buildInputs = with python2Packages; [
Babel coverage fixtures mox3 mock oslosphinx requests2 testrepository pep8
testresources testscenarios testtools psutil_1 oslotest psycopg2
sqlite which strace
diff --git a/pkgs/applications/virtualization/openstack/keystone.nix b/pkgs/applications/virtualization/openstack/keystone.nix
index bbce75b5e51..3a594188079 100644
--- a/pkgs/applications/virtualization/openstack/keystone.nix
+++ b/pkgs/applications/virtualization/openstack/keystone.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pythonPackages, xmlsec, which, openssl }:
+{ stdenv, fetchurl, python2Packages, xmlsec, which, openssl }:
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
name = "keystone-${version}";
version = "8.0.0";
namePrefix = "";
@@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec {
patches = [ ./remove-oslo-policy-tests.patch ];
# https://github.com/openstack/keystone/blob/stable/liberty/requirements.txt
- propagatedBuildInputs = with pythonPackages; [
+ propagatedBuildInputs = with python2Packages; [
pbr webob eventlet greenlet PasteDeploy paste routes cryptography six
sqlalchemy sqlalchemy_migrate stevedore passlib keystoneclient memcached
keystonemiddleware oauthlib pysaml2 dogpile_cache jsonschema pycadf msgpack
@@ -28,7 +28,7 @@ pythonPackages.buildPythonApplication rec {
oslo-utils
];
- buildInputs = with pythonPackages; [
+ buildInputs = with python2Packages; [
coverage fixtures mock subunit tempest-lib testtools testrepository
ldap ldappool webtest requests2 oslotest pep8 pymongo which
];
diff --git a/pkgs/applications/virtualization/openstack/neutron.nix b/pkgs/applications/virtualization/openstack/neutron.nix
index ac839d9f914..c1ee231d97f 100644
--- a/pkgs/applications/virtualization/openstack/neutron.nix
+++ b/pkgs/applications/virtualization/openstack/neutron.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pythonPackages, xmlsec, which, dnsmasq }:
+{ stdenv, fetchurl, python2Packages, xmlsec, which, dnsmasq }:
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
name = "neutron-${version}";
version = "7.0.0";
namePrefix = "";
@@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec {
};
# https://github.com/openstack/neutron/blob/stable/liberty/requirements.txt
- propagatedBuildInputs = with pythonPackages; [
+ propagatedBuildInputs = with python2Packages; [
pbr paste PasteDeploy routes debtcollector eventlet greenlet httplib2 requests2
jinja2 keystonemiddleware netaddr retrying sqlalchemy webob alembic six
stevedore pecan ryu networking-hyperv MySQL_python
@@ -34,7 +34,7 @@ pythonPackages.buildPythonApplication rec {
'';
patches = [ ./neutron-iproute-4.patch ];
- buildInputs = with pythonPackages; [
+ buildInputs = with python2Packages; [
cliff coverage fixtures mock subunit requests-mock oslosphinx testrepository
testtools testresources testscenarios webtest oslotest os-testr tempest-lib
ddt pep8
diff --git a/pkgs/applications/virtualization/openstack/nova.nix b/pkgs/applications/virtualization/openstack/nova.nix
index a4e0779d3f9..219026f1e0f 100644
--- a/pkgs/applications/virtualization/openstack/nova.nix
+++ b/pkgs/applications/virtualization/openstack/nova.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pythonPackages, openssl, openssh }:
+{ stdenv, fetchurl, python2Packages, openssl, openssh }:
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
name = "nova-${version}";
version = "12.0.0";
namePrefix = "";
@@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec {
'';
# https://github.com/openstack/nova/blob/stable/liberty/requirements.txt
- propagatedBuildInputs = with pythonPackages; [
+ propagatedBuildInputs = with python2Packages; [
pbr sqlalchemy boto decorator eventlet jinja2 lxml routes cryptography
webob greenlet PasteDeploy paste prettytable sqlalchemy_migrate netaddr
netifaces paramiko Babel iso8601 jsonschema keystoneclient requests2 six
@@ -37,7 +37,7 @@ pythonPackages.buildPythonApplication rec {
cinderclient neutronclient glanceclient
];
- buildInputs = with pythonPackages; [
+ buildInputs = with python2Packages; [
coverage fixtures mock mox3 subunit requests-mock pillow oslosphinx
oslotest testrepository testresources testtools tempest-lib bandit
oslo-vmware pep8 barbicanclient ironicclient openssl openssh
diff --git a/pkgs/applications/virtualization/rancher-compose/default.nix b/pkgs/applications/virtualization/rancher-compose/default.nix
new file mode 100644
index 00000000000..5980141d8b9
--- /dev/null
+++ b/pkgs/applications/virtualization/rancher-compose/default.nix
@@ -0,0 +1,44 @@
+{ lib, buildGoPackage, fetchFromGitHub }:
+
+let
+ generic = { version, sha256 }: buildGoPackage rec {
+ name = "rancher-compose-${version}";
+
+ goPackagePath = "github.com/rancher/rancher-compose";
+
+ src = fetchFromGitHub {
+ owner = "rancher";
+ repo = "rancher-compose";
+ rev = "v${version}";
+ inherit sha256;
+ };
+
+ buildFlagsArray = ''
+ -ldflags=
+ -X github.com/rancher/rancher-compose/version.VERSION=${version}
+ '';
+
+ excludedPackages = "scripts";
+
+ meta = with lib; {
+ description = "Docker compose compatible client to deploy to Rancher";
+ homepage = "https://docs.rancher.com/rancher/rancher-compose/";
+ license = licenses.asl20;
+ platforms = platforms.unix;
+ maintainers = [maintainers.mic92];
+ };
+ };
+in {
+ # should point to a version compatible
+ # with the latest stable release of rancher
+ rancher-compose = generic {
+ version = "0.9.2";
+ sha256 = "1wlsdjaa4j2b3c034hb6zci5h900b1msimmshz5h4g5hiaqb3khq";
+ };
+
+ # for rancher v1.2.0-pre3+
+ rancher-compose_0_10 = generic {
+ version = "0.10.0";
+ sha256 = "17f3ya4qq0dzk4wvhgxp0lh9p8c87kpq7hmh3g21ashzqwmcflxl";
+ };
+}
diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index 6a53ad32b39..7c5cc8de7ab 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -2,7 +2,7 @@
cpio, fetchurl, fetchFromGitHub, iptables, systemd, makeWrapper, glibc }:
let
- # Always get the information from
+ # Always get the information from
# https://github.com/coreos/rkt/blob/v${VERSION}/stage1/usr_from_coreos/coreos-common.mk
coreosImageRelease = "1151.0.0";
coreosImageSystemdVersion = "231";
@@ -12,7 +12,7 @@ let
stage1Dir = "lib/rkt/stage1-images";
in stdenv.mkDerivation rec {
- version = "1.15.0";
+ version = "1.17.0";
name = "rkt-${version}";
BUILDDIR="build-${name}";
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
owner = "coreos";
repo = "rkt";
rev = "v${version}";
- sha256 = "0ppi6r3wr69s6ka1j9xljvq3rw2chp8syyvqcx6ijnzjbwgbwar3";
+ sha256 = "1jbdnbd2h58zd5irllim6cfa9bf0fdk5nr8qxpjnsgd1fsyhkpld";
};
stage1BaseImage = fetchurl {
@@ -58,7 +58,7 @@ in stdenv.mkDerivation rec {
cp -Rv $BUILDDIR/target/bin/stage1-*.aci $out/${stage1Dir}/
wrapProgram $out/bin/rkt \
- --prefix LD_LIBRARY_PATH : ${systemd}/lib \
+ --prefix LD_LIBRARY_PATH : ${systemd.lib}/lib \
--prefix PATH : ${iptables}/bin
'';
diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index 5cda21066b5..0964e1b4814 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -20,7 +20,7 @@ buildPythonApplication rec {
propagatedBuildInputs =
[ eventlet greenlet gflags netaddr carrot routes
PasteDeploy m2crypto ipy twisted
- distutils_extra simplejson readline glanceclient cheetah lockfile httplib2
+ distutils_extra simplejson glanceclient cheetah lockfile httplib2
urlgrabber virtinst pyGtkGlade dbus-python gnome_python pygobject3
libvirt libxml2Python ipaddr vte libosinfo gobjectIntrospection gtk3 mox
gtkvnc libvirt-glib glib gsettings_desktop_schemas gnome3.defaultIconTheme
diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix
index 36fe43b1d3d..04223d9a9e9 100644
--- a/pkgs/applications/virtualization/virtinst/default.nix
+++ b/pkgs/applications/virtualization/virtinst/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
pythonPath = with pythonPackages;
[ setuptools eventlet greenlet gflags netaddr carrot routes
PasteDeploy m2crypto ipy twisted
- distutils_extra simplejson readline glanceclient cheetah lockfile httplib2
+ distutils_extra simplejson glanceclient cheetah lockfile httplib2
# !!! should libvirt be a build-time dependency? Note that
# libxml2Python is a dependency of libvirt.py.
libvirt libxml2Python urlgrabber
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index ef834897022..64275448651 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -81,7 +81,7 @@ in stdenv.mkDerivation {
'';
patches = optional enableHardening ./hardened.patch
- ++ [ ./libressl.patch ./qtx11extras.patch ];
+ ++ [ ./qtx11extras.patch ];
postPatch = ''
sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \
diff --git a/pkgs/applications/virtualization/virtualbox/libressl.patch b/pkgs/applications/virtualization/virtualbox/libressl.patch
deleted file mode 100644
index db9b7e7a59d..00000000000
--- a/pkgs/applications/virtualization/virtualbox/libressl.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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/upstream-info.json b/pkgs/applications/virtualization/virtualbox/upstream-info.json
index 3a386004a3f..d861a7e7932 100644
--- a/pkgs/applications/virtualization/virtualbox/upstream-info.json
+++ b/pkgs/applications/virtualization/virtualbox/upstream-info.json
@@ -1,8 +1,8 @@
{
"__NOTE": "Generated using update.py from the same directory.",
- "extpack": "607ac3636bd49a738d5c48159b39261369b5487f71fb10afa2ecf869627a12de",
- "extpackRev": "110634",
- "guest": "cbcf9b9b1000e09911b3d20e1efe529aef8a945cf130f6abffc14a39522cc1ed",
- "main": "2e0112b0d85841587b8f212e6ba8f6c35b31e1cce6b6999497dc917cd37e6911",
- "version": "5.1.6"
+ "extpack": "d28bcd01c14eb07eedd2b964d1abe4876f0a7e0e89530e7ba285a5d6267bf322",
+ "extpackRev": "111374",
+ "guest": "347fd39df6ddee8079ad41fbc038e2fb64952a40255d75292e8e49a0a0cbf657",
+ "main": "e447031de468aee746529b2cf60768922f9beff22a13c54284aa430f5e925933",
+ "version": "5.1.8"
}
diff --git a/pkgs/applications/virtualization/xen/4.5.0.nix b/pkgs/applications/virtualization/xen/4.5.0.nix
deleted file mode 100644
index 887734ac6b9..00000000000
--- a/pkgs/applications/virtualization/xen/4.5.0.nix
+++ /dev/null
@@ -1,79 +0,0 @@
-{ callPackage, fetchurl, fetchgit, ... } @ args:
-
-let
- # Xen 4.5.0
- xenConfig = rec {
- version = "4.5.0";
- name = "xen-${version}";
-
- src = fetchurl {
- url = "http://bits.xensource.com/oss-xen/release/${version}/${name}.tar.gz";
- sha256 = "0fvg00d596gh6cfm51xr8kj2mghcyivrf6np3dafnbldnbi41nsv";
- };
-
- # Sources needed to build the xen tools and tools/firmware.
- firmwareGits =
- [ # tag 1.7.5
- { git = { name = "seabios";
- url = https://xenbits.xen.org/git-http/seabios.git;
- rev = "e51488c5f8800a52ac5c8da7a31b85cca5cc95d2";
- sha256 = "0jk54ybhmw97pzyhpm6jr2x99f702kbn0ipxv5qxcbynflgdazyb";
- };
- patches = [ ./0000-qemu-seabios-enable-ATA_DMA.patch ];
- }
- { git = { name = "ovmf";
- url = https://xenbits.xen.org/git-http/ovmf.git;
- rev = "447d264115c476142f884af0be287622cd244423";
- sha256 = "7086f882495a8be1497d881074e8f1005dc283a5e1686aec06c1913c76a6319b";
- };
- }
- ];
-
- toolsGits =
- [ # tag qemu-xen-4.5.0
- { git = { name = "qemu-xen";
- url = https://xenbits.xen.org/git-http/qemu-xen.git;
- rev = "1ebb75b1fee779621b63e84fefa7b07354c43a99";
- sha256 = "0yp9vmna3yl28vm5fkirghzhndaihmsm34fjzgr9sl6s46wx5yzg";
- };
- }
- # tag xen-4.5.0
- { git = { name = "qemu-xen-traditional";
- url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git;
- rev = "b0d42741f8e9a00854c3b3faca1da84bfc69bf22";
- sha256 = "1lxlf1s81y5j0rhzzm1f4sbyrnbvd32vxiczs1qjcg6ls866vlki";
- };
- }
- { git = { name = "xen-libhvm";
- url = https://github.com/ts468/xen-libhvm;
- rev = "442dcc4f6f4e374a51e4613532468bd6b48bdf63";
- sha256 = "9ba97c39a00a54c154785716aa06691d312c99be498ebbc00dc3769968178ba8";
- };
- description = ''
- Helper library for reading ACPI and SMBIOS firmware values
- from the host system for use with the HVM guest firmware
- pass-through feature in Xen.
- '';
- #license = licenses.bsd2;
- }
- ];
-
- xenserverPatches =
- let
- patches = {
- url = https://github.com/ts468/xen-4.5.pg.git;
- rev = "3442b65b490f43c817cbc53369220d0b1ab9b785";
- sha256 = "31436c15def0a300b3ea1a63b2208c4a3bcbb143db5c6488d4db370b3ceeb845";
- };
- in ''
- cp -r ${fetchgit patches}/master patches
- quilt push -a
- substituteInPlace tools/xenguest/Makefile --replace "_BSD_SOURCE" "_DEFAULT_SOURCE"
- '';
-
- xenPatches = [ ./0001-libxl-Spice-image-compression-setting-support-for-up.patch
- ./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch
- ./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch ];
- };
-
-in callPackage ./generic.nix (args // { xenConfig=xenConfig; })
diff --git a/pkgs/applications/virtualization/xen/4.5.2.nix b/pkgs/applications/virtualization/xen/4.5.nix
similarity index 68%
rename from pkgs/applications/virtualization/xen/4.5.2.nix
rename to pkgs/applications/virtualization/xen/4.5.nix
index e0b13edb1f2..271ab7e7fe9 100644
--- a/pkgs/applications/virtualization/xen/4.5.2.nix
+++ b/pkgs/applications/virtualization/xen/4.5.nix
@@ -1,47 +1,41 @@
{ callPackage, fetchurl, fetchgit, ... } @ args:
let
- # Xen 4.5.2
+ # Xen 4.5.5
xenConfig = rec {
- version = "4.5.2";
+ version = "4.5.5";
name = "xen-${version}";
src = fetchurl {
url = "http://bits.xensource.com/oss-xen/release/${version}/${name}.tar.gz";
- sha256 = "1s7702zrxpsmx4vqvll4x2s762cfdiss4vgpx5s4jj7a9sn5v7jc";
+ sha256 = "1y74ms4yc3znf8jc3fgyq94va2y0pf7jh8m9pfqnpgklywqnw8g2";
};
# Sources needed to build the xen tools and tools/firmware.
firmwareGits =
- [ # tag 1.7.5
+ [
{ git = { name = "seabios";
url = https://xenbits.xen.org/git-http/seabios.git;
- rev = "e51488c5f8800a52ac5c8da7a31b85cca5cc95d2";
+ rev = "rel-1.7.5";
sha256 = "0jk54ybhmw97pzyhpm6jr2x99f702kbn0ipxv5qxcbynflgdazyb";
};
patches = [ ./0000-qemu-seabios-enable-ATA_DMA.patch ];
}
- { git = { name = "ovmf";
- url = https://xenbits.xen.org/git-http/ovmf.git;
- rev = "cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd";
- sha256 = "07zmdj90zjrzip74fvd4ss8n8njk6cim85s58mc6snxmqqv7gmcq";
- };
- }
];
toolsGits =
- [ # tag qemu-xen-4.5.2
+ [
{ git = { name = "qemu-xen";
url = https://xenbits.xen.org/git-http/qemu-xen.git;
- rev = "e5a1bb22cfb307db909dbd3404c48e5bbeb9e66d";
- sha256 = "00h6hc1y19y9wafxk01hvwm2j8lysz26wi2dnv8md76zxavg4maa";
+ rev = "refs/tags/qemu-xen-${version}";
+ sha256 = "014s755slmsc7xzy7qhk9i3kbjr2grxb5yznjp71dl6xxfvnday2";
};
}
- # tag xen-4.5.2
{ git = { name = "qemu-xen-traditional";
url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git;
- rev = "dfe880e8d5fdc863ce6bbcdcaebaf918f8689cc0";
- sha256 = "07jwpxgk9ls5hma6vv1frnx1aczlvpddlgiyii9qmmlxxwjs21yj";
+ # rev = "28c21388c2a32259cff37fc578684f994dca8c9f";
+ rev = "refs/tags/xen-${version}";
+ sha256 = "0n0ycxlf1wgdjkdl8l2w1i0zzssk55dfv67x8i6b2ima01r0k93r";
};
}
{ git = { name = "xen-libhvm";
diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix
index 2f65322c356..a697e2aa7ef 100644
--- a/pkgs/applications/virtualization/xen/generic.nix
+++ b/pkgs/applications/virtualization/xen/generic.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, which, zlib, pkgconfig, SDL, openssl
, libuuid, gettext, ncurses, dev86, iasl, pciutils, bzip2
-, lvm2, utillinux, procps, texinfo, perl, pythonPackages
+, lvm2, utillinux, procps, texinfo, perl, python2Packages
, glib, bridge-utils, xorg, pixman, iproute, udev, bison
, flex, cmake, ocamlPackages, figlet, libaio, yajl
, checkpolicy, transfig, glusterfs, acl, fetchgit, xz, spice
@@ -38,16 +38,14 @@ stdenv.mkDerivation {
buildInputs =
[ which zlib pkgconfig SDL openssl libuuid gettext ncurses
dev86 iasl pciutils bzip2 xz texinfo perl yajl
- pythonPackages.python pythonPackages.wrapPython
+ python2Packages.python python2Packages.wrapPython
glib bridge-utils pixman iproute udev bison xorg.libX11
flex ocamlPackages.ocaml ocamlPackages.findlib figlet libaio
- checkpolicy pythonPackages.markdown transfig
+ checkpolicy python2Packages.markdown transfig
glusterfs acl cmake spice spice_protocol usbredir
alsaLib quilt
];
- pythonPath = [ pythonPackages.curses ];
-
hardeningDisable = [ "stackprotector" "fortify" "pic" ];
patches = stdenv.lib.optionals ((xenserverPatched == false) && (builtins.hasAttr "xenPatches" xenConfig)) xenConfig.xenPatches;
diff --git a/pkgs/applications/window-managers/bspwm/unstable.nix b/pkgs/applications/window-managers/bspwm/unstable.nix
new file mode 100644
index 00000000000..7b31c63128a
--- /dev/null
+++ b/pkgs/applications/window-managers/bspwm/unstable.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, libxcb, libXinerama, sxhkd, xcbutil, xcbutilkeysyms, xcbutilwm }:
+
+stdenv.mkDerivation rec {
+ name = "bspwm-unstable-2016-09-30";
+
+
+ src = fetchFromGitHub {
+ owner = "baskerville";
+ repo = "bspwm";
+ rev = "8664c007e44de162c1597fd7e163635b274fb747";
+ sha256 = "0clvpz32z38i8kr10hqlifa661szpfn93c63m2aq2h4dwmr44slz";
+ };
+
+ buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ];
+
+ buildPhase = ''
+ make PREFIX=$out
+ '';
+
+ installPhase = ''
+ make PREFIX=$out install
+ '';
+
+ meta = {
+ description = "A tiling window manager based on binary space partitioning (git version)";
+ homepage = https://github.com/baskerville/bspwm;
+ maintainers = [ stdenv.lib.maintainers.meisternu stdenv.lib.maintainers.epitrochoid ];
+ license = stdenv.lib.licenses.bsd2;
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix
index 378001528b1..6c53c51551a 100644
--- a/pkgs/applications/window-managers/i3/lock-fancy.nix
+++ b/pkgs/applications/window-managers/i3/lock-fancy.nix
@@ -3,13 +3,13 @@
}:
stdenv.mkDerivation rec {
- rev = "b7196aaff72b90bb6ea0464a9f7b37d140db3230";
- name = "i3lock-fancy-2016-05-05_rev${builtins.substring 0 7 rev}";
+ rev = "546ce2e71bd2339f2134904c7d22062e86105b46";
+ name = "i3lock-fancy-unstable-2016-10-13_rev${builtins.substring 0 7 rev}";
src = fetchFromGitHub {
owner = "meskarune";
repo = "i3lock-fancy";
inherit rev;
- sha256 = "0az43nqhmbniih3yw9kz5lnky0n7mxylvklsib76s4l2alf6i3ps";
+ sha256 = "1pbxydwdfd7jlw3b8cnlwlrkqlyh5jyanfhjybndqmacd3y8vplb";
};
patchPhase = ''
sed -i -e "s|(mktemp)|(${coreutils}/bin/mktemp)|" lock
@@ -19,15 +19,16 @@ stdenv.mkDerivation rec {
sed -i -e "s|awk -F|${gawk}/bin/awk -F|" lock
sed -i -e "s| awk | ${gawk}/bin/awk |" lock
sed -i -e "s|i3lock -n |${i3lock-color}/bin/i3lock-color -n |" lock
- sed -i -e 's|ICON="$SCRIPTPATH/lockdark.png"|ICON="'$out'/share/i3lock-fancy/lockdark.png"|' lock
- sed -i -e 's|ICON="$SCRIPTPATH/lock.png"|ICON="'$out'/share/i3lock-fancy/lock.png"|' lock
+ sed -i -e 's|ICON="$SCRIPTPATH/icons/lockdark.png"|ICON="'$out'/share/i3lock-fancy/icons/lockdark.png"|' lock
+ sed -i -e 's|ICON="$SCRIPTPATH/icons/lock.png"|ICON="'$out'/share/i3lock-fancy/icons/lock.png"|' lock
sed -i -e "s|getopt |${getopt}/bin/getopt |" lock
sed -i -e "s|fc-match |${fontconfig.bin}/bin/fc-match |" lock
+ sed -i -e "s|SHOT=(import -window root)|SHOT=(${scrot}/bin/scrot -z)|" lock
'';
installPhase = ''
- mkdir -p $out/bin $out/share/i3lock-fancy
+ mkdir -p $out/bin $out/share/i3lock-fancy/icons
cp lock $out/bin/i3lock-fancy
- cp lock*.png $out/share/i3lock-fancy
+ cp icons/lock*.png $out/share/i3lock-fancy/icons
'';
meta = with stdenv.lib; {
description = "i3lock is a bash script that takes a screenshot of the desktop, blurs the background and adds a lock icon and text.";
diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix
index c3425afd988..47130ac71ec 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/pkgs/applications/window-managers/jwm/default.nix
@@ -1,15 +1,17 @@
-{ stdenv, fetchurl, pkgconfig, automake, autoconf, libtool, gettext, which,
- xorg, libX11, libXext, libXinerama, libXpm, libXft, libXau, libXdmcp,
- libXmu, libpng, libjpeg, expat, xproto, xextproto, xineramaproto, librsvg,
- freetype, fontconfig }:
+{ stdenv, fetchFromGitHub, pkgconfig, automake, autoconf, libtool,
+ gettext, which, xorg, libX11, libXext, libXinerama, libXpm, libXft,
+ libXau, libXdmcp, libXmu, libpng, libjpeg, expat, xproto, xextproto,
+ xineramaproto, librsvg, freetype, fontconfig }:
stdenv.mkDerivation rec {
name = "jwm-${version}";
- version = "1548";
+ version = "1563";
- src = fetchurl {
- url = "https://github.com/joewing/jwm/archive/s${version}.tar.gz";
- sha256 = "1ih5y7567vwcbnkjwm3cc9iq4n9rzz818mkh6ryli9ld230hla5r";
+ src = fetchFromGitHub {
+ owner = "joewing";
+ repo = "jwm";
+ rev = "s${version}";
+ sha256 = "0xfrsk0cffc0fmlmq1340ylzdcmancn2bwgzv6why3gklxplsp9z";
};
nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ];
diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix
index d170c9b7478..4b9da41b028 100644
--- a/pkgs/applications/window-managers/qtile/default.nix
+++ b/pkgs/applications/window-managers/qtile/default.nix
@@ -31,7 +31,7 @@ python27Packages.buildPythonApplication rec {
buildInputs = [ pkgconfig glib libxcb cairo pango python27Packages.xcffib ];
- pythonPath = with python27Packages; [ xcffib cairocffi-xcffib trollius readline];
+ pythonPath = with python27Packages; [ xcffib cairocffi-xcffib trollius ];
postInstall = ''
wrapProgram $out/bin/qtile \
diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix
index e550f9fdd83..81080386689 100644
--- a/pkgs/applications/window-managers/ratpoison/default.nix
+++ b/pkgs/applications/window-managers/ratpoison/default.nix
@@ -12,11 +12,19 @@ stdenv.mkDerivation rec {
sha256 = "1w502z55vv7zs45l80nsllqh9fvfwjfdfi11xy1qikhzdmirains";
};
+ outputs = [ "out" "contrib" "doc" "info" ];
+
buildInputs =
[ pkgconfig perl autoconf automake
libX11 inputproto libXt libXpm libXft libXtst xextproto libXi
fontconfig freetype readline ];
+ postInstall = ''
+ mkdir -p $contrib/{bin,share}
+ mv $out/bin/rpws $contrib/bin
+ mv $out/share/ratpoison $contrib/share
+ '';
+
meta = with stdenv.lib; {
homepage = "http://www.nongnu.org/ratpoison/";
description = "Simple mouse-free tiling window manager";
diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix
index f3b19e84610..0f362e02ebf 100644
--- a/pkgs/applications/window-managers/sawfish/default.nix
+++ b/pkgs/applications/window-managers/sawfish/default.nix
@@ -1,5 +1,8 @@
-{ stdenv, fetchgit, pkgconfig, which, autoreconfHook, rep-gtk, pango
-, gdk_pixbuf, libXinerama, libXrandr, libXtst, imlib, gettext, texinfo
+{ stdenv, fetchurl
+, pkgconfig, which, autoreconfHook
+, rep-gtk, pango, gdk_pixbuf
+, imlib, gettext, texinfo
+, libXinerama, libXrandr, libXtst, libICE, libSM
, makeWrapper
}:
@@ -8,18 +11,18 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "sawfish-${version}";
- version = "1.11.90";
+ version = "1.12.0";
+ sourceName = "sawfish_${version}";
- src = fetchgit {
- url = "https://github.com/SawfishWM/sawfish.git";
- rev = "b121f832571c9aebd228691c32604146e49f5e55";
- sha256 = "0y7rmjzp7ha5qj9q1dasw50gd6jiaxc0qsjbvyfzxvwssl3i9hsc";
+ src = fetchurl {
+ url = "http://download.tuxfamily.org/sawfish/${sourceName}.tar.xz";
+ sha256 = "1z7awzgw8d15aw17kpbj460pcxq8l2rhkaxk47w7yg9qrmg0xja4";
};
- buildInputs =
- [ pkgconfig which autoreconfHook rep-gtk pango gdk_pixbuf libXinerama
- libXrandr libXtst imlib gettext texinfo makeWrapper
- ];
+ buildInputs = [ pkgconfig which autoreconfHook
+ rep-gtk pango gdk_pixbuf imlib gettext texinfo
+ libXinerama libXrandr libXtst libICE libSM
+ makeWrapper ];
patchPhase = ''
sed -e 's|REP_DL_LOAD_PATH=|REP_DL_LOAD_PATH=$(REP_DL_LOAD_PATH):|g' -i Makedefs.in
diff --git a/pkgs/applications/window-managers/sxhkd/unstable.nix b/pkgs/applications/window-managers/sxhkd/unstable.nix
new file mode 100644
index 00000000000..a3379259a8c
--- /dev/null
+++ b/pkgs/applications/window-managers/sxhkd/unstable.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, asciidoc, libxcb, xcbutil, xcbutilkeysyms, xcbutilwm }:
+
+stdenv.mkDerivation rec {
+ name = "sxhkd-unstable-2016-08-29";
+
+ src = fetchFromGitHub {
+ owner = "baskerville";
+ repo = "sxhkd";
+ rev = "69b6acc7831bd333b39286c37188e5638ad0de27";
+ sha256 = "11i451hz0icsbxnvbq2bdl6r5kacxf6ps0yvi9ix3vkpxn4zcanh";
+ };
+
+ buildInputs = [ asciidoc libxcb xcbutil xcbutilkeysyms xcbutilwm ];
+
+ makeFlags = ''PREFIX=$(out)'';
+
+ meta = with stdenv.lib; {
+ description = "Simple X hotkey daemon (git version)";
+ inherit (src.meta) homepage;
+ license = licenses.bsd2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 8a9bd3ecb4d..c8e3d8b4cc8 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -252,10 +252,10 @@ stdenv.mkDerivation {
# some linkers on some platforms don't support specific -z flags
hardening_unsupported_flags=""
- if [[ "$($ldPath/ld -z now 2>&1 || true)" =~ "unknown option" ]]; then
+ if [[ "$($ldPath/ld -z now 2>&1 || true)" =~ un(recognized|known)\ option ]]; then
hardening_unsupported_flags+=" bindnow"
fi
- if [[ "$($ldPath/ld -z relro 2>&1 || true)" =~ "unknown option" ]]; then
+ if [[ "$($ldPath/ld -z relro 2>&1 || true)" =~ un(recognized|known)\ option ]]; then
hardening_unsupported_flags+=" relro"
fi
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index b3db68a665d..21e0d2b5128 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -395,10 +395,14 @@ rec {
layer =
if runAsRoot == null
- then mkPureLayer { inherit name baseJson contents extraCommands; }
- else mkRootLayer { inherit name baseJson fromImage fromImageName
- fromImageTag contents runAsRoot diskSize
- extraCommands; };
+ then mkPureLayer {
+ name = baseName;
+ inherit baseJson contents extraCommands;
+ } else mkRootLayer {
+ name = baseName;
+ inherit baseJson fromImage fromImageName fromImageTag
+ contents runAsRoot diskSize extraCommands;
+ };
result = runCommand "docker-image-${baseName}.tar.gz" {
buildInputs = [ jshon pigz coreutils findutils ];
imageName = name;
@@ -438,7 +442,7 @@ rec {
< image/repositories)
for l in image/*/layer.tar; do
- ls_tar image/*/layer.tar >> baseFiles
+ ls_tar $l >> baseFiles
done
fi
diff --git a/pkgs/build-support/fetchfile/builder.sh b/pkgs/build-support/fetchfile/builder.sh
deleted file mode 100644
index b849491fc5a..00000000000
--- a/pkgs/build-support/fetchfile/builder.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-source $stdenv/setup
-
-echo "copying $pathname into $out..."
-
-cp "$pathname" "$out" || exit 1
-
-actual=$(md5sum -b $out | cut -c1-32)
-if test "$actual" != "$md5"; then
- echo "hash is $actual, expected $md5"
- exit 1
-fi
diff --git a/pkgs/build-support/fetchfile/default.nix b/pkgs/build-support/fetchfile/default.nix
deleted file mode 100644
index 685c1e69520..00000000000
--- a/pkgs/build-support/fetchfile/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{stdenv}: {pathname, md5 ? "", sha256 ? ""}: stdenv.mkDerivation {
- name = baseNameOf (toString pathname);
- builder = ./builder.sh;
- pathname = pathname;
-} // if (sha256 == "") then {
- md5 = (stdenv.lib.fetchMD5warn "fetchfile" pathname md5);
- id = md5;
-} else {
- sha256 = sha256;
- id = sha256;
-}
diff --git a/pkgs/build-support/fetchgx/default.nix b/pkgs/build-support/fetchgx/default.nix
new file mode 100644
index 00000000000..c72bbec6632
--- /dev/null
+++ b/pkgs/build-support/fetchgx/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, gx, gx-go, go, cacert }:
+
+{ name, src, sha256 }:
+
+stdenv.mkDerivation {
+ name = "${name}-gxdeps";
+ inherit src;
+
+ buildInputs = [ go gx gx-go ];
+
+ outputHashAlgo = "sha256";
+ outputHashMode = "recursive";
+ outputHash = sha256;
+
+ phases = [ "unpackPhase" "buildPhase" "installPhase" ];
+
+ SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+
+ buildPhase = ''
+ export GOPATH=$(pwd)/vendor
+ mkdir vendor
+ gx install
+ '';
+
+ installPhase = ''
+ mv vendor $out
+ '';
+
+ preferLocalBuild = true;
+}
diff --git a/pkgs/build-support/gcc-cross-wrapper/builder.sh b/pkgs/build-support/gcc-cross-wrapper/builder.sh
index 1bdda969653..b729144b860 100644
--- a/pkgs/build-support/gcc-cross-wrapper/builder.sh
+++ b/pkgs/build-support/gcc-cross-wrapper/builder.sh
@@ -8,7 +8,7 @@ mkdir $out/nix-support
cflagsCompile="-B$out/bin/"
if test -z "$nativeLibc" -a -n "$libc"; then
- cflagsCompile="$cflagsCompile -B$gccLibs/lib -B$libc/lib/ -isystem $libc/include"
+ cflagsCompile="$cflagsCompile -B$gccLibs/lib -B$libc/lib/ -isystem $libc_dev/include"
ldflags="$ldflags -L$libc/lib"
# Get the proper dynamic linker for glibc and uclibc.
dlinker=`eval 'echo $libc/lib/ld*.so.?'`
diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix
index 4379b1997ae..ccd46e20654 100644
--- a/pkgs/build-support/grsecurity/default.nix
+++ b/pkgs/build-support/grsecurity/default.nix
@@ -21,7 +21,7 @@ assert (kernel.version == grsecPatch.kver);
overrideDerivation (kernel.override {
inherit modDirVersion;
- kernelPatches = [ grsecPatch ] ++ kernelPatches ++ (kernel.kernelPatches or []);
+ kernelPatches = lib.unique ([ grsecPatch ] ++ kernelPatches ++ (kernel.kernelPatches or []));
extraConfig = ''
GRKERNSEC y
PAX y
diff --git a/pkgs/build-support/kernel/modules-closure.nix b/pkgs/build-support/kernel/modules-closure.nix
index 6ae844a6246..9940e611124 100644
--- a/pkgs/build-support/kernel/modules-closure.nix
+++ b/pkgs/build-support/kernel/modules-closure.nix
@@ -3,10 +3,10 @@
# the modules identified by `rootModules', plus their dependencies.
# Also generate an appropriate modules.dep.
-{ stdenv, kernel, nukeReferences, rootModules
+{ stdenvNoCC, kernel, nukeReferences, rootModules
, kmod, allowMissing ? false }:
-stdenv.mkDerivation {
+stdenvNoCC.mkDerivation {
name = kernel.name + "-shrunk";
builder = ./modules-closure.sh;
buildInputs = [ nukeReferences kmod ];
diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix
index a4ecc24d3a6..25a99789af5 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.3.0";
+ version = "0.3.1";
name = "zeal-${version}";
src = fetchFromGitHub {
owner = "zealdocs";
repo = "zeal";
rev = "v${version}";
- sha256 = "1f0nsnily2lsrraj1f8j34lqhiskiyq22clkci7w4h2zfv35j1s0";
+ sha256 = "14ld7zm15677jdlasnfa6c42kiswd4d6yg1db50xbk2yflzzwqqa";
};
buildInputs = [
diff --git a/pkgs/data/fonts/font-awesome-ttf/default.nix b/pkgs/data/fonts/font-awesome-ttf/default.nix
index 9cbf7059d92..55995f6d11d 100644
--- a/pkgs/data/fonts/font-awesome-ttf/default.nix
+++ b/pkgs/data/fonts/font-awesome-ttf/default.nix
@@ -1,28 +1,30 @@
-{stdenv, fetchurl, unzip}:
+{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "font-awesome-4.6.3";
+ name = "font-awesome-${version}";
+ version = "4.7.0";
- src = fetchurl {
- url = "http://fortawesome.github.io/Font-Awesome/assets/${name}.zip";
- sha256 = "06d6p3rydy86hg82igra4vqglyx7bii19jj5kdyhva0d2gqv7zfn";
+ src = fetchFromGitHub {
+ owner = "FortAwesome";
+ repo = "Font-Awesome";
+ rev = "v${version}";
+ sha256 = "0w30y26jp8nvxa3iiw7ayl6rkza1rz62msl9xw3srvxya1c77grc";
};
buildCommand = ''
- ${unzip}/bin/unzip $src
mkdir -p $out/share/fonts/truetype
- cp */fonts/*.ttf $out/share/fonts/truetype
+ cp $src/fonts/*.ttf $out/share/fonts/truetype
'';
- meta = {
+ meta = with stdenv.lib; {
description = "Font Awesome - TTF font";
longDescription = ''
Font Awesome gives you scalable vector icons that can instantly be customized.
This package includes only the TTF font. For full CSS etc. see the project website.
'';
homepage = "http://fortawesome.github.io/Font-Awesome/";
- license = stdenv.lib.licenses.ofl;
- platforms = stdenv.lib.platforms.all;
- maintainers = [ stdenv.lib.maintainers.abaldeau ];
+ license = licenses.ofl;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ abaldeau ];
};
}
diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix
index 62e99079d17..ee637f880ad 100644
--- a/pkgs/data/fonts/google-fonts/default.nix
+++ b/pkgs/data/fonts/google-fonts/default.nix
@@ -38,8 +38,8 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = https://www.google.com/fontsl;
- description = "Font files available from Google Font";
+ homepage = https://fonts.google.com;
+ description = "Font files available from Google Fonts";
license = with licenses; [ asl20 ofl ufl ];
platforms = platforms.all;
hydraPlatforms = [];
diff --git a/pkgs/data/fonts/league-of-moveable-type/default.nix b/pkgs/data/fonts/league-of-moveable-type/default.nix
index c592ac2d38b..e02ee967b67 100644
--- a/pkgs/data/fonts/league-of-moveable-type/default.nix
+++ b/pkgs/data/fonts/league-of-moveable-type/default.nix
@@ -1,65 +1,32 @@
-{stdenv, fetchurl, unzip}:
+{stdenv, fetchurl, unzip, raleway}:
+let
+
+ # TO UPDATE:
+ # ./update.sh > ./fonts.nix
+ # we use the extended version of raleway (same license).
+ fonts = [raleway]
+ ++ map fetchurl (builtins.filter (f: f.name != "raleway.zip") (import ./fonts.nix));
+
+in
stdenv.mkDerivation rec {
+
baseName = "league-of-moveable-type";
- version = "2014-12";
+ version = "2016-10-15";
name="${baseName}-${version}";
- srcs = [(fetchurl {
- url = "https://www.theleagueofmoveabletype.com/league-gothic/download";
- sha256 = "0nbwsbwhs375kbis3lpk98dw05mnh455vghjg1cq0j2fsj1zb99b";
- name = "league-gothic.zip";
- })
-
- (fetchurl {
- url = "https://www.theleagueofmoveabletype.com/fanwood/download";
- sha256 = "1023da7hik8ci8s7rcy6lh4h9p6igx1kz9y1a2cv6sizbp819w8g";
- name = "fanwood.zip";
- })
-
- (fetchurl {
- url = "https://www.theleagueofmoveabletype.com/linden-hill/download";
- sha256 = "0rm92rz9kki91l5wcn149mdpwq1mfql4dv6d159hv534qmg3z3ks";
- name = "linden-hill.zip";
- })
-
- (fetchurl {
- url = "https://www.theleagueofmoveabletype.com/raleway/download";
- sha256 = "0f6anym0adq0ankqbdqx4lyzbysx824zqdj1x60gafyisjx48y87";
- name = "raleway.zip";
- })
-
- (fetchurl {
- url = "https://www.theleagueofmoveabletype.com/prociono/download";
- sha256 = "11hamjry5lx3cykzpjq7kwlp6h9cjqy470fmn9f2pi954b46xkdy";
- name = "prociono.zip";
- })
-
- (fetchurl {
- url = "https://www.theleagueofmoveabletype.com/goudy-bookletter-1911/download";
- sha256 = "01qganq5n7rgqw546lf45kj8j7ymfjr00i2bwp3qw7ibifg9pn4n";
- name = "goudy-bookletter-1911.zip";
- })
-
- (fetchurl {
- url = "https://www.theleagueofmoveabletype.com/sorts-mill-goudy/download";
- sha256 = "11aywj5lzapk04k2yzi1g96acbbm48x902ka0v9cfwwqpn6js9ra";
- name = "sorts-mill-goudy.zip";
- })
-
-
-];
-
- buildInputs = [unzip];
+ srcs = fonts;
+ buildInputs = [ unzip ];
sourceRoot = ".";
installPhase = ''
- mkdir -p $out/share/fonts/truetype
- cp */*.otf $out/share/fonts/truetype
+ mkdir -p $out/share/fonts/opentype
+ cp */*.otf $out/share/fonts/opentype
+ # for Raleway, where the fonts are already in /share/…
+ cp */share/fonts/opentype/*.otf $out/share/fonts/opentype
'';
-
meta = {
description = "Font Collection by The League of Moveable Type";
@@ -74,6 +41,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.ofl;
platforms = stdenv.lib.platforms.all;
- maintainers = with stdenv.lib.maintainers; [ bergey ];
+ maintainers = with stdenv.lib.maintainers; [ bergey profpatsch ];
};
}
diff --git a/pkgs/data/fonts/league-of-moveable-type/fonts.nix b/pkgs/data/fonts/league-of-moveable-type/fonts.nix
new file mode 100644
index 00000000000..efbe6a4c41c
--- /dev/null
+++ b/pkgs/data/fonts/league-of-moveable-type/fonts.nix
@@ -0,0 +1,82 @@
+[
+ {
+ url = "https://www.theleagueofmoveabletype.com/league-spartan/download";
+ sha256 = "1z9pff8xm58njs7whaxb3sq4vbdkxv7llwgm9nqhwshmgr52jrm1";
+ name = "league-spartan.zip";
+ }
+ {
+ url = "https://www.theleagueofmoveabletype.com/junction/download";
+ sha256 = "1qbhfha012ma26n43lm1fh06i7z47wk50r8qsp09bpxc5yr4ypi7";
+ name = "junction.zip";
+ }
+ {
+ url = "https://www.theleagueofmoveabletype.com/ostrich-sans/download";
+ sha256 = "11ydhbgcfhmydcnim64vb035cha14krxxrbf62426dm6bvxkphp3";
+ name = "ostrich-sans.zip";
+ }
+ {
+ url = "https://www.theleagueofmoveabletype.com/league-gothic/download";
+ sha256 = "0nbwsbwhs375kbis3lpk98dw05mnh455vghjg1cq0j2fsj1zb99b";
+ name = "league-gothic.zip";
+ }
+ {
+ url = "https://www.theleagueofmoveabletype.com/blackout/download";
+ sha256 = "1r7dihnjvy4fgvaj5m4llc9dm4cpdl1l79mhg3as16qvjgazms3p";
+ name = "blackout.zip";
+ }
+ {
+ url = "https://www.theleagueofmoveabletype.com/knewave/download";
+ sha256 = "065yiakhm6h6jkmigj4pqm2qi6saph0pwb7g8s9gwkskhkk5iy57";
+ name = "knewave.zip";
+ }
+ {
+ url = "https://www.theleagueofmoveabletype.com/fanwood/download";
+ sha256 = "1023da7hik8ci8s7rcy6lh4h9p6igx1kz9y1a2cv6sizbp819w8g";
+ name = "fanwood.zip";
+ }
+ {
+ url = "https://www.theleagueofmoveabletype.com/linden-hill/download";
+ sha256 = "0rm92rz9kki91l5wcn149mdpwq1mfql4dv6d159hv534qmg3z3ks";
+ name = "linden-hill.zip";
+ }
+ {
+ url = "https://www.theleagueofmoveabletype.com/league-script-number-one/download";
+ sha256 = "056hb02a5vydrq5q0gwzanp2zkrrv1spm8sfc5wzhyfzgwd1vc76";
+ name = "league-script-number-one.zip";
+ }
+ {
+ url = "https://www.theleagueofmoveabletype.com/raleway/download";
+ sha256 = "0f6anym0adq0ankqbdqx4lyzbysx824zqdj1x60gafyisjx48y87";
+ name = "raleway.zip";
+ }
+ {
+ url = "https://www.theleagueofmoveabletype.com/prociono/download";
+ sha256 = "11hamjry5lx3cykzpjq7kwlp6h9cjqy470fmn9f2pi954b46xkdy";
+ name = "prociono.zip";
+ }
+ {
+ url = "https://www.theleagueofmoveabletype.com/orbitron/download";
+ sha256 = "156w4j324d350pvjmzdg2w8inhhdfzrvb86rhlavgd9sxx2fykk4";
+ name = "orbitron.zip";
+ }
+ {
+ url = "https://www.theleagueofmoveabletype.com/goudy-bookletter-1911/download";
+ sha256 = "01qganq5n7rgqw546lf45kj8j7ymfjr00i2bwp3qw7ibifg9pn4n";
+ name = "goudy-bookletter-1911.zip";
+ }
+ {
+ url = "https://www.theleagueofmoveabletype.com/sorts-mill-goudy/download";
+ sha256 = "11aywj5lzapk04k2yzi1g96acbbm48x902ka0v9cfwwqpn6js9ra";
+ name = "sorts-mill-goudy.zip";
+ }
+ {
+ url = "https://www.theleagueofmoveabletype.com/chunk/download";
+ sha256 = "15mbqwz90y1n4vlj2xkc8vd56va6la5qnxhiipvcmkrng5y3931j";
+ name = "chunk.zip";
+ }
+ {
+ url = "https://www.theleagueofmoveabletype.com/sniglet/download";
+ sha256 = "1lhpnjm52gyhy9s2kwbsg1rd9iyrqli5q9ngp141igx4p1bgbqkc";
+ name = "sniglet.zip";
+ }
+]
diff --git a/pkgs/data/fonts/league-of-moveable-type/update.sh b/pkgs/data/fonts/league-of-moveable-type/update.sh
new file mode 100644
index 00000000000..4d41df4fdb8
--- /dev/null
+++ b/pkgs/data/fonts/league-of-moveable-type/update.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+SITE=https://www.theleagueofmoveabletype.com
+
+# since there is no nice way to get all the fonts,
+# this fetches the homepage and extracts their names from the html …
+fonts=$(curl "$SITE" 2>/dev/null | \
+ sed -ne 's//dev/null)
+ cat <= $FOLKS_MIN_VERSION
+ geocode-glib-1.0 >= $GEOCODE_MIN_VERSION
+ champlain-0.12 >= $CHAMPLAIN_MIN_VERSION
+ libxml-2.0
+ rest-0.7
++ libsoup-2.4
+ ])
+ AC_SUBST(GNOME_MAPS_LIB_CFLAGS)
+ AC_SUBST(GNOME_MAPS_LIB_LIBS)
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/src.nix
new file mode 100644
index 00000000000..ef668faef53
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-maps-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-maps/3.22/gnome-maps-3.22.0.tar.xz;
+ sha256 = "7ce98a683f1c38d3ba1b5d68c7d05add9f9366774678fd50fdeeda6987163c39";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-music/default.nix
new file mode 100644
index 00000000000..ea8f15fd4e5
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-music/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, intltool, fetchurl, gdk_pixbuf, tracker
+, libxml2, python3Packages, libnotify, wrapGAppsHook
+, pkgconfig, gtk3, glib, cairo
+, makeWrapper, itstool, gnome3, librsvg, gst_all_1 }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+ buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart
+ gdk_pixbuf gnome3.defaultIconTheme librsvg python3Packages.python
+ gnome3.grilo gnome3.grilo-plugins gnome3.totem-pl-parser libxml2 libnotify
+ python3Packages.pycairo python3Packages.dbus-python python3Packages.requests2
+ python3Packages.pygobject3 gst_all_1.gstreamer gst_all_1.gst-plugins-base
+ gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad wrapGAppsHook
+ gnome3.gsettings_desktop_schemas makeWrapper tracker ];
+
+ wrapPrefixVariables = [ "PYTHONPATH" ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Music;
+ description = "Music player and management application for the GNOME desktop environment";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-music/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-music/src.nix
new file mode 100644
index 00000000000..5b3a79a111a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-music/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-music-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-music/3.22/gnome-music-3.22.0.tar.xz;
+ sha256 = "170685ffa89556951b9fb0b9225b2bca863e54348d4079a56b8e5c4eeafa9b03";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-nettool/default.nix
new file mode 100644
index 00000000000..4c152777f2c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-nettool/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, libgtop, intltool, itstool, libxml2, nmap, inetutils }:
+
+stdenv.mkDerivation rec {
+ name = "gnome-nettool-3.8.1";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/gnome-nettool/3.8/${name}.tar.xz";
+ sha256 = "1c9cvzvyqgfwa5zzyvp7118pkclji62fkbb33g4y9sp5kw6m397h";
+ };
+
+ buildInputs = [
+ pkgconfig gtk3 wrapGAppsHook libgtop intltool itstool libxml2
+ gnome3.defaultIconTheme
+ ];
+
+ propagatedUserEnvPkgs = [ nmap inetutils ];
+
+ meta = with stdenv.lib; {
+ homepage = http://projects.gnome.org/gnome-network;
+ description = "A collection of networking tools";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-photos/default.nix
new file mode 100644
index 00000000000..df7e23ef9d4
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-photos/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, intltool, fetchurl, exempi, libxml2
+, pkgconfig, gtk3, glib
+, makeWrapper, itstool, gegl, babl, lcms2
+, desktop_file_utils, gmp, libmediaart, wrapGAppsHook
+, gnome3, librsvg, gdk_pixbuf, libexif, gexiv2 }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ # doCheck = true;
+
+ NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
+
+ buildInputs = [ pkgconfig gtk3 glib intltool itstool gegl babl gnome3.libgdata
+ gnome3.gsettings_desktop_schemas makeWrapper gmp libmediaart
+ gdk_pixbuf gnome3.defaultIconTheme librsvg exempi
+ gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo
+ gnome3.gnome_online_accounts gnome3.gnome_desktop
+ lcms2 libexif gnome3.tracker libxml2 desktop_file_utils
+ wrapGAppsHook gexiv2 ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Photos;
+ description = "Photos is an application to access, organize and share your photos with GNOME 3";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-photos/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-photos/src.nix
new file mode 100644
index 00000000000..f28d626ff94
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-photos/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-photos-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-photos/3.22/gnome-photos-3.22.0.tar.xz;
+ sha256 = "568329142855901a85f325ee014176e24f735b15a496842bcd31f5cb2615ba53";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-weather/default.nix
new file mode 100644
index 00000000000..dbd5377d5bf
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-weather/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs
+, libgweather, intltool, itstool, geoclue2 }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = [
+ pkgconfig gtk3 wrapGAppsHook gjs intltool itstool
+ libgweather gnome3.defaultIconTheme geoclue2 gnome3.gsettings_desktop_schemas
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Weather;
+ description = "Access current weather conditions and forecasts";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-weather/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-weather/src.nix
new file mode 100644
index 00000000000..8cfab25381e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-weather/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-weather-3.20.2";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-weather/3.20/gnome-weather-3.20.2.tar.xz;
+ sha256 = "7823ca7c08fa852232b98c2517830e3bd9b0ab80c9ac83f182c18ec140a5c18b";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/3.22/apps/nautilus-sendto/default.nix
new file mode 100644
index 00000000000..093900dcb7a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/apps/nautilus-sendto/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool
+, gobjectIntrospection, makeWrapper }:
+
+stdenv.mkDerivation rec {
+ name = "nautilus-sendto-${version}";
+
+ version = "3.8.1";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/nautilus-sendto/3.8/${name}.tar.xz";
+ sha256 = "03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab";
+ };
+
+ buildInputs = [ glib pkgconfig gobjectIntrospection intltool makeWrapper ];
+
+ meta = with stdenv.lib; {
+ description = "Integrates Evolution and Pidgin into the Nautilus file manager";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix b/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix
new file mode 100644
index 00000000000..1927585fd32
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, intltool, fetchurl, gdk_pixbuf, adwaita-icon-theme
+, telepathy_glib, gjs, itstool, telepathy_idle, libxml2
+, pkgconfig, gtk3, glib, librsvg, gnome3, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ propagatedUserEnvPkgs = [ telepathy_idle ];
+
+ buildInputs = [ pkgconfig gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook
+ telepathy_glib gjs gdk_pixbuf librsvg libxml2 ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Polari;
+ description = "IRC chat client designed to integrate with the GNOME desktop";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/polari/src.nix b/pkgs/desktops/gnome-3/3.22/apps/polari/src.nix
new file mode 100644
index 00000000000..a8c4b303c38
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/apps/polari/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "polari-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/polari/3.22/polari-3.22.0.tar.xz;
+ sha256 = "90ea3db7ed0a03d46d9376e3201b4332f56d6149bc284379c367159094b73818";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix
new file mode 100644
index 00000000000..e59df06f8a0
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, intltool, fetchurl, vala_0_32
+, pkgconfig, gtk3, glib
+, makeWrapper, itstool, gnupg, libsoup
+, gnome3, librsvg, gdk_pixbuf, gpgme
+, libsecret, avahi, p11_kit, openssh }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ doCheck = true;
+
+ propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+ NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
+
+ buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr
+ gnome3.gsettings_desktop_schemas makeWrapper gnupg
+ gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme
+ libsecret avahi libsoup p11_kit vala_0_32 gnome3.gcr
+ openssh ];
+
+ preFixup = ''
+ wrapProgram "$out/bin/seahorse" \
+ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Seahorse;
+ description = "Application for managing encryption keys and passwords in the GnomeKeyring";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/seahorse/src.nix b/pkgs/desktops/gnome-3/3.22/apps/seahorse/src.nix
new file mode 100644
index 00000000000..0ae195a0a7b
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/apps/seahorse/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "seahorse-3.20.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/seahorse/3.20/seahorse-3.20.0.tar.xz;
+ sha256 = "e2b07461ed54a8333e5628e9b8e517ec2b731068377bf376570aad998274c6df";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/3.22/apps/vinagre/default.nix
new file mode 100644
index 00000000000..8b8b6248642
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/apps/vinagre/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, vte, libxml2, gtkvnc, intltool
+, libsecret, itstool, makeWrapper, librsvg }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = [ pkgconfig gtk3 vte libxml2 gtkvnc intltool libsecret
+ itstool makeWrapper gnome3.defaultIconTheme librsvg ];
+
+ preFixup = ''
+ wrapProgram "$out/bin/vinagre" \
+ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share"
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Vinagre;
+ description = "Remote desktop viewer for GNOME";
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/vinagre/src.nix b/pkgs/desktops/gnome-3/3.22/apps/vinagre/src.nix
new file mode 100644
index 00000000000..3d1357c4989
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/apps/vinagre/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "vinagre-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/vinagre/3.22/vinagre-3.22.0.tar.xz;
+ sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/default.nix
new file mode 100644
index 00000000000..3c3a05dc3af
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gnome3
+, iconnamingutils, gtk, gdk_pixbuf, librsvg, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ # For convenience, we can specify adwaita-icon-theme only in packages
+ propagatedBuildInputs = [ hicolor_icon_theme ];
+
+ buildInputs = [ gdk_pixbuf librsvg ];
+
+ nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ];
+
+ # remove a tree of dirs with no files within
+ postInstall = '' rm -rf "$out/locale" '';
+
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/src.nix b/pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/src.nix
new file mode 100644
index 00000000000..a48b404ceb6
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "adwaita-icon-theme-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/adwaita-icon-theme/3.22/adwaita-icon-theme-3.22.0.tar.xz;
+ sha256 = "c18bf6e26087d9819a962c77288b291efab25d0419b73d909dd771716a45dcb7";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix
new file mode 100644
index 00000000000..f7a0ff473cc
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, intltool, fetchurl, vala_0_32, libgtop
+, pkgconfig, gtk3, glib
+, bash, makeWrapper, itstool, libxml2
+, gnome3, librsvg, gdk_pixbuf, file }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ doCheck = true;
+
+ NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
+
+ propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+ buildInputs = [ vala_0_32 pkgconfig gtk3 glib libgtop intltool itstool libxml2
+ gnome3.gsettings_desktop_schemas makeWrapper file
+ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
+
+ preFixup = ''
+ wrapProgram "$out/bin/baobab" \
+ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Baobab;
+ description = "Graphical application to analyse disk usage in any Gnome environment";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/baobab/src.nix b/pkgs/desktops/gnome-3/3.22/core/baobab/src.nix
new file mode 100644
index 00000000000..df4cefc4816
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/baobab/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "baobab-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/baobab/3.22/baobab-3.22.0.tar.xz;
+ sha256 = "796e784886d5bdf2e9d8ac94d74d5f94e055f4285ef54dc16552fb9c9b9c3e99";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/caribou/default.nix b/pkgs/desktops/gnome-3/3.22/core/caribou/default.nix
new file mode 100644
index 00000000000..d63b6e86af3
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/caribou/default.nix
@@ -0,0 +1,31 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2, autoconf
+, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core, automake }:
+
+let
+ majorVersion = "0.4";
+in
+stdenv.mkDerivation rec {
+ name = "caribou-${majorVersion}.21";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/caribou/${majorVersion}/${name}.tar.xz";
+ sha256 = "0mfychh1q3dx0b96pjz9a9y112bm9yqyim40yykzxx1hppsdjhww";
+ };
+
+ buildInputs = with gnome3;
+ [ glib pkgconfig gtk clutter at_spi2_core dbus pythonPackages.python automake
+ pythonPackages.pygobject3 libxml2 libXtst gtk2 intltool libxslt autoconf ];
+
+ propagatedBuildInputs = [ gnome3.libgee libxklavier ];
+
+ preBuild = ''
+ patchShebangs .
+ substituteInPlace libcaribou/Makefile.am --replace "--shared-library=libcaribou.so.0" "--shared-library=$out/lib/libcaribou.so.0"
+ '';
+
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/3.22/core/dconf-editor/default.nix
new file mode 100644
index 00000000000..6e0184e134e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/dconf-editor/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, vala_0_32, libxslt, pkgconfig, glib, dbus_glib, gnome3
+, libxml2, intltool, docbook_xsl_ns, docbook_xsl, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+
+ buildInputs = [ vala_0_32 libxslt glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme
+ intltool docbook_xsl docbook_xsl_ns gnome3.dconf ];
+
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/dconf-editor/src.nix b/pkgs/desktops/gnome-3/3.22/core/dconf-editor/src.nix
new file mode 100644
index 00000000000..64e19864536
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/dconf-editor/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "dconf-editor-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/dconf-editor/3.22/dconf-editor-3.22.0.tar.xz;
+ sha256 = "4ca3c2c3836f4c944f161540d1521507dab8e7bee0cac7d543560808efb9246f";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.22/core/dconf/default.nix
new file mode 100644
index 00000000000..02c60256e15
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/dconf/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, vala_0_32, libxslt, pkgconfig, glib, dbus_glib, gnome3
+, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }:
+
+let
+ majorVersion = "0.26";
+in
+stdenv.mkDerivation rec {
+ name = "dconf-${version}";
+ version = "${majorVersion}.0";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/dconf/${majorVersion}/${name}.tar.xz";
+ sha256 = "1jaqsr1r0grpd25rbsc2v3vb0sc51lia9w31wlqswgqsncp2k0w6";
+ };
+
+ buildInputs = [ vala_0_32 libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2
+ intltool docbook_xsl docbook_xsl_ns makeWrapper ];
+
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.22/core/empathy/default.nix
new file mode 100644
index 00000000000..9a29d11f1ae
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/empathy/default.nix
@@ -0,0 +1,57 @@
+{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
+, file, librsvg, gnome3, gdk_pixbuf
+, dbus_glib, dbus_libs, telepathy_glib, telepathy_farstream
+, clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts
+, gcr, libsecret, folks, libpulseaudio, telepathy_mission_control
+, telepathy_logger, libnotify, clutter, libsoup, gnutls
+, evolution_data_server
+, libcanberra_gtk3, p11_kit, farstream, libtool, shared_mime_info
+, bash, makeWrapper, itstool, libxml2, libxslt, icu, libgee }:
+
+# TODO: enable more features
+
+let
+ majorVersion = "3.12";
+in
+stdenv.mkDerivation rec {
+ name = "empathy-${majorVersion}.11";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/empathy/${majorVersion}/${name}.tar.xz";
+ sha256 = "11yl8msyf017197fm6h15yw159yjp9i08566l967yashbx7gzr6i";
+ };
+
+ propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard
+ gnome_online_accounts shared_mime_info ];
+ propagatedBuildInputs = [ folks telepathy_logger evolution_data_server
+ telepathy_mission_control ];
+ buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool
+ libxml2 libxslt icu file makeWrapper
+ telepathy_glib clutter_gtk clutter-gst cogl
+ gst_all_1.gstreamer gst_all_1.gst-plugins-base
+ gcr libsecret libpulseaudio gnome3.yelp_xsl gdk_pixbuf
+ libnotify clutter libsoup gnutls libgee p11_kit
+ libcanberra_gtk3 telepathy_farstream farstream
+ gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas
+ file libtool librsvg ];
+
+ NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0"
+ "-I${dbus_libs.dev}/include/dbus-1.0"
+ "-I${dbus_libs.dev}/lib/dbus-1.0/include" ];
+
+ preFixup = ''
+ for f in $out/bin/* $out/libexec/*; do
+ wrapProgram $f \
+ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+ done
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Empathy;
+ description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols";
+ maintainers = gnome3.maintainers;
+ # TODO: license = [ licenses.gpl2 licenses.lgpl2 ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/eog/default.nix b/pkgs/desktops/gnome-3/3.22/core/eog/default.nix
new file mode 100644
index 00000000000..23759e3bf90
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/eog/default.nix
@@ -0,0 +1,20 @@
+{ fetchurl, stdenv, intltool, pkgconfig, itstool, libxml2, libjpeg, gnome3
+, shared_mime_info, wrapGAppsHook, librsvg, libexif }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+
+ buildInputs = with gnome3;
+ [ intltool itstool libxml2 libjpeg gtk glib libpeas librsvg
+ gsettings_desktop_schemas shared_mime_info adwaita-icon-theme
+ gnome_desktop libexif dconf ];
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/EyeOfGnome;
+ platforms = platforms.linux;
+ description = "GNOME image viewer";
+ maintainers = gnome3.maintainers;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/eog/src.nix b/pkgs/desktops/gnome-3/3.22/core/eog/src.nix
new file mode 100644
index 00000000000..f3995e6bc2c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/eog/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "eog-3.20.4";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/eog/3.20/eog-3.20.3.tar.xz;
+ sha256 = "09ic1ndvl31jnlsmigd5dgdv262ybq61ik0xh35kmvgcklw8qc0n";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix
new file mode 100644
index 00000000000..9d36648d5cd
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu
+, bash, wrapGAppsHook, gnome3, libwnck3, libxml2, libxslt, libtool
+, webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit
+, sqlite, gcr, avahi, nss, isocodes, itstool, file, which
+, gdk_pixbuf, librsvg, gnome_common }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ # Tests need an X display
+ configureFlags = [ "--disable-static --disable-tests" ];
+
+ propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+ nativeBuildInputs = [ pkgconfig file wrapGAppsHook ];
+
+ buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file
+ 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
+ gnome3.glib_networking ];
+
+ NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Epiphany;
+ description = "WebKit based web browser for GNOME";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix b/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix
new file mode 100644
index 00000000000..09ea2baf197
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "epiphany-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/epiphany/3.22/epiphany-3.22.0.tar.xz;
+ sha256 = "a645d17c10a1c266d4647306ea3e5496d3ca575d2ed8152947ed77e9eb623a27";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/evince/default.nix b/pkgs/desktops/gnome-3/3.22/core/evince/default.nix
new file mode 100644
index 00000000000..7629e5b5655
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/evince/default.nix
@@ -0,0 +1,63 @@
+{ fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2
+, glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3
+, poppler, ghostscriptX, djvulibre, libspectre, libsecret , wrapGAppsHook
+, librsvg, gobjectIntrospection
+, recentListSize ? null # 5 is not enough, allow passing a different number
+, supportXPS ? false # Open XML Paper Specification via libgxps
+}:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+
+ buildInputs = [
+ intltool perl perlXMLParser libxml2
+ glib gtk3 pango atk gdk_pixbuf gobjectIntrospection
+ itstool gnome3.adwaita-icon-theme
+ gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas
+ poppler ghostscriptX djvulibre libspectre
+ libsecret librsvg gnome3.adwaita-icon-theme gnome3.dconf
+ ] ++ stdenv.lib.optional supportXPS gnome3.libgxps;
+
+ configureFlags = [
+ "--disable-nautilus" # Do not use nautilus
+ "--enable-introspection"
+ (if supportXPS then "--enable-xps" else "--disable-xps")
+ ];
+
+ NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
+
+ preConfigure = with stdenv.lib;
+ optionalString doCheck ''
+ for file in test/*.py; do
+ echo "patching $file"
+ sed '1s,/usr,${python},' -i "$file"
+ done
+ '' + optionalString (recentListSize != null) ''
+ sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c
+ sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' shell/ev-window.c
+ '';
+
+ preFixup = ''
+ gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share")
+ '';
+
+ doCheck = false; # would need pythonPackages.dogTail, which is missing
+
+ meta = with stdenv.lib; {
+ homepage = http://www.gnome.org/projects/evince/;
+ description = "GNOME's document viewer";
+
+ longDescription = ''
+ Evince is a document viewer for multiple document formats. It
+ currently supports PDF, PostScript, DjVu, TIFF and DVI. The goal
+ of Evince is to replace the multiple document viewers that exist
+ on the GNOME Desktop with a single simple application.
+ '';
+
+ license = stdenv.lib.licenses.gpl2Plus;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.vcunat ];
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/evince/src.nix b/pkgs/desktops/gnome-3/3.22/core/evince/src.nix
new file mode 100644
index 00000000000..36572a58e17
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/evince/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "evince-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/evince/3.22/evince-3.22.0.tar.xz;
+ sha256 = "22ebabf890057e8b43020ffdebdbb57d6a586beba031838f0f0c8a596c479d46";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix
new file mode 100644
index 00000000000..b67795ea59c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix
@@ -0,0 +1,32 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, python
+, intltool, libsoup, libxml2, libsecret, icu, sqlite
+, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala_0_32 }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = with gnome3;
+ [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts
+ gcr p11_kit libgweather libgdata gperf makeWrapper icu sqlite gsettings_desktop_schemas ]
+ ++ stdenv.lib.optional valaSupport vala_0_32;
+
+ propagatedBuildInputs = [ libsecret nss nspr libical db ];
+
+ # uoa irrelevant for now
+ configureFlags = [ "--disable-uoa" "--disable-google-auth" ]
+ ++ stdenv.lib.optional valaSupport "--enable-vala-bindings";
+
+ enableParallelBuilding = true;
+
+ preFixup = ''
+ for f in "$out/libexec/"*; do
+ wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+ done
+ '';
+
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/src.nix b/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/src.nix
new file mode 100644
index 00000000000..84817846f72
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "evolution-data-server-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/evolution-data-server/3.22/evolution-data-server-3.22.0.tar.xz;
+ sha256 = "8653a9a28980e661e8b91ba335dae04a0553e12611ad155bc48fb3fb3c98653d";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/folks/default.nix b/pkgs/desktops/gnome-3/3.22/core/folks/default.nix
new file mode 100644
index 00000000000..171ad077450
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/folks/default.nix
@@ -0,0 +1,43 @@
+{ fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool
+, vala_0_32, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs
+, telepathy_glib, evolution_data_server, libsecret, db }:
+
+# TODO: enable more folks backends
+
+let
+ majorVersion = "0.11";
+in
+stdenv.mkDerivation rec {
+ name = "folks-${majorVersion}.3";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/folks/${majorVersion}/${name}.tar.xz";
+ sha256 = "2a2828a7c87fd39e5786f8f2cf0ebe47576a74974f1355c478a6dc747d7bcb64";
+ };
+
+ propagatedBuildInputs = [ glib gnome3.libgee sqlite ];
+ # dbus_daemon needed for tests
+ buildInputs = [ dbus_glib telepathy_glib evolution_data_server dbus_libs
+ vala_0_32 libsecret libxml2 libsoup nspr nss intltool db ];
+ nativeBuildInputs = [ pkgconfig ];
+
+ configureFlags = "--disable-fatal-warnings";
+
+ NIX_CFLAGS_COMPILE = ["-I${nss.dev}/include/nss"
+ "-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0"];
+
+ enableParallelBuilding = true;
+
+ postBuild = "rm -rf $out/share/gtk-doc";
+
+ meta = {
+ description = "Folks";
+
+ homepage = https://wiki.gnome.org/Projects/Folks;
+
+ license = stdenv.lib.licenses.lgpl2Plus;
+
+ maintainers = gnome3.maintainers;
+ platforms = stdenv.lib.platforms.gnu; # arbitrary choice
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix b/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix
new file mode 100644
index 00000000000..a4cb3e8c146
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, pkgconfig, dbus_glib, gnome3 ? null, glib, libxml2
+, intltool, polkit, orbit, withGtk ? false }:
+
+assert withGtk -> (gnome3 != null);
+
+stdenv.mkDerivation rec {
+
+ versionMajor = "3.2";
+ versionMinor = "6";
+ moduleName = "GConf";
+
+ origName = "${moduleName}-${versionMajor}.${versionMinor}";
+
+ name = "gconf-${versionMajor}.${versionMinor}";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${origName}.tar.xz";
+ sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr";
+ };
+
+ buildInputs = [ libxml2 polkit orbit ] ++ stdenv.lib.optional withGtk gnome3.gtk;
+ propagatedBuildInputs = [ glib dbus_glib ];
+ nativeBuildInputs = [ pkgconfig intltool ];
+
+ # ToDo: ldap reported as not found but afterwards reported as supported
+
+ meta = with stdenv.lib; {
+ homepage = http://projects.gnome.org/gconf/;
+ description = "A system for storing application preferences";
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.22/core/gcr/default.nix
new file mode 100644
index 00000000000..55eebf77be5
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gcr/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib
+, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk
+, gobjectIntrospection, makeWrapper, libxslt, vala_0_32, gnome3 }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = [
+ pkgconfig intltool gnupg glib gobjectIntrospection libxslt
+ libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper vala_0_32
+ ];
+
+ propagatedBuildInputs = [ p11_kit ];
+
+ #doCheck = true;
+
+ #enableParallelBuilding = true; issues on hydra
+
+ preFixup = ''
+ wrapProgram "$out/bin/gcr-viewer" \
+ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+ '';
+
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gcr/src.nix b/pkgs/desktops/gnome-3/3.22/core/gcr/src.nix
new file mode 100644
index 00000000000..d166f033266
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gcr/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gcr-3.20.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gcr/3.20/gcr-3.20.0.tar.xz;
+ sha256 = "90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/default.nix b/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/default.nix
new file mode 100644
index 00000000000..51b67afb01f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus
+, intltool, accountsservice, libX11, gnome3, systemd, gnome_session
+, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+ name = "gdm-${gnome3.version}.2";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/gdm/${gnome3.version}/${name}.tar.xz";
+ sha256 = "0mhv3q8z208qvhz00zrxlqn7w9gi5vy6w8dpjh5s2ka28l3yhbn3";
+ };
+
+ preConfigure = ''
+ substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X"
+ substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session'
+ substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.tools}/bin/dbus-launch'
+ substituteInPlace data/gdm.conf-custom.in --replace '#WaylandEnable=false' 'WaylandEnable=false'
+ sed 's/#Enable=true/Enable=true/' -i data/gdm.conf-custom.in
+ '';
+
+ configureFlags = [ "--localstatedir=/var" "--with-systemd=yes" "--without-plymouth"
+ "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
+ "--with-initial-vt=10" ];
+
+ buildInputs = [ pkgconfig glib itstool libxml2 intltool
+ accountsservice gnome3.dconf systemd
+ gobjectIntrospection libX11 gtk
+ libcanberra_gtk3 pam libtool ];
+
+ #enableParallelBuilding = true; # problems compiling
+
+ # Disable Access Control because our X does not support FamilyServerInterpreted yet
+ patches = [ ./xserver_path.patch ./sessions_dir.patch ./disable_x_access_control.patch ];
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Projects/GDM;
+ description = "A program that manages graphical display servers and handles graphical user logins";
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/disable_x_access_control.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/disable_x_access_control.patch
new file mode 100644
index 00000000000..7691a9e86f0
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/disable_x_access_control.patch
@@ -0,0 +1,15 @@
+--- gdm-3.16.0/daemon/gdm-display.c.orig 2015-04-08 13:53:14.370274369 +0200
++++ gdm-3.16.0/daemon/gdm-display.c 2015-04-08 13:53:36.287520435 +0200
+@@ -1706,9 +1706,10 @@
+
+ gdm_error_trap_push ();
+
+- for (i = 0; i < G_N_ELEMENTS (host_entries); i++) {
++ /*for (i = 0; i < G_N_ELEMENTS (host_entries); i++) {
+ XAddHost (self->priv->x11_display, &host_entries[i]);
+- }
++ }*/
++ XDisableAccessControl(self->priv->x11_display);
+
+ XSync (self->priv->x11_display, False);
+ if (gdm_error_trap_pop ()) {
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/sessions_dir.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/sessions_dir.patch
new file mode 100644
index 00000000000..b8fbad4d731
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/sessions_dir.patch
@@ -0,0 +1,17 @@
+diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
+index f759d2d..d154716 100644
+--- a/daemon/gdm-session.c
++++ b/daemon/gdm-session.c
+@@ -373,9 +373,12 @@ get_system_session_dirs (void)
+ #ifdef ENABLE_WAYLAND_SUPPORT
+ DATADIR "/wayland-sessions/",
+ #endif
++ NULL,
+ NULL
+ };
+
++ search_dirs[4] = getenv("GDM_SESSIONS_DIR") != NULL ? getenv("GDM_SESSIONS_DIR") : NULL;
++
+ return search_dirs;
+ }
+
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/xserver_path.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/xserver_path.patch
new file mode 100644
index 00000000000..b451d129391
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/xserver_path.patch
@@ -0,0 +1,83 @@
+--- a/daemon/gdm-server.c 2014-07-30 23:00:17.786841724 +0200
++++ b/daemon/gdm-server.c 2014-07-30 23:02:10.491239180 +0200
+@@ -322,7 +322,11 @@
+ fallback:
+ #endif
+
+- server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
++ if (g_getenv("GDM_X_SERVER") != NULL) {
++ server->priv->command = g_strdup (g_getenv("GDM_X_SERVER"));
++ } else {
++ server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
++ }
+ }
+
+ static gboolean
+--- gdm-3.16.0/daemon/gdm-x-session.c.orig 2015-04-15 18:44:16.875743928 +0200
++++ gdm-3.16.0/daemon/gdm-x-session.c 2015-04-16 13:34:02.335708638 +0200
+@@ -207,6 +207,8 @@
+ char *display_fd_string = NULL;
+ char *vt_string = NULL;
+ char *display_number;
++ int nixos_argc = 0;
++ char **nixos_argv = NULL;
+ gsize display_number_size;
+
+ auth_file = prepare_auth_file ();
+@@ -236,7 +238,15 @@
+
+ display_fd_string = g_strdup_printf ("%d", DISPLAY_FILENO);
+
+- g_ptr_array_add (arguments, X_SERVER);
++ if (g_getenv("GDM_X_SERVER") != NULL) {
++ int i = 0;
++ g_shell_parse_argv(g_getenv("GDM_X_SERVER"), &nixos_argc, &nixos_argv, NULL);
++ for (i = 0; i < nixos_argc; i++) {
++ g_ptr_array_add (arguments, nixos_argv[i]);
++ }
++ } else {
++ g_ptr_array_add (arguments, X_SERVER);
++ }
+
+ if (vt_string != NULL) {
+ g_ptr_array_add (arguments, vt_string);
+@@ -259,12 +269,12 @@
+ g_ptr_array_add (arguments, "-noreset");
+ g_ptr_array_add (arguments, "-keeptty");
+
+- g_ptr_array_add (arguments, "-verbose");
++ /*g_ptr_array_add (arguments, "-verbose");
+ if (state->debug_enabled) {
+ g_ptr_array_add (arguments, "7");
+ } else {
+ g_ptr_array_add (arguments, "3");
+- }
++ }*/
+
+ if (state->debug_enabled) {
+ g_ptr_array_add (arguments, "-core");
+@@ -275,6 +285,9 @@
+ (const char * const *) arguments->pdata,
+ &error);
+ g_free (display_fd_string);
++ if (nixos_argv) {
++ g_strfreev (nixos_argv);
++ }
+ g_clear_object (&launcher);
+ g_ptr_array_free (arguments, TRUE);
+
+--- gdm-3.16.0/daemon/gdm-session.c.orig 2015-04-16 14:19:01.392802683 +0200
++++ gdm-3.16.0/daemon/gdm-session.c 2015-04-16 14:20:36.012296764 +0200
+@@ -2359,6 +2359,12 @@
+ gchar *desktop_names;
+ const char *locale;
+
++ if (g_getenv ("GDM_X_SERVER") != NULL) {
++ gdm_session_set_environment_variable (self,
++ "GDM_X_SERVER",
++ g_getenv ("GDM_X_SERVER"));
++ }
++
+ gdm_session_set_environment_variable (self,
+ "GDMSESSION",
+ get_session_name (self));
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix
new file mode 100644
index 00000000000..7ba3c3734f8
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus
+, intltool, accountsservice, libX11, gnome3, systemd, autoreconfHook
+, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection, plymouth }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ # Only needed to make it build
+ preConfigure = ''
+ substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver.out}/bin/X"
+ '';
+
+ configureFlags = [ "--sysconfdir=/etc"
+ "--localstatedir=/var"
+ "--with-plymouth=yes"
+ "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
+
+ buildInputs = [ pkgconfig glib itstool libxml2 intltool autoreconfHook
+ accountsservice gnome3.dconf systemd
+ gobjectIntrospection libX11 gtk
+ libcanberra_gtk3 pam libtool plymouth ];
+
+ enableParallelBuilding = true;
+
+ # Disable Access Control because our X does not support FamilyServerInterpreted yet
+ patches = [ #./xserver_path.patch # gdm now uses wayland
+ ./sessions_dir.patch
+ ./gdm-x-session_extra_args.patch
+ ./gdm-session-worker_xserver-path.patch
+ # ./disable_x_access_control.patch ./no-dbus-launch.patch
+ # ./libsystemd.patch
+ ];
+
+ installFlags = [ "sysconfdir=$(out)/etc" "dbusconfdir=$(out)/etc/dbus-1/system.d" ];
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Projects/GDM;
+ description = "A program that manages graphical display servers and handles graphical user logins";
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/disable_x_access_control.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/disable_x_access_control.patch
new file mode 100644
index 00000000000..e100e013b78
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gdm/disable_x_access_control.patch
@@ -0,0 +1,13 @@
+--- gdm-3.14.2/daemon/gdm-slave.c.orig 2015-04-16 15:05:27.844353079 +0200
++++ gdm-3.14.2/daemon/gdm-slave.c 2015-04-16 15:05:40.240417915 +0200
+@@ -369,8 +369,9 @@
+ gdm_error_trap_push ();
+
+ for (i = 0; i < G_N_ELEMENTS (host_entries); i++) {
+- XAddHost (slave->priv->server_display, &host_entries[i]);
++ //XAddHost (slave->priv->server_display, &host_entries[i]);
+ }
++ XDisableAccessControl(slave->priv->server_display);
+
+ XSync (slave->priv->server_display, False);
+ if (gdm_error_trap_pop ()) {
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/gdm-session-worker_xserver-path.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/gdm-session-worker_xserver-path.patch
new file mode 100644
index 00000000000..d020752fef3
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gdm/gdm-session-worker_xserver-path.patch
@@ -0,0 +1,17 @@
+diff --git a/daemon/gdm-session-worker.c.orig b/daemon/gdm-session-worker.c
+index 7bbda49..592691d 100644
+--- a/daemon/gdm-session-worker.c.orig
++++ b/daemon/gdm-session-worker.c
+@@ -1557,6 +1557,12 @@ gdm_session_worker_accredit_user (GdmSessionWorker *worker,
+ goto out;
+ }
+
++ if (g_getenv ("GDM_X_SERVER_EXTRA_ARGS") != NULL) {
++ g_debug ("forwarding GDM_X_SERVER_EXTRA_ARGS= %s", g_getenv("GDM_X_SERVER_EXTRA_ARGS"));
++ gdm_session_worker_set_environment_variable (worker, "GDM_X_SERVER_EXTRA_ARGS",
++ g_getenv("GDM_X_SERVER_EXTRA_ARGS"));
++ }
++
+ gdm_session_worker_update_environment_from_passwd_info (worker,
+ uid,
+ gid,
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/gdm-x-session_extra_args.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/gdm-x-session_extra_args.patch
new file mode 100644
index 00000000000..66071aa4af8
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gdm/gdm-x-session_extra_args.patch
@@ -0,0 +1,38 @@
+diff --git a/daemon/gdm-x-session.c.orig b/daemon/gdm-x-session.c
+index d835b34..1f4b7f1 100644
+--- a/daemon/gdm-x-session.c.orig
++++ b/daemon/gdm-x-session.c
+@@ -211,6 +211,7 @@ spawn_x_server (State *state,
+ char *vt_string = NULL;
+ char *display_number;
+ gsize display_number_size;
++ gchar **xserver_extra_args = NULL;
+
+ auth_file = prepare_auth_file ();
+
+@@ -285,6 +286,17 @@ spawn_x_server (State *state,
+ if (state->debug_enabled) {
+ g_ptr_array_add (arguments, "-core");
+ }
++
++ if (g_getenv ("GDM_X_SERVER_EXTRA_ARGS") != NULL) {
++ g_debug ("using GDM_X_SERVER_EXTRA_ARGS: %s", g_getenv("GDM_X_SERVER_EXTRA_ARGS"));
++ xserver_extra_args = g_strsplit(g_getenv("GDM_X_SERVER_EXTRA_ARGS"), " ", -1);
++ for (gchar **extra_arg = xserver_extra_args; *extra_arg; extra_arg++) {
++ if (strlen(*extra_arg) < 1) continue;
++ g_debug ("adding: %s", *extra_arg);
++ g_ptr_array_add (arguments, *extra_arg);
++ }
++ }
++
+ g_ptr_array_add (arguments, NULL);
+
+ subprocess = g_subprocess_launcher_spawnv (launcher,
+@@ -332,6 +344,7 @@ spawn_x_server (State *state,
+
+ is_running = TRUE;
+ out:
++ g_strfreev(xserver_extra_args);
+ g_clear_pointer (&auth_file, g_free);
+ g_clear_object (&data_stream);
+ g_clear_object (&subprocess);
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/gdm-x-session_path.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/gdm-x-session_path.patch
new file mode 100644
index 00000000000..84081f4786c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gdm/gdm-x-session_path.patch
@@ -0,0 +1,19 @@
+diff --git a/daemon/gdm-x-session.c.orig b/daemon/gdm-x-session.c
+index d835b34..86f0d47 100644
+--- a/daemon/gdm-x-session.c.orig
++++ b/daemon/gdm-x-session.c
+@@ -240,7 +240,13 @@ spawn_x_server (State *state,
+
+ display_fd_string = g_strdup_printf ("%d", DISPLAY_FILENO);
+
+- g_ptr_array_add (arguments, X_SERVER);
++ if (g_getenv ("GDM_X_SERVER") != NULL) {
++ g_debug ("using GDM_X_SERVER: %s", g_getenv("GDM_X_SERVER"));
++ g_ptr_array_add (arguments, g_getenv("GDM_X_SERVER"));
++ } else {
++ g_debug ("GDM_X_SERVER not set, using default: %s", X_SERVER);
++ g_ptr_array_add (arguments, X_SERVER);
++ }
+
+ if (vt_string != NULL) {
+ g_ptr_array_add (arguments, vt_string);
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/libsystemd.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/libsystemd.patch
new file mode 100644
index 00000000000..4556f418cc8
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gdm/libsystemd.patch
@@ -0,0 +1,21 @@
+https://github.com/GNOME/gdm/commit/eee5bf72c9bb1c1d62eb0e7102088ae3b9a188cd
+--- a/configure.ac 2016-05-27 11:10:44.589740789 +0200
++++ b/configure.ac 2016-05-27 11:11:00.146427723 +0200
+@@ -888,7 +888,7 @@
+ dnl ---------------------------------------------------------------------------
+
+ PKG_CHECK_MODULES(SYSTEMD,
+- [libsystemd-login >= 186 libsystemd-daemon],
++ [libsystemd],
+ [have_systemd=yes], [have_systemd=no])
+
+ if test "x$with_systemd" = "xauto" ; then
+@@ -912,7 +912,7 @@
+ AC_SUBST(SYSTEMD_LIBS)
+
+ PKG_CHECK_MODULES(JOURNALD,
+- [libsystemd-journal],
++ [libsystemd],
+ [have_journald=yes], [have_journald=no])
+
+ if test "x$enable_systemd_journal" = "xauto" ; then
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/no-dbus-launch.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/no-dbus-launch.patch
new file mode 100644
index 00000000000..c87554078c7
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gdm/no-dbus-launch.patch
@@ -0,0 +1,20 @@
+--- a/daemon/gdm-launch-environment.c 2015-06-22 15:11:07.277474398 +0000
++++ b/daemon/gdm-launch-environment.c 2015-06-22 15:12:31.301157665 +0000
+@@ -48,8 +48,6 @@
+ #include "gdm-session-enum-types.h"
+ #include "gdm-launch-environment.h"
+
+-#define DBUS_LAUNCH_COMMAND BINDIR "/dbus-launch --exit-with-session"
+-
+ extern char **environ;
+
+ #define GDM_LAUNCH_ENVIRONMENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_LAUNCH_ENVIRONMENT, GdmLaunchEnvironmentPrivate))
+@@ -512,7 +510,7 @@
+ gdm_session_select_program (launch_environment->priv->session, launch_environment->priv->command);
+ } else {
+ /* wrap it in dbus-launch */
+- char *command = g_strdup_printf ("%s %s", DBUS_LAUNCH_COMMAND, launch_environment->priv->command);
++ char *command = g_strdup (launch_environment->priv->command);
+
+ gdm_session_select_program (launch_environment->priv->session, command);
+ g_free (command);
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/sessions_dir.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/sessions_dir.patch
new file mode 100644
index 00000000000..9714a68600a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gdm/sessions_dir.patch
@@ -0,0 +1,21 @@
+diff --git a/daemon/gdm-session.c.orig b/daemon/gdm-session.c
+index b839fea..053d4ac 100644
+--- a/daemon/gdm-session.c.orig
++++ b/daemon/gdm-session.c
+@@ -344,12 +344,16 @@ get_system_session_dirs (GdmSession *self)
+ #ifdef ENABLE_WAYLAND_SUPPORT
+ DATADIR "/wayland-sessions/",
+ #endif
++ "/var/empty",
+ "/etc/X11/sessions/",
+ DMCONFDIR "/Sessions/",
+ DATADIR "/gdm/BuiltInSessions/",
+ DATADIR "/xsessions/",
+ NULL
+ };
++ if (getenv("GDM_SESSIONS_DIR") != NULL) {
++ search_dirs[1] = getenv("GDM_SESSIONS_DIR");
++ };
+
+ #ifdef ENABLE_WAYLAND_SUPPORT
+ if (self->priv->ignore_wayland) {
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/src.nix b/pkgs/desktops/gnome-3/3.22/core/gdm/src.nix
new file mode 100644
index 00000000000..795be7f4cfe
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gdm/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gdm-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gdm/3.22/gdm-3.22.0.tar.xz;
+ sha256 = "b9180d07c6a4a3fb0e8df6bcb4f333008cb3071f0ef81e02f081ff8a144f62d4";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/xserver_path.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/xserver_path.patch
new file mode 100644
index 00000000000..3f2ec808cd6
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gdm/xserver_path.patch
@@ -0,0 +1,17 @@
+diff --git a/daemon/gdm-server.c.orig b/daemon/gdm-server.c
+index 6357d34..5bef5c8 100644
+--- a/daemon/gdm-server.c.orig
++++ b/daemon/gdm-server.c
+@@ -264,7 +264,11 @@ gdm_server_init_command (GdmServer *server)
+ return;
+
+ fallback:
+- server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
++ if (g_getenv("GDM_X_SERVER") != NULL) {
++ server->priv->command = g_strdup (g_getenv("GDM_X_SERVER"));
++ } else {
++ server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
++ }
+
+ }
+
diff --git a/pkgs/desktops/gnome-3/3.22/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/3.22/core/geocode-glib/default.nix
new file mode 100644
index 00000000000..4d75bdc4996
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/geocode-glib/default.nix
@@ -0,0 +1,14 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json_glib }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = with gnome3;
+ [ intltool pkgconfig glib libsoup json_glib ];
+
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/geocode-glib/src.nix b/pkgs/desktops/gnome-3/3.22/core/geocode-glib/src.nix
new file mode 100644
index 00000000000..135e05e90e9
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/geocode-glib/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "geocode-glib-3.20.1";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/geocode-glib/3.20/geocode-glib-3.20.1.tar.xz;
+ sha256 = "669fc832cabf8cc2f0fc4194a8fa464cdb9c03ebf9aca5353d7cf935ba8637a2";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.22/core/gjs/default.nix
new file mode 100644
index 00000000000..ac5572decb8
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gjs/default.nix
@@ -0,0 +1,20 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, gtk3, gobjectIntrospection
+, spidermonkey_24, pango, readline, glib, libxml2, dbus }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = [ libxml2 gobjectIntrospection pkgconfig gtk3 glib pango readline dbus ];
+
+ propagatedBuildInputs = [ spidermonkey_24 ];
+
+ postInstall = ''
+ sed 's|-lreadline|-L${readline.out}/lib -lreadline|g' -i $out/lib/libgjs.la
+ '';
+
+ meta = with stdenv.lib; {
+ maintainers = gnome3.maintainers;
+ platforms = platforms.linux;
+ };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gjs/src.nix b/pkgs/desktops/gnome-3/3.22/core/gjs/src.nix
new file mode 100644
index 00000000000..1f4ef08f9b1
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gjs/src.nix
@@ -0,0 +1,11 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: rec {
+ name = "gjs-${major}.0";
+ major = "1.46";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/gjs/${major}/${name}.tar.xz";
+ sha256 = "2283591fa70785443793e1d7db66071b36052d707075f229baeb468d8dd25ad4";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/default.nix
new file mode 100644
index 00000000000..32d6d6e7535
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/default.nix
@@ -0,0 +1,12 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, intltool }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ nativeBuildInputs = [ pkgconfig intltool ];
+
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/src.nix
new file mode 100644
index 00000000000..2b20cae9cda
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-backgrounds-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-backgrounds/3.22/gnome-backgrounds-3.22.0.tar.xz;
+ sha256 = "6c83e01647375d5c409312d7215d038d705a3f214179227ed37d3158afdd001f";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-bluetooth/default.nix
new file mode 100644
index 00000000000..7fae0b5c67f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-bluetooth/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, gnome3, pkgconfig, gtk3, intltool, glib
+, udev, itstool, libxml2, makeWrapper, libnotify, libcanberra_gtk3 }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = [ pkgconfig intltool glib gtk3 udev libxml2 gnome3.defaultIconTheme
+ makeWrapper gnome3.gsettings_desktop_schemas itstool
+ libnotify libcanberra_gtk3 ];
+
+ preFixup = ''
+ wrapProgram "$out/bin/bluetooth-sendto" \
+ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en;
+ description = "Application that let you manage Bluetooth in the GNOME destkop";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-bluetooth/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-bluetooth/src.nix
new file mode 100644
index 00000000000..474d4722b4a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-bluetooth/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-bluetooth-3.20.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-bluetooth/3.20/gnome-bluetooth-3.20.0.tar.xz;
+ sha256 = "93b3ca16b348a168d044b3f777049b7dba2a9292c4adb2751a771e3bc5e4eb53";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/default.nix
new file mode 100644
index 00000000000..e1b81339e91
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, intltool, fetchurl, pkgconfig, libxml2
+, bash, gtk3, glib, wrapGAppsHook
+, itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp, libsoup }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
+
+ propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+ nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+
+ buildInputs = [ bash gtk3 glib intltool itstool
+ libxml2 gnome3.gtksourceview mpfr gmp
+ gdk_pixbuf gnome3.defaultIconTheme librsvg
+ gnome3.gsettings_desktop_schemas gnome3.dconf libsoup ];
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/action/show/Apps/Calculator;
+ description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/src.nix
new file mode 100644
index 00000000000..891ce5c58f6
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-calculator-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-calculator/3.22/gnome-calculator-3.22.0.tar.xz;
+ sha256 = "fa0f192fc0cad43a8520d4015780ce008d9fc6201bd2dd6dc06365ba45458728";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-common/default.nix
new file mode 100644
index 00000000000..f9261e183ef
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-common/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, which, gnome3, autoconf, automake }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ patches = [(fetchurl {
+ name = "gnome-common-patch";
+ url = "https://bug697543.bugzilla-attachments.gnome.org/attachment.cgi?id=240935";
+ sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl";
+ })];
+
+ propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome_common tends to require which
+
+ meta = with stdenv.lib; {
+ maintainers = gnome3.maintainers;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-common/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-common/src.nix
new file mode 100644
index 00000000000..8ffe7e20e1a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-common/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-common-3.18.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-common/3.18/gnome-common-3.18.0.tar.xz;
+ sha256 = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix
new file mode 100644
index 00000000000..8097cf32ba6
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, intltool, fetchurl, evolution_data_server, db
+, pkgconfig, gtk3, glib, libsecret
+, libchamplain, clutter_gtk, geocode_glib
+, bash, makeWrapper, itstool, folks, libnotify, libxml2
+, gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss
+, libsoup, vala_0_32, dbus_glib, automake115x, autoconf }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ doCheck = true;
+
+ propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard evolution_data_server ];
+
+ # force build from vala
+ preBuild = ''
+ touch src/*.vala
+ '';
+
+ buildInputs = [ pkgconfig gtk3 glib intltool itstool evolution_data_server
+ gnome3.gsettings_desktop_schemas makeWrapper file libnotify
+ folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib
+ libxml2 libsoup gnome3.gnome_online_accounts nspr nss
+ gdk_pixbuf gnome3.defaultIconTheme librsvg
+ libchamplain clutter_gtk geocode_glib
+ vala_0_32 automake115x autoconf db ];
+
+ preFixup = ''
+ for f in "$out/bin/gnome-contacts" "$out/libexec/gnome-contacts-search-provider"; do
+ wrapProgram $f \
+ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+ done
+ '';
+
+ patches = [ ./gio_unix.patch ];
+
+ patchFlags = "-p0";
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Contacts;
+ description = "Contacts is GNOME's integrated address book";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/gio_unix.patch b/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/gio_unix.patch
new file mode 100644
index 00000000000..f1b3d3c94ac
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/gio_unix.patch
@@ -0,0 +1,10 @@
+--- configure.ac.orig 2015-04-09 18:45:50.581232289 +0200
++++ configure.ac 2015-04-09 18:45:59.744280137 +0200
+@@ -54,6 +54,7 @@
+ champlain-0.12
+ clutter-gtk-1.0
+ geocode-glib-1.0 >= 3.15.3
++ gio-unix-2.0
+ "
+ PKG_CHECK_MODULES(CONTACTS, [$pkg_modules])
+
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/src.nix
new file mode 100644
index 00000000000..4409747169b
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-contacts-3.22.1";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-contacts/3.22/gnome-contacts-3.22.1.tar.xz;
+ sha256 = "e45297fb6f379a978605f7e183201be70dff2912f55072a363bdb1f67d9fe87b";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix
new file mode 100644
index 00000000000..78fc82ebaed
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix
@@ -0,0 +1,56 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper
+, 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
+, libwacom, samba, shared_mime_info, tzdata, icu, libtool, udev
+, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk
+, fontconfig, sound-theme-freedesktop, grilo }:
+
+# http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules
+# TODO: bluetooth, wacom, printers
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ propagatedUserEnvPkgs =
+ [ gnome3.gnome_themes_standard gnome3.libgnomekbd ];
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=752596
+ enableParallelBuilding = false;
+
+ buildInputs = with gnome3;
+ [ 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
+ shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
+ gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk
+ gnome3.vino udev libcanberra_gtk3 libgudev
+ networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth grilo ];
+
+ preBuild = ''
+ substituteInPlace panels/datetime/tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab"
+
+ # hack to make test-endianess happy
+ mkdir -p $out/share/locale
+ substituteInPlace panels/datetime/test-endianess.c --replace "/usr/share/locale/" "$out/share/locale/"
+ '';
+
+ preFixup = with gnome3; ''
+ wrapProgram $out/bin/gnome-control-center \
+ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${sound-theme-freedesktop}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+ for i in $out/share/applications/*; do
+ substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center"
+ done
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Utilities to configure the GNOME desktop";
+ license = licenses.gpl2Plus;
+ maintainers = gnome3.maintainers;
+ platforms = platforms.linux;
+ };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/src.nix
new file mode 100644
index 00000000000..bbe7f5a009d
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-control-center-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-control-center/3.22/gnome-control-center-3.22.0.tar.xz;
+ sha256 = "d264ae919aeeb27987dcdd5af5577fad0590e1f184f506b563c89f356aab5052";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-desktop/default.nix
new file mode 100644
index 00000000000..7265f09731f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-desktop/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gnome3, gtk3, glib
+, intltool, gnome_doc_utils, libxkbfile, xkeyboard_config, isocodes, itstool, wayland
+, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ # this should probably be setuphook for glib
+ NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
+
+ enableParallelBuilding = true;
+
+ buildInputs = [ pkgconfig python libxml2Python libxslt which libX11
+ xkeyboard_config isocodes itstool wayland
+ gtk3 glib intltool gnome_doc_utils libxkbfile
+ gobjectIntrospection ];
+
+ propagatedBuildInputs = [ gnome3.gsettings_desktop_schemas ];
+
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-desktop/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-desktop/src.nix
new file mode 100644
index 00000000000..8efa20f01dc
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-desktop/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-desktop-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-desktop/3.22/gnome-desktop-3.22.0.tar.xz;
+ sha256 = "cff36ccd8d0a62177a4c1513ec70d13ead3b84fdc208ba54199cf7616f05644d";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-dictionary/default.nix
new file mode 100644
index 00000000000..c94c178558d
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-dictionary/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, intltool, fetchurl
+, pkgconfig, gtk3, glib
+, bash, makeWrapper, itstool, libxml2
+, gnome3, librsvg, gdk_pixbuf, file }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ doCheck = true;
+
+ NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
+
+ propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+ propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
+
+ buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 file
+ gnome3.gsettings_desktop_schemas makeWrapper ];
+
+ preFixup = ''
+ wrapProgram "$out/bin/gnome-dictionary" \
+ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+ --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Dictionary;
+ description = "Dictionary is the GNOME application to look up definitions";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-dictionary/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-dictionary/src.nix
new file mode 100644
index 00000000000..249cb314c2a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-dictionary/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-dictionary-3.20.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-dictionary/3.20/gnome-dictionary-3.20.0.tar.xz;
+ sha256 = "efb36377d46eff9291d3b8fec37baab2355f9dc8bc7edb791b6a625574716121";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/default.nix
new file mode 100644
index 00000000000..c329d68674a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread
+, bash, gtk3, glib, makeWrapper, cracklib, libnotify
+, itstool, gnome3, librsvg, gdk_pixbuf, libxml2, python
+, libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ doCheck = true;
+
+ NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
+
+ propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+ buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
+ libxslt libtool libsecret libpwquality cracklib
+ libnotify libdvdread libcanberra_gtk3 docbook_xsl
+ gdk_pixbuf gnome3.defaultIconTheme
+ librsvg udisks2 gnome3.gnome_settings_daemon
+ gnome3.gsettings_desktop_schemas makeWrapper libxml2 ];
+
+ preFixup = ''
+ wrapProgram "$out/bin/gnome-disks" \
+ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://en.wikipedia.org/wiki/GNOME_Disks;
+ description = "A udisks graphical front-end";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/src.nix
new file mode 100644
index 00000000000..c0a0798cd27
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-disk-utility-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-disk-utility/3.22/gnome-disk-utility-3.22.0.tar.xz;
+ sha256 = "757d4ff438e63ac337a8681c9ef184a36143b39494381b609cdf889128d7fb22";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/default.nix
new file mode 100644
index 00000000000..d0ec2307a85
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, intltool, fetchurl
+, pkgconfig, gtk3, glib
+, bash, makeWrapper, itstool
+, gnome3, librsvg, gdk_pixbuf }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ doCheck = true;
+
+ NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
+
+ propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+ buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gnome_desktop
+ gdk_pixbuf gnome3.defaultIconTheme librsvg
+ gnome3.gsettings_desktop_schemas makeWrapper ];
+
+ preFixup = ''
+ wrapProgram "$out/bin/gnome-font-viewer" \
+ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Program that can preview fonts and create thumbnails for fonts";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/src.nix
new file mode 100644
index 00000000000..ee87655bba7
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-font-viewer-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-font-viewer/3.22/gnome-font-viewer-3.22.0.tar.xz;
+ sha256 = "bd27cbc523016711508d7913878f32e262893cfcc7e10795171dbf8e35af9be0";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/default.nix
new file mode 100644
index 00000000000..3ea108808f5
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt
+, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, makeWrapper
+, docbook_xsl_ns, docbook_xsl, gnome3 }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = with gnome3; [
+ dbus libgcrypt pam python gtk3 gconf libgnome_keyring
+ pango gcr gdk_pixbuf atk p11_kit makeWrapper
+ ];
+
+ propagatedBuildInputs = [ glib libtasn1 libxslt ];
+
+ nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl ];
+
+ configureFlags = [
+ "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories
+ "--with-pkcs11-modules=$$out/lib/pkcs11/"
+ ];
+
+ preFixup = ''
+ wrapProgram "$out/bin/gnome-keyring" \
+ --prefix XDG_DATA_DIRS : "${glib.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+ wrapProgram "$out/bin/gnome-keyring-daemon" \
+ --prefix XDG_DATA_DIRS : "${glib.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+ '';
+
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/src.nix
new file mode 100644
index 00000000000..88179fff3c7
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-keyring-3.20.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-keyring/3.20/gnome-keyring-3.20.0.tar.xz;
+ sha256 = "bc17cecd748a0e46e302171d11c3ae3d76bba5258c441fabec3786f418e7ec99";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-menus/default.nix
new file mode 100644
index 00000000000..90209634fbf
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-menus/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, intltool, pkgconfig, glib, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+ name = "gnome-menus-${version}";
+ version = "3.10.1";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/gnome-menus/3.10/${name}.tar.xz";
+ sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6";
+ };
+
+ makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
+
+ buildInputs = [ intltool pkgconfig glib gobjectIntrospection ];
+
+ meta = {
+ homepage = "http://www.gnome.org";
+ description = "Gnome menu specification";
+
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/default.nix
new file mode 100644
index 00000000000..85c15042614
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, makeWrapper
+, webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common
+, telepathy_glib, intltool, dbus_libs, icu
+, libsoup, docbook_xsl_ns, docbook_xsl, gnome3
+}:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0";
+
+ enableParallelBuilding = true;
+
+ buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest gnome_common makeWrapper
+ libsecret dbus_glib telepathy_glib intltool icu libsoup
+ docbook_xsl_ns docbook_xsl gnome3.defaultIconTheme ];
+
+ preFixup = ''
+ for f in "$out/libexec/"*; do
+ wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+ done
+ '';
+
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/src.nix
new file mode 100644
index 00000000000..3c1c426d264
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-online-accounts-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-online-accounts/3.22/gnome-online-accounts-3.22.0.tar.xz;
+ sha256 = "aacce93a71bf5e687a45ae0d00f31ea0625ddd8143235d6d8c64c4ec21bbfa33";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-online-miners/default.nix
new file mode 100644
index 00000000000..90fc3a8737a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-online-miners/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2
+, libsoup, json_glib, gmp, openssl, makeWrapper }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = [ pkgconfig glib gnome3.libgdata libxml2 libsoup gmp openssl
+ gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins
+ gnome3.gnome_online_accounts makeWrapper gnome3.libmediaart
+ gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest ];
+
+ enableParallelBuilding = true;
+
+ preFixup = ''
+ for f in $out/libexec/*; do
+ wrapProgram "$f" \
+ --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-${gnome3.grilo-plugins.major}"
+ done
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners;
+ description = "A set of crawlers that go through your online content and index them locally in Tracker";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-online-miners/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-online-miners/src.nix
new file mode 100644
index 00000000000..2bafae9967e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-online-miners/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-online-miners-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-online-miners/3.22/gnome-online-miners-3.22.0.tar.xz;
+ sha256 = "bf51666866527b236d980fa3a0d036581a85987c59d604566ccb3ad685dd8bb8";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix
new file mode 100644
index 00000000000..29ebe8b0ca6
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, intltool, fetchurl, pkgconfig, libcanberra_gtk3
+, bash, gtk3, glib, makeWrapper
+, itstool, gnome3, librsvg, gdk_pixbuf }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ doCheck = true;
+
+ NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
+
+ propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+ propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
+
+ buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libcanberra_gtk3
+ gnome3.gsettings_desktop_schemas makeWrapper ];
+
+ preFixup = ''
+ wrapProgram "$out/bin/gnome-screenshot" \
+ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+ --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://en.wikipedia.org/wiki/GNOME_Screenshot;
+ description = "Utility used in the GNOME desktop environment for taking screenshots";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/src.nix
new file mode 100644
index 00000000000..3668417d280
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-screenshot-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-screenshot/3.22/gnome-screenshot-3.22.0.tar.xz;
+ sha256 = "8a05f14b3c7c6cb42f9848ad0332034c7fe5c34a69742910203588fd60b00230";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix
new file mode 100644
index 00000000000..2f4aefe69a8
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix
@@ -0,0 +1,34 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower
+, libxslt, intltool, makeWrapper, systemd, xorg }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ configureFlags = "--enable-systemd";
+
+ buildInputs = with gnome3;
+ [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt
+ gnome3.gnome_settings_daemon xorg.xtrans gnome3.defaultIconTheme
+ gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ];
+
+ # FIXME: glib binaries shouldn't be in .dev!
+ preFixup = ''
+ for desktopFile in $(grep -rl "Exec=gnome-session" $out/share)
+ do
+ echo "Patching gnome-session path in: $desktopFile"
+ sed -i "s,^Exec=gnome-session,Exec=$out/bin/gnome-session --debug," $desktopFile
+ done
+ wrapProgram "$out/bin/gnome-session" \
+ --prefix PATH : "${glib.dev}/bin" \
+ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+ --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
+ --suffix XDG_DATA_DIRS : "${gnome3.gnome_shell}/share" \
+ --suffix XDG_CONFIG_DIRS : "${gnome3.gnome_settings_daemon}/etc/xdg"
+ '';
+
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-session/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-session/src.nix
new file mode 100644
index 00000000000..29f1ad93abb
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-session/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-session-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-session/3.22/gnome-session-3.22.0.tar.xz;
+ sha256 = "ec5c5e133c8ff1c044802eb887f4911183c45ca2d9de4ce29c6f10768ddc8e42";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix
new file mode 100644
index 00000000000..00999353c2f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix
@@ -0,0 +1,32 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst
+, libxkbfile, libpulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit
+, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libtool, networkmanager
+, docbook_xsl, docbook_xsl_ns, makeWrapper, ibus, xkeyboard_config }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ # fatal error: gio/gunixfdlist.h: No such file or directory
+ NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
+
+ buildInputs = with gnome3;
+ [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas networkmanager
+ libnotify gnome_desktop lcms2 libXtst libxkbfile libpulseaudio
+ libcanberra_gtk3 upower colord libgweather xkeyboard_config
+ polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt
+ libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ];
+
+ # FIXME: glib binaries shouldn't be in .dev!
+ preFixup = ''
+ wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \
+ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+ --prefix PATH : "${glib.dev}/bin" \
+ --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
+ '';
+
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/src.nix
new file mode 100644
index 00000000000..1457aab1d01
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-settings-daemon-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-settings-daemon/3.22/gnome-settings-daemon-3.22.0.tar.xz;
+ sha256 = "430e42c4f2cc4cb72b669a44c744343f1592ec00d26d2168745a878afe73f82b";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-shell-extensions/default.nix
new file mode 100644
index 00000000000..e9eae87f14e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-shell-extensions/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, intltool, fetchurl, libgtop, pkgconfig, gtk3, glib
+, bash, makeWrapper, itstool, gnome3, file }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ doCheck = true;
+
+ buildInputs = [ pkgconfig gtk3 glib libgtop intltool itstool
+ makeWrapper file ];
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Projects/GnomeShell/Extensions;
+ description = "Modify and extend GNOME Shell functionality and behavior";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-shell-extensions/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-shell-extensions/src.nix
new file mode 100644
index 00000000000..e17d02a011f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-shell-extensions/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-shell-extensions-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-shell-extensions/3.22/gnome-shell-extensions-3.22.0.tar.xz;
+ sha256 = "317b35f6f1299d5162e693d39b21031f5fe875083c4020217db3ec056e245fc5";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix
new file mode 100644
index 00000000000..dccdb8a5a5f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix
@@ -0,0 +1,65 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret
+, python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at_spi2_core
+, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip
+, sqlite, libgweather, libcanberra_gtk3
+, libpulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper
+, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }:
+
+# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ # Needed to find /etc/NetworkManager/VPN
+ configureFlags = [ "--sysconfdir=/etc" ];
+
+ buildInputs = with gnome3;
+ [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice
+ 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
+ libcanberra_gtk3 gnome_control_center
+ defaultIconTheme sqlite gnome3.gnome-bluetooth
+ libgweather # not declared at build time, but typelib is needed at runtime
+ gnome3.gnome-clocks # schemas needed
+ at_spi2_core upower ibus gnome_desktop telepathy_logger gnome3.gnome_settings_daemon ];
+
+ propagatedBuildInputs = [ python3Packages.pygobject3 python3Packages.python gobjectIntrospection ];
+
+ installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ];
+
+ preBuild = ''
+ patchShebangs src/data-to-c.pl
+ substituteInPlace data/Makefile --replace " install-keysDATA" ""
+ '';
+
+ preFixup = with gnome3; ''
+ wrapProgram "$out/bin/gnome-shell" \
+ --prefix PATH : "${unzip}/bin" \
+ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+ --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS" \
+ --suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+
+ wrapProgram "$out/bin/gnome-shell-extension-tool" \
+ --prefix PYTHONPATH : "${python3Packages.pygobject3}/${python3Packages.python.sitePackages}:$PYTHONPATH"
+
+ wrapProgram "$out/libexec/gnome-shell-calendar-server" \
+ --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+
+ echo "${unzip}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path
+ '';
+
+ enableParallelBuilding = true;
+
+ passthru = {
+ mozillaPlugin = "/lib/mozilla/plugins";
+ };
+
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-shell/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-shell/src.nix
new file mode 100644
index 00000000000..b835eea019c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-shell/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-shell-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-shell/3.22/gnome-shell-3.22.0.tar.xz;
+ sha256 = "d8d22cc19e28641f2eac47e812065c209e4866b6e5f9d636647a0a8c96e5dca9";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-software/default.nix
new file mode 100644
index 00000000000..a6a196625b4
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-software/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gnome3, wrapGAppsHook, packagekit
+, appstream-glib, libsoup, polkit, attr, acl, libyaml, isocodes, gtkspell3
+, json_glib, libsecret }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ];
+ buildInputs = [ gnome3.gtk packagekit appstream-glib libsoup
+ gnome3.gsettings_desktop_schemas gnome3.gnome_desktop
+ gtkspell3 json_glib libsecret
+ polkit attr acl libyaml ];
+ propagatedBuildInputs = [ isocodes ];
+
+ postInstall = ''
+ mkdir -p $out/share/xml/
+ ln -s ${isocodes}/share/xml/iso-codes $out/share/xml/iso-codes
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://www.freedesktop.org/software/PackageKit/;
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ description = "GNOME Software lets you install and update applications and system extensions.";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-software/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-software/src.nix
new file mode 100644
index 00000000000..a05e6bd09e5
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-software/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-software-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-software/3.22/gnome-software-3.22.0.tar.xz;
+ sha256 = "22e30c84851b0768bd46dbb90de6d3308acdc2973d3ca4ee52a19cdb5a0182ba";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-system-log/default.nix
new file mode 100644
index 00000000000..50ee229cfa4
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-system-log/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, intltool, fetchurl, pkgconfig
+, bash, gtk3, glib, makeWrapper
+, itstool, gnome3, librsvg, gdk_pixbuf, libxml2 }:
+
+stdenv.mkDerivation rec {
+ name = "gnome-system-log-3.9.90";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/gnome-system-log/3.9/${name}.tar.xz";
+ sha256 = "9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411";
+ };
+
+ doCheck = true;
+
+ NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
+
+ propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+ propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
+
+ buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
+ gnome3.gsettings_desktop_schemas makeWrapper libxml2 ];
+
+ preFixup = ''
+ wrapProgram "$out/bin/gnome-system-log" \
+ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+ --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://help.gnome.org/users/gnome-system-log/3.9/;
+ description = "Graphical, menu-driven viewer that you can use to view and monitor your system logs";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/default.nix
new file mode 100644
index 00000000000..bdbdefecf22
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2
+, bash, gtk3, glib, makeWrapper
+, itstool, gnome3, librsvg, gdk_pixbuf, libgtop }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ doCheck = true;
+
+ propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+ buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2
+ gtkmm3 libgtop makeWrapper
+ gdk_pixbuf gnome3.defaultIconTheme librsvg
+ gnome3.gsettings_desktop_schemas ];
+
+ preFixup = ''
+ wrapProgram "$out/bin/gnome-system-monitor" \
+ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+ '';
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = https://help.gnome.org/users/gnome-system-monitor/3.12/;
+ description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/src.nix
new file mode 100644
index 00000000000..e8e9ba37501
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-system-monitor-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-system-monitor/3.22/gnome-system-monitor-3.22.0.tar.xz;
+ sha256 = "4339d36c2f7b702652ee03424a241f855992c583bb437d7083c61d8dcfe3fff8";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/default.nix
new file mode 100644
index 00000000000..073a791ac3c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango
+, gnome_doc_utils, intltool, libX11, which, libuuid, vala_0_32
+, desktop_file_utils, itstool, wrapGAppsHook, appdata-tools }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools
+ gnome3.dconf itstool gnome3.nautilus vala_0_32 ];
+
+ nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2
+ desktop_file_utils wrapGAppsHook ];
+
+ # Silly ./configure, it looks for dbus file from gnome-shell in the
+ # installation tree of the package it is configuring.
+ postPatch = ''
+ substituteInPlace configure --replace '$(eval echo $(eval echo $(eval echo ''${dbusinterfacedir})))/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome_shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml"
+ substituteInPlace src/Makefile.in --replace '$(dbusinterfacedir)/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome_shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml"
+ '';
+
+ # FIXME: enable for gnome3
+ configureFlags = [ "--disable-migration" ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "The GNOME Terminal Emulator";
+ homepage = https://wiki.gnome.org/Apps/Terminal/;
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/src.nix
new file mode 100644
index 00000000000..5d8088d78d3
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-terminal-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-terminal/3.22/gnome-terminal-3.22.0.tar.xz;
+ sha256 = "97e6b1b4128ac133d8917b3940c71ddf9b89d189c5ac8402b1060126733993ed";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-themes-standard/default.nix
new file mode 100644
index 00000000000..5cc3385ad84
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-themes-standard/default.nix
@@ -0,0 +1,14 @@
+{ stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2
+, gdk_pixbuf }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf
+ gnome3.defaultIconTheme ];
+
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-themes-standard/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-themes-standard/src.nix
new file mode 100644
index 00000000000..a5ccd23b9fc
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-themes-standard/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-themes-standard-3.22.1";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-themes-standard/3.22/gnome-themes-standard-3.22.1.tar.xz;
+ sha256 = "90f6f4e79eaa42e424fa35144cdbcb5db93db56e73200ac045742ba320febb54";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-user-docs/default.nix
new file mode 100644
index 00000000000..4f02673e036
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-user-docs/default.nix
@@ -0,0 +1,15 @@
+{ stdenv, fetchurl, pkgconfig, file, gnome3, itstool, libxml2, intltool }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = [ pkgconfig gnome3.yelp itstool libxml2 intltool ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://help.gnome.org/users/gnome-help/${gnome3.version}";
+ description = "User and system administration help for the GNOME desktop";
+ maintainers = gnome3.maintainers;
+ license = licenses.cc-by-30;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-user-docs/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-user-docs/src.nix
new file mode 100644
index 00000000000..e7e67e0b4fb
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-user-docs/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-user-docs-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-user-docs/3.22/gnome-user-docs-3.22.0.tar.xz;
+ sha256 = "7467825a1c56ae2522fe9e36622a84b8887c731bb5f24cecfbf49acc66f6e3fc";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-user-share/default.nix
new file mode 100644
index 00000000000..f8b40e42d02
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-user-share/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, intltool, fetchurl, apacheHttpd_2_2, nautilus
+, pkgconfig, gtk3, glib, libxml2, gnused, systemd
+, bash, makeWrapper, itstool, libnotify, libtool, mod_dnssd
+, gnome3, librsvg, gdk_pixbuf, file, libcanberra_gtk3 }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ doCheck = true;
+
+ NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
+
+ preConfigure = ''
+ sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' -i data/dav_user_2.2.conf
+ '';
+
+ configureFlags = [ "--with-httpd=${apacheHttpd_2_2.out}/bin/httpd"
+ "--with-modules-path=${apacheHttpd_2_2.dev}/modules"
+ "--with-systemduserunitdir=$(out)/etc/systemd/user"
+ "--disable-bluetooth"
+ "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ];
+
+ buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool
+ makeWrapper file gdk_pixbuf gnome3.defaultIconTheme librsvg
+ nautilus libnotify libcanberra_gtk3 systemd ];
+
+ postInstall = ''
+ mkdir -p $out/share/gsettings-schemas/$name
+ mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name
+ ${glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas
+ '';
+
+ preFixup = ''
+ wrapProgram "$out/libexec/gnome-user-share-webdav" \
+ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+ --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://help.gnome.org/users/gnome-user-share/3.8;
+ description = "Service that exports the contents of the Public folder in your home directory on the local network";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-user-share/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-user-share/src.nix
new file mode 100644
index 00000000000..2d06f9e7a7c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-user-share/src.nix
@@ -0,0 +1,12 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: rec {
+ major = "3.18";
+ minor = "3";
+ name = "gnome-user-share-${major}.${minor}";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/gnome-user-share/${major}/${name}.tar.xz";
+ sha256 = "3092fa7ad137531e35484195dde4ecbbc75a8a3d9b8209aef4c852717cf4bbf1";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/3.22/core/grilo-plugins/default.nix
new file mode 100644
index 00000000000..4b8fc90adad
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/grilo-plugins/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, pkgconfig, file, intltool, glib, sqlite
+, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp_av
+, gmime, json_glib, avahi, tracker, itstool }:
+
+stdenv.mkDerivation rec {
+ major = "0.3";
+ minor = "3";
+ name = "grilo-plugins-${major}.${minor}";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/grilo-plugins/${major}/${name}.tar.xz";
+ sha256 = "fe66e887847fef9c361bcb7226047c43b2bc22b172aaf22afd5534947cc85b9c";
+ };
+
+ installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-${major}" ];
+
+ buildInputs = [ pkgconfig gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata
+ lua5 liboauth gupnp_av sqlite gnome3.gnome_online_accounts
+ gnome3.totem-pl-parser gnome3.rest gmime json_glib
+ avahi gnome3.libmediaart tracker intltool itstool ];
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/action/show/Projects/Grilo;
+ description = "A collection of plugins for the Grilo framework";
+ maintainers = gnome3.maintainers;
+ license = licenses.lgpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/grilo/default.nix b/pkgs/desktops/gnome-3/3.22/core/grilo/default.nix
new file mode 100644
index 00000000000..0deac26c259
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/grilo/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, pkgconfig, file, intltool, glib
+, libxml2, gnome3, gobjectIntrospection, libsoup, python3Packages }:
+
+stdenv.mkDerivation rec {
+ major = "0.3"; # if you change this, also change ./setup-hook.sh
+ minor = "2";
+ name = "grilo-${major}.${minor}";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/grilo/${major}/${name}.tar.xz";
+ sha256 = "f26f684a5d76aea8dbce136750bc67d2170b36575f109292fbb78ae99ec87f5b";
+ };
+
+ setupHook = ./setup-hook.sh;
+
+ configureFlags = [ "--enable-grl-pls" "--enable-grl-net" ];
+
+ preConfigure = ''
+ for f in src/Makefile.in libs/pls/Makefile.in libs/net/Makefile.in; do
+ substituteInPlace $f --replace @INTROSPECTION_GIRDIR@ "$out/share/gir-1.0/"
+ substituteInPlace $f --replace @INTROSPECTION_TYPELIBDIR@ "$out/lib/girepository-1.0"
+ done
+ '';
+
+ buildInputs = [ pkgconfig file intltool glib libxml2 libsoup
+ gnome3.totem-pl-parser ];
+
+ propagatedBuildInputs = [ python3Packages.pygobject3 gobjectIntrospection ];
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/action/show/Projects/Grilo;
+ description = "Framework that provides access to various sources of multimedia content, using a pluggable system";
+ maintainers = gnome3.maintainers;
+ license = licenses.lgpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/grilo/setup-hook.sh b/pkgs/desktops/gnome-3/3.22/core/grilo/setup-hook.sh
new file mode 100644
index 00000000000..3291e38addb
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/grilo/setup-hook.sh
@@ -0,0 +1,7 @@
+make_grilo_find_plugins() {
+ if [ -d "$1"/lib/grilo-0.3 ]; then
+ addToSearchPath GRL_PLUGIN_PATH "$1/lib/grilo-0.3"
+ fi
+}
+
+envHooks+=(make_grilo_find_plugins)
diff --git a/pkgs/desktops/gnome-3/3.22/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/3.22/core/gsettings-desktop-schemas/default.nix
new file mode 100644
index 00000000000..5123cadbdaf
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gsettings-desktop-schemas/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection
+ # just for passthru
+, gnome3, gtk3, gsettings_desktop_schemas }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ postPatch = ''
+ for file in "background" "screensaver"; do
+ substituteInPlace "schemas/org.gnome.desktop.$file.gschema.xml.in" \
+ --replace "@datadir@" "${gnome3.gnome-backgrounds}/share/"
+ done
+ '';
+
+ buildInputs = [ glib gobjectIntrospection ];
+
+ nativeBuildInputs = [ pkgconfig intltool ];
+
+ meta = with stdenv.lib; {
+ maintainers = gnome3.maintainers;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gsettings-desktop-schemas/src.nix b/pkgs/desktops/gnome-3/3.22/core/gsettings-desktop-schemas/src.nix
new file mode 100644
index 00000000000..50a54eab7eb
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gsettings-desktop-schemas/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gsettings-desktop-schemas-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gsettings-desktop-schemas/3.22/gsettings-desktop-schemas-3.22.0.tar.xz;
+ sha256 = "0f06c7ba34c3a99e4d58b10889496133c9aaad6698ea2d8405d481c7f1a7eae1";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gsound/default.nix b/pkgs/desktops/gnome-3/3.22/core/gsound/default.nix
new file mode 100644
index 00000000000..95785d9ed4d
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gsound/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, glib, libcanberra_gtk2, gobjectIntrospection, libtool, gnome3 }:
+
+let
+ majVer = "1.0";
+in stdenv.mkDerivation rec {
+ name = "gsound-${majVer}.1";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/gsound/${majVer}/${name}.tar.xz";
+ sha256 = "ea0dd94429c0645f2f98824274ef04543fe459dd83a5449a68910acc3ba67f29";
+ };
+
+ buildInputs = [ pkgconfig glib libcanberra_gtk2 gobjectIntrospection libtool ];
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Projects/GSound;
+ description = "Small library for playing system sounds";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix
new file mode 100644
index 00000000000..aac1739a6e9
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango
+, libxml2Python, perl, intltool, gettext, gnome3 }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ propagatedBuildInputs = [ gtk3 ];
+
+ buildInputs = [ pkgconfig atk cairo glib pango
+ libxml2Python perl intltool gettext ];
+
+ preBuild = ''
+ substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share"
+ '';
+
+ patches = [ ./nix_share_path.patch ];
+
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gtksourceview/nix_share_path.patch b/pkgs/desktops/gnome-3/3.22/core/gtksourceview/nix_share_path.patch
new file mode 100644
index 00000000000..c87350167c2
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gtksourceview/nix_share_path.patch
@@ -0,0 +1,11 @@
+--- a/gtksourceview/gtksourceview-utils.c 2014-07-13 16:13:57.418687726 +0200
++++ b/gtksourceview/gtksourceview-utils.c 2014-07-13 16:14:20.550847767 +0200
+@@ -68,6 +68,8 @@
+ basename,
+ NULL));
+
++ g_ptr_array_add (dirs, g_build_filename ("@NIX_SHARE_PATH@", SOURCEVIEW_DIR, basename, NULL));
++
+ g_ptr_array_add (dirs, NULL);
+
+ return (gchar**) g_ptr_array_free (dirs, FALSE);
diff --git a/pkgs/desktops/gnome-3/3.22/core/gtksourceview/src.nix b/pkgs/desktops/gnome-3/3.22/core/gtksourceview/src.nix
new file mode 100644
index 00000000000..6e010227fc3
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gtksourceview/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gtksourceview-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gtksourceview/3.22/gtksourceview-3.22.0.tar.xz;
+ sha256 = "70657f48732427984dce6cc812bdd3f2b701c0a49e0a0a08889705b3dadcf8e5";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/default.nix b/pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/default.nix
new file mode 100644
index 00000000000..d0453ba8ebb
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, pkgconfig, gtkmm, glibmm, gtksourceview }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = [ pkgconfig glibmm gtkmm gtksourceview ];
+
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ homepage = "https://developer.gnome.org/gtksourceviewmm/";
+ description = "C++ wrapper for gtksourceview";
+ license = licenses.lgpl2;
+ maintainers = [ maintainers.juliendehos ];
+ };
+}
+
diff --git a/pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/src.nix b/pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/src.nix
new file mode 100644
index 00000000000..21618c45e05
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gtksourceviewmm-3.21.2";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gtksourceviewmm/3.21/gtksourceviewmm-3.21.2.tar.xz;
+ sha256 = "d21296d8624a1046841bfec082021b7b966df0b62e19ee300828519bc54dd9c6";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/3.22/core/gucharmap/default.nix
new file mode 100644
index 00000000000..05aff866606
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gucharmap/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, intltool, fetchurl, pkgconfig, gtk3
+, glib, desktop_file_utils, bash, appdata-tools
+, makeWrapper, gnome3, file, itstool, libxml2 }:
+
+# TODO: icons and theme still does not work
+# use packaged gnome3.adwaita-icon-theme
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ doCheck = true;
+
+ propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+ preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
+
+ buildInputs = [ pkgconfig gtk3 intltool itstool glib appdata-tools
+ gnome3.yelp_tools libxml2 file desktop_file_utils
+ gnome3.gsettings_desktop_schemas makeWrapper ];
+
+ preFixup = ''
+ wrapProgram "$out/bin/gucharmap" \
+ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Gucharmap;
+ description = "GNOME Character Map, based on the Unicode Character Database";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gucharmap/src.nix b/pkgs/desktops/gnome-3/3.22/core/gucharmap/src.nix
new file mode 100644
index 00000000000..69c0dd60025
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/gucharmap/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gucharmap-3.18.2";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gucharmap/3.18/gucharmap-3.18.2.tar.xz;
+ sha256 = "80141d3e892c3c4812c1a8fad8f89978559ef19e933843267e6e9a5524c09ec9";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix
new file mode 100644
index 00000000000..a4c46ef85d4
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig, libxml2, glib }:
+
+stdenv.mkDerivation rec {
+ name = "libcroco-0.6.11";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/libcroco/0.6/${name}.tar.xz";
+ sha256 = "0mm0wldbi40am5qn0nv7psisbg01k42rwzjxl3gv11l5jj554aqk";
+ };
+
+ outputs = [ "out" "dev" ];
+ outputBin = "dev";
+
+ configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";
+
+ buildInputs = [ pkgconfig libxml2 glib ];
+
+ meta = with stdenv.lib; {
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgdata/default.nix b/pkgs/desktops/gnome-3/3.22/core/libgdata/default.nix
new file mode 100644
index 00000000000..08f05bcaedc
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/libgdata/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib, json_glib
+, gobjectIntrospection, liboauth, gnome3, p11_kit, openssl, uhttpmock }:
+
+let
+ majorVersion = "0.17";
+in
+stdenv.mkDerivation rec {
+ name = "libgdata-${majorVersion}.6";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/libgdata/${majorVersion}/${name}.tar.xz";
+ sha256 = "8b6a3ff1db23bd9e5ebbcc958b29b769a898f892eed4798222d562ba69df30b0";
+ };
+
+ NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup.dev}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1";
+
+ buildInputs = with gnome3;
+ [ pkgconfig libsoup intltool libxml2 glib gobjectIntrospection
+ liboauth gcr gnome_online_accounts p11_kit openssl uhttpmock ];
+
+ propagatedBuildInputs = [ json_glib ];
+
+ meta = with stdenv.lib; {
+ description = "GData API library";
+ maintainers = with maintainers; [ raskin lethalman ];
+ platforms = platforms.linux;
+ license = licenses.lgpl21Plus;
+ };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.22/core/libgee/default.nix
new file mode 100644
index 00000000000..7b49af3c50f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/libgee/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, autoconf, vala_0_32, pkgconfig, glib, gobjectIntrospection, gnome3 }:
+let
+ ver_maj = "0.18";
+ ver_min = "0";
+in
+stdenv.mkDerivation rec {
+ name = "libgee-${ver_maj}.${ver_min}";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/libgee/${ver_maj}/${name}.tar.xz";
+ sha256 = "16a34js81w9m2bw4qd8csm4pcgr3zq5z87867j4b8wfh6zwrxnaa";
+ };
+
+ doCheck = true;
+
+ patches = [ ./fix_introspection_paths.patch ];
+
+ buildInputs = [ autoconf vala_0_32 pkgconfig glib gobjectIntrospection ];
+
+ meta = with stdenv.lib; {
+ description = "Utility library providing GObject-based interfaces and classes for commonly used data structures";
+ license = licenses.lgpl21Plus;
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgee/fix_introspection_paths.patch b/pkgs/desktops/gnome-3/3.22/core/libgee/fix_introspection_paths.patch
new file mode 100644
index 00000000000..67003f45164
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/libgee/fix_introspection_paths.patch
@@ -0,0 +1,13 @@
+--- fix_introspection_paths.patch/configure 2014-01-07 17:43:53.521339338 +0000
++++ fix_introspection_paths.patch/configure-fix 2014-01-07 17:45:11.068635069 +0000
+@@ -12085,8 +12085,8 @@
+ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
+ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
++ INTROSPECTION_GIRDIR="${datadir}/gir-1.0"
++ INTROSPECTION_TYPELIBDIR="${libdir}/girepository-1.0"
+ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgepub/default.nix b/pkgs/desktops/gnome-3/3.22/core/libgepub/default.nix
new file mode 100644
index 00000000000..47cb96de6c3
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/libgepub/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, autoconf, pkgconfig, glib, gobjectIntrospection, gnome3
+, webkitgtk, libsoup, libxml2, libarchive }:
+stdenv.mkDerivation rec {
+ name = "libgepub-${version}";
+ version = "0.4";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/libgepub/${version}/${name}.tar.xz";
+ sha256 = "5666a1c4d186d205bd2d91b71d4c1cd5426025569114a765dd913a564f149ff4";
+ };
+
+ doCheck = true;
+
+ buildInputs = [ autoconf pkgconfig glib gobjectIntrospection webkitgtk libsoup
+ libxml2 libarchive ];
+
+ meta = with stdenv.lib; {
+ description = "GObject based library for handling and rendering epub documents";
+ license = licenses.lgpl21Plus;
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.22/core/libgnome-keyring/default.nix
new file mode 100644
index 00000000000..c6c9323c010
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/libgnome-keyring/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+ name = "libgnome-keyring-3.12.0";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/libgnome-keyring/3.12/${name}.tar.xz";
+ sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783";
+ };
+
+ propagatedBuildInputs = [ glib gobjectIntrospection dbus_libs libgcrypt ];
+ nativeBuildInputs = [ pkgconfig intltool ];
+
+ meta = {
+ description = "Framework for managing passwords and other secrets";
+ homepage = http://live.gnome.org/GnomeKeyring;
+ license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ];
+ inherit (glib.meta) platforms maintainers;
+
+ longDescription = ''
+ gnome-keyring is a program that keeps password and other secrets for
+ users. The library libgnome-keyring is used by applications to integrate
+ with the gnome-keyring system.
+ '';
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/3.22/core/libgnomekbd/default.nix
new file mode 100644
index 00000000000..2bcbefc8dbf
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/libgnomekbd/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, makeWrapper, gnome3 }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = [ pkgconfig file intltool glib gtk3 libxklavier makeWrapper ];
+
+ preFixup = ''
+ wrapProgram $out/bin/gkbd-keyboard-display \
+ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Keyboard management library";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgnomekbd/src.nix b/pkgs/desktops/gnome-3/3.22/core/libgnomekbd/src.nix
new file mode 100644
index 00000000000..02fa2716987
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/libgnomekbd/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "libgnomekbd-3.22.0.1";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/libgnomekbd/3.22/libgnomekbd-3.22.0.1.tar.xz;
+ sha256 = "4efdb6b8ec92f04caced710b5edb285fb27715059ed6ca5e100b6933999a93de";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgweather/default.nix b/pkgs/desktops/gnome-3/3.22/core/libgweather/default.nix
new file mode 100644
index 00000000000..79ede15df8f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/libgweather/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, libsoup, gconf
+, pango, gdk_pixbuf, atk, tzdata, gnome3 }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
+
+ configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" ];
+ propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk gnome3.geocode_glib ];
+ nativeBuildInputs = [ pkgconfig intltool ];
+
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgweather/src.nix b/pkgs/desktops/gnome-3/3.22/core/libgweather/src.nix
new file mode 100644
index 00000000000..94657351946
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/libgweather/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "libgweather-3.20.3";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/libgweather/3.20/libgweather-3.20.3.tar.xz;
+ sha256 = "fb6bc5b64ef5db3dc40a9798f072b83ebcafe7ff5af472aaee70600619b56c0b";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgxps/default.nix b/pkgs/desktops/gnome-3/3.22/core/libgxps/default.nix
new file mode 100644
index 00000000000..b39e1f6fa56
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/libgxps/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig, glib, cairo, libarchive, freetype, libjpeg, libtiff
+, openssl, bzip2, acl, attr, libxml2
+}:
+
+stdenv.mkDerivation rec {
+ name = "libgxps-0.2.2";
+
+ src = fetchurl {
+ url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz";
+ sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r";
+ };
+
+ buildInputs = [ pkgconfig glib cairo freetype libjpeg libtiff acl openssl bzip2 attr libxml2 ];
+ propagatedBuildInputs = [ libarchive ];
+
+ configureFlags = "--without-liblcms2";
+
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.22/core/libpeas/default.nix
new file mode 100644
index 00000000000..1ba143539d4
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/libpeas/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gnome3
+, glib, gtk3, gobjectIntrospection, python3Packages, ncurses
+}:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ configureFlags = [ "--enable-python3" ];
+
+ buildInputs = [ intltool pkgconfig glib gtk3 gnome3.defaultIconTheme ncurses python3Packages.python python3Packages.pygobject3 gobjectIntrospection ];
+
+ meta = with stdenv.lib; {
+ description = "A GObject-based plugins engine";
+ homepage = "http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/";
+ license = licenses.gpl2Plus;
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/libpeas/src.nix b/pkgs/desktops/gnome-3/3.22/core/libpeas/src.nix
new file mode 100644
index 00000000000..cd440858946
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/libpeas/src.nix
@@ -0,0 +1,13 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: rec {
+ major = "1.18";
+ minor = "0";
+ version = "${major}.${minor}";
+ name = "libpeas-${version}";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/libpeas/${major}/${name}.tar.xz";
+ sha256 = "09jy2rwwgp0xx7cnypxl56m7zzxnj3j4v58xqjxjasf3chn88jdz";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/3.22/core/libzapojit/default.nix
new file mode 100644
index 00000000000..5a8117528b6
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/libzapojit/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, pkgconfig, glib, intltool, json_glib, rest, libsoup, gtk, gnome_online_accounts }:
+
+stdenv.mkDerivation rec {
+ name = "libzapojit-0.0.3";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/libzapojit/0.0/${name}.tar.xz";
+ sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x";
+ };
+
+ buildInputs = [ pkgconfig glib intltool json_glib rest libsoup gtk gnome_online_accounts ];
+
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix
new file mode 100644
index 00000000000..9fad1873fbd
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix
@@ -0,0 +1,36 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
+, pango, cogl, clutter, libstartup_notification, libcanberra_gtk2, zenity, libcanberra_gtk3
+, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libudev, libinput
+, libgudev, xwayland }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ # fatal error: gio/gunixfdlist.h: No such file or directory
+ NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
+
+ configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra --with-xwayland-path=${xwayland}/bin/Xwayland";
+
+ buildInputs = with gnome3;
+ [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower
+ gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra_gtk2
+ gnome3.geocode_glib libudev libinput libgudev
+ libcanberra_gtk3 zenity libtool makeWrapper xkeyboard_config libxkbfile libxkbcommon ];
+
+ preFixup = ''
+ wrapProgram "$out/bin/mutter" \
+ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+ '';
+
+ patches = [
+ #./x86.patch ./math.patch
+ ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/mutter/math.patch b/pkgs/desktops/gnome-3/3.22/core/mutter/math.patch
new file mode 100644
index 00000000000..dbdfd93f5e1
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/mutter/math.patch
@@ -0,0 +1,10 @@
+--- mutter-3.18.0/src/backends/meta-cursor-renderer.c.orig 2015-09-23 13:54:31.297523343 +0200
++++ mutter-3.18.0/src/backends/meta-cursor-renderer.c 2015-09-23 13:54:43.728271766 +0200
+@@ -31,6 +31,7 @@
+
+ #include
+ #include
++#include
+
+ #include "meta-stage.h"
+
diff --git a/pkgs/desktops/gnome-3/3.22/core/mutter/src.nix b/pkgs/desktops/gnome-3/3.22/core/mutter/src.nix
new file mode 100644
index 00000000000..02e9b6e0d84
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/mutter/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "mutter-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/mutter/3.22/mutter-3.22.0.tar.xz;
+ sha256 = "a5acdde788f5d137ec6dfe218a214c1f6cfb7e2e851fbcebe0b2d67b4c96e5f3";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/mutter/x86.patch b/pkgs/desktops/gnome-3/3.22/core/mutter/x86.patch
new file mode 100644
index 00000000000..a997b27540e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/mutter/x86.patch
@@ -0,0 +1,33 @@
+--- a/src/core/window.c 2015-05-26 10:52:41.382834963 +0200
++++ b/src/core/window.c 2015-05-26 10:53:03.039948034 +0200
+@@ -3499,7 +3499,7 @@
+
+ static MetaMonitorInfo *
+ find_monitor_by_winsys_id (MetaWindow *window,
+- guint winsys_id)
++ gint winsys_id)
+ {
+ int i;
+
+@@ -3618,7 +3618,7 @@
+ */
+
+ gboolean did_placement;
+- guint old_output_winsys_id;
++ gint old_output_winsys_id;
+ MetaRectangle unconstrained_rect;
+ MetaRectangle constrained_rect;
+ MetaMoveResizeResultFlags result = 0;
+--- a/src/core/startup-notification.c 2016-06-06 12:13:27.100251933 +0200
++++ b/src/core/startup-notification.c 2016-06-06 12:13:42.554956773 +0200
+@@ -418,7 +418,7 @@
+ elapsed = ctod->now - timestamp;
+
+ meta_topic (META_DEBUG_STARTUP,
+- "Sequence used %ld ms vs. %d max: %s\n",
++ "Sequence used %" G_GINT64_FORMAT " ms vs. %d max: %s\n",
+ elapsed, STARTUP_TIMEOUT,
+ meta_startup_notification_sequence_get_id (sequence));
+
+[?25l[J[J[J[34h[?25h[?1049h[?1h=[1;44r[34l[34h[?25h[23m[24m[0m[H[J[?25l[2;1H[1m[34m~ [3;1H~ [4;1H~ [5;1H~ [6;1H~ [7;1H~ [8;1H~ [9;1H~ [10;1H~ [11;1H~ [12;1H~ [13;1H~ [14;1H~ [15;1H~ [16;1H~ [17;1H~ [18;1H~ [19;1H~ [20;1H~ [21;1H~ [22;1H~ [23;1H~ [24;1H~ [25;1H~ [26;1H~ [27;1H~ [28;1H~ [29;1H~ [30;1H~ [31;1H~ [32;1H~ [33;1H~ [34;1H~ [35;1H~ [36;1H~ [37;1H~ [38;1H~ [39;1H~ [40;1H~ [41;1H~ [42;1H~ [43;1H~ [1;1H[34h[?25h[?25l[0m[44;1HType :quit to exit Vim[1;1H[34h[?25h[?25l[34h[?25h[?25l[34h[?25h[?25l[34h[?25h[?25l[34h[?25h[?25l[34h[?25h[?25l[34h[?25h[44;1H
+[?1l>[?1049l
diff --git a/pkgs/desktops/gnome-3/3.22/core/nautilus/default.nix b/pkgs/desktops/gnome-3/3.22/core/nautilus/default.nix
new file mode 100644
index 00000000000..d508f148359
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/nautilus/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif
+, gtk, gnome3, libunique, intltool, gobjectIntrospection, gnome-autoar, glib
+, libnotify, wrapGAppsHook, exempi, librsvg, tracker, libselinux }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+
+ buildInputs = [ libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi librsvg
+ gnome3.gnome_desktop gnome3.adwaita-icon-theme
+ gnome3.gsettings_desktop_schemas gnome3.dconf libnotify tracker libselinux ];
+
+ propagatedBuildInputs = [ gnome-autoar ];
+
+ # fatal error: gio/gunixinputstream.h: No such file or directory
+ NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
+
+# hardeningDisable = [ "format" ];
+ enableParallelBuilding = true;
+
+ patches = [ ./extension_dir.patch ];
+
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/nautilus/extension_dir.patch b/pkgs/desktops/gnome-3/3.22/core/nautilus/extension_dir.patch
new file mode 100644
index 00000000000..e1313999675
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/nautilus/extension_dir.patch
@@ -0,0 +1,24 @@
+diff --git a/src/nautilus-module.c b/src/nautilus-module.c
+index 6273a76..4adcc8a 100644
+--- a/src/nautilus-module.c
++++ b/src/nautilus-module.c
+@@ -242,11 +242,17 @@ void
+ nautilus_module_setup (void)
+ {
+ static gboolean initialized = FALSE;
++ const gchar* extensiondir = NULL;
+
+ if (!initialized)
+ {
+ initialized = TRUE;
+
+- load_module_dir (NAUTILUS_EXTENSIONDIR);
++ extensiondir = g_getenv ("NAUTILUS_EXTENSION_DIR");
++ if (extensiondir == NULL) {
++ extensiondir = NAUTILUS_EXTENSIONDIR;
++ }
++
++ load_module_dir (extensiondir);
+
+ eel_debug_call_at_shutdown (free_module_objects);
+ }
diff --git a/pkgs/desktops/gnome-3/3.22/core/nautilus/src.nix b/pkgs/desktops/gnome-3/3.22/core/nautilus/src.nix
new file mode 100644
index 00000000000..e0c7f3034f9
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/nautilus/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "nautilus-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/nautilus/3.22/nautilus-3.22.0.tar.xz;
+ sha256 = "7671d9cf9df0321f5ad03abce03ab35ab6d643e1b3392a84f3c1d7c23ce29816";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/rest/default.nix b/pkgs/desktops/gnome-3/3.22/core/rest/default.nix
new file mode 100644
index 00000000000..d467cad93b4
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/rest/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection, gnome3 }:
+
+stdenv.mkDerivation rec {
+ name = "rest-${version}";
+ major = "0.8";
+ version = "${major}.0";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/rest/${major}/${name}.tar.xz";
+ sha256 = "e7b89b200c1417073aef739e8a27ff2ab578056c27796ec74f5886a5e0dff647";
+ };
+
+ buildInputs = [ pkgconfig glib libsoup gobjectIntrospection];
+
+ configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt";
+
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/sushi/default.nix b/pkgs/desktops/gnome-3/3.22/core/sushi/default.nix
new file mode 100644
index 00000000000..fb010756f29
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/sushi/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, pkgconfig, file, intltool, gobjectIntrospection, glib
+, clutter_gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz
+, webkitgtk, libmusicbrainz5, icu, makeWrapper, gst_all_1
+, gdk_pixbuf, librsvg, gtk3, harfbuzz }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ propagatedUserEnvPkgs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ];
+
+ buildInputs = [ pkgconfig file intltool gobjectIntrospection glib gtk3
+ clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf
+ librsvg gnome3.defaultIconTheme libmusicbrainz5 webkitgtk
+ gnome3.evince icu makeWrapper harfbuzz ];
+
+ enableParallelBuilding = true;
+
+ postConfigure = ''
+ substituteInPlace src/libsushi/sushi-font-widget.h \
+ --replace "" ""
+ substituteInPlace src/libsushi/sushi-font-widget.c \
+ --replace "" ""
+ '';
+
+ preFixup = ''
+ wrapProgram $out/libexec/sushi-start \
+ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
+ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "http://en.wikipedia.org/wiki/Sushi_(software)";
+ description = "A quick previewer for Nautilus";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2Plus;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/sushi/src.nix b/pkgs/desktops/gnome-3/3.22/core/sushi/src.nix
new file mode 100644
index 00000000000..e1fc1011b56
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/sushi/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "sushi-3.21.91";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/sushi/3.21/sushi-3.21.91.tar.xz;
+ sha256 = "db71c9ec3dd2dde6aed03b469253ce7d9f30c60ff50c2a8dc9f7776b70d15d55";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/3.22/core/totem-pl-parser/default.nix
new file mode 100644
index 00000000000..63f36004bcd
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/totem-pl-parser/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, file, intltool, gmime, libxml2, libsoup, gnome3 }:
+
+stdenv.mkDerivation rec {
+ name = "totem-pl-parser-3.10.2";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/totem-pl-parser/3.10/${name}.tar.xz";
+ sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469";
+ };
+
+ buildInputs = [ pkgconfig file intltool gmime libxml2 libsoup ];
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Videos;
+ description = "Simple GObject-based library to parse and save a host of playlist formats";
+ maintainers = gnome3.maintainers;
+ license = licenses.lgpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/totem/default.nix b/pkgs/desktops/gnome-3/3.22/core/totem/default.nix
new file mode 100644
index 00000000000..6e62a2d522f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/totem/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, intltool, fetchurl, gst_all_1
+, clutter_gtk, clutter-gst, python3Packages, shared_mime_info
+, pkgconfig, gtk3, glib, gobjectIntrospection
+, bash, wrapGAppsHook, itstool, libxml2, dbus_glib
+, gnome3, librsvg, gdk_pixbuf, file, tracker, nautilus }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ doCheck = true;
+
+ enableParallelBuilding = true;
+
+ NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
+
+ propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+ buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 gnome3.grilo
+ clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins
+ gst_all_1.gstreamer gst_all_1.gst-plugins-base
+ gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-libav
+ gnome3.libpeas shared_mime_info dbus_glib
+ gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gnome_desktop
+ gnome3.gsettings_desktop_schemas wrapGAppsHook file tracker nautilus ];
+
+ propagatedBuildInputs = [ gobjectIntrospection python3Packages.pylint python3Packages.pygobject2 ];
+
+ configureFlags = [ "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ];
+
+ GI_TYPELIB_PATH = "$out/lib/girepository-1.0";
+
+ wrapPrefixVariables = [ "PYTHONPATH" ];
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Videos;
+ description = "Movie player for the GNOME desktop based on GStreamer";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/totem/src.nix b/pkgs/desktops/gnome-3/3.22/core/totem/src.nix
new file mode 100644
index 00000000000..11e20f665b7
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/totem/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "totem-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/totem/3.22/totem-3.22.0.tar.xz;
+ sha256 = "026a5b5b1674bdb941bc28e1ee95ecc168627e0fc323b6ec8d73407d21964fea";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.22/core/tracker/default.nix
new file mode 100644
index 00000000000..72ebd543e90
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/tracker/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, intltool, fetchurl, libxml2, upower
+, pkgconfig, gtk3, glib
+, bash, makeWrapper, itstool, vala_0_32, sqlite, libxslt
+, gnome3, librsvg, gdk_pixbuf, file, libnotify
+, evolution_data_server, gst_all_1, poppler
+, icu, taglib, libjpeg, libtiff, giflib, libcue
+, libvorbis, flac, exempi, networkmanager
+, libpng, libexif, libgsf, libuuid, bzip2 }:
+
+stdenv.mkDerivation rec {
+
+ inherit (import ./src.nix fetchurl) name src;
+
+ propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+ NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0 -I${poppler.dev}/include/poppler";
+
+ enableParallelBuilding = true;
+
+ buildInputs = [ vala_0_32 pkgconfig gtk3 glib intltool itstool libxml2
+ bzip2 gnome3.totem-pl-parser libxslt
+ gnome3.gsettings_desktop_schemas makeWrapper file
+ gdk_pixbuf gnome3.defaultIconTheme librsvg sqlite
+ upower libnotify evolution_data_server gnome3.libgee
+ gst_all_1.gstreamer gst_all_1.gst-plugins-base flac
+ poppler icu taglib libjpeg libtiff giflib libvorbis
+ exempi networkmanager libpng libexif libgsf libuuid ];
+
+ preConfigure = ''
+ substituteInPlace src/libtracker-sparql/Makefile.in --replace "--shared-library=libtracker-sparql" "--shared-library=$out/lib/libtracker-sparql"
+ '';
+
+ preFixup = ''
+ for f in $out/bin/* $out/libexec/*; do
+ wrapProgram $f \
+ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+ done
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Projects/Tracker;
+ description = "Desktop-neutral user information store, search tool and indexer";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/tracker/src.nix b/pkgs/desktops/gnome-3/3.22/core/tracker/src.nix
new file mode 100644
index 00000000000..6889f6ee09e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/tracker/src.nix
@@ -0,0 +1,11 @@
+fetchurl: rec {
+ major = "1.10";
+ minor = "0";
+ name = "tracker-${major}.${minor}";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/tracker/${major}/${name}.tar.xz";
+ sha256 = "df95b4a1e7de442f66d1097b725dd3cdd739862f491453fc7d7b1f88181a12fb";
+ };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/vino/default.nix b/pkgs/desktops/gnome-3/3.22/core/vino/default.nix
new file mode 100644
index 00000000000..52481395756
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/vino/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, lib, makeWrapper
+, pkgconfig, gnome3, gtk3, glib, intltool, libXtst, libnotify, libsoup
+, telepathySupport ? false, dbus_glib ? null, telepathy_glib ? null
+, libsecret ? null, gnutls ? null, libgcrypt ? null, avahi ? null
+, zlib ? null, libjpeg ? null
+, libXdamage ? null, libXfixes ? null, libXext ? null
+, gnomeKeyringSupport ? false, libgnome_keyring3 ? null
+, networkmanager ? null }:
+
+with lib;
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ doCheck = true;
+
+ buildInputs = [
+ makeWrapper
+ pkgconfig gnome3.defaultIconTheme gtk3 glib intltool libXtst libnotify libsoup
+ ] ++ optionals telepathySupport [ dbus_glib telepathy_glib ]
+ ++ optional gnomeKeyringSupport libgnome_keyring3
+ ++ filter (p: p != null) [
+ libsecret gnutls libgcrypt avahi zlib libjpeg
+ libXdamage libXfixes libXext networkmanager
+ ];
+
+ preFixup = ''
+ wrapProgram "$out/libexec/vino-server" \
+ --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/action/show/Projects/Vino;
+ description = "GNOME desktop sharing server";
+ maintainers = with maintainers; [ lethalman domenkozar ];
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/vino/src.nix b/pkgs/desktops/gnome-3/3.22/core/vino/src.nix
new file mode 100644
index 00000000000..8cf55272da9
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/vino/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "vino-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/vino/3.22/vino-3.22.0.tar.xz;
+ sha256 = "2911c779b6a2c46e5bc8e5a0c94c2a4d5bd4a1ee7e35f2818702cb13d9d23bab";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix b/pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix
new file mode 100644
index 00000000000..cbb52c9aaa1
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+ versionMajor = "0.36";
+ versionMinor = "3";
+ moduleName = "vte";
+
+ name = "${moduleName}-${versionMajor}.${versionMinor}";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
+ sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c";
+ };
+
+ buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ];
+
+ configureFlags = [ "--enable-introspection" ];
+
+ enableParallelBuilding = true;
+
+ postInstall = ''
+ substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses.out}/lib -lncurses"
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://www.gnome.org/;
+ description = "A library implementing a terminal emulator widget for GTK+";
+ longDescription = ''
+ VTE is a library (libvte) implementing a terminal emulator widget for
+ GTK+, and a minimal sample application (vte) using that. Vte is
+ mainly used in gnome-terminal, but can also be used to embed a
+ console/terminal in games, editors, IDEs, etc. VTE supports Unicode and
+ character set conversion, as well as emulating any terminal known to
+ the system's terminfo database.
+ '';
+ license = licenses.lgpl2;
+ maintainers = with maintainers; [ astsmtl antono lethalman ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/default.nix b/pkgs/desktops/gnome-3/3.22/core/vte/default.nix
new file mode 100644
index 00000000000..50aef658713
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/vte/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, intltool, pkgconfig
+, gnome3, ncurses, gobjectIntrospection, vala_0_32, libxml2, gnutls
+, fetchFromGitHub, autoconf, automake, libtool, gtk_doc, gperf, pcre2
+}:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib
+ gnome3.gtk3 ncurses vala_0_32 libxml2 ];
+
+ propagatedBuildInputs = [ gnutls pcre2 ];
+
+ preConfigure = "patchShebangs .";
+
+ configureFlags = [ "--enable-introspection" ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = http://www.gnome.org/;
+ description = "A library implementing a terminal emulator widget for GTK+";
+ longDescription = ''
+ VTE is a library (libvte) implementing a terminal emulator widget for
+ GTK+, and a minimal sample application (vte) using that. Vte is
+ mainly used in gnome-terminal, but can also be used to embed a
+ console/terminal in games, editors, IDEs, etc. VTE supports Unicode and
+ character set conversion, as well as emulating any terminal known to
+ the system's terminfo database.
+ '';
+ license = licenses.lgpl2;
+ maintainers = with maintainers; [ astsmtl antono lethalman ];
+ platforms = platforms.linux;
+ };
+}
+
diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/src.nix b/pkgs/desktops/gnome-3/3.22/core/vte/src.nix
new file mode 100644
index 00000000000..d80749a2566
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/vte/src.nix
@@ -0,0 +1,11 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: rec {
+ name = "vte-${major}.0";
+ major = "0.46";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/vte/${major}/${name}.tar.xz";
+ sha256 = "5f7122e7860eb2470d310fc63df91d3ee32bab233729c2dc181a0cbc9b3249d7";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/3.22/core/yelp-tools/default.nix
new file mode 100644
index 00000000000..9111802eb6a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/yelp-tools/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl pkgconfig ];
+
+ doCheck = true;
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Yelp/Tools;
+ description = "Small programs that help you create, edit, manage, and publish your Mallard or DocBook documentation";
+ maintainers = with maintainers; [ domenkozar ];
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/yelp-tools/src.nix b/pkgs/desktops/gnome-3/3.22/core/yelp-tools/src.nix
new file mode 100644
index 00000000000..f03c6d1bc31
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/yelp-tools/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "yelp-tools-3.18.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/yelp-tools/3.18/yelp-tools-3.18.0.tar.xz;
+ sha256 = "c6c1d65f802397267cdc47aafd5398c4b60766e0a7ad2190426af6c0d0716932";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/3.22/core/yelp-xsl/default.nix
new file mode 100644
index 00000000000..0a3976f35a1
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/yelp-xsl/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, intltool, fetchurl, pkgconfig, bash
+, itstool, libxml2, libxslt, gnome3 }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ doCheck = true;
+
+ buildInputs = [ pkgconfig intltool itstool libxml2 libxslt ];
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Yelp;
+ description = "Yelp's universal stylesheets for Mallard and DocBook";
+ maintainers = gnome3.maintainers;
+ license = [licenses.gpl2 licenses.lgpl2];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/yelp-xsl/src.nix b/pkgs/desktops/gnome-3/3.22/core/yelp-xsl/src.nix
new file mode 100644
index 00000000000..de5d68d1fab
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/yelp-xsl/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "yelp-xsl-3.20.1";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/yelp-xsl/3.20/yelp-xsl-3.20.1.tar.xz;
+ sha256 = "dc61849e5dca473573d32e28c6c4e3cf9c1b6afe241f8c26e29539c415f97ba0";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.22/core/yelp/default.nix
new file mode 100644
index 00000000000..4ee79bbc3dc
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/yelp/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
+, file, librsvg, gnome3, gdk_pixbuf, sqlite, groff
+, bash, makeWrapper, itstool, libxml2, libxslt, icu, gst_all_1
+, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+ preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
+
+ buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool sqlite
+ libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl
+ librsvg gdk_pixbuf gnome3.defaultIconTheme groff
+ gnome3.gsettings_desktop_schemas wrapGAppsHook
+ gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ];
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Yelp;
+ description = "The help viewer in Gnome";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/yelp/src.nix b/pkgs/desktops/gnome-3/3.22/core/yelp/src.nix
new file mode 100644
index 00000000000..7f38bab736f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/yelp/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "yelp-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/yelp/3.22/yelp-3.22.0.tar.xz;
+ sha256 = "8616b77c239aaa731312609f192c9b2c71d54b2cae42ff23efa23b5b3188778e";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/zenity/default.nix b/pkgs/desktops/gnome-3/3.22/core/zenity/default.nix
new file mode 100644
index 00000000000..8f525945a6a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/zenity/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango
+, gnome_doc_utils, intltool, libX11, which, itstool }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ preBuild = ''
+ mkdir -p $out/include
+ '';
+
+ buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ];
+
+ nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ];
+
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/zenity/src.nix b/pkgs/desktops/gnome-3/3.22/core/zenity/src.nix
new file mode 100644
index 00000000000..75476b43b95
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/core/zenity/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "zenity-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/zenity/3.22/zenity-3.22.0.tar.xz;
+ sha256 = "1ecdfa1071d383b373b8135954b3ec38d402d671dcd528e69d144aff36a0e466";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/default.nix b/pkgs/desktops/gnome-3/3.22/default.nix
new file mode 100644
index 00000000000..3b76ac80fdb
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/default.nix
@@ -0,0 +1,398 @@
+{ pkgs }:
+
+let
+
+ pkgsFun = overrides:
+ let
+ self = self_ // overrides;
+ self_ = with self; {
+
+ overridePackages = f:
+ let newself = pkgsFun (f newself self);
+ in newself;
+
+ callPackage = pkgs.newScope self;
+
+ version = "3.22";
+ maintainers = with pkgs.lib.maintainers; [ lethalman jgeerds DamienCassou ];
+
+ corePackages = with gnome3; [
+ pkgs.desktop_file_utils pkgs.ibus
+ pkgs.shared_mime_info # for update-mime-database
+ glib # for gsettings
+ gtk3 # for gtk-update-icon-cache
+ glib_networking gvfs dconf gnome-backgrounds gnome_control_center
+ gnome-menus gnome_settings_daemon gnome_shell
+ gnome_themes_standard defaultIconTheme gnome-shell-extensions
+ pkgs.hicolor_icon_theme
+ ];
+
+ optionalPackages = with gnome3; [ baobab eog epiphany evince
+ gucharmap nautilus totem vino yelp gnome-bluetooth
+ gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot
+ gnome-system-log gnome-system-monitor
+ gnome_terminal gnome-user-docs bijiben evolution file-roller gedit
+ gnome-clocks gnome-music gnome-tweak-tool gnome-photos
+ nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
+ gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool
+ gnome-getting-started-docs gnome-packagekit gnome-software
+ ];
+
+ gamesPackages = with gnome3; [ swell-foop lightsoff iagno
+ tali quadrapassel gnome-sudoku aisleriot five-or-more
+ four-in-a-row gnome-chess gnome-klotski gnome-mahjongg
+ gnome-mines gnome-nibbles gnome-robots gnome-tetravex
+ hitori gnome-taquin
+ ];
+
+ inherit (pkgs) glib gtk2 webkitgtk214x 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; };
+ gtk = gtk3;
+ gtkmm = gtkmm3;
+ vala = pkgs.vala_0_32;
+ gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; };
+ webkitgtk = webkitgtk214x;
+
+# Simplify the nixos module and gnome packages
+ defaultIconTheme = adwaita-icon-theme;
+
+# ISO installer
+# installerIso = callPackage ./installer.nix {};
+
+#### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
+
+ adwaita-icon-theme = callPackage ./core/adwaita-icon-theme { };
+
+ baobab = callPackage ./core/baobab { };
+
+ caribou = callPackage ./core/caribou { };
+
+ dconf = callPackage ./core/dconf { };
+ dconf-editor = callPackage ./core/dconf-editor { };
+
+ # empathy = callPackage ./core/empathy {
+ # webkitgtk = webkitgtk24x;
+ # clutter-gst = pkgs.clutter-gst;
+ # };
+
+ epiphany = callPackage ./core/epiphany { };
+
+ evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests
+
+ evolution_data_server = callPackage ./core/evolution-data-server { };
+
+ gconf = callPackage ./core/gconf { };
+
+ geocode_glib = callPackage ./core/geocode-glib { };
+
+ gcr = callPackage ./core/gcr { }; # ToDo: tests fail
+
+ gdm = callPackage ./core/gdm { };
+
+ gjs = callPackage ./core/gjs { };
+
+ glib_networking = pkgs.glib_networking.override {
+ inherit gsettings_desktop_schemas;
+ };
+
+ gnome-backgrounds = callPackage ./core/gnome-backgrounds { };
+
+ gnome-bluetooth = callPackage ./core/gnome-bluetooth { };
+
+ gnome-contacts = callPackage ./core/gnome-contacts { };
+
+ gnome_control_center = callPackage ./core/gnome-control-center { };
+
+ gnome-calculator = callPackage ./core/gnome-calculator { };
+
+ gnome_common = callPackage ./core/gnome-common { };
+
+ gnome_desktop = callPackage ./core/gnome-desktop { };
+
+ gnome-dictionary = callPackage ./core/gnome-dictionary { };
+
+ gnome-disk-utility = callPackage ./core/gnome-disk-utility { };
+
+ gnome-font-viewer = callPackage ./core/gnome-font-viewer { };
+
+ gnome-menus = callPackage ./core/gnome-menus { };
+
+ gnome_keyring = callPackage ./core/gnome-keyring { };
+
+ libgnome_keyring = callPackage ./core/libgnome-keyring { };
+
+ libgnomekbd = callPackage ./core/libgnomekbd { };
+
+ folks = callPackage ./core/folks { };
+
+ gnome_online_accounts = callPackage ./core/gnome-online-accounts { };
+
+ gnome-online-miners = callPackage ./core/gnome-online-miners { };
+
+ gnome_session = callPackage ./core/gnome-session { };
+
+ gnome_shell = callPackage ./core/gnome-shell { };
+
+ gnome-shell-extensions = callPackage ./core/gnome-shell-extensions { };
+
+ gnome-screenshot = callPackage ./core/gnome-screenshot { };
+
+ gnome_settings_daemon = callPackage ./core/gnome-settings-daemon { };
+
+ gnome-software = callPackage ./core/gnome-software { };
+
+ gnome-system-log = callPackage ./core/gnome-system-log { };
+
+ gnome-system-monitor = callPackage ./core/gnome-system-monitor { };
+
+ gnome_terminal = callPackage ./core/gnome-terminal { };
+
+ gnome_themes_standard = callPackage ./core/gnome-themes-standard { };
+
+ gnome-user-docs = callPackage ./core/gnome-user-docs { };
+
+ gnome-user-share = callPackage ./core/gnome-user-share { };
+
+ grilo = callPackage ./core/grilo { };
+
+ grilo-plugins = callPackage ./core/grilo-plugins { };
+
+ gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { };
+
+ gsound = callPackage ./core/gsound { };
+
+ gtksourceview = callPackage ./core/gtksourceview { };
+
+ gtksourceviewmm = callPackage ./core/gtksourceviewmm { };
+
+ gucharmap = callPackage ./core/gucharmap { };
+
+ gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; };
+
+ eog = callPackage ./core/eog { };
+
+ libcroco = callPackage ./core/libcroco {};
+
+ libgee = callPackage ./core/libgee { };
+
+ libgepub = callPackage ./core/libgepub { };
+
+ libgdata = callPackage ./core/libgdata { };
+
+ libgxps = callPackage ./core/libgxps { };
+
+ libpeas = callPackage ./core/libpeas {};
+
+ libgweather = callPackage ./core/libgweather { };
+
+ libzapojit = callPackage ./core/libzapojit { };
+
+ mutter = callPackage ./core/mutter { };
+
+ nautilus = callPackage ./core/nautilus { };
+
+ networkmanager_openvpn = pkgs.networkmanager_openvpn.override {
+ inherit gnome3;
+ };
+
+ networkmanager_pptp = pkgs.networkmanager_pptp.override {
+ inherit gnome3;
+ };
+
+ networkmanager_vpnc = pkgs.networkmanager_vpnc.override {
+ inherit gnome3;
+ };
+
+ networkmanager_openconnect = pkgs.networkmanager_openconnect.override {
+ inherit gnome3;
+ };
+
+ networkmanager_l2tp = pkgs.networkmanager_l2tp.override {
+ inherit gnome3;
+ };
+
+ networkmanagerapplet = pkgs.networkmanagerapplet.override {
+ inherit gnome3 gsettings_desktop_schemas glib_networking;
+ };
+
+ rest = callPackage ./core/rest { };
+
+ sushi = callPackage ./core/sushi { };
+
+ totem = callPackage ./core/totem { };
+
+ totem-pl-parser = callPackage ./core/totem-pl-parser { };
+
+ tracker = callPackage ./core/tracker { giflib = pkgs.giflib_5_0; };
+
+ vte = callPackage ./core/vte { };
+
+ vte_290 = callPackage ./core/vte/2.90.nix { };
+
+ vino = callPackage ./core/vino { };
+
+ yelp = callPackage ./core/yelp { };
+
+ yelp_xsl = callPackage ./core/yelp-xsl { };
+
+ yelp_tools = callPackage ./core/yelp-tools { };
+
+ zenity = callPackage ./core/zenity { };
+
+
+#### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/)
+
+ accerciser = callPackage ./apps/accerciser { };
+
+ bijiben = callPackage ./apps/bijiben {
+ # https://bugzilla.gnome.org/show_bug.cgi?id=728293
+ webkitgtk = pkgs.webkitgtk24x;
+ };
+
+ cheese = callPackage ./apps/cheese { };
+
+ evolution = callPackage ./apps/evolution { };
+
+ file-roller = callPackage ./apps/file-roller { };
+
+ gedit = callPackage ./apps/gedit { };
+
+ glade = callPackage ./apps/glade { };
+
+ gnome-boxes = callPackage ./apps/gnome-boxes { };
+
+ gnome-calendar = callPackage ./apps/gnome-calendar { };
+
+ gnome-characters = callPackage ./apps/gnome-characters { };
+
+ gnome-clocks = callPackage ./apps/gnome-clocks { };
+
+ gnome-documents = callPackage ./apps/gnome-documents { };
+
+ gnome-getting-started-docs = callPackage ./apps/gnome-getting-started-docs { };
+
+ gnome-logs = callPackage ./apps/gnome-logs { };
+
+ gnome-maps = callPackage ./apps/gnome-maps { };
+
+ gnome-music = callPackage ./apps/gnome-music { };
+
+ gnome-nettool = callPackage ./apps/gnome-nettool { };
+
+ gnome-photos = callPackage ./apps/gnome-photos {
+ gegl = gegl_0_3;
+ };
+
+ gnome-weather = callPackage ./apps/gnome-weather { };
+
+ nautilus-sendto = callPackage ./apps/nautilus-sendto { };
+
+ polari = callPackage ./apps/polari { };
+
+ # scrollkeeper replacement
+ rarian = callPackage ./desktop/rarian { };
+
+ seahorse = callPackage ./apps/seahorse { };
+
+ vinagre = callPackage ./apps/vinagre { };
+
+#### Dev http://ftp.gnome.org/pub/GNOME/devtools/
+
+ anjuta = callPackage ./devtools/anjuta { };
+
+ devhelp = callPackage ./devtools/devhelp { };
+
+ gdl = callPackage ./devtools/gdl { };
+
+ gnome-devel-docs = callPackage ./devtools/gnome-devel-docs { };
+
+ nemiver = callPackage ./devtools/nemiver { };
+
+#### Games
+
+ aisleriot = callPackage ./games/aisleriot { };
+
+ five-or-more = callPackage ./games/five-or-more { };
+
+ four-in-a-row = callPackage ./games/four-in-a-row { };
+
+ gnome-chess = callPackage ./games/gnome-chess { };
+
+ gnome-klotski = callPackage ./games/gnome-klotski { };
+
+ gnome-mahjongg = callPackage ./games/gnome-mahjongg { };
+
+ gnome-mines = callPackage ./games/gnome-mines { };
+
+ gnome-nibbles = callPackage ./games/gnome-nibbles { };
+
+ gnome-robots = callPackage ./games/gnome-robots { };
+
+ gnome-sudoku = callPackage ./games/gnome-sudoku { };
+
+ gnome-taquin = callPackage ./games/gnome-taquin { };
+
+ gnome-tetravex = callPackage ./games/gnome-tetravex { };
+
+ hitori = callPackage ./games/hitori { };
+
+ iagno = callPackage ./games/iagno { };
+
+ lightsoff = callPackage ./games/lightsoff { };
+
+ swell-foop = callPackage ./games/swell-foop { };
+
+ tali = callPackage ./games/tali { };
+
+ quadrapassel = callPackage ./games/quadrapassel { };
+
+#### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/
+
+ california = callPackage ./misc/california { };
+
+ geary = callPackage ./misc/geary {
+ # https://bugzilla.gnome.org/show_bug.cgi?id=728002
+ webkitgtk = pkgs.webkitgtk24x;
+ };
+
+ gfbgraph = callPackage ./misc/gfbgraph { };
+
+ gitg = callPackage ./misc/gitg { };
+
+ gspell = callPackage ./misc/gspell { };
+
+ libgames-support = callPackage ./misc/libgames-support { };
+
+ libgda = callPackage ./misc/libgda { };
+
+ libgit2-glib = callPackage ./misc/libgit2-glib { };
+
+ libmediaart = callPackage ./misc/libmediaart { };
+
+ gexiv2 = callPackage ./misc/gexiv2 { };
+
+ gnome-tweak-tool = callPackage ./misc/gnome-tweak-tool { };
+
+ gpaste = callPackage ./misc/gpaste { };
+
+ pidgin-im-gnome-shell-extension = callPackage ./misc/pidgin { };
+
+ gtkhtml = callPackage ./misc/gtkhtml { };
+
+ pomodoro = callPackage ./misc/pomodoro { };
+
+ gnome-autoar = callPackage ./misc/gnome-autoar { };
+
+ gnome-video-effects = callPackage ./misc/gnome-video-effects { };
+
+ gnome-packagekit = callPackage ./misc/gnome-packagekit { };
+
+ };
+ in self; # pkgsFun
+
+in pkgsFun {}
diff --git a/pkgs/desktops/gnome-3/3.22/desktop/rarian/default.nix b/pkgs/desktops/gnome-3/3.22/desktop/rarian/default.nix
new file mode 100644
index 00000000000..a1b38b21869
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/desktop/rarian/default.nix
@@ -0,0 +1,16 @@
+{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42}:
+
+stdenv.mkDerivation rec {
+ name = "rarian-0.8.1";
+ src = fetchurl {
+ url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2";
+ sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577";
+ };
+
+ buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt];
+ configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat";
+
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.22/devtools/anjuta/default.nix
new file mode 100644
index 00000000000..3cb62fef6c2
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/devtools/anjuta/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool,
+ itstool, python, makeWrapper }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ enableParallelBuilding = true;
+
+ buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl
+ gnome3.libgda gnome3.gtksourceview intltool itstool python makeWrapper
+ gnome3.gsettings_desktop_schemas
+ ];
+
+ preFixup = ''
+ wrapProgram $out/bin/anjuta \
+ --prefix XDG_DATA_DIRS : \
+ "$GSETTINGS_SCHEMAS_PATH"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Software development studio";
+ homepage = http://anjuta.org/;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/anjuta/src.nix b/pkgs/desktops/gnome-3/3.22/devtools/anjuta/src.nix
new file mode 100644
index 00000000000..bbb7696d91c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/devtools/anjuta/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "anjuta-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/anjuta/3.22/anjuta-3.22.0.tar.xz;
+ sha256 = "4face1c063a5a6687a6cfc6f1f700ba15f13664633c05caa2fbf50317608dd03";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/3.22/devtools/devhelp/default.nix
new file mode 100644
index 00000000000..1cfae754cfe
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/devtools/devhelp/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, webkitgtk, intltool }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = [
+ pkgconfig gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = https://live.gnome.org/devhelp;
+ description = "API documentation browser for GNOME";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/devhelp/src.nix b/pkgs/desktops/gnome-3/3.22/devtools/devhelp/src.nix
new file mode 100644
index 00000000000..02747b9153c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/devtools/devhelp/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "devhelp-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/devhelp/3.22/devhelp-3.22.0.tar.xz;
+ sha256 = "59cae02e12d238cc5fc3f049d779895ba89701426d9173f5b534d4ab90c5ffb0";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/3.22/devtools/gdl/default.nix
new file mode 100644
index 00000000000..156d91b3eae
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/devtools/gdl/default.nix
@@ -0,0 +1,15 @@
+{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, gnome3, intltool }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = [ pkgconfig libxml2 gtk3 intltool ];
+
+ meta = with stdenv.lib; {
+ description = "Gnome docking library";
+ homepage = https://developer.gnome.org/gdl/;
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/gdl/src.nix b/pkgs/desktops/gnome-3/3.22/devtools/gdl/src.nix
new file mode 100644
index 00000000000..c8b65884e08
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/devtools/gdl/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gdl-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gdl/3.22/gdl-3.22.0.tar.xz;
+ sha256 = "cc5b360e1392292186924f0f9a8efc0f4db7e6e56dc7042037466b5cc839660c";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/3.22/devtools/gnome-devel-docs/default.nix
new file mode 100644
index 00000000000..50960f41a31
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/devtools/gnome-devel-docs/default.nix
@@ -0,0 +1,15 @@
+{ stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = [ intltool itstool libxml2 ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/GNOME/gnome-devel-docs;
+ description = "Developer documentation for GNOME";
+ maintainers = gnome3.maintainers;
+ license = licenses.fdl12;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/gnome-devel-docs/src.nix b/pkgs/desktops/gnome-3/3.22/devtools/gnome-devel-docs/src.nix
new file mode 100644
index 00000000000..7f39aabda02
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/devtools/gnome-devel-docs/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-devel-docs-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-devel-docs/3.22/gnome-devel-docs-3.22.0.tar.xz;
+ sha256 = "e0778c62670b1c19d45191ac5503568cbd09500e9e30015b48c19e95959e6d85";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/nemiver/bool_slot.patch b/pkgs/desktops/gnome-3/3.22/devtools/nemiver/bool_slot.patch
new file mode 100644
index 00000000000..83423122110
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/devtools/nemiver/bool_slot.patch
@@ -0,0 +1,13 @@
+--- a/src/dbgengine/nmv-dbg-common.h 2014-07-09 10:36:05.000000000 +0200
++++ b/src/dbgengine/nmv-dbg-common.h 2016-08-04 22:40:28.447842746 +0200
+@@ -171,7 +171,9 @@
+
+ bool has_slot () const
+ {
+- return m_slot;
++ //return m_slot;
++ // https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=822502
++ return static_cast (m_slot);
+ }
+
+ template
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/nemiver/default.nix b/pkgs/desktops/gnome-3/3.22/devtools/nemiver/default.nix
new file mode 100644
index 00000000000..e61643fd9db
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/devtools/nemiver/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, libxml2, intltool, itstool, gdb,
+ boost, sqlite, gconf, libgtop, glibmm, gtkmm, vte, gtksourceview,
+ gtksourceviewmm, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+
+ buildInputs = [ gtk3 libxml2 intltool itstool gdb boost sqlite gconf libgtop
+ glibmm gtkmm vte gtksourceview gtksourceviewmm ];
+
+ patches = [ ./bool_slot.patch ./safe_ptr.patch ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://wiki.gnome.org/Apps/Nemiver";
+ description = "Easy to use standalone C/C++ debugger";
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.juliendehos ];
+ };
+}
+
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/nemiver/safe_ptr.patch b/pkgs/desktops/gnome-3/3.22/devtools/nemiver/safe_ptr.patch
new file mode 100644
index 00000000000..e3413b22497
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/devtools/nemiver/safe_ptr.patch
@@ -0,0 +1,10 @@
+--- a/src/confmgr/nmv-gconf-mgr.cc 2014-07-08 10:24:06.000000000 +0200
++++ b/src/confmgr/nmv-gconf-mgr.cc 2016-08-04 23:50:08.143060464 +0200
+@@ -32,6 +32,7 @@
+ NEMIVER_BEGIN_NAMESPACE (nemiver)
+
+ using nemiver::common::GCharSafePtr;
++using nemiver::common::GErrorSafePtr;
+
+ class GConfMgr : public IConfMgr {
+ GConfMgr (const GConfMgr &);
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/nemiver/src.nix b/pkgs/desktops/gnome-3/3.22/devtools/nemiver/src.nix
new file mode 100644
index 00000000000..2fcf639fe1b
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/devtools/nemiver/src.nix
@@ -0,0 +1,11 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "nemiver-0.9.6";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/nemiver/0.9/nemiver-0.9.6.tar.xz;
+ sha256 = "85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2";
+ };
+}
+
diff --git a/pkgs/desktops/gnome-3/3.22/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/3.22/games/aisleriot/default.nix
new file mode 100644
index 00000000000..e149a0b3126
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/aisleriot/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, gtk3
+, wrapGAppsHook, gconf, librsvg, libxml2, desktop_file_utils
+, guile, libcanberra_gtk3 }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ configureFlags = [ "--with-card-theme-formats=svg" ];
+
+ buildInputs = [ pkgconfig intltool itstool gtk3 wrapGAppsHook gconf
+ librsvg libxml2 desktop_file_utils guile libcanberra_gtk3 ];
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Aisleriot;
+ description = "A collection of patience games written in guile scheme";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/aisleriot/src.nix b/pkgs/desktops/gnome-3/3.22/games/aisleriot/src.nix
new file mode 100644
index 00000000000..fbe6505b9a0
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/aisleriot/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "aisleriot-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/aisleriot/3.22/aisleriot-3.22.0.tar.xz;
+ sha256 = "e7b603df0a482bdd0ab8083efc096a24a46aea1b36cc8608846e568b7a353eb7";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/3.22/games/five-or-more/default.nix
new file mode 100644
index 00000000000..50a7d2906a7
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/five-or-more/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, librsvg, intltool, itstool, libxml2 }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = [
+ pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2
+ gnome3.defaultIconTheme
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Five_or_more;
+ description = "Remove colored balls from the board by forming lines";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/five-or-more/src.nix b/pkgs/desktops/gnome-3/3.22/games/five-or-more/src.nix
new file mode 100644
index 00000000000..597db69a5dc
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/five-or-more/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "five-or-more-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/five-or-more/3.22/five-or-more-3.22.0.tar.xz;
+ sha256 = "33c0ba7723144aea496112fa85a1d7e5a2a8ecaa32f4373471470d7c3078da94";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/3.22/games/four-in-a-row/default.nix
new file mode 100644
index 00000000000..68228750cd8
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/four-in-a-row/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, intltool, itstool, libcanberra_gtk3, librsvg, libxml2 }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = [
+ pkgconfig gtk3 wrapGAppsHook intltool itstool libcanberra_gtk3 librsvg
+ libxml2 gnome3.defaultIconTheme
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Four-in-a-row;
+ description = "Make lines of the same color to win";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/four-in-a-row/src.nix b/pkgs/desktops/gnome-3/3.22/games/four-in-a-row/src.nix
new file mode 100644
index 00000000000..e0e11bc2124
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/four-in-a-row/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "four-in-a-row-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/four-in-a-row/3.22/four-in-a-row-3.22.0.tar.xz;
+ sha256 = "c2e26630f7b4e81cff087314edc0f39cd645dfbf4b31f826232bd8e9d57a7ff7";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-chess/default.nix
new file mode 100644
index 00000000000..a96dae3c12c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/gnome-chess/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, intltool, itstool, librsvg, libxml2 }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = [
+ pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2
+ gnome3.defaultIconTheme
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Chess;
+ description = "Play the classic two-player boardgame of chess";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-chess/src.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-chess/src.nix
new file mode 100644
index 00000000000..1cced81517d
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/gnome-chess/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-chess-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-chess/3.22/gnome-chess-3.22.0.tar.xz;
+ sha256 = "838040c120af08aaa8ef1a6a284e2de296b998b37e49adb9436a12b6a428154a";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-klotski/default.nix
new file mode 100644
index 00000000000..dc2289daff8
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/gnome-klotski/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, librsvg, libxml2, intltool, itstool, libgee, libgames-support }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = [
+ pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2 libgee libgames-support
+ gnome3.defaultIconTheme
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Klotski;
+ description = "Slide blocks to solve the puzzle";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-klotski/src.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-klotski/src.nix
new file mode 100644
index 00000000000..447bc1eff13
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/gnome-klotski/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-klotski-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-klotski/3.22/gnome-klotski-3.22.0.tar.xz;
+ sha256 = "25e35369d1b5d2f9e6b92d44568d21df631b5b23dd7b12ca226a04f58cb54700";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-mahjongg/default.nix
new file mode 100644
index 00000000000..43db32e8857
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/gnome-mahjongg/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, librsvg, intltool, itstool, libxml2 }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = [
+ pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2
+ gnome3.defaultIconTheme
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Mahjongg;
+ description = "Disassemble a pile of tiles by removing matching pairs";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-mahjongg/src.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-mahjongg/src.nix
new file mode 100644
index 00000000000..c021136ee30
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/gnome-mahjongg/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-mahjongg-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-mahjongg/3.22/gnome-mahjongg-3.22.0.tar.xz;
+ sha256 = "f5972a14fa4ad04153bd6e68475b85cd79c6b44f6cac1fe1edb64dbad4135218";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-mines/default.nix
new file mode 100644
index 00000000000..0b670ec9f65
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/gnome-mines/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, librsvg, intltool, itstool, libxml2, libgames-support, libgee }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = [
+ pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2
+ gnome3.defaultIconTheme libgames-support libgee
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Mines;
+ description = "Clear hidden mines from a minefield";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-mines/src.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-mines/src.nix
new file mode 100644
index 00000000000..67db003d99a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/gnome-mines/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-mines-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-mines/3.22/gnome-mines-3.22.0.tar.xz;
+ sha256 = "ee6df05b36fdff0376371887c1375e63d9e90655146a9a787db3c3aa2b74908a";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-nibbles/default.nix
new file mode 100644
index 00000000000..cf228218878
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/gnome-nibbles/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, librsvg, libcanberra_gtk3, clutter_gtk, intltool, itstool
+, libxml2, libgee, libgames-support }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = [
+ pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
+ librsvg libcanberra_gtk3 clutter_gtk gnome3.defaultIconTheme
+ libgee libgames-support
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Nibbles;
+ description = "Guide a worm around a maze";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-nibbles/src.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-nibbles/src.nix
new file mode 100644
index 00000000000..e2948db9e4c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/gnome-nibbles/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-nibbles-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-nibbles/3.22/gnome-nibbles-3.22.0.tar.xz;
+ sha256 = "9cbc0aa458af0a4c00fd1bd528c4c3fecaea713390e2cbee796b0a6930e0cb49";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-robots/default.nix
new file mode 100644
index 00000000000..9eafb166eee
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/gnome-robots/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, librsvg, libcanberra_gtk3, intltool, itstool, libxml2, libgames-support
+, libgee}:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = [
+ pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libcanberra_gtk3
+ libxml2 gnome3.defaultIconTheme libgames-support libgee
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Robots;
+ description = "Avoid the robots and make them crash into each other";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-robots/src.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-robots/src.nix
new file mode 100644
index 00000000000..17fabe2de26
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/gnome-robots/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-robots-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-robots/3.22/gnome-robots-3.22.0.tar.xz;
+ sha256 = "ddb02f9d04c970354d1836813f8c0d9ffc3ff509091d2580384e2275663e6f73";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-sudoku/default.nix
new file mode 100644
index 00000000000..c8ba82c7246
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/gnome-sudoku/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gnome3, wrapGAppsHook
+, json_glib, qqwing, itstool, libxml2 }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = [ pkgconfig intltool wrapGAppsHook gtk3 gnome3.libgee
+ json_glib qqwing itstool libxml2 ];
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Sudoku;
+ description = "Test your logic skills in this number grid puzzle";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-sudoku/src.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-sudoku/src.nix
new file mode 100644
index 00000000000..085cf2ffb20
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/gnome-sudoku/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-sudoku-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-sudoku/3.22/gnome-sudoku-3.22.0.tar.xz;
+ sha256 = "0f39a7afb864c6cffa1991cc5fda958e0eb03329eebe21ca2d965588cf5fa0d5";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-taquin/default.nix
new file mode 100644
index 00000000000..78eaa23e63b
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/gnome-taquin/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, librsvg, libcanberra_gtk3, intltool, itstool, libxml2 }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = [
+ pkgconfig gtk3 wrapGAppsHook librsvg libcanberra_gtk3
+ intltool itstool libxml2 gnome3.defaultIconTheme
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Taquin;
+ description = "Move tiles so that they reach their places";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-taquin/src.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-taquin/src.nix
new file mode 100644
index 00000000000..6828e56a911
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/gnome-taquin/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-taquin-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-taquin/3.22/gnome-taquin-3.22.0.tar.xz;
+ sha256 = "780af247856b91095a9a2e1a6b425e4e3a78520659e2157eddb421377e8ce982";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-tetravex/default.nix
new file mode 100644
index 00000000000..d6feab93dba
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/gnome-tetravex/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, libxml2, intltool, itstool }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = [
+ pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.defaultIconTheme
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Tetravex;
+ description = "Complete the puzzle by matching numbered tiles";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-tetravex/src.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-tetravex/src.nix
new file mode 100644
index 00000000000..e79b18263b9
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/gnome-tetravex/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-tetravex-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-tetravex/3.22/gnome-tetravex-3.22.0.tar.xz;
+ sha256 = "0a6d7ff5ffcd6c05454a919d46a2e389d6b5f87bc80e82c52c2f20d9d914e18d";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/hitori/default.nix b/pkgs/desktops/gnome-3/3.22/games/hitori/default.nix
new file mode 100644
index 00000000000..bd6be7d43c5
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/hitori/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, libxml2, intltool, itstool }:
+
+stdenv.mkDerivation rec {
+ name = "hitori-${gnome3.version}.1";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/hitori/${gnome3.version}/${name}.tar.xz";
+ sha256 = "07pm3xl05jgb8x151k1j2ap57dmfvk2nkz9dmqnn5iywfigsysd1";
+ };
+
+ buildInputs = [
+ pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
+ gnome3.defaultIconTheme
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Hitori;
+ description = "GTK+ application to generate and let you play games of Hitori";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/hitori/src.nix b/pkgs/desktops/gnome-3/3.22/games/hitori/src.nix
new file mode 100644
index 00000000000..47989cf2eae
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/hitori/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "hitori-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/hitori/3.22/hitori-3.22.0.tar.xz;
+ sha256 = "f70521c9a7a7c3e16b3951b64780eb0c5bce1bb1bb29de4482be06fb5e41adaa";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/iagno/default.nix b/pkgs/desktops/gnome-3/3.22/games/iagno/default.nix
new file mode 100644
index 00000000000..1b6f08d1fd6
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/iagno/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook
+, intltool, itstool, libcanberra_gtk3, libxml2, dconf }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
+ dconf libxml2 libcanberra_gtk3 wrapGAppsHook itstool intltool ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Iagno;
+ description = "Computer version of the game Reversi, more popularly called Othello";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/iagno/src.nix b/pkgs/desktops/gnome-3/3.22/games/iagno/src.nix
new file mode 100644
index 00000000000..6c20a8f7844
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/iagno/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "iagno-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/iagno/3.22/iagno-3.22.0.tar.xz;
+ sha256 = "e7070c55f1f74cd9345388ee120f0e6cc47392868c2601664c26a0fa2672fe13";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/3.22/games/lightsoff/default.nix
new file mode 100644
index 00000000000..8ec54b48972
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/lightsoff/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook
+, intltool, itstool, clutter, clutter_gtk, libxml2, dconf }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg dconf
+ libxml2 clutter clutter_gtk wrapGAppsHook itstool intltool ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Lightsoff;
+ description = "Puzzle game, where the objective is to turn off all of the tiles on the board";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/lightsoff/src.nix b/pkgs/desktops/gnome-3/3.22/games/lightsoff/src.nix
new file mode 100644
index 00000000000..c79aa1582a1
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/lightsoff/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "lightsoff-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/lightsoff/3.22/lightsoff-3.22.0.tar.xz;
+ sha256 = "0458e0ff99a10a99573db4d3e1ea5abde186056d8e32cf1f0bd76e25ff2c4fca";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/3.22/games/quadrapassel/default.nix
new file mode 100644
index 00000000000..f319608764d
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/quadrapassel/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf
+, librsvg, libcanberra_gtk3
+, intltool, itstool, libxml2, clutter, clutter_gtk, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
+ libcanberra_gtk3 itstool intltool clutter
+ libxml2 clutter_gtk wrapGAppsHook ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Quadrapassel;
+ description = "Classic falling-block game, Tetris";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/quadrapassel/src.nix b/pkgs/desktops/gnome-3/3.22/games/quadrapassel/src.nix
new file mode 100644
index 00000000000..57bdb4771dd
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/quadrapassel/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "quadrapassel-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/quadrapassel/3.22/quadrapassel-3.22.0.tar.xz;
+ sha256 = "0ed44ef73c8811cbdfc3b44c8fd80eb6e2998d102d59ac324e4748f5d9dddb55";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/3.22/games/swell-foop/default.nix
new file mode 100644
index 00000000000..3d3e424d0da
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/swell-foop/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, dconf
+, clutter, clutter_gtk, intltool, itstool, libxml2, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
+ dconf wrapGAppsHook itstool intltool clutter clutter_gtk libxml2 ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = "https://wiki.gnome.org/Apps/Swell%20Foop";
+ description = "Puzzle game, previously known as Same GNOME";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/swell-foop/src.nix b/pkgs/desktops/gnome-3/3.22/games/swell-foop/src.nix
new file mode 100644
index 00000000000..e0644e539fb
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/swell-foop/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "swell-foop-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/swell-foop/3.22/swell-foop-3.22.0.tar.xz;
+ sha256 = "e7bb6f4c7932a17c3f48e5b7df66f4e3953642e8126389531592a79fdf71e0a4";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/tali/default.nix b/pkgs/desktops/gnome-3/3.22/games/tali/default.nix
new file mode 100644
index 00000000000..c2b1f585712
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/tali/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf
+, librsvg, intltool, itstool, libxml2, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
+ libxml2 itstool intltool wrapGAppsHook ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Tali;
+ description = "Sort of poker with dice and less money";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/tali/src.nix b/pkgs/desktops/gnome-3/3.22/games/tali/src.nix
new file mode 100644
index 00000000000..108144cc3ee
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/games/tali/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "tali-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/tali/3.22/tali-3.22.0.tar.xz;
+ sha256 = "5ba17794d6fb06b794daaffa62a6aaa372b7de8886ce5ec596c37e62bb71728b";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/installer.nix b/pkgs/desktops/gnome-3/3.22/installer.nix
new file mode 100644
index 00000000000..4999e1f3343
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/installer.nix
@@ -0,0 +1,15 @@
+{ isoBaseName ? "nixos-graphical-gnome", system ? builtins.currentSystem
+, extraModules ? [] }:
+
+let
+
+ module = ../../../../nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix;
+
+ config = (import ../../../../nixos/lib/eval-config.nix {
+ inherit system;
+ modules = [ module { isoImage.isoBaseName = isoBaseName; } ] ++ extraModules;
+ }).config;
+
+in
+ config.system.build.isoImage
+
diff --git a/pkgs/desktops/gnome-3/3.22/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch b/pkgs/desktops/gnome-3/3.22/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch
new file mode 100644
index 00000000000..c229cc96094
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch
@@ -0,0 +1,39 @@
+diff --git a/configure.ac b/configure.ac
+index 8a94642..1ca6426 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -27,7 +27,7 @@ AC_SUBST(LDFLAGS)
+ GLIB_REQUIRED=2.38.0
+ GTK_REQUIRED=3.12.2
+ GEE_REQUIRED=0.10.5
+-ECAL_REQUIRED=3.8.5
++ECAL_REQUIRED=3.13.90
+ LIBSOUP_REQUIRED=2.44
+ GDATA_REQUIRED=0.14.0
+ GOA_REQUIRED=3.8.3
+diff --git a/src/backing/eds/backing-eds-calendar-source.vala b/src/backing/eds/backing-eds-calendar-source.vala
+index ee6a572..5009b5d 100644
+--- a/src/backing/eds/backing-eds-calendar-source.vala
++++ b/src/backing/eds/backing-eds-calendar-source.vala
+@@ -256,7 +256,7 @@ internal class EdsCalendarSource : CalendarSource {
+
+ // Invoked by EdsStore prior to making it available outside of unit
+ internal async void open_async(Cancellable? cancellable) throws Error {
+- client = (E.CalClient) yield E.CalClient.connect(eds_source, E.CalClientSourceType.EVENTS,
++ client = (E.CalClient) yield E.CalClient.connect(eds_source, E.CalClientSourceType.EVENTS, 1,
+ cancellable);
+
+ client.bind_property("readonly", this, PROP_READONLY, BindingFlags.SYNC_CREATE);
+diff --git a/vapi/libecal-1.2.vapi b/vapi/libecal-1.2.vapi
+index 6ead3ec..46fd711 100644
+--- a/vapi/libecal-1.2.vapi
++++ b/vapi/libecal-1.2.vapi
+@@ -23,7 +23,7 @@ namespace E {
+ public bool check_save_schedules ();
+ public static bool check_timezones (iCal.icalcomponent comp, GLib.List comps, GLib.Callback tzlookup, void* ecalclient, GLib.Cancellable cancellable) throws GLib.Error;
+ [CCode (finish_name = "e_cal_client_connect_finish")]
+- public static async unowned E.Client connect (E.Source source, E.CalClientSourceType source_type, GLib.Cancellable cancellable) throws GLib.Error;
++ public static async unowned E.Client connect (E.Source source, E.CalClientSourceType source_type, uint32 wait_for_connected_seconds, GLib.Cancellable cancellable) throws GLib.Error;
+ public static unowned E.Client connect_sync (E.Source source, E.CalClientSourceType source_type, GLib.Cancellable cancellable) throws GLib.Error;
+ [CCode (finish_name = "e_cal_client_create_object_finish")]
+ public async void create_object (iCal.icalcomponent icalcomp, GLib.Cancellable? cancellable, out string out_uid) throws GLib.Error;
diff --git a/pkgs/desktops/gnome-3/3.22/misc/california/default.nix b/pkgs/desktops/gnome-3/3.22/misc/california/default.nix
new file mode 100644
index 00000000000..ca0450dc7f9
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/misc/california/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_32, makeWrapper
+, gnome3, glib, libsoup, libgdata, sqlite, itstool, xdg_utils }:
+
+let
+ majorVersion = "0.4";
+in
+stdenv.mkDerivation rec {
+ name = "california-${majorVersion}.0";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/california/${majorVersion}/${name}.tar.xz";
+ sha256 = "1dky2kllv469k8966ilnf4xrr7z35pq8mdvs7kwziy59cdikapxj";
+ };
+
+ propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+ buildInputs = [ makeWrapper intltool pkgconfig vala_0_32 glib gtk3 gnome3.libgee
+ libsoup libgdata gnome3.gnome_online_accounts gnome3.evolution_data_server
+ sqlite itstool xdg_utils gnome3.gsettings_desktop_schemas ];
+
+ preFixup = ''
+ wrapProgram "$out/bin/california" \
+ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.defaultIconTheme}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH:${gnome3.gsettings_desktop_schemas}/share"
+ '';
+
+ enableParallelBuilding = true;
+
+ # Apply fedoras patch to build with evolution-data-server >3.13
+ patches = [ ./0002-Build-with-evolution-data-server-3.13.90.patch ];
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/California;
+ description = "Calendar application for GNOME 3";
+ maintainers = with maintainers; [ pSub ];
+ license = licenses.lgpl21;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.22/misc/geary/default.nix
new file mode 100644
index 00000000000..9eb7e78d8d4
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/misc/geary/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_32
+, makeWrapper, gdk_pixbuf, cmake, desktop_file_utils
+, libnotify, libcanberra_gtk3, libsecret, gmime
+, libpthreadstubs, sqlite
+, gnome3, librsvg, gnome_doc_utils, webkitgtk }:
+
+let
+ majorVersion = "0.11";
+in
+stdenv.mkDerivation rec {
+ name = "geary-${majorVersion}.2";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/geary/${majorVersion}/${name}.tar.xz";
+ sha256 = "0ca6kdprhm8w990n6wgpvn0vzsdrnv9vjdm448pa8winspn217jw";
+ };
+
+ propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+ buildInputs = [ intltool pkgconfig gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils
+ vala_0_32 webkitgtk libnotify libcanberra_gtk3 gnome3.libgee libsecret gmime sqlite
+ libpthreadstubs gnome3.gsettings_desktop_schemas gnome3.gcr
+ gdk_pixbuf librsvg gnome3.defaultIconTheme ];
+
+ preConfigure = ''
+ substituteInPlace src/CMakeLists.txt --replace '`pkg-config --variable=girdir gobject-introspection-1.0`' '${webkitgtk}/share/gir-1.0'
+ '';
+
+ postInstall = ''
+ mkdir -p $out/share/gsettings-schemas/${name}/
+ mv $out/share/glib-2.0 $out/share/gsettings-schemas/${name}
+ '';
+
+ preFixup = ''
+ wrapProgram "$out/bin/geary" \
+ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+ '';
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Geary;
+ description = "Mail client for GNOME 3";
+ maintainers = gnome3.maintainers;
+ license = licenses.lgpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gexiv2/default.nix
new file mode 100644
index 00000000000..7cea9cd8d15
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/misc/gexiv2/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, pkgconfig, exiv2, glib, libtool, m4, gnome3 }:
+
+let
+ majorVersion = "0.10";
+in
+stdenv.mkDerivation rec {
+ name = "gexiv2-${version}";
+ version = "${majorVersion}.3";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/gexiv2/${majorVersion}/${name}.tar.xz";
+ sha256 = "390cfb966197fa9f3f32200bc578d7c7f3560358c235e6419657206a362d3988";
+ };
+
+ preConfigure = ''
+ patchShebangs .
+ '';
+
+ buildInputs = [ pkgconfig glib libtool m4 ];
+ propagatedBuildInputs = [ exiv2 ];
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Projects/gexiv2;
+ description = "GObject wrapper around the Exiv2 photo metadata library";
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gfbgraph/default.nix
new file mode 100644
index 00000000000..46fa9bc39e5
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/misc/gfbgraph/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, intltool, fetchurl, pkgconfig, glib
+, gnome3, libsoup, json_glib }:
+
+stdenv.mkDerivation rec {
+ name = "gfbgraph-0.2.3";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/gfbgraph/0.2/${name}.tar.xz";
+ sha256 = "1dp0v8ia35fxs9yhnqpxj3ir5lh018jlbiwifjfn8ayy7h47j4fs";
+ };
+
+ buildInputs = [ pkgconfig glib gnome3.gnome_online_accounts ];
+ propagatedBuildInputs = [ libsoup json_glib gnome3.rest ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "GLib/GObject wrapper for the Facebook Graph API";
+ maintainers = gnome3.maintainers;
+ license = licenses.lgpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gitg/default.nix
new file mode 100644
index 00000000000..8d9ee143ac2
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/misc/gitg/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, fetchgit, vala_0_32, intltool, libgit2, pkgconfig, gtk3, glib
+, json_glib, webkitgtk, wrapGAppsHook, libpeas, bash, gobjectIntrospection
+, gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg, libsecret
+, dconf}:
+
+
+# TODO: icons and theme still does not work
+# use packaged gnome3.adwaita-icon-theme
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ preCheck = ''
+ substituteInPlace tests/libgitg/test-commit.c --replace "/bin/bash" "${bash}/bin/bash"
+ '';
+ doCheck = true;
+
+ makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
+
+ propagatedUserEnvPkgs = [ shared_mime_info
+ gnome3.gnome_themes_standard ];
+
+ buildInputs = [ vala_0_32 intltool libgit2 pkgconfig gtk3 glib json_glib webkitgtk libgee libpeas
+ libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview
+ librsvg libsecret dconf
+ gobjectIntrospection gnome3.adwaita-icon-theme ];
+
+ nativeBuildInputs = [ wrapGAppsHook ];
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=758240
+ preBuild = ''make -j$NIX_BUILD_CORES Gitg-1.0.gir'';
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/action/show/Apps/Gitg;
+ description = "GNOME GUI client to view git repositories";
+ maintainers = with maintainers; [ domenkozar ];
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix b/pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix
new file mode 100644
index 00000000000..bc9e517aceb
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gitg-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gitg/3.22/gitg-3.22.0.tar.xz;
+ sha256 = "ba6895f85c18748294075980a5e03e0936ad4e84534dbb0d8f9e29aa874ddeaf";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gnome-autoar/default.nix
new file mode 100644
index 00000000000..3a35a87ceaf
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/misc/gnome-autoar/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, pkgconfig, gnome3
+, gtk3, glib, gobjectIntrospection, libarchive
+}:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk3 glib ];
+ propagatedBuildInputs = [ libarchive gobjectIntrospection ];
+
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ license = licenses.lgpl21;
+ description = "Library to integrate compressed files management with GNOME";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-autoar/src.nix b/pkgs/desktops/gnome-3/3.22/misc/gnome-autoar/src.nix
new file mode 100644
index 00000000000..c9f10fa8cd7
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/misc/gnome-autoar/src.nix
@@ -0,0 +1,12 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: rec {
+ pname = "gnome-autoar";
+ version = "0.1";
+ name = "${pname}-${version}.1";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/${pname}/${version}/${name}.tar.xz";
+ sha256 = "f65cb810b562dc038ced739fbf59739fd5df1a8e848636e21f363ded9f349ac9";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gnome-packagekit/default.nix
new file mode 100644
index 00000000000..ee3dd60e59a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/misc/gnome-packagekit/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gnome3, libxslt, packagekit
+, fontconfig, libcanberra_gtk3, libnotify, wrapGAppsHook, dbus_glib, dbus_libs }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0";
+
+ nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ];
+ buildInputs = [ libxslt gnome3.gtk packagekit fontconfig
+ libcanberra_gtk3 libnotify dbus_glib dbus_libs ];
+
+ meta = with stdenv.lib; {
+ homepage = https://www.freedesktop.org/software/PackageKit/;
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ description = "Tools for installing software on the GNOME desktop using PackageKit";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-packagekit/src.nix b/pkgs/desktops/gnome-3/3.22/misc/gnome-packagekit/src.nix
new file mode 100644
index 00000000000..8937b7dd1a7
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/misc/gnome-packagekit/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-packagekit-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-packagekit/3.22/gnome-packagekit-3.22.0.tar.xz;
+ sha256 = "0b28d4928f9767a512723b49656266aaa2a7909d880e5e4238c0e3436ac4908c";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
new file mode 100644
index 00000000000..7a16d2c24e5
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
@@ -0,0 +1,120 @@
+From bdbbe312e6520ce70e91319162e85367a69ce044 Mon Sep 17 00:00:00 2001
+From: Jascha Geerds
+Date: Sat, 1 Aug 2015 21:01:11 +0200
+Subject: [PATCH 1/3] Search for themes and icons in system data dirs
+
+---
+ gtweak/tweaks/tweak_group_interface.py | 17 ++++-------------
+ gtweak/tweaks/tweak_group_keymouse.py | 7 ++-----
+ gtweak/utils.py | 17 +++++++++++++++++
+ 3 files changed, 23 insertions(+), 18 deletions(-)
+
+Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
+===================================================================
+--- gnome-tweak-tool-3.20.1.orig/gtweak/tweaks/tweak_group_interface.py
++++ gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
+@@ -26,7 +26,7 @@ from gi.repository import Gtk
+ from gi.repository import GLib
+
+ import gtweak
+-from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file
++from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs
+ from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE
+ from gtweak.gshellwrapper import GnomeShellFactory
+ from gtweak.gsettings import GSettingsSetting
+@@ -50,10 +50,7 @@ class GtkThemeSwitcher(GSettingsComboTwe
+ if gtk_ver % 2: # Want even number
+ gtk_ver += 1
+
+- dirs = ( os.path.join(gtweak.DATA_DIR, "themes"),
+- os.path.join(GLib.get_user_data_dir(), "themes"),
+- os.path.join(os.path.expanduser("~"), ".themes"))
+- valid = walk_directories(dirs, lambda d:
++ valid = walk_directories(get_resource_dirs("themes"), lambda d:
+ os.path.exists(os.path.join(d, "gtk-2.0")) and \
+ (os.path.exists(os.path.join(d, "gtk-3.0")) or \
+ os.path.exists(os.path.join(d, "gtk-3.{}".format(gtk_ver)))))
+@@ -69,10 +66,7 @@ class IconThemeSwitcher(GSettingsComboTw
+ **options)
+
+ def _get_valid_icon_themes(self):
+- dirs = ( os.path.join(gtweak.DATA_DIR, "icons"),
+- os.path.join(GLib.get_user_data_dir(), "icons"),
+- os.path.join(os.path.expanduser("~"), ".icons"))
+- valid = walk_directories(dirs, lambda d:
++ valid = walk_directories(get_resource_dirs("icons"), lambda d:
+ os.path.isdir(d) and \
+ os.path.exists(os.path.join(d, "index.theme")))
+ return valid
+@@ -87,10 +81,7 @@ class CursorThemeSwitcher(GSettingsCombo
+ **options)
+
+ def _get_valid_cursor_themes(self):
+- dirs = ( os.path.join(gtweak.DATA_DIR, "icons"),
+- os.path.join(GLib.get_user_data_dir(), "icons"),
+- os.path.join(os.path.expanduser("~"), ".icons"))
+- valid = walk_directories(dirs, lambda d:
++ valid = walk_directories(get_resource_dirs("icons"), lambda d:
+ os.path.isdir(d) and \
+ os.path.exists(os.path.join(d, "cursors")))
+ return valid
+Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py
+===================================================================
+--- gnome-tweak-tool-3.20.1.orig/gtweak/tweaks/tweak_group_keymouse.py
++++ gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py
+@@ -20,7 +20,7 @@ import os.path
+ from gi.repository import GLib
+
+ import gtweak
+-from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default
++from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs
+ from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title, GSettingsComboEnumTweak
+
+ class PrimaryPasteTweak(GetterSetterSwitchTweak):
+@@ -48,10 +48,7 @@ class KeyThemeSwitcher(GSettingsComboTwe
+ **options)
+
+ def _get_valid_key_themes(self):
+- dirs = ( os.path.join(gtweak.DATA_DIR, "themes"),
+- os.path.join(GLib.get_user_data_dir(), "themes"),
+- os.path.join(os.path.expanduser("~"), ".themes"))
+- valid = walk_directories(dirs, lambda d:
++ valid = walk_directories(get_resource_dirs("themes"), lambda d:
+ os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \
+ os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc")))
+ return valid
+Index: gnome-tweak-tool-3.20.1/gtweak/utils.py
+===================================================================
+--- gnome-tweak-tool-3.20.1.orig/gtweak/utils.py
++++ gnome-tweak-tool-3.20.1/gtweak/utils.py
+@@ -21,6 +21,7 @@ import tempfile
+ import shutil
+ import subprocess
+ import glob
++import itertools
+
+ import gtweak
+ from gtweak.gsettings import GSettingsSetting
+@@ -116,6 +117,22 @@ def execute_subprocess(cmd_then_args, bl
+ stdout, stderr = p.communicate()
+ return stdout, stderr, p.returncode
+
++def get_resource_dirs(resource):
++ """Returns a list of all known resource dirs for a given resource.
++
++ :param str resource:
++ Name of the resource (e.g. "themes")
++ :return:
++ A list of resource dirs
++ """
++ dirs = [os.path.join(dir, resource)
++ for dir in itertools.chain(GLib.get_system_data_dirs(),
++ (gtweak.DATA_DIR,
++ GLib.get_user_data_dir()))]
++ dirs += [os.path.join(os.path.expanduser("~"), ".{}".format(resource))]
++
++ return [dir for dir in dirs if os.path.isdir(dir)]
++
+ @singleton
+ class AutostartManager:
+
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
new file mode 100644
index 00000000000..5ddc13949cb
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
@@ -0,0 +1,100 @@
+From 22b948c39b32fb45066c4f5a9f99082094fea3d1 Mon Sep 17 00:00:00 2001
+From: Jascha Geerds
+Date: Sat, 1 Aug 2015 21:26:57 +0200
+Subject: [PATCH 2/3] Don't show multiple entries for a single theme
+
+---
+ gtweak/tweaks/tweak_group_interface.py | 8 ++++----
+ gtweak/tweaks/tweak_group_keymouse.py | 4 ++--
+ gtweak/utils.py | 16 ++++++++++++++++
+ 3 files changed, 22 insertions(+), 6 deletions(-)
+
+Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
+===================================================================
+--- gnome-tweak-tool-3.20.1.orig/gtweak/tweaks/tweak_group_interface.py
++++ gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
+@@ -26,7 +26,7 @@ from gi.repository import Gtk
+ from gi.repository import GLib
+
+ import gtweak
+-from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs
++from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs, get_unique_resources
+ from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE
+ from gtweak.gshellwrapper import GnomeShellFactory
+ from gtweak.gsettings import GSettingsSetting
+@@ -54,7 +54,7 @@ class GtkThemeSwitcher(GSettingsComboTwe
+ os.path.exists(os.path.join(d, "gtk-2.0")) and \
+ (os.path.exists(os.path.join(d, "gtk-3.0")) or \
+ os.path.exists(os.path.join(d, "gtk-3.{}".format(gtk_ver)))))
+- return valid
++ return get_unique_resources(valid)
+
+ class IconThemeSwitcher(GSettingsComboTweak):
+ def __init__(self, **options):
+@@ -69,7 +69,7 @@ class IconThemeSwitcher(GSettingsComboTw
+ valid = walk_directories(get_resource_dirs("icons"), lambda d:
+ os.path.isdir(d) and \
+ os.path.exists(os.path.join(d, "index.theme")))
+- return valid
++ return get_unique_resources(valid)
+
+ class CursorThemeSwitcher(GSettingsComboTweak):
+ def __init__(self, **options):
+@@ -84,7 +84,7 @@ class CursorThemeSwitcher(GSettingsCombo
+ valid = walk_directories(get_resource_dirs("icons"), lambda d:
+ os.path.isdir(d) and \
+ os.path.exists(os.path.join(d, "cursors")))
+- return valid
++ return get_unique_resources(valid)
+
+ class ShellThemeTweak(Gtk.Box, Tweak):
+
+Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py
+===================================================================
+--- gnome-tweak-tool-3.20.1.orig/gtweak/tweaks/tweak_group_keymouse.py
++++ gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py
+@@ -20,7 +20,7 @@ import os.path
+ from gi.repository import GLib
+
+ import gtweak
+-from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs
++from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs, get_unique_resources
+ from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title, GSettingsComboEnumTweak
+
+ class PrimaryPasteTweak(GetterSetterSwitchTweak):
+@@ -51,7 +51,7 @@ class KeyThemeSwitcher(GSettingsComboTwe
+ valid = walk_directories(get_resource_dirs("themes"), lambda d:
+ os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \
+ os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc")))
+- return valid
++ return get_unique_resources(valid)
+
+ TWEAK_GROUPS = [
+ ListBoxTweakGroup(_("Keyboard and Mouse"),
+Index: gnome-tweak-tool-3.20.1/gtweak/utils.py
+===================================================================
+--- gnome-tweak-tool-3.20.1.orig/gtweak/utils.py
++++ gnome-tweak-tool-3.20.1/gtweak/utils.py
+@@ -133,6 +133,22 @@ def get_resource_dirs(resource):
+
+ return [dir for dir in dirs if os.path.isdir(dir)]
+
++def get_unique_resources(dirs):
++ """Filter out duplicated resources.
++
++ :param list dirs:
++ List of resource dirs (e.g. /usr/share/themes/Adwaita)
++ :return:
++ List of dirs without duplicated resources
++ """
++ unique_dirs = {}
++ for dir in dirs:
++ basename = os.path.basename(dir)
++ if basename not in unique_dirs:
++ unique_dirs[basename] = dir
++
++ return unique_dirs
++
+ @singleton
+ class AutostartManager:
+
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
new file mode 100644
index 00000000000..b25b2d6dc4a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
@@ -0,0 +1,29 @@
+From cdafa01dc90da486d0114b423e3e467f7b083d1b Mon Sep 17 00:00:00 2001
+From: Jascha Geerds
+Date: Sun, 2 Aug 2015 12:01:20 +0200
+Subject: [PATCH 3/3] Create config dir if it doesn't exist
+
+Otherwise gnome-tweak-tool can't enable the dark theme and fails
+without a clear error message.
+---
+ gtweak/gtksettings.py | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/gtweak/gtksettings.py b/gtweak/gtksettings.py
+index bcec9f1..f39991b 100644
+--- a/gtweak/gtksettings.py
++++ b/gtweak/gtksettings.py
+@@ -35,6 +35,10 @@ class GtkSettingsManager:
+ def _get_keyfile(self):
+ keyfile = None
+ try:
++ config_dir = os.path.dirname(self._path)
++ if not os.path.isdir(config_dir):
++ os.makedirs(config_dir)
++
+ keyfile = GLib.KeyFile()
+ keyfile.load_from_file(self._path, 0)
+ except MemoryError:
+--
+2.7.0
+
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix
new file mode 100644
index 00000000000..e6c4b8c8202
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, intltool, fetchurl, atk
+, pkgconfig, gtk3, glib, libsoup
+, bash, makeWrapper, itstool, libxml2, python2Packages
+, gnome3, librsvg, gdk_pixbuf, file, libnotify, gobjectIntrospection, wrapGAppsHook }:
+
+let
+ python = python2Packages.python.withPackages ( ps: with ps; [ pygobject3 ] );
+in stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ doCheck = true;
+
+ propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+ makeFlags = [ "DESTDIR=/" ];
+
+ buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2
+ gnome3.gsettings_desktop_schemas makeWrapper file
+ gdk_pixbuf gnome3.defaultIconTheme librsvg
+ libnotify gnome3.gnome_shell
+ libsoup gnome3.gnome_settings_daemon gnome3.nautilus
+ gnome3.gnome_desktop wrapGAppsHook ];
+
+ propagatedBuildInputs = [ python gobjectIntrospection ];
+
+ PYTHONPATH = "$out/${python.python.sitePackages}";
+
+ wrapPrefixVariables = [ "PYTHONPATH" ];
+
+ patches = [
+ ./find_gsettings.patch
+ ./0001-Search-for-themes-and-icons-in-system-data-dirs.patch
+ ./0002-Don-t-show-multiple-entries-for-a-single-theme.patch
+ ./0003-Create-config-dir-if-it-doesn-t-exist.patch
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/action/show/Apps/GnomeTweakTool;
+ description = "A tool to customize advanced GNOME 3 options";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/find_gsettings.patch b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/find_gsettings.patch
new file mode 100644
index 00000000000..3e68c04cb3a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/find_gsettings.patch
@@ -0,0 +1,22 @@
+diff --git a/gtweak/gsettings.py b/gtweak/gsettings.py
+index a00fe19..dce74b2 100644
+--- a/gtweak/gsettings.py
++++ b/gtweak/gsettings.py
+@@ -33,10 +33,15 @@ class GSettingsMissingError(Exception):
+
+ class _GSettingsSchema:
+ def __init__(self, schema_name, schema_dir=None, schema_filename=None, **options):
+- if not schema_dir:
+- schema_dir = gtweak.GSETTINGS_SCHEMA_DIR
+ if not schema_filename:
+ schema_filename = schema_name + ".gschema.xml"
++ if not schema_dir:
++ schema_dir = gtweak.GSETTINGS_SCHEMA_DIR
++ for xdg_dir in GLib.get_system_data_dirs():
++ dir = os.path.join(xdg_dir, "glib-2.0", "schemas")
++ if os.path.exists(os.path.join(dir, schema_filename)):
++ schema_dir = dir
++ break
+
+ schema_path = os.path.join(schema_dir, schema_filename)
+ if not os.path.exists(schema_path):
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/src.nix b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/src.nix
new file mode 100644
index 00000000000..88f3b3069f1
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-tweak-tool-3.22.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-tweak-tool/3.22/gnome-tweak-tool-3.22.0.tar.xz;
+ sha256 = "3d6ae11e13f6169ee543e573135e1e5697cf92ab8d86570c6f952021ae093abb";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-video-effects/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gnome-video-effects/default.nix
new file mode 100644
index 00000000000..c0bd2fed3f2
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/misc/gnome-video-effects/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gnome3 }:
+
+stdenv.mkDerivation rec {
+ name = "gnome-video-effects-${version}";
+ version = "0.4.1";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/gnome-video-effects/0.4/${name}.tar.xz";
+ sha256 = "0jl4iny2dqpcgi3sgxzpgnbw0752i8ay3rscp2cgdjlp79ql5gil";
+ };
+
+ buildInputs = [ pkgconfig intltool ];
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Projects/GnomeVideoEffects;
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gpaste/default.nix
new file mode 100644
index 00000000000..99766ad898e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/misc/gpaste/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, intltool, autoreconfHook, pkgconfig, vala_0_32, glib
+, pango, gtk3, gnome3, dbus, clutter, appstream-glib, makeWrapper, systemd, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+ version = "3.20.4";
+ name = "gpaste-${version}";
+
+ src = fetchurl {
+ url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz";
+ sha256 = "08h1igdgapz7px12r7mrfcxmz68g9ijg73w69j75spg0yc6f4xax";
+ };
+
+ buildInputs = [ intltool autoreconfHook pkgconfig vala_0_32 glib
+ gtk3 gnome3.gnome_control_center dbus
+ clutter pango appstream-glib makeWrapper systemd gobjectIntrospection ];
+
+ preConfigure = "intltoolize -f";
+
+ configureFlags = [ "--with-controlcenterdir=$(out)/gnome-control-center/keybindings"
+ "--with-dbusservicesdir=$(out)/share/dbus-1/services"
+ "--with-systemduserunitdir=$(out)/etc/systemd/user" ];
+
+ enableParallelBuilding = true;
+
+ preFixup =
+ let
+ libPath = stdenv.lib.makeLibraryPath
+ [ glib gtk3 clutter pango ];
+ in
+ ''
+ for i in $out/libexec/gpaste/*; do
+ wrapProgram $i \
+ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
+ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH"
+ done
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/Keruspe/GPaste;
+ description = "Clipboard management system with GNOME3 integration";
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix
new file mode 100644
index 00000000000..fbb95efb27a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix
@@ -0,0 +1,11 @@
+{ stdenv, fetchurl, pkgconfig, glib, gtk3, enchant, isocodes }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = [ pkgconfig glib gtk3 enchant isocodes ];
+
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix b/pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix
new file mode 100644
index 00000000000..248e3915152
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix
@@ -0,0 +1,10 @@
+fetchurl: rec {
+ major = "1.0";
+ minor = "3";
+ name = "gspell-${major}.${minor}";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/gspell/${major}/${name}.tar.xz";
+ sha256 = "1m8v4rqaxjsblccc3nnirkbkzgqm90vfpzp3x08lkqriqvk0anfr";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gtkhtml/default.nix
new file mode 100644
index 00000000000..89703b61932
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/misc/gtkhtml/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, pkgconfig, gtk3, intltool
+, gnome3, enchant, isocodes }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = [ pkgconfig gtk3 intltool gnome3.adwaita-icon-theme
+ gnome3.gsettings_desktop_schemas ];
+
+ propagatedBuildInputs = [ enchant isocodes ];
+
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gtkhtml/src.nix b/pkgs/desktops/gnome-3/3.22/misc/gtkhtml/src.nix
new file mode 100644
index 00000000000..21876ec9c39
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/misc/gtkhtml/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gtkhtml-4.10.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gtkhtml/4.10/gtkhtml-4.10.0.tar.xz;
+ sha256 = "ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/libgames-support/default.nix b/pkgs/desktops/gnome-3/3.22/misc/libgames-support/default.nix
new file mode 100644
index 00000000000..06937c74c65
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/misc/libgames-support/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, intltool }:
+
+let
+ major = "1";
+ minor = "0";
+in stdenv.mkDerivation rec {
+ version = "${major}.${minor}";
+ name = "libgames-support-${version}";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/libgames-support/${version}/${name}.tar.xz";
+ sha256 = "02qn009m1i07nh8wnyrrjf7kbbapk814ap5pvin5ka5sj996cyqq";
+ };
+
+ buildInputs = [ pkgconfig glib gtk3 libgee intltool ];
+
+ meta = with stdenv.lib; {
+ description = "Small library intended for internal use by GNOME Games, but it may be used by others";
+ homepage = https://github.com/GNOME/libgames-support;
+ license = licenses.gpl3;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/libgda/default.nix b/pkgs/desktops/gnome-3/3.22/misc/libgda/default.nix
new file mode 100644
index 00000000000..2e5b0a4af84
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/misc/libgda/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ configureFlags = [
+ "--enable-gi-system-install=no"
+ ];
+
+ enableParallelBuilding = true;
+
+ hardeningDisable = [ "format" ];
+
+ buildInputs = [ pkgconfig intltool itstool libxml2 gtk3 openssl ];
+
+ meta = with stdenv.lib; {
+ description = "Database access library";
+ homepage = http://www.gnome-db.org/;
+ license = [ licenses.lgpl2 licenses.gpl2 ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/libgda/src.nix b/pkgs/desktops/gnome-3/3.22/misc/libgda/src.nix
new file mode 100644
index 00000000000..8812ccc8ccd
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/misc/libgda/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "libgda-5.2.4";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/libgda/5.2/libgda-5.2.4.tar.xz;
+ sha256 = "2cee38dd583ccbaa5bdf6c01ca5f88cc08758b9b144938a51a478eb2684b765e";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/default.nix
new file mode 100644
index 00000000000..6915ede4ad5
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/default.nix
@@ -0,0 +1,13 @@
+{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala_0_32, libssh2
+, gtk_doc, gobjectIntrospection, libgit2, glib }:
+
+stdenv.mkDerivation rec {
+ inherit (import ./src.nix fetchurl) name src;
+
+ buildInputs = [ gnome3.gnome_common libtool pkgconfig vala_0_32 libssh2
+ gtk_doc gobjectIntrospection libgit2 glib ];
+
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/src.nix b/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/src.nix
new file mode 100644
index 00000000000..6922a7aee1b
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/src.nix
@@ -0,0 +1,12 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: rec {
+ major = "0.24";
+ minor = "4";
+ name = "libgit2-glib-${major}.${minor}";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/libgit2-glib/${major}/${name}.tar.xz";
+ sha256 = "0802qskm64l5ic8rvfjxg27chj502irhw1xkabrl4015dxsiy89s";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/3.22/misc/libmediaart/default.nix
new file mode 100644
index 00000000000..b8648012573
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/misc/libmediaart/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, gobjectIntrospection, gnome3 }:
+
+let
+ majorVersion = "1.9";
+in
+stdenv.mkDerivation rec {
+ name = "libmediaart-${majorVersion}.0";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/libmediaart/${majorVersion}/${name}.tar.xz";
+ sha256 = "0vshvm3sfwqs365glamvkmgnzjnmxd15j47xn0ak3p6l57dqlrll";
+ };
+
+ buildInputs = [ pkgconfig glib gdk_pixbuf gobjectIntrospection ];
+
+ meta = with stdenv.lib; {
+ description = "Library tasked with managing, extracting and handling media art caches";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/pidgin/default.nix b/pkgs/desktops/gnome-3/3.22/misc/pidgin/default.nix
new file mode 100644
index 00000000000..e3f6bca10a4
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/misc/pidgin/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchFromGitHub, glib }:
+
+stdenv.mkDerivation rec {
+ version = "1.0.1";
+ basename = "pidgin-im-gnome-shell-extension";
+ name = "${basename}-${version}";
+
+ src = fetchFromGitHub {
+ owner = "muffinmad";
+ repo = "${basename}";
+ rev = "v${version}";
+ sha256 = "1567s2sfqig4jw0nrn134f5vkx0yq31q044grv3xk4vpl1f3z2lr";
+ };
+
+ buildInputs = [ glib ];
+
+ configurePhase = "";
+ buildPhase = "";
+ installPhase = ''
+ share_dir="$prefix/share"
+ extensions_dir="$share_dir/gnome-shell/extensions/pidgin@muffinmad"
+ mkdir -p "$extensions_dir"
+ mv *.js metadata.json dbus.xml gnome-shell-extension-pidgin.pot "$extensions_dir"
+
+ schemas_dir="$share_dir/gsettings-schemas/${name}/glib-2.0/schemas"
+ mkdir -p "$schemas_dir"
+ mv schemas/* "$schemas_dir" # fix Emacs syntax highlighting: */
+ ${glib.dev}/bin/glib-compile-schemas "$schemas_dir"
+
+ locale_dir="$share_dir/locale"
+ mkdir -p "$locale_dir"
+ mv locale/* $locale_dir # fix Emacs syntax highlighting: */
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/muffinmad/pidgin-im-gnome-shell-extension;
+ description = "Make Pidgin IM conversations appear in the Gnome Shell message tray";
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ DamienCassou ];
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix
new file mode 100644
index 00000000000..1c7f712b12c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper,
+ dbus_glib, libcanberra_gtk2, gst_all_1, vala_0_32, gnome3, gtk3, gst_plugins_base,
+ glib, gobjectIntrospection, telepathy_glib
+}:
+
+stdenv.mkDerivation rec {
+ version = "0.11.2";
+ name = "gnome-shell-pomodoro-${version}";
+
+ src = fetchFromGitHub {
+ owner = "codito";
+ repo = "gnome-pomodoro";
+ rev = "${version}";
+ sha256 = "0x656drq8vnvdj1x6ghnglgpa0z8yd2yj9dh5iqprwjv0z3qkw4l";
+ };
+
+ configureScript = ''./autogen.sh'';
+
+ buildInputs = [
+ which automake113x intltool glib gobjectIntrospection pkgconfig libtool
+ 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
+ gnome3.defaultIconTheme
+ ];
+
+ preBuild = ''
+ sed -i 's|\$(INTROSPECTION_GIRDIR)|${gnome3.gnome_desktop}/share/gir-1.0|' \
+ vapi/Makefile
+ '';
+
+ preFixup = ''
+ wrapProgram $out/bin/gnome-pomodoro \
+ --prefix XDG_DATA_DIRS : \
+ "$out/share:$GSETTINGS_SCHEMAS_PATH:$XDG_DATA_DIRS"
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/codito/gnome-shell-pomodoro;
+ description = "A time management utility for GNOME based on the pomodoro technique";
+ longDescription = ''
+ This GNOME utility helps to manage time according to Pomodoro Technique.
+ It intends to improve productivity and focus by taking short breaks.
+ '';
+ maintainers = with maintainers; [ DamienCassou jgeerds ];
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix
index 980cc9ac25c..942bd5eb977 100644
--- a/pkgs/desktops/kde-5/applications/default.nix
+++ b/pkgs/desktops/kde-5/applications/default.nix
@@ -53,6 +53,7 @@ let
kio-extras = callPackage ./kio-extras.nix {};
kompare = callPackage ./kompare.nix {};
konsole = callPackage ./konsole.nix {};
+ kwalletmanager = callPackage ./kwalletmanager.nix {};
libkdcraw = callPackage ./libkdcraw.nix {};
libkexiv2 = callPackage ./libkexiv2.nix {};
libkipi = callPackage ./libkipi.nix {};
@@ -63,6 +64,9 @@ let
spectacle = callPackage ./spectacle.nix {};
l10n = pkgs.recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib pkgs; });
+
+ # External packages
+ kipi-plugins = callPackage ../../../applications/graphics/kipi-plugins/5.x.nix {};
};
in packages
diff --git a/pkgs/desktops/kde-5/applications/fetch.sh b/pkgs/desktops/kde-5/applications/fetch.sh
index c23d8a4d757..666acf1a8cb 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.1/ -A '*.tar.xz' )
+WGET_ARGS=( http://ftp.ussg.iu.edu/kde/stable/applications/16.08.2/ --cut-dirs=1 -A '*.tar.xz' )
diff --git a/pkgs/desktops/kde-5/applications/gwenview.nix b/pkgs/desktops/kde-5/applications/gwenview.nix
index 66df17f2e44..18f5036127d 100644
--- a/pkgs/desktops/kde-5/applications/gwenview.nix
+++ b/pkgs/desktops/kde-5/applications/gwenview.nix
@@ -1,8 +1,8 @@
{
kdeApp, lib, kdeWrapper,
ecm, kdoctools,
- baloo, exiv2, kactivities, kdelibs4support, kio, lcms2, phonon,
- qtsvg, qtx11extras
+ baloo, exiv2, kactivities, kdelibs4support, kio, kipi-plugins, lcms2,
+ libkdcraw, libkipi, phonon, qtsvg, qtx11extras
}:
let
@@ -15,9 +15,12 @@ let
};
nativeBuildInputs = [ ecm kdoctools ];
propagatedBuildInputs = [
- baloo kactivities kdelibs4support kio qtx11extras exiv2 lcms2 phonon
- qtsvg
+ baloo kactivities kdelibs4support kio qtx11extras exiv2 lcms2 libkdcraw
+ libkipi phonon qtsvg
];
};
in
-kdeWrapper unwrapped { targets = [ "bin/gwenview" ]; }
+kdeWrapper unwrapped {
+ targets = [ "bin/gwenview" ];
+ paths = [ kipi-plugins ];
+}
diff --git a/pkgs/desktops/kde-5/applications/kwalletmanager.nix b/pkgs/desktops/kde-5/applications/kwalletmanager.nix
new file mode 100644
index 00000000000..a7a7ba47f43
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications/kwalletmanager.nix
@@ -0,0 +1,35 @@
+{ lib
+, kdeApp
+, kdeWrapper
+, ecm
+, kdoctools
+, kauth
+, kcmutils
+, kconfigwidgets
+, kcoreaddons
+, kdbusaddons
+, kdelibs4support
+, kxmlgui
+}:
+
+let
+ unwrapped = kdeApp {
+ name = "kwalletmanager";
+ meta = {
+ license = with lib.licenses; [ gpl2 ];
+ maintainers = with lib.maintainers; [ fridh ];
+ };
+ nativeBuildInputs = [ ecm kdoctools ];
+ propagatedBuildInputs = [
+ kauth
+ kcmutils
+ kconfigwidgets
+ kcoreaddons
+ kdbusaddons
+ kdelibs4support
+ kxmlgui
+ ];
+ };
+in kdeWrapper unwrapped {
+ targets = ["bin/kwalletmanager5"];
+}
diff --git a/pkgs/desktops/kde-5/applications/spectacle.nix b/pkgs/desktops/kde-5/applications/spectacle.nix
index 26faea2678a..aa618ffcde1 100644
--- a/pkgs/desktops/kde-5/applications/spectacle.nix
+++ b/pkgs/desktops/kde-5/applications/spectacle.nix
@@ -1,8 +1,9 @@
{
kdeApp, lib, kdeWrapper,
ecm, kdoctools,
- kconfig, kcoreaddons, kdbusaddons, kdeclarative, ki18n, kio, knotifications,
- kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi, xcb-util-cursor
+ kconfig, kcoreaddons, kdbusaddons, kdeclarative, ki18n, kio, kipi-plugins,
+ knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi,
+ xcb-util-cursor
}:
let
@@ -17,4 +18,7 @@ let
];
};
in
-kdeWrapper unwrapped { targets = [ "bin/spectacle" ]; }
+kdeWrapper unwrapped {
+ targets = [ "bin/spectacle" ];
+ paths = [ kipi-plugins ];
+}
diff --git a/pkgs/desktops/kde-5/applications/srcs.nix b/pkgs/desktops/kde-5/applications/srcs.nix
index e3ecd24b6db..a8c984ad645 100644
--- a/pkgs/desktops/kde-5/applications/srcs.nix
+++ b/pkgs/desktops/kde-5/applications/srcs.nix
@@ -3,2067 +3,2067 @@
{
akonadi = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/akonadi-16.08.1.tar.xz";
- sha256 = "1km4qis98z19b5vy0g8r52mnd4i301ycf9l96a4vw4q56wmss2f1";
- name = "akonadi-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/akonadi-16.08.2.tar.xz";
+ sha256 = "141da3xj9d5gwksh9lz93s4zsvpadf314345ai6lirhhi99683g6";
+ name = "akonadi-16.08.2.tar.xz";
};
};
akonadi-calendar = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/akonadi-calendar-16.08.2.tar.xz";
+ sha256 = "0jpmh5051mxcndaf1clldz7zzfhfyi8qxz87lj20s0d4gzrf6cpw";
+ name = "akonadi-calendar-16.08.2.tar.xz";
};
};
akonadi-contacts = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/akonadi-contacts-16.08.2.tar.xz";
+ sha256 = "0d3cjyq4i778zvy13wm2gfpzkibsr17wgxydqm5ac5wkl30wb07l";
+ name = "akonadi-contacts-16.08.2.tar.xz";
};
};
akonadi-mime = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/akonadi-mime-16.08.2.tar.xz";
+ sha256 = "0q1g6g1dyj82ya8dfnq87asx9qnmqypsmb873y20i8x3pkzjwzld";
+ name = "akonadi-mime-16.08.2.tar.xz";
};
};
akonadi-notes = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/akonadi-notes-16.08.2.tar.xz";
+ sha256 = "0ryw21y25iq28rn75gibfxlwgyx0fz1y37lkgnqfcl3mwj16gcb4";
+ name = "akonadi-notes-16.08.2.tar.xz";
};
};
akonadi-search = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/akonadi-search-16.08.2.tar.xz";
+ sha256 = "063y170nfdi279pbh9zdyhrga2hf0xsb20bn2p210vhmwhi7l51r";
+ name = "akonadi-search-16.08.2.tar.xz";
};
};
analitza = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/analitza-16.08.1.tar.xz";
- sha256 = "1l08g9gzi6aabzh62cg2k4731nbw8hnfb7qy1mjb4yn2gap0c4cd";
- name = "analitza-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/analitza-16.08.2.tar.xz";
+ sha256 = "1rh58dfpnxyahpqz49p935pa01mxci9bbqddayv1807my2i5kz2h";
+ name = "analitza-16.08.2.tar.xz";
};
};
ark = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/ark-16.08.1.tar.xz";
- sha256 = "1g9qvxw26hqngvbp4i82lmhpbr4nxidv7pj0sg1ji48jzycjbd3q";
- name = "ark-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/ark-16.08.2.tar.xz";
+ sha256 = "043nl64g6374diczkrq7prid4fr8ll625df2nhqnaz79fnh1ysv8";
+ name = "ark-16.08.2.tar.xz";
};
};
artikulate = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/artikulate-16.08.1.tar.xz";
- sha256 = "1rbs6yf3pmhp9xj3lpr0h14pb4mylffhav2nb8sb42hw7c3pjycb";
- name = "artikulate-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/artikulate-16.08.2.tar.xz";
+ sha256 = "1pcpwqpd7xk796bc5gyydqqrvqm592jhyh8swvlsdqadczlqnn9h";
+ name = "artikulate-16.08.2.tar.xz";
};
};
audiocd-kio = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/audiocd-kio-16.08.2.tar.xz";
+ sha256 = "0m85j4lrdas47l501f20i44q7w7qwxvpdy754zp4nf5wzm7nvjdv";
+ name = "audiocd-kio-16.08.2.tar.xz";
};
};
baloo-widgets = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/baloo-widgets-16.08.2.tar.xz";
+ sha256 = "1r784qd1j3y1ff6y494m8qyfdjsz626agwdj05h6igngvw1ywff2";
+ name = "baloo-widgets-16.08.2.tar.xz";
};
};
blinken = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/blinken-16.08.1.tar.xz";
- sha256 = "0xk39mcyad8s8haj2rmg2m7x46qzayl8zivc8v8h28vn80lvhk4v";
- name = "blinken-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/blinken-16.08.2.tar.xz";
+ sha256 = "0nqkw6abnzbx80d25ba0b6bix1ngr3wfrxlfjqdk4gmb1m34dkcm";
+ name = "blinken-16.08.2.tar.xz";
};
};
bomber = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/bomber-16.08.1.tar.xz";
- sha256 = "0rsgwr8vlnfli8zb77l9vdqn60k7kpdxpsaq16nhxxwl2n3780gn";
- name = "bomber-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/bomber-16.08.2.tar.xz";
+ sha256 = "1zcqxkfy57lw03v6fpf44asbdf8q9ivn323li9ks0kwzzc2nk7f9";
+ name = "bomber-16.08.2.tar.xz";
};
};
bovo = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/bovo-16.08.1.tar.xz";
- sha256 = "1vc4dv5gh2vif98fz4rcdb8zv20sashq4xbgfvk0xq3ls9j3qdyi";
- name = "bovo-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/bovo-16.08.2.tar.xz";
+ sha256 = "0clbhcg6bw8nrjw3nynlhcglgxasxw2b15ski25cf9cvrq3cahn7";
+ name = "bovo-16.08.2.tar.xz";
};
};
calendarsupport = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/calendarsupport-16.08.1.tar.xz";
- sha256 = "08xvnmlpkwrsdz5fawcddcd5s7dn3zczfk5shk9a00734nc4akkb";
- name = "calendarsupport-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/calendarsupport-16.08.2.tar.xz";
+ sha256 = "1h9w8mk2gwnfbm9520bfmqbzjjg1211lpvzbq8ba4jg3l99d69j6";
+ name = "calendarsupport-16.08.2.tar.xz";
};
};
cantor = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/cantor-16.08.1.tar.xz";
- sha256 = "1cawdhpmyfb5qgbxil38szghi8q7hslpljzgsn7ma3gy6sqv3k9s";
- name = "cantor-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/cantor-16.08.2.tar.xz";
+ sha256 = "1zi989fklw4qs0yj2zs0rpbaq1yfd9dax6ric376s2r85mrdfvjc";
+ name = "cantor-16.08.2.tar.xz";
};
};
cervisia = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/cervisia-16.08.1.tar.xz";
- sha256 = "0apb29k4r2wsf6hn3rl2h1yvmy8npi4dmvjhr02j3gqfxic68vf1";
- name = "cervisia-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/cervisia-16.08.2.tar.xz";
+ sha256 = "1pnjiww36689vzqg8aixn8q7jf9j295i18gr8ggck80ccxrrf7rd";
+ name = "cervisia-16.08.2.tar.xz";
};
};
dolphin = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/dolphin-16.08.1.tar.xz";
- sha256 = "022mnq1x9la8yxim3svf3vj2x43gdp5qd6fwr50lvxw4i4gc8giy";
- name = "dolphin-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/dolphin-16.08.2.tar.xz";
+ sha256 = "1d6r7fi4cmdhxbrks8x0ar9s147zi4d6ap1pbxjmlxfa1v7jmmls";
+ name = "dolphin-16.08.2.tar.xz";
};
};
dolphin-plugins = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/dolphin-plugins-16.08.2.tar.xz";
+ sha256 = "0cpcfgl77s02zi4hhsg9fnnmfrl0crk8vyacfis8j59zwcjf5n3d";
+ name = "dolphin-plugins-16.08.2.tar.xz";
};
};
dragon = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/dragon-16.08.1.tar.xz";
- sha256 = "1441jgg8bwvqghz31xnkwwlsayw134q0jiffgh1nis4rxm2rln8h";
- name = "dragon-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/dragon-16.08.2.tar.xz";
+ sha256 = "0rv300ggjz4mclw5k406hjbg0a7jh5gkp9ycb897qaj4cfzw59x8";
+ name = "dragon-16.08.2.tar.xz";
};
};
eventviews = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/eventviews-16.08.1.tar.xz";
- sha256 = "0hp282if9fzw1xv4zdwrvar7wkchi9psl373r1594a7rjz9iby5j";
- name = "eventviews-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/eventviews-16.08.2.tar.xz";
+ sha256 = "1mphb53nl2y8z42m47prh9nm6s42z2xcsk3c0ssk5glyq52g3z00";
+ name = "eventviews-16.08.2.tar.xz";
};
};
ffmpegthumbs = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/ffmpegthumbs-16.08.1.tar.xz";
- sha256 = "08gna4lcz6ipjkm2vx862n1w61cxzkskaapsd22zxfmgfhmqyp73";
- name = "ffmpegthumbs-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/ffmpegthumbs-16.08.2.tar.xz";
+ sha256 = "1q2gkbfy57r23k7wchlnxmcy0phw41rwz5hl7mi9hliz1dlvkhc0";
+ name = "ffmpegthumbs-16.08.2.tar.xz";
};
};
filelight = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/filelight-16.08.1.tar.xz";
- sha256 = "0l059q0vh4yp2y5m0alvcz74g4amiks6yfhh45bd38vkvfay8073";
- name = "filelight-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/filelight-16.08.2.tar.xz";
+ sha256 = "0jw6vpd6nnn9fbmfcas5g938ir7q3sk5b0x6advspci0asngnins";
+ name = "filelight-16.08.2.tar.xz";
};
};
gpgmepp = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/gpgmepp-16.08.1.tar.xz";
- sha256 = "1fqxjfn3mqkar8akpfh0i2lr30bvf99fm2ldsx34x7fq3kh29ys5";
- name = "gpgmepp-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/gpgmepp-16.08.2.tar.xz";
+ sha256 = "0828qlhdi1i26n2xgyb01c0q77m6jlppbxv6mprryxq0ma88940a";
+ name = "gpgmepp-16.08.2.tar.xz";
};
};
granatier = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/granatier-16.08.1.tar.xz";
- sha256 = "1k270rqcyf37gl1r4086q4r49ssvawy56d32y1n02ph289m3dgl6";
- name = "granatier-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/granatier-16.08.2.tar.xz";
+ sha256 = "0qx1rlgm9dznk387yv6ylvi2i97a652bi1nvr86syiwgydawb5ag";
+ name = "granatier-16.08.2.tar.xz";
};
};
grantleetheme = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/grantleetheme-16.08.1.tar.xz";
- sha256 = "10xajrlmkjpz6xl3jg47mdvpf478vvxx3rcwcvd2zxaza9yyakms";
- name = "grantleetheme-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/grantleetheme-16.08.2.tar.xz";
+ sha256 = "0mviqfbzd8jb8ni4maydcdni034p52wm2ndms0r5f4az5mq1vs8i";
+ name = "grantleetheme-16.08.2.tar.xz";
};
};
gwenview = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/gwenview-16.08.1.tar.xz";
- sha256 = "1i55zd0pbgg2xinqzhxpsqx0vqp3dwn4z7bbf85m5cldbi070yv8";
- name = "gwenview-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/gwenview-16.08.2.tar.xz";
+ sha256 = "0y2pk0a0wk2srfcyk401ymy2qmp413448r7larmgnw1yy0fbp8l2";
+ name = "gwenview-16.08.2.tar.xz";
};
};
incidenceeditor = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/incidenceeditor-16.08.1.tar.xz";
- sha256 = "0wl89kwbnqrafflrdphczrn3l5gjgl5fqxvz4z995ri9m98kvgin";
- name = "incidenceeditor-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/incidenceeditor-16.08.2.tar.xz";
+ sha256 = "1z25z2pc3m6lnw3hpcjrrpj0f8jfbjav4i9kz6f97cs1rrklabym";
+ name = "incidenceeditor-16.08.2.tar.xz";
};
};
jovie = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/jovie-16.08.1.tar.xz";
- sha256 = "0nkrcvdsjcpba2awgvk0nv8ni3b5596p2jygxa906w50sjkcf5bk";
- name = "jovie-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/jovie-16.08.2.tar.xz";
+ sha256 = "1iia5ja90ypid2mm59njr2jg4hlsqz727fipa1v88c5nx31fqn9s";
+ name = "jovie-16.08.2.tar.xz";
};
};
juk = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/juk-16.08.1.tar.xz";
- sha256 = "1kj5iw3hfgqwz08imcfjicgm5m4v7m1fny6da8jidvwzyn46nll4";
- name = "juk-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/juk-16.08.2.tar.xz";
+ sha256 = "0l0scc3706ap2jfyvhv0shp3l5jw5r5jma1y6ikv0r85h9sxv6lw";
+ name = "juk-16.08.2.tar.xz";
};
};
kaccessible = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kaccessible-16.08.1.tar.xz";
- sha256 = "086spk1aignmb2bry6hbw11nssm99dk38mnk4s89f444ydczs3fs";
- name = "kaccessible-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kaccessible-16.08.2.tar.xz";
+ sha256 = "1j7zm4qk0sfax3h85mljrh40ys0snmilj5fqbqv5cad8kna3v3gg";
+ name = "kaccessible-16.08.2.tar.xz";
};
};
kaccounts-integration = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kaccounts-integration-16.08.2.tar.xz";
+ sha256 = "03k7h6lg39d6yvmz6b1i9a4cfakfncr91iw5bvy47xf4myp16dkr";
+ name = "kaccounts-integration-16.08.2.tar.xz";
};
};
kaccounts-providers = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kaccounts-providers-16.08.2.tar.xz";
+ sha256 = "1lz3wx78h0kpc218ngrgqnws89ar1cpra0h7dywswvh3ndnd1iiz";
+ name = "kaccounts-providers-16.08.2.tar.xz";
};
};
kajongg = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kajongg-16.08.1.tar.xz";
- sha256 = "0z8kin497631fa7wls6bi42q32ijqgy674cigcmz9jfgn2hwkbc0";
- name = "kajongg-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kajongg-16.08.2.tar.xz";
+ sha256 = "08wz24z1rdqz3vkg0vwfm2w6mjl8psbs1c13x4h3ia2l456b2y73";
+ name = "kajongg-16.08.2.tar.xz";
};
};
kalarmcal = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kalarmcal-16.08.1.tar.xz";
- sha256 = "10r31l6ak6dbksfj5444ndv06qx0jl4si634hv3i77q20jys1j26";
- name = "kalarmcal-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kalarmcal-16.08.2.tar.xz";
+ sha256 = "0h9xx2k78i0jyiqn4rcr79lcgqp7zsy980mbvv5zyddisjs5hd9x";
+ name = "kalarmcal-16.08.2.tar.xz";
};
};
kalgebra = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kalgebra-16.08.1.tar.xz";
- sha256 = "1wfiqlhhm36p137wcgpbvnhr6idqwkdann99pb1y463jblrdibv6";
- name = "kalgebra-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kalgebra-16.08.2.tar.xz";
+ sha256 = "02y4nrkf7dk8crmqdz7wg6gflm0zg3392m55zfsj6ad3vy78p1gg";
+ name = "kalgebra-16.08.2.tar.xz";
};
};
kalzium = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kalzium-16.08.1.tar.xz";
- sha256 = "09rz69cqqmicmwm9dj9yzq4l3j4w74ih8wcw0xyky948p3x6dh2r";
- name = "kalzium-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kalzium-16.08.2.tar.xz";
+ sha256 = "0jl77cr107gykfkdkxgnknlg1rhb9w6llwhva6863v57n6gq1hgh";
+ name = "kalzium-16.08.2.tar.xz";
};
};
kamera = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kamera-16.08.1.tar.xz";
- sha256 = "01fvdbwi10pnhwg9q7w5lyr027mpy67mzdwpcwv4h1js6dsi68nz";
- name = "kamera-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kamera-16.08.2.tar.xz";
+ sha256 = "1pghfxs3l20iv92dl39qh9rvdgqcrzmlrwjbmdjs8rdyb4cm0ivc";
+ name = "kamera-16.08.2.tar.xz";
};
};
kanagram = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kanagram-16.08.1.tar.xz";
- sha256 = "0a2rk092sgp1ysaw7h47y6lmw9z269j7llnw5vzq3mblc2ay2sda";
- name = "kanagram-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kanagram-16.08.2.tar.xz";
+ sha256 = "0q4v7g0a746qj62vjy09z5d50b6p6x3dfzciracz3jngsbngkkh6";
+ name = "kanagram-16.08.2.tar.xz";
};
};
kapman = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kapman-16.08.1.tar.xz";
- sha256 = "0x7b1d6hhl0nwyz8qzcz9nnjv8477ghifzgiyw3g1bx8044wqlsk";
- name = "kapman-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kapman-16.08.2.tar.xz";
+ sha256 = "0rfbn8p2fbgb3w9w7kn6s7q8yk6024sqc5l1f2k1b79g4f3mng82";
+ name = "kapman-16.08.2.tar.xz";
};
};
kapptemplate = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kapptemplate-16.08.1.tar.xz";
- sha256 = "1zkq5hpi8y4bny0q8p0aa3s4jpd5bxw18m5jxadjm4gfznnw8afv";
- name = "kapptemplate-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kapptemplate-16.08.2.tar.xz";
+ sha256 = "1anjn061cbssbdvv9mvbafjwpxck9lxvxrmbjj1hq4z47z2hdh4h";
+ name = "kapptemplate-16.08.2.tar.xz";
};
};
kate = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kate-16.08.1.tar.xz";
- sha256 = "0z1q5lnkqnx40zbxj3bnwg9wrx7xk7xzfwc8i02zzvx50n7qn57n";
- name = "kate-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kate-16.08.2.tar.xz";
+ sha256 = "0ch23k1n3csk2pc8xmsbp262ya3vng3n5lc3hcr2g03jkrjab214";
+ name = "kate-16.08.2.tar.xz";
};
};
katomic = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/katomic-16.08.1.tar.xz";
- sha256 = "1ilaz15qg1fasd0yv03vcspxx54cbw2m99wl39zzrh7jc3df0ad8";
- name = "katomic-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/katomic-16.08.2.tar.xz";
+ sha256 = "07njyf7lnysvy2h6jql0z28yl1h6j3njrqnlxz4mf83ds09d73w6";
+ name = "katomic-16.08.2.tar.xz";
};
};
kblackbox = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kblackbox-16.08.1.tar.xz";
- sha256 = "1w7rh9m6qwdid2li7xhmsfs0v7q95gyl24529xm17y79k1qxcbm7";
- name = "kblackbox-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kblackbox-16.08.2.tar.xz";
+ sha256 = "13spiwy2sjcfiz7hjg2jrx5aflnmccg3d5ki37bk72vcwg21i30y";
+ name = "kblackbox-16.08.2.tar.xz";
};
};
kblocks = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kblocks-16.08.1.tar.xz";
- sha256 = "086b8k8zhs9v0rp06z9wx8gaaphc2178px5501rqx6062azxflil";
- name = "kblocks-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kblocks-16.08.2.tar.xz";
+ sha256 = "0ck0b8jxxcpz84sailh4i9c80dqqrw95fy8jgknwwb85w1a82r5v";
+ name = "kblocks-16.08.2.tar.xz";
};
};
kblog = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kblog-16.08.1.tar.xz";
- sha256 = "1vc2a3c4iz2jm2137zw3i69n6qam2rlhvjr8ybv84xv9s7b3pz25";
- name = "kblog-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kblog-16.08.2.tar.xz";
+ sha256 = "1n9camf91p4igbn54j3n8jgqv9154y54fvyn0dlajmwf3ir8lyk9";
+ name = "kblog-16.08.2.tar.xz";
};
};
kbounce = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kbounce-16.08.1.tar.xz";
- sha256 = "0a4khwdrhzg33i4bbz1kb7w2jyzahnj1agcdybpzbqjnczgv4rnn";
- name = "kbounce-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kbounce-16.08.2.tar.xz";
+ sha256 = "0mka3s4vx1gbzavhdbhy24jfginkl8v6ab9za47cfyiwnirscry7";
+ name = "kbounce-16.08.2.tar.xz";
};
};
kbreakout = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kbreakout-16.08.1.tar.xz";
- sha256 = "14i4yyxxd9w72sgdfwp47y8drbdl7lsb8fxgdswg91dpcnm1jmgi";
- name = "kbreakout-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kbreakout-16.08.2.tar.xz";
+ sha256 = "0kyxd112yfdp14d73s3dbg393r11gmb7bc0ibb4a5ab7ki3vvp5h";
+ name = "kbreakout-16.08.2.tar.xz";
};
};
kbruch = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kbruch-16.08.1.tar.xz";
- sha256 = "02dyc90ir79swf8vjd53flxqp2imaaa9c5dikflbxiahj4k6rpa4";
- name = "kbruch-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kbruch-16.08.2.tar.xz";
+ sha256 = "0m4zk03gxim4bxxzy391jkspjslf4i3gk23h7jpzwvp2yppibzxk";
+ name = "kbruch-16.08.2.tar.xz";
};
};
kcachegrind = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kcachegrind-16.08.1.tar.xz";
- sha256 = "1d7i162a6v7xhykzpszmia7cizrsgh040wk0ql7ijgb838iawflg";
- name = "kcachegrind-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kcachegrind-16.08.2.tar.xz";
+ sha256 = "0hflqnx4cbqjx61cmxh4y2xkxzqxfw52m7snwhzyd9nlc1f842f4";
+ name = "kcachegrind-16.08.2.tar.xz";
};
};
kcalc = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kcalc-16.08.1.tar.xz";
- sha256 = "18nhvmgd0d2m0ji23536fhqykf4xdnnky5x0hy6vkja0dw91aggg";
- name = "kcalc-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kcalc-16.08.2.tar.xz";
+ sha256 = "19zxdikqw922q4nc5nfm63pcaq3dg2d6bvcgxw7nd8r1jbn94acm";
+ name = "kcalc-16.08.2.tar.xz";
};
};
kcalcore = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kcalcore-16.08.1.tar.xz";
- sha256 = "12q30gsaw2fr7wx6jpswa7aby8d58wldxagbcdkwcifv78d7bgk7";
- name = "kcalcore-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kcalcore-16.08.2.tar.xz";
+ sha256 = "1r0r0mk7yzi8h6mn81aaldcfa4vgxsz17sj5dm5m2p0mr42jxip3";
+ name = "kcalcore-16.08.2.tar.xz";
};
};
kcalutils = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kcalutils-16.08.1.tar.xz";
- sha256 = "0fvhy2r5mw871ld18rab4nx9cv52fg7vwkxj31gbvx6rbzbmzsrs";
- name = "kcalutils-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kcalutils-16.08.2.tar.xz";
+ sha256 = "0achb65qs07b17qhdvfhl7w2qjfls00bycmg8jl789lz0jpdsgg7";
+ name = "kcalutils-16.08.2.tar.xz";
};
};
kcharselect = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kcharselect-16.08.1.tar.xz";
- sha256 = "1mx2biawax867rfq42w0mi4b7v10j17anfq64gx5q6vi79k6jqaj";
- name = "kcharselect-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kcharselect-16.08.2.tar.xz";
+ sha256 = "1r50jpyl8a79qgz3gb1apzwrgkx5h7s9m645smi1y5af7qh6dkvy";
+ name = "kcharselect-16.08.2.tar.xz";
};
};
kcolorchooser = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kcolorchooser-16.08.1.tar.xz";
- sha256 = "1s490hkjbinhlc3pf2waks9ka8dvkpq3l5vblmd11h1yckbpcdqi";
- name = "kcolorchooser-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kcolorchooser-16.08.2.tar.xz";
+ sha256 = "1sms0wms94lrykpsj45y8g34dnkkibszahv5303zbzg1ndak4a5i";
+ name = "kcolorchooser-16.08.2.tar.xz";
};
};
kcontacts = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kcontacts-16.08.1.tar.xz";
- sha256 = "198qqs7001m2ywmryx9489jpay1g7i9g04bl9y25jr2a3lf4id87";
- name = "kcontacts-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kcontacts-16.08.2.tar.xz";
+ sha256 = "0y8i5302jndpwms0wksf71yqxvz67x8wbwfkjjmlr3n6g477cvf3";
+ name = "kcontacts-16.08.2.tar.xz";
};
};
kcron = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kcron-16.08.1.tar.xz";
- sha256 = "062ndya5r67imkx0fw2whgppfm9j3jwxscfz8vd64g3532kai9n5";
- name = "kcron-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kcron-16.08.2.tar.xz";
+ sha256 = "05v5lwcdys0r715x21ddzgl1f3m1vqw8jmyb7igcb4m14iixvfwk";
+ name = "kcron-16.08.2.tar.xz";
};
};
kde-baseapps = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-baseapps-16.08.2.tar.xz";
+ sha256 = "1p7h1jygqiwdgwi1g5pr7rq0219i6qq6mrg0c0shcfvvi926dg10";
+ name = "kde-baseapps-16.08.2.tar.xz";
};
};
kdebugsettings = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kdebugsettings-16.08.1.tar.xz";
- sha256 = "0b3940wzm3bl0w0wdjk62ikf6cxlzipckwzq7skpnp115j90pnyp";
- name = "kdebugsettings-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kdebugsettings-16.08.2.tar.xz";
+ sha256 = "0aixcx4fcnrhz7g9dwl65khn2d5a667jchsxjnlwwrxhff2djy3z";
+ name = "kdebugsettings-16.08.2.tar.xz";
};
};
kde-dev-scripts = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-dev-scripts-16.08.2.tar.xz";
+ sha256 = "1iis5zlfz0ylycpz1i9s99grhp6pzskwv9hmsr620mj2fhcy3nwv";
+ name = "kde-dev-scripts-16.08.2.tar.xz";
};
};
kde-dev-utils = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-dev-utils-16.08.2.tar.xz";
+ sha256 = "1sm540r4nfr8azw9bvsmjbqy709039sk0z7rv3d5mh3d6f363my1";
+ name = "kde-dev-utils-16.08.2.tar.xz";
};
};
kdeedu-data = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kdeedu-data-16.08.2.tar.xz";
+ sha256 = "1m8831nr9f97fz9vxca4bcwwvv5nicd4y74sgp6xm3v41xqwda6b";
+ name = "kdeedu-data-16.08.2.tar.xz";
};
};
kdegraphics-mobipocket = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kdegraphics-mobipocket-16.08.2.tar.xz";
+ sha256 = "0y19q7r4pbfkqf0mb80h9rqzc13q9csllb9b8ca536bcjh41r6yy";
+ name = "kdegraphics-mobipocket-16.08.2.tar.xz";
};
};
kdegraphics-thumbnailers = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kdegraphics-thumbnailers-16.08.2.tar.xz";
+ sha256 = "155nfj6apbvrs2p69yj0ic0ybp59air0a3wdwz5sw84y47dslnaz";
+ name = "kdegraphics-thumbnailers-16.08.2.tar.xz";
};
};
kde-l10n-ar = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ar-16.08.2.tar.xz";
+ sha256 = "0aaxwb4sr2bq5cmcr0j7n7dbvih52d5gwbcx17ksip0fp7y0cgnr";
+ name = "kde-l10n-ar-16.08.2.tar.xz";
};
};
kde-l10n-ast = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ast-16.08.2.tar.xz";
+ sha256 = "1s55wrb2ll4fh0f648yybg6mxgsvikanwplw88kk254gxailbvi4";
+ name = "kde-l10n-ast-16.08.2.tar.xz";
};
};
kde-l10n-bg = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-bg-16.08.2.tar.xz";
+ sha256 = "15slc3an490xcbkwhfkysrzx3xg0h1mrwzp4bxsrsvqcjw4nlrdy";
+ name = "kde-l10n-bg-16.08.2.tar.xz";
};
};
kde-l10n-bs = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-bs-16.08.2.tar.xz";
+ sha256 = "1117i784lwi9ci1ryd46x01pjraw30lma0z4kcg987xpj6ww22ha";
+ name = "kde-l10n-bs-16.08.2.tar.xz";
};
};
kde-l10n-ca = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ca-16.08.2.tar.xz";
+ sha256 = "07f6h2prkm7iq3bwvn5p9y32xzis3p21sgxpg1x6663w3603w2pa";
+ name = "kde-l10n-ca-16.08.2.tar.xz";
};
};
kde-l10n-ca_valencia = {
- version = "ca_valencia-16.08.1";
+ version = "ca_valencia-16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ca@valencia-16.08.2.tar.xz";
+ sha256 = "05fw1dj1rfsi1j8mzvjvqwvdv7zkjcj4y0fb9wm9wzcqlsl742wv";
+ name = "kde-l10n-ca_valencia-16.08.2.tar.xz";
};
};
kde-l10n-cs = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-cs-16.08.2.tar.xz";
+ sha256 = "1vfn41kayimddrcg2h6zrx3sc31vq2zlv6bkpg29h6yddir6xjgk";
+ name = "kde-l10n-cs-16.08.2.tar.xz";
};
};
kde-l10n-da = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-da-16.08.2.tar.xz";
+ sha256 = "0k8cs5m9aypgjkrvwrff4qvaanppaizryc6wncqr9jj13hr2vz1q";
+ name = "kde-l10n-da-16.08.2.tar.xz";
};
};
kde-l10n-de = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-de-16.08.2.tar.xz";
+ sha256 = "01kfh8zlf7r3dlmi96nvl4gksxryd10aqrnddhwjxni29l2sqjil";
+ name = "kde-l10n-de-16.08.2.tar.xz";
};
};
kde-l10n-el = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-el-16.08.2.tar.xz";
+ sha256 = "1b6q3xriy9bv5537v2salz4vi4yx4hlx73aga4ic4pas8n0fn155";
+ name = "kde-l10n-el-16.08.2.tar.xz";
};
};
kde-l10n-en_GB = {
- version = "en_GB-16.08.1";
+ version = "en_GB-16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-en_GB-16.08.2.tar.xz";
+ sha256 = "12cf5cx7kmc0wg752xpaz4jr4m3vxaahhxd0cp41p3lrb3079g2c";
+ name = "kde-l10n-en_GB-16.08.2.tar.xz";
};
};
kde-l10n-eo = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-eo-16.08.2.tar.xz";
+ sha256 = "07rwf3jcrs7r16hpyf4mz9fk41qi1nfm6x6qlf6xlpi7ynxgyyj0";
+ name = "kde-l10n-eo-16.08.2.tar.xz";
};
};
kde-l10n-es = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-es-16.08.2.tar.xz";
+ sha256 = "1m366lxafwxa390nyvxwslbk653m1g6nwv9hr4mmpcnf2xxqsq2b";
+ name = "kde-l10n-es-16.08.2.tar.xz";
};
};
kde-l10n-et = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-et-16.08.2.tar.xz";
+ sha256 = "0n08x8102hlzl3xp3d306lxf47b7870wxvr95krnchbrnmb847jv";
+ name = "kde-l10n-et-16.08.2.tar.xz";
};
};
kde-l10n-eu = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-eu-16.08.2.tar.xz";
+ sha256 = "0kacy7cbjd4pgzr54x9y28lk28rdbilqamg5gv2lxz3l2rqbnkpf";
+ name = "kde-l10n-eu-16.08.2.tar.xz";
};
};
kde-l10n-fa = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-fa-16.08.2.tar.xz";
+ sha256 = "1nznmql7i2dkziyam6czyd8j0spjg276l9nwqnznrzpjnpks1dl2";
+ name = "kde-l10n-fa-16.08.2.tar.xz";
};
};
kde-l10n-fi = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-fi-16.08.2.tar.xz";
+ sha256 = "0rxf7hcjrhmv7zrrrc9bv65dxwiw0vywwn7j92jvsw5psbb9yf1x";
+ name = "kde-l10n-fi-16.08.2.tar.xz";
};
};
kde-l10n-fr = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-fr-16.08.2.tar.xz";
+ sha256 = "07b9a4vlnampg7i7nb4ykh1cp77pdf5k0h6aa0mjg1rjycpwflv3";
+ name = "kde-l10n-fr-16.08.2.tar.xz";
};
};
kde-l10n-ga = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ga-16.08.2.tar.xz";
+ sha256 = "08dgs9rz52mk4bl41h5k4p0cpqjw381aw3h6xw8080lj9zh0nvbn";
+ name = "kde-l10n-ga-16.08.2.tar.xz";
};
};
kde-l10n-gl = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-gl-16.08.2.tar.xz";
+ sha256 = "0986i04gfa6yw3ljmlx857src7lda8cwqdkk68cbxfi371ly0spl";
+ name = "kde-l10n-gl-16.08.2.tar.xz";
};
};
kde-l10n-he = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-he-16.08.2.tar.xz";
+ sha256 = "0xbbf3jpsmyq8k3d2qq3y75jq9wmf6iy46s52qbmr0pbdg288h3c";
+ name = "kde-l10n-he-16.08.2.tar.xz";
};
};
kde-l10n-hi = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-hi-16.08.2.tar.xz";
+ sha256 = "1cfmn3qafmps51mld735synlsf8h1nfb84ji9qv64qpw2gjvpp9n";
+ name = "kde-l10n-hi-16.08.2.tar.xz";
};
};
kde-l10n-hr = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-hr-16.08.2.tar.xz";
+ sha256 = "11kfxqjavmh9bcaivm5zd82r0b3d4rz8zmc2awc1433i6wgdxrkq";
+ name = "kde-l10n-hr-16.08.2.tar.xz";
};
};
kde-l10n-hu = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-hu-16.08.2.tar.xz";
+ sha256 = "0m714qii2z1bc8kv112bf9wpq078yaqgzd1m4h2apyj1rzl8sni8";
+ name = "kde-l10n-hu-16.08.2.tar.xz";
};
};
kde-l10n-ia = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ia-16.08.2.tar.xz";
+ sha256 = "1r10w7dpxmgby3igh57yli6hp1paxwh1m4vkzi5f91fgh2s8qjjg";
+ name = "kde-l10n-ia-16.08.2.tar.xz";
};
};
kde-l10n-id = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-id-16.08.2.tar.xz";
+ sha256 = "1r26h3rlgh91f00qzmkzmd3sflsmvyxdcy92ljj1g64wh9cigh66";
+ name = "kde-l10n-id-16.08.2.tar.xz";
};
};
kde-l10n-is = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-is-16.08.2.tar.xz";
+ sha256 = "0ldxw1sl7sr7v0783cby6qp5ig2x5dq2s8w7k3fh1qa88cp1nsld";
+ name = "kde-l10n-is-16.08.2.tar.xz";
};
};
kde-l10n-it = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-it-16.08.2.tar.xz";
+ sha256 = "0knvilb2p9s1cr354bzwhxzmfi49g17v3clqdvlcyglghkz94aam";
+ name = "kde-l10n-it-16.08.2.tar.xz";
};
};
kde-l10n-ja = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ja-16.08.2.tar.xz";
+ sha256 = "0x3sfprw1pvjkivva05cg9nbzml2g4vzidvjq37vp7nkyfdxldcp";
+ name = "kde-l10n-ja-16.08.2.tar.xz";
};
};
kde-l10n-kk = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-kk-16.08.2.tar.xz";
+ sha256 = "1jmqahyhxz798yqlc25lyj3x6xa426czkydbikpngb3775wy918z";
+ name = "kde-l10n-kk-16.08.2.tar.xz";
};
};
kde-l10n-km = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-km-16.08.2.tar.xz";
+ sha256 = "00p7grks0cjca5r2xvmf4kxvpjqasbjcss938x9ss6wc0knq8laa";
+ name = "kde-l10n-km-16.08.2.tar.xz";
};
};
kde-l10n-ko = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ko-16.08.2.tar.xz";
+ sha256 = "0w14n8vzvmwiliqnakg4s76cka1qp0j0azc632aaiy6d17g0yw2k";
+ name = "kde-l10n-ko-16.08.2.tar.xz";
};
};
kde-l10n-lt = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-lt-16.08.2.tar.xz";
+ sha256 = "1yj119r7p9bjk405ml5383y5jqrhaj9v4ksjiyhjs8l5zx0pjb3b";
+ name = "kde-l10n-lt-16.08.2.tar.xz";
};
};
kde-l10n-lv = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-lv-16.08.2.tar.xz";
+ sha256 = "0g173n4nqiw7mk6phys4dlis6dfd9iw0kpv4hhvz4b54i67wamvw";
+ name = "kde-l10n-lv-16.08.2.tar.xz";
};
};
kde-l10n-mr = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-mr-16.08.2.tar.xz";
+ sha256 = "1696gqib17f250p5y0vfjxcx8w4wx1lhi8nqy9bbjj6acmahishj";
+ name = "kde-l10n-mr-16.08.2.tar.xz";
};
};
kde-l10n-nb = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-nb-16.08.2.tar.xz";
+ sha256 = "0z2v14m329r8687qpvf0qxnbvpp48mvl1yri16203bya8q44764j";
+ name = "kde-l10n-nb-16.08.2.tar.xz";
};
};
kde-l10n-nds = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-nds-16.08.2.tar.xz";
+ sha256 = "0d7nzwll2hqlb3ca3zdwr9x4rnhvv3fgxammzac07gib1aq27lap";
+ name = "kde-l10n-nds-16.08.2.tar.xz";
};
};
kde-l10n-nl = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-nl-16.08.2.tar.xz";
+ sha256 = "0hq7gqg6nqb06kg8pgjf36w6lx6kv0z4v0lz4wac47v10jipcix4";
+ name = "kde-l10n-nl-16.08.2.tar.xz";
};
};
kde-l10n-nn = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-nn-16.08.2.tar.xz";
+ sha256 = "02935kj4gw93lyjik6vqk40rnpblib0pq1dl0im2mavfym2nacjj";
+ name = "kde-l10n-nn-16.08.2.tar.xz";
};
};
kde-l10n-pa = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-pa-16.08.2.tar.xz";
+ sha256 = "08qq6lkr9jrsl12slqfhp83vkamr5nv9x7hr91g8xgg1s9i3aj3z";
+ name = "kde-l10n-pa-16.08.2.tar.xz";
};
};
kde-l10n-pl = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-pl-16.08.2.tar.xz";
+ sha256 = "0ylsc89nsmbjm4c5gbnh5qczmr7bal7037bm5nsmrh7aqkwg1s1x";
+ name = "kde-l10n-pl-16.08.2.tar.xz";
};
};
kde-l10n-pt = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-pt-16.08.2.tar.xz";
+ sha256 = "0cbaf2vnr56qa0qfhr4cgdmbq3hbck9wfcx5a7bvvaglck95f4gq";
+ name = "kde-l10n-pt-16.08.2.tar.xz";
};
};
kde-l10n-pt_BR = {
- version = "pt_BR-16.08.1";
+ version = "pt_BR-16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-pt_BR-16.08.2.tar.xz";
+ sha256 = "048ssv4bhx8bn2q8nsh5n0m1nl64qadndwrh3hx3avd7jjnj7l4s";
+ name = "kde-l10n-pt_BR-16.08.2.tar.xz";
};
};
kde-l10n-ro = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ro-16.08.2.tar.xz";
+ sha256 = "05pi6v5hp3yki0hiy19gggz1mpk7ykjz6f94k6cv63vinvai6gpw";
+ name = "kde-l10n-ro-16.08.2.tar.xz";
};
};
kde-l10n-ru = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ru-16.08.2.tar.xz";
+ sha256 = "18kk3iyn1dyir43dxlrs0jcdin001h0qfzm9cszxlz52yx5vn4ba";
+ name = "kde-l10n-ru-16.08.2.tar.xz";
};
};
kde-l10n-sk = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-sk-16.08.2.tar.xz";
+ sha256 = "0gxia3j689a315jww9cfw802vhz226zd3ci6i45ffrj5sdpm0bcs";
+ name = "kde-l10n-sk-16.08.2.tar.xz";
};
};
kde-l10n-sl = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-sl-16.08.2.tar.xz";
+ sha256 = "1d6gxc2jcnjzjrp6aw63l86wsqkdg4qw3zz5pc0j1qc5ihaak6pm";
+ name = "kde-l10n-sl-16.08.2.tar.xz";
};
};
kde-l10n-sr = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-sr-16.08.2.tar.xz";
+ sha256 = "0mixdfpvryg1ch917nxc469m7fzgy5dkbxadc55kzgy9k18vry30";
+ name = "kde-l10n-sr-16.08.2.tar.xz";
};
};
kde-l10n-sv = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-sv-16.08.2.tar.xz";
+ sha256 = "10day8y3fqdf9rg24wmxa38snpkry08swcgzh2qxy2wlg7w1n2ld";
+ name = "kde-l10n-sv-16.08.2.tar.xz";
};
};
kde-l10n-tr = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-tr-16.08.2.tar.xz";
+ sha256 = "19a5cribm12pi0y84vfwmigkyvn8d4ylvx07g9df4iapjf2kgs54";
+ name = "kde-l10n-tr-16.08.2.tar.xz";
};
};
kde-l10n-ug = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ug-16.08.2.tar.xz";
+ sha256 = "0p2ijv13wk02sm065nk328pdl2qn22sashwdzw5viy6hr67z8igv";
+ name = "kde-l10n-ug-16.08.2.tar.xz";
};
};
kde-l10n-uk = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-uk-16.08.2.tar.xz";
+ sha256 = "0m03z8yac3mbsp78zskyiw316im7fr2197lmjl6prfz8hdvblyqm";
+ name = "kde-l10n-uk-16.08.2.tar.xz";
};
};
kde-l10n-wa = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-wa-16.08.2.tar.xz";
+ sha256 = "08zv0pl9gm7xpykzvb7cf4gx0r78jrfx33281iam3496bgl9iz63";
+ name = "kde-l10n-wa-16.08.2.tar.xz";
};
};
kde-l10n-zh_CN = {
- version = "zh_CN-16.08.1";
+ version = "zh_CN-16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-zh_CN-16.08.2.tar.xz";
+ sha256 = "1fzkykipaqlabzmddzk694h26cw15r8vwn3f6033pbgpd47rxmh7";
+ name = "kde-l10n-zh_CN-16.08.2.tar.xz";
};
};
kde-l10n-zh_TW = {
- version = "zh_TW-16.08.1";
+ version = "zh_TW-16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-zh_TW-16.08.2.tar.xz";
+ sha256 = "0i02bbpkn802wzavyj3ilmp889v6frkbb1zp8q9wsrvdwv71zmrj";
+ name = "kde-l10n-zh_TW-16.08.2.tar.xz";
};
};
kdelibs = {
- version = "4.14.24";
+ version = "4.14.25";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kdelibs-4.14.24.tar.xz";
- sha256 = "1vs60cwwva59fifhg392c60wwp49bvwmm7m6xlai24wzfgl67rj5";
- name = "kdelibs-4.14.24.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kdelibs-4.14.25.tar.xz";
+ sha256 = "00idq3iqd72gjyqj79ci8992jlww877m3znjvvlnh8s97y4kwpds";
+ name = "kdelibs-4.14.25.tar.xz";
};
};
kdenetwork-filesharing = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kdenetwork-filesharing-16.08.2.tar.xz";
+ sha256 = "0k9c1mjdr754qgzhfmx0qrh7lf1hlp698wq6mynw31b45ngx26n9";
+ name = "kdenetwork-filesharing-16.08.2.tar.xz";
};
};
kdenlive = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kdenlive-16.08.1.tar.xz";
- sha256 = "0aza2y5xybgj8qnfsc4vbpvmvdvscdmv1bqc67nks72z7c48cpfl";
- name = "kdenlive-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kdenlive-16.08.2.tar.xz";
+ sha256 = "1lw0dayp2hryqpfw2090fzj7yqxi1y8bmpzadljqkl1glb6sd16l";
+ name = "kdenlive-16.08.2.tar.xz";
};
};
kdepim = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kdepim-16.08.1.tar.xz";
- sha256 = "0ibbc9whg6wy0ipfza5jjwf5y6lz5cbd30nxj93p3adfd4bl55by";
- name = "kdepim-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kdepim-16.08.2.tar.xz";
+ sha256 = "15w9yyyld84hp0mzlw0iv9bl3f4dk560l6mynrq5ccya90lfrnc2";
+ name = "kdepim-16.08.2.tar.xz";
};
};
kdepim-addons = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kdepim-addons-16.08.2.tar.xz";
+ sha256 = "06plflqj1p3jhn8c2jm2vm55yhiwa7wsvndh86q39ajw5qw60mhx";
+ name = "kdepim-addons-16.08.2.tar.xz";
};
};
kdepim-apps-libs = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kdepim-apps-libs-16.08.2.tar.xz";
+ sha256 = "1vygdkh43b0aajxywy6sa01khx8zvsv1n3aainqcbn8jndxlkb82";
+ name = "kdepim-apps-libs-16.08.2.tar.xz";
};
};
kdepim-runtime = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kdepim-runtime-16.08.2.tar.xz";
+ sha256 = "0dg3ww5l6mq7xi4z1j7b4w2d7i425wbz1gwml0a9ajy3v0k14vqb";
+ name = "kdepim-runtime-16.08.2.tar.xz";
};
};
kde-runtime = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kde-runtime-16.08.2.tar.xz";
+ sha256 = "1q0m4nywap0qmg9fj9z2d8b7j9bvykniqq9jga3jmys5g2cjn205";
+ name = "kde-runtime-16.08.2.tar.xz";
};
};
kdesdk-kioslaves = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kdesdk-kioslaves-16.08.2.tar.xz";
+ sha256 = "11png8q0ci86if2g49nrmx63l8pxcmp789k9kkamnzsx79y6arq2";
+ name = "kdesdk-kioslaves-16.08.2.tar.xz";
};
};
kdesdk-thumbnailers = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kdesdk-thumbnailers-16.08.2.tar.xz";
+ sha256 = "1dmmm6l5yy64l6hqqjx4d5cycgx1wzjv81ll9jizgg8c5cknhi8l";
+ name = "kdesdk-thumbnailers-16.08.2.tar.xz";
};
};
kdewebdev = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kdewebdev-16.08.1.tar.xz";
- sha256 = "1xi72wfj57z06s2d7ijjc2vpi14nqdavcp2gmczp08lf4n7lkfjr";
- name = "kdewebdev-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kdewebdev-16.08.2.tar.xz";
+ sha256 = "0dm013da1i2z0n6svmm0yqzgn3j608ldc2w80dvgkvykh85z5ccy";
+ name = "kdewebdev-16.08.2.tar.xz";
};
};
kdf = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kdf-16.08.1.tar.xz";
- sha256 = "02azfa3j9m95m6ch1h4b5r2cwbyq987rxzyxsldsbna3x80kqpsv";
- name = "kdf-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kdf-16.08.2.tar.xz";
+ sha256 = "0lvzyxn434rqknqmzwi6ih60gvkd24i2ms0ziypkh5ihs9scbmg7";
+ name = "kdf-16.08.2.tar.xz";
};
};
kdgantt2 = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kdgantt2-16.08.1.tar.xz";
- sha256 = "1qz44461wk2h2bi5xpyrh5s201azqigph3vclp92phy55s12q83s";
- name = "kdgantt2-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kdgantt2-16.08.2.tar.xz";
+ sha256 = "1hhfrcjv6yx69ahnhc641h6sh9fp9m69jkb85aav2pydnps1p4bp";
+ name = "kdgantt2-16.08.2.tar.xz";
};
};
kdiamond = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kdiamond-16.08.1.tar.xz";
- sha256 = "0w2kxndpjq2s35qz05vsbr1qnd30lnxhmkyxmy5r7qcqkfdjfwbb";
- name = "kdiamond-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kdiamond-16.08.2.tar.xz";
+ sha256 = "0kaqxxm30kxvkbzgzj69zzsql903qbkczlkmxfb9x2zp2484f7jq";
+ name = "kdiamond-16.08.2.tar.xz";
};
};
kfloppy = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kfloppy-16.08.1.tar.xz";
- sha256 = "133ib3kicmaxryc4623fmayk12gp4nnymi3g3d97kyk0nmrx1vg7";
- name = "kfloppy-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kfloppy-16.08.2.tar.xz";
+ sha256 = "0jkbamqbdggf72k1xszaan890nhqz4qwhd8d0mbgm2nhzbs9q1cb";
+ name = "kfloppy-16.08.2.tar.xz";
};
};
kfourinline = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kfourinline-16.08.1.tar.xz";
- sha256 = "0114ldvw1826v75az3wdppd4qdnhswiixm03801rsp680fg9fm9s";
- name = "kfourinline-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kfourinline-16.08.2.tar.xz";
+ sha256 = "0cb2kap8bp35ijnhghp9df4kai7vizayzcax0p3wamv0zy4zfx4b";
+ name = "kfourinline-16.08.2.tar.xz";
};
};
kgeography = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kgeography-16.08.1.tar.xz";
- sha256 = "0psxpq1ap8cm3adf5j6hr0z858wx41aag95n8mx7vgyfjgaj81s4";
- name = "kgeography-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kgeography-16.08.2.tar.xz";
+ sha256 = "0s88gzyy0ldz10vlklnvwi7aip0vn5gnawikqn80xfw3vwb5zyki";
+ name = "kgeography-16.08.2.tar.xz";
};
};
kget = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kget-16.08.1.tar.xz";
- sha256 = "0brihzmn7fz43mi1mf8flkbbk80pv2sg3ny1il4cdkk6nwryk3dn";
- name = "kget-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kget-16.08.2.tar.xz";
+ sha256 = "1pna3rw76n1lg9l805ccisxirrmxw23n2az5nd95wsck77lgxnr6";
+ name = "kget-16.08.2.tar.xz";
};
};
kgoldrunner = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kgoldrunner-16.08.1.tar.xz";
- sha256 = "10bllkkiisb4ci97wzfln5b8bxs5l72k29mbd4qqxhq69r8xqi5c";
- name = "kgoldrunner-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kgoldrunner-16.08.2.tar.xz";
+ sha256 = "0r14mspzyigj4md7zzjq06sswb1y4m4232kfkwg4p7yp8xpsr56c";
+ name = "kgoldrunner-16.08.2.tar.xz";
};
};
kgpg = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kgpg-16.08.1.tar.xz";
- sha256 = "0zpq8smwh648jsxkf82pc2xvz980f07ilp2rzd8yr3w2n18gz120";
- name = "kgpg-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kgpg-16.08.2.tar.xz";
+ sha256 = "0bx4d4i4n8v58yyqcb7pz70cpikymmjz9nd69mly9g8hj8jwqnll";
+ name = "kgpg-16.08.2.tar.xz";
};
};
khangman = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/khangman-16.08.1.tar.xz";
- sha256 = "1jz8wardcsip8c3r7s7lz1zn5gifb9jdksi0hdzn1kv1ha70dfyr";
- name = "khangman-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/khangman-16.08.2.tar.xz";
+ sha256 = "172ciifrcydyhmawzxx3k1aq564ywjlj5wqfbjgxaf7pj3pbxndk";
+ name = "khangman-16.08.2.tar.xz";
};
};
khelpcenter = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/khelpcenter-16.08.1.tar.xz";
- sha256 = "0nv7i3dm6d7wr9y34l009fybdlmp4j5891wl9wwzp6ccnw2qls4g";
- name = "khelpcenter-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/khelpcenter-16.08.2.tar.xz";
+ sha256 = "1iiz4w4zzf28g336hypmhf50lndwl6rj3y46wbj1mzpc99wrrxhr";
+ name = "khelpcenter-16.08.2.tar.xz";
};
};
kholidays = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kholidays-16.08.1.tar.xz";
- sha256 = "0dcnlbkmpzj58l9qvggsxk54cf1gspax388dniz5ihs07mkksg24";
- name = "kholidays-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kholidays-16.08.2.tar.xz";
+ sha256 = "12fawyvy5nyiyr4zfbkwi5p0m5kgbcs4ly4f7bdq7qy7qbw6k8b6";
+ name = "kholidays-16.08.2.tar.xz";
};
};
kidentitymanagement = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kidentitymanagement-16.08.1.tar.xz";
- sha256 = "1cdm4p62idsmzb3q6ywlqll7ivkrbbraia6bdc3ad9p2m6mjkwkk";
- name = "kidentitymanagement-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kidentitymanagement-16.08.2.tar.xz";
+ sha256 = "00q21hfyfyhkh7ip14q0a8rgngigm17hs5gp8r6gymvcysp3glny";
+ name = "kidentitymanagement-16.08.2.tar.xz";
};
};
kig = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kig-16.08.1.tar.xz";
- sha256 = "0slpafdkhyfpixm6iypd62y85j85f62fi2yd3hrmq8859qsp7n74";
- name = "kig-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kig-16.08.2.tar.xz";
+ sha256 = "14p9cl7mbb04lz5l2ajbfxlqli065v09bc22nyjcsin45rxvdvmn";
+ name = "kig-16.08.2.tar.xz";
};
};
kigo = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kigo-16.08.1.tar.xz";
- sha256 = "10mrb94vlhg598r4bpydxj2llzh9239c0ziz3yllnw2jh7xw94rs";
- name = "kigo-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kigo-16.08.2.tar.xz";
+ sha256 = "13lkzhb00bmynkwrshvwl8r270zsxp6bj5ca75xy3g4vmp04gy0i";
+ name = "kigo-16.08.2.tar.xz";
};
};
killbots = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/killbots-16.08.1.tar.xz";
- sha256 = "1fr7vj9y5bh9dcznvslzsp3f20qrmqfaq8jl4rbas08882lx7am4";
- name = "killbots-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/killbots-16.08.2.tar.xz";
+ sha256 = "1vrzj91ff78g6w34vb68ljp2dpckc80545n9bhk8x1pr1s3jl3ks";
+ name = "killbots-16.08.2.tar.xz";
};
};
kimap = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kimap-16.08.1.tar.xz";
- sha256 = "01nlqmprbzirw0kwqw1m1klwq401nz3sfc51gi1r01ghhskwfjj0";
- name = "kimap-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kimap-16.08.2.tar.xz";
+ sha256 = "1j0bsbzp669mxizr3vaxfg3wjavg7zx3xfrjrmwabl0h04hmkn0g";
+ name = "kimap-16.08.2.tar.xz";
};
};
kio-extras = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kio-extras-16.08.2.tar.xz";
+ sha256 = "1j5bmnq77yg5wpha0xl2cm4n2m0frw5dvr24i4ypvvqnpb1gim7q";
+ name = "kio-extras-16.08.2.tar.xz";
};
};
kiriki = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kiriki-16.08.1.tar.xz";
- sha256 = "15p205hcvvf9w1bwcciwaq8igf6nspzjili48x13pzcmmgjf46m8";
- name = "kiriki-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kiriki-16.08.2.tar.xz";
+ sha256 = "03vanq33hd7hlspckfydbbiavzv7g7maswca4zzd9sinybx45r7a";
+ name = "kiriki-16.08.2.tar.xz";
};
};
kiten = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kiten-16.08.1.tar.xz";
- sha256 = "1n94jzy50imvhgan3d5av9iifd0g2bn65gi5bxf9yzq48a6npnkv";
- name = "kiten-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kiten-16.08.2.tar.xz";
+ sha256 = "0kj1abs4f1ff0spkzwn5xxabcfb0xny7dlsa7lb0fbyvyczq3jgd";
+ name = "kiten-16.08.2.tar.xz";
};
};
kjumpingcube = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kjumpingcube-16.08.1.tar.xz";
- sha256 = "1i8agl9l996yf1x88s1xg2a3gahjjy2swscw5lb35li565rm7vyr";
- name = "kjumpingcube-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kjumpingcube-16.08.2.tar.xz";
+ sha256 = "1rnmwz729jain4pv0wpb8x95k6cx0bvb2wk46sjm2p80202clb0r";
+ name = "kjumpingcube-16.08.2.tar.xz";
};
};
kldap = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kldap-16.08.1.tar.xz";
- sha256 = "0m28i0rprj36b3ds51ljmhlpkld4ghl0259z9cc5fh4k7pnfi6jr";
- name = "kldap-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kldap-16.08.2.tar.xz";
+ sha256 = "18myysm48c8b6lpgl76x70na0k6qw47zrmmax2yfhbi4fsi13sg4";
+ name = "kldap-16.08.2.tar.xz";
};
};
kleopatra = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kleopatra-16.08.1.tar.xz";
- sha256 = "0f7ydyfp9iyg3jzrn02x8bm1x41yysixzwlcpl8l3qimibs65840";
- name = "kleopatra-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kleopatra-16.08.2.tar.xz";
+ sha256 = "0pi2j6yrdw5nhm7kb3k5gg1qgs2dyijqv6r07xx3r260v98jz9jb";
+ name = "kleopatra-16.08.2.tar.xz";
};
};
klettres = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/klettres-16.08.1.tar.xz";
- sha256 = "11xhprq24hq3f7vvifp1ilmcihadxwyk0jmpb643w898kh6qv9hd";
- name = "klettres-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/klettres-16.08.2.tar.xz";
+ sha256 = "07jqr3n67g0rgcdnxh4bmak6335w86irdla791bpkdl1swxwmvqi";
+ name = "klettres-16.08.2.tar.xz";
};
};
klickety = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/klickety-16.08.1.tar.xz";
- sha256 = "1hrplywk2b5qkw9ijpkyxgln2zwqj1ja2prp3acqs1683rsdndam";
- name = "klickety-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/klickety-16.08.2.tar.xz";
+ sha256 = "08nk4ihr8np36kzs4g94psh9xd5d8rpbhjd047pmw5226yv0lcr5";
+ name = "klickety-16.08.2.tar.xz";
};
};
klines = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/klines-16.08.1.tar.xz";
- sha256 = "07754lvllpjb016da1r7y4n72mp07h8bn16mq38qsxa1d0rdjjd6";
- name = "klines-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/klines-16.08.2.tar.xz";
+ sha256 = "18w4mc781ysjhr9krvvwac2c0hz7hqzks957i35d0jvs5675l1ds";
+ name = "klines-16.08.2.tar.xz";
};
};
kmag = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kmag-16.08.1.tar.xz";
- sha256 = "0d75z94p28zwh7pz7ss75fscwfcphvnxdd4bj0yr1hz4rzk5bmd2";
- name = "kmag-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kmag-16.08.2.tar.xz";
+ sha256 = "0x5x2gs5cs3vhr0ss14iy4pd5rxx1ry67ic52nnj7baa3b4kqssq";
+ name = "kmag-16.08.2.tar.xz";
};
};
kmahjongg = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kmahjongg-16.08.1.tar.xz";
- sha256 = "0xap6jw1gx86k8yhs7mmyp69jg4401551kmrhwbfz8cdpbzdrgz3";
- name = "kmahjongg-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kmahjongg-16.08.2.tar.xz";
+ sha256 = "03yj71cz4ca847niw26vrssd56pjjgc04fmzv7vxlx25jb73cn13";
+ name = "kmahjongg-16.08.2.tar.xz";
};
};
kmailtransport = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kmailtransport-16.08.1.tar.xz";
- sha256 = "052pnk3pqv9g58l5zlpz1mj17x72zrzjds77gd9vavmgmngzz2nd";
- name = "kmailtransport-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kmailtransport-16.08.2.tar.xz";
+ sha256 = "0dggvmhp0w085pq0fwf83zzv3rhckmcnzzjznsn7fzw2lxj6ns90";
+ name = "kmailtransport-16.08.2.tar.xz";
};
};
kmbox = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kmbox-16.08.1.tar.xz";
- sha256 = "10v9x4i1waqrdq28lk4fvxg8bjpldjajdfsv2qv1wyl28kkr8xkb";
- name = "kmbox-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kmbox-16.08.2.tar.xz";
+ sha256 = "1jny5qcadw1ssfcfwbhfwwn0v5n6rd1v0rj92n7vj814ni41yk62";
+ name = "kmbox-16.08.2.tar.xz";
};
};
kmime = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kmime-16.08.1.tar.xz";
- sha256 = "188lwyp345vigjgqbljlvw84jsjisfs6drvknx4qvk74a6idj078";
- name = "kmime-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kmime-16.08.2.tar.xz";
+ sha256 = "06rg1w5k53dvrhr2pcclhdlpf9784c4s7d3zyklwlc7r93bk0mch";
+ name = "kmime-16.08.2.tar.xz";
};
};
kmines = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kmines-16.08.1.tar.xz";
- sha256 = "1m7p0bwpq4ry1dw78nic73jcyf78zyrxc4cw9phdavrwvfvajzng";
- name = "kmines-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kmines-16.08.2.tar.xz";
+ sha256 = "02dbsrspg5x2avgdc0hrl522qzkki3hzr9k8zrbcjdh3j2rli965";
+ name = "kmines-16.08.2.tar.xz";
};
};
kmix = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kmix-16.08.1.tar.xz";
- sha256 = "0ikiillqsi1s2rl65j8f9883xg5y78a53nfha7wrzav5insyvrd0";
- name = "kmix-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kmix-16.08.2.tar.xz";
+ sha256 = "0fgvzcvxvic72mckxj8hwwh0fs851c61p560rvp13lzwwjl1l290";
+ name = "kmix-16.08.2.tar.xz";
};
};
kmousetool = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kmousetool-16.08.1.tar.xz";
- sha256 = "0dfmjs9d1pr4sxa5v6fk2bbx4anawm0841spg8vijxikwi67vayk";
- name = "kmousetool-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kmousetool-16.08.2.tar.xz";
+ sha256 = "13fa5r3gzngbcma8xmgr5im5kwxqcpnb260z0jmx7la67rrd4igh";
+ name = "kmousetool-16.08.2.tar.xz";
};
};
kmouth = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kmouth-16.08.1.tar.xz";
- sha256 = "01hin9yzv8zvj1pihr409clci905i3fhrwqz9izk1nhq3djxg7ld";
- name = "kmouth-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kmouth-16.08.2.tar.xz";
+ sha256 = "11xhzxh7rg0lzwq1wkr9a0dlsy70fy2d7nrmhi787xlgmcq1d1h8";
+ name = "kmouth-16.08.2.tar.xz";
};
};
kmplot = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kmplot-16.08.1.tar.xz";
- sha256 = "069qsi1bk385sil9m75y0zs7nzv8qscrfpdm8iip53fwf10bx5qa";
- name = "kmplot-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kmplot-16.08.2.tar.xz";
+ sha256 = "1mflaypy1ncg22pchfm632ik3kj65c3g1h48zirb6a0njzma81bf";
+ name = "kmplot-16.08.2.tar.xz";
};
};
knavalbattle = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/knavalbattle-16.08.1.tar.xz";
- sha256 = "0xxx053p42j8r6zlz6vv6avx6iqqm5aq6q3ggjib70w4ixl1wqmp";
- name = "knavalbattle-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/knavalbattle-16.08.2.tar.xz";
+ sha256 = "1w85z4m5yfj51z4yn60w83yfm2fnx96b313j4ysqgwzn6qsvw269";
+ name = "knavalbattle-16.08.2.tar.xz";
};
};
knetwalk = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/knetwalk-16.08.1.tar.xz";
- sha256 = "15nrfcd6l08lkshh6gyqfawr2b9izsirwdg9mqnnymdji8lg91nl";
- name = "knetwalk-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/knetwalk-16.08.2.tar.xz";
+ sha256 = "1nd2ddcf1m7nbxsmqiv8b9kxsifxyczy0qkdm02fl27hjz45jsa3";
+ name = "knetwalk-16.08.2.tar.xz";
};
};
kolf = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kolf-16.08.1.tar.xz";
- sha256 = "040fsd1kdww4yv258w1na3b5x3sxb14dj035rmw1y48lw883g439";
- name = "kolf-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kolf-16.08.2.tar.xz";
+ sha256 = "1afbdms3fzbl62g76c40d2k96djf5srl4xkpa20rm0by1ksfjcbg";
+ name = "kolf-16.08.2.tar.xz";
};
};
kollision = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kollision-16.08.1.tar.xz";
- sha256 = "0w9wsgdqcpgklv31iqhbd79n6qiqk49jkhrc2c6zhmxqp588wy14";
- name = "kollision-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kollision-16.08.2.tar.xz";
+ sha256 = "18bi7diwzql96w41s7kmrvynrwg1h8ihifw2cb8ganjlp215r216";
+ name = "kollision-16.08.2.tar.xz";
};
};
kolourpaint = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kolourpaint-16.08.1.tar.xz";
- sha256 = "1siari77ivnrbllncviy504sz8q1f1mhdpjp45z69hsjn6bw8rcz";
- name = "kolourpaint-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kolourpaint-16.08.2.tar.xz";
+ sha256 = "12rs8qgc30vma45ri7k3awigiqsk703lbl6k8dxbiir6nqdvz4n9";
+ name = "kolourpaint-16.08.2.tar.xz";
};
};
kompare = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kompare-16.08.1.tar.xz";
- sha256 = "0xmr3g2azrzhrjz1n9sp8wif7rxh574a1mg3prhl636pqcijq1bw";
- name = "kompare-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kompare-16.08.2.tar.xz";
+ sha256 = "130019r4623wkmw44s62wnn01l96bc0b0d3l0m6nzgilxq8xj7xw";
+ name = "kompare-16.08.2.tar.xz";
};
};
konquest = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/konquest-16.08.1.tar.xz";
- sha256 = "1hsh9n17gqwnash5f8z8zpnwxl0n09zn9hv1qn39zad23vg6fjjd";
- name = "konquest-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/konquest-16.08.2.tar.xz";
+ sha256 = "1m5pifwhzviz5hry0a26nvfh4j962mc7dnvl5n7yjwgnmk8m609m";
+ name = "konquest-16.08.2.tar.xz";
};
};
konsole = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/konsole-16.08.1.tar.xz";
- sha256 = "0dgphhg2icqagaw16i8z3x3mw8rmmpl3wmafbaca1gn9xw67md1g";
- name = "konsole-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/konsole-16.08.2.tar.xz";
+ sha256 = "0kjf2yj5kz70pswrpkggz1zhwvm819r1qhg16i6xg43cpsfsim85";
+ name = "konsole-16.08.2.tar.xz";
};
};
kontactinterface = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kontactinterface-16.08.1.tar.xz";
- sha256 = "0a8swis8i3dbv9nbbw8ksbghj5pvfsba6kkh2l4lgmkbdi0m9a3s";
- name = "kontactinterface-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kontactinterface-16.08.2.tar.xz";
+ sha256 = "1c8q9jywr8c3yag2vxlmkl5ri7wm7miyhgqkxavs9lyxbqqkcgnw";
+ name = "kontactinterface-16.08.2.tar.xz";
};
};
kopete = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kopete-16.08.1.tar.xz";
- sha256 = "0l2wkf8b2jp6gnr2930xxxz9jqmh6mlms5h8934k89z9x00ha1p5";
- name = "kopete-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kopete-16.08.2.tar.xz";
+ sha256 = "0jxrgb36snfgqbl4q1myala63pyrvaw1jvc9pf5bbkx8xpr5pk2c";
+ name = "kopete-16.08.2.tar.xz";
};
};
kpat = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kpat-16.08.1.tar.xz";
- sha256 = "1gpvha8636lwlb1qcdkirs5whil2fh6fp5xd3yh31dppxwryadaf";
- name = "kpat-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kpat-16.08.2.tar.xz";
+ sha256 = "12mm57bpx92kbrk9f1xzvlg7knfhivgrqwa90lj6mgdsa39g27v2";
+ name = "kpat-16.08.2.tar.xz";
};
};
kpimtextedit = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kpimtextedit-16.08.1.tar.xz";
- sha256 = "1a73s0w49jrblxmzfsp25pknvpggx1p765w2hflij4yr0cb0ganz";
- name = "kpimtextedit-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kpimtextedit-16.08.2.tar.xz";
+ sha256 = "1ybwx73zzyknlrg7yw8yb8dkr0wwk9632s3w7g64nskm5ps51vvv";
+ name = "kpimtextedit-16.08.2.tar.xz";
};
};
kppp = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kppp-16.08.1.tar.xz";
- sha256 = "00fv4r6fiq7kkfi3awvk8b7ccj21hm5f7jdgkhacs6np5kv4spnd";
- name = "kppp-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kppp-16.08.2.tar.xz";
+ sha256 = "0xp6qcdnl3dcivkx0mavzjw2shah1wl8vd5b15chnf1qn1pa00qv";
+ name = "kppp-16.08.2.tar.xz";
};
};
kqtquickcharts = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kqtquickcharts-16.08.1.tar.xz";
- sha256 = "0xy84v0z0mx30ynsym7qian2khck8mfgkm62sfd5v3xkgffhhdyh";
- name = "kqtquickcharts-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kqtquickcharts-16.08.2.tar.xz";
+ sha256 = "16qzqv3g7kckc5biphzzv7gmly2519mihd89118yksymp70cznh6";
+ name = "kqtquickcharts-16.08.2.tar.xz";
};
};
krdc = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/krdc-16.08.1.tar.xz";
- sha256 = "1mq867gv8l6i1xlykm0fnfsgz52h60hb3s06aq1rp97yddclr4q1";
- name = "krdc-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/krdc-16.08.2.tar.xz";
+ sha256 = "1jxkv7fsml1iq87y9jm04dhp7qxqyv5dnvp1yg5225xnvq2lhrzn";
+ name = "krdc-16.08.2.tar.xz";
};
};
kremotecontrol = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kremotecontrol-16.08.1.tar.xz";
- sha256 = "09iyp1sfva7rzxrp7ma90l3ls8yda5hyypvvn3kliv6rap0vrwv5";
- name = "kremotecontrol-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kremotecontrol-16.08.2.tar.xz";
+ sha256 = "1p5cvls132p585v5yxaw6b9fadmr1qzijh86z232amfb8iax23zg";
+ name = "kremotecontrol-16.08.2.tar.xz";
};
};
kreversi = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kreversi-16.08.1.tar.xz";
- sha256 = "15g87r85wh4b9vx21bsxp2vavfgzy8kdgwyvv39gg87rl62j7qxf";
- name = "kreversi-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kreversi-16.08.2.tar.xz";
+ sha256 = "10nn66422vr5sav7yf5z1vq84v7kl94f4zv2w4ywrgbaknwkhyf7";
+ name = "kreversi-16.08.2.tar.xz";
};
};
krfb = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/krfb-16.08.1.tar.xz";
- sha256 = "0952cxnfbwab6d1ji6wwx3snv4a9k031h8pph3n47xxr12nkjj19";
- name = "krfb-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/krfb-16.08.2.tar.xz";
+ sha256 = "0kz7x4mwby8v7d3wr9fpd362db9fmh0agym5rq4q8d68wvzgbyi9";
+ name = "krfb-16.08.2.tar.xz";
};
};
kross-interpreters = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/kross-interpreters-16.08.2.tar.xz";
+ sha256 = "13jc263vj0jsqvhlcag8an5ixs3dn2q35q1p29wyy1fpd80snhcj";
+ name = "kross-interpreters-16.08.2.tar.xz";
};
};
kruler = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kruler-16.08.1.tar.xz";
- sha256 = "0j3hi77wlf5nwdmqiq5g34zb8pdzxn313hmc0k99p1gvkb1xn4zp";
- name = "kruler-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kruler-16.08.2.tar.xz";
+ sha256 = "1cy7jx8nc9ajzpis13dvg7hpd1a76splc5yrqyhbmb7cga50098l";
+ name = "kruler-16.08.2.tar.xz";
};
};
ksaneplugin = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/ksaneplugin-16.08.1.tar.xz";
- sha256 = "0bx7vaw5vkr7fvmn6ywil8997d1qy6qv7sycxz3ydc5ljg1ansmr";
- name = "ksaneplugin-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/ksaneplugin-16.08.2.tar.xz";
+ sha256 = "1glvx52gzrprywmi8n3npjfm5ixx8ibx7126n6n284jwigcr580g";
+ name = "ksaneplugin-16.08.2.tar.xz";
};
};
kscd = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kscd-16.08.1.tar.xz";
- sha256 = "1a6sq2dgkgvhycjxz95xa2b2xdibhl0ky54chj7hmdf43w69bdzc";
- name = "kscd-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kscd-16.08.2.tar.xz";
+ sha256 = "0axjc68ag84pvdskbhwqyg40qmnil9n6m8x3z4k24cgajr83hmbq";
+ name = "kscd-16.08.2.tar.xz";
};
};
kshisen = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kshisen-16.08.1.tar.xz";
- sha256 = "1j33byc485rxbcf3wk8kra7vxq4r1sg8cpfrlxwiyb9ibk762jlh";
- name = "kshisen-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kshisen-16.08.2.tar.xz";
+ sha256 = "1605fmsrg2pyydg303kf49hncdjcdq8m2g2xam0c96bdn44kd7cp";
+ name = "kshisen-16.08.2.tar.xz";
};
};
ksirk = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/ksirk-16.08.1.tar.xz";
- sha256 = "121j8jz9gabdqv5fh4c2qcsg4ndj72xnmavvdrlib8a7qidjzaga";
- name = "ksirk-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/ksirk-16.08.2.tar.xz";
+ sha256 = "196fjfyrwspzcm2hlqr09a079sr8p4gp80c4xfj1dhmfavs3cmvx";
+ name = "ksirk-16.08.2.tar.xz";
};
};
ksnakeduel = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/ksnakeduel-16.08.1.tar.xz";
- sha256 = "1qzqr5ai5d7azh7xmm2vihbz3jzxxvb6qvhpfrix0yf4yr8m8fxz";
- name = "ksnakeduel-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/ksnakeduel-16.08.2.tar.xz";
+ sha256 = "0nw1fsd7q9ar0922v3gkpig8smvlw0va6jh9a4v8g4pfsk5avii5";
+ name = "ksnakeduel-16.08.2.tar.xz";
};
};
kspaceduel = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kspaceduel-16.08.1.tar.xz";
- sha256 = "0zy6m325gaivwfrr20mfwn8pdgl1i4ym1ymwb5dyw7a5yfi27m7n";
- name = "kspaceduel-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kspaceduel-16.08.2.tar.xz";
+ sha256 = "1ww7cz89jkn28qpk0a3xpcv9ngh39wwzpiam64pjlnniycxw3zk8";
+ name = "kspaceduel-16.08.2.tar.xz";
};
};
ksquares = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/ksquares-16.08.1.tar.xz";
- sha256 = "1rccb2qifqfb68apag01i3y97jbrskarf3480p61ixk7lrmbbrx4";
- name = "ksquares-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/ksquares-16.08.2.tar.xz";
+ sha256 = "04j30ld2ly6gm1va0yw2vsfrvab5kla6dlxir31375b1w85gfhil";
+ name = "ksquares-16.08.2.tar.xz";
};
};
kstars = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kstars-16.08.1.tar.xz";
- sha256 = "1fwl9hry23lmhyx5ldqspa7hp6bvmjp8kzwi6p9y1kbwzbzmki0k";
- name = "kstars-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kstars-16.08.2.tar.xz";
+ sha256 = "117hk0wj649f2b158sad0jcqsrb1a8cw0blx3yz83fxw8z160j2x";
+ name = "kstars-16.08.2.tar.xz";
};
};
ksudoku = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/ksudoku-16.08.1.tar.xz";
- sha256 = "1msxx4hay0njp7bxjgplq7ylblbr56mf01l70sywj5madvvrmh8y";
- name = "ksudoku-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/ksudoku-16.08.2.tar.xz";
+ sha256 = "0y3w626g3ah8r3yipxsqg71gh886higlmr8ai0sc8179gcmy84zd";
+ name = "ksudoku-16.08.2.tar.xz";
};
};
ksystemlog = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/ksystemlog-16.08.1.tar.xz";
- sha256 = "0garxwsgzdc5j6426gv3wqqgxra6qfdlk7xrk6mhlyg3wnwy8lz9";
- name = "ksystemlog-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/ksystemlog-16.08.2.tar.xz";
+ sha256 = "02l7bchc767jcdpyras24k57qddq7pk4h7jaa22ns134977rw8yb";
+ name = "ksystemlog-16.08.2.tar.xz";
};
};
kteatime = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kteatime-16.08.1.tar.xz";
- sha256 = "0m6rri4mgr9qzcpxr5ifm1xs5mpmx7nz074gscff662nv4cj1h5n";
- name = "kteatime-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kteatime-16.08.2.tar.xz";
+ sha256 = "02knfjpb0p3bgdfwqjp3fqnqz4i6cqshhy14w71wviprybb40cxd";
+ name = "kteatime-16.08.2.tar.xz";
};
};
ktimer = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/ktimer-16.08.1.tar.xz";
- sha256 = "0n94r34d24dnpi8rr6lb2vqrx1bz29xb92a63dm3s6pvbrw7zmhr";
- name = "ktimer-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/ktimer-16.08.2.tar.xz";
+ sha256 = "197m6ywq2bs7kclwxsdv7w4mqfhs9ad3wgcbw6m3yvkyz03xl3p8";
+ name = "ktimer-16.08.2.tar.xz";
};
};
ktnef = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/ktnef-16.08.1.tar.xz";
- sha256 = "0gjq14gcc34mqx21f74kzqb1575fhckaq13fpf00ascar0s1w0sx";
- name = "ktnef-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/ktnef-16.08.2.tar.xz";
+ sha256 = "0mpavsp6p2ipxf90ararnvz7qvb51fy3w7rh5giv3j9wc37awi39";
+ name = "ktnef-16.08.2.tar.xz";
};
};
ktouch = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/ktouch-16.08.1.tar.xz";
- sha256 = "0jjn59hjbj5mc0svd8nrnqdwa4xz4wj76512gx1w1lga37ysk5gx";
- name = "ktouch-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/ktouch-16.08.2.tar.xz";
+ sha256 = "08zzibxcv8gh527j0qwnhjs4rsk01hrx5iqa9d4r2b508h6xcwm2";
+ name = "ktouch-16.08.2.tar.xz";
};
};
ktp-accounts-kcm = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/ktp-accounts-kcm-16.08.2.tar.xz";
+ sha256 = "1ql13gkc16a0xjs159pjkw810dph0f3c8lvjxlgzg5dnavjpkmsm";
+ name = "ktp-accounts-kcm-16.08.2.tar.xz";
};
};
ktp-approver = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/ktp-approver-16.08.2.tar.xz";
+ sha256 = "1n885817as1j9s8c6ppj02hcih4v7k778q88lbxwnps32la7m6n9";
+ name = "ktp-approver-16.08.2.tar.xz";
};
};
ktp-auth-handler = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/ktp-auth-handler-16.08.2.tar.xz";
+ sha256 = "1vfnj1id8jisxsalghr13blx8x19r376dc2v4w46jqxj1xaiwglx";
+ name = "ktp-auth-handler-16.08.2.tar.xz";
};
};
ktp-call-ui = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/ktp-call-ui-16.08.2.tar.xz";
+ sha256 = "0jk09x53cimcs24cj3ay9al0r91xjwqf5cjnj16ibbnqhxd8rym1";
+ name = "ktp-call-ui-16.08.2.tar.xz";
};
};
ktp-common-internals = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/ktp-common-internals-16.08.2.tar.xz";
+ sha256 = "1mw4cmrpk705dcka1v3fhvfz3q1r142yrik98jma8v4pjlm84n70";
+ name = "ktp-common-internals-16.08.2.tar.xz";
};
};
ktp-contact-list = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/ktp-contact-list-16.08.2.tar.xz";
+ sha256 = "0rsljaimdqvrxfp8sq1bckzkx23xr5pq2q9mrgh0zy39abmdak25";
+ name = "ktp-contact-list-16.08.2.tar.xz";
};
};
ktp-contact-runner = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/ktp-contact-runner-16.08.2.tar.xz";
+ sha256 = "0b3rhrvgmkwcsk9jdr6j8kg80zrwdsza8297hrzfv76bpxn60dbn";
+ name = "ktp-contact-runner-16.08.2.tar.xz";
};
};
ktp-desktop-applets = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/ktp-desktop-applets-16.08.2.tar.xz";
+ sha256 = "0d8ypp531zhb6i8w703hr02cb863z0g8sbaadrrp3x4h2dff2kcv";
+ name = "ktp-desktop-applets-16.08.2.tar.xz";
};
};
ktp-filetransfer-handler = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/ktp-filetransfer-handler-16.08.2.tar.xz";
+ sha256 = "0vh6h9cbamscjm22rib1dx8crr6r4a1bq5p2rrq6bq56zp78gkfb";
+ name = "ktp-filetransfer-handler-16.08.2.tar.xz";
};
};
ktp-kded-module = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/ktp-kded-module-16.08.2.tar.xz";
+ sha256 = "1lh1pi7xi60dsyz5g608lsfhpr5p8vqsfdc2cmyaalkcixb7s4wg";
+ name = "ktp-kded-module-16.08.2.tar.xz";
};
};
ktp-send-file = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/ktp-send-file-16.08.2.tar.xz";
+ sha256 = "0q6mnirx6k8xs6pkfwrrhgg1i75xrd9bsg2liyjrjgbgm1lwm0jz";
+ name = "ktp-send-file-16.08.2.tar.xz";
};
};
ktp-text-ui = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/ktp-text-ui-16.08.2.tar.xz";
+ sha256 = "1wrxa65rx0vjd57qk4c7ak43vb9h8yv7r7618hnfycjr0mgr6gf5";
+ name = "ktp-text-ui-16.08.2.tar.xz";
};
};
ktuberling = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/ktuberling-16.08.1.tar.xz";
- sha256 = "1brm1xdma1d5fcgbyn8nw3pwncnyvxknrwlbr7capgwqn7s9pckl";
- name = "ktuberling-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/ktuberling-16.08.2.tar.xz";
+ sha256 = "0337fvw21h62y8zlib93fyk5wbwrgkakpyd78q5mcn5sazq7nb67";
+ name = "ktuberling-16.08.2.tar.xz";
};
};
kturtle = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kturtle-16.08.1.tar.xz";
- sha256 = "1d6kw35dzyq3c62j7pqsl57l8cpw98awr6bdr1v2w8xdiw9xi73c";
- name = "kturtle-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kturtle-16.08.2.tar.xz";
+ sha256 = "1fljwnxr8vvy78mlwf58p48wv45g6k4w9xs6kzb0j3xayg389x36";
+ name = "kturtle-16.08.2.tar.xz";
};
};
kubrick = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kubrick-16.08.1.tar.xz";
- sha256 = "1x34gyqa77b03hqs50vajqcmw9yrqxq1f4niyfj43wkw2b4jks9f";
- name = "kubrick-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kubrick-16.08.2.tar.xz";
+ sha256 = "19avy6001n7kbxnbqbxxv62qwn015z8jjslys6s81if8bh9b81bl";
+ name = "kubrick-16.08.2.tar.xz";
};
};
kuser = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kuser-16.08.1.tar.xz";
- sha256 = "0dkv9x052iavp3hnrvnarm8hv3416kamdizwp3c22w2cfz3q4rdc";
- name = "kuser-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kuser-16.08.2.tar.xz";
+ sha256 = "0vlckiy3n0ghfzjkl22pk29qrl8y7hh6a9q4bfj7a8mwmkskr8qc";
+ name = "kuser-16.08.2.tar.xz";
};
};
kwalletmanager = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kwalletmanager-16.08.1.tar.xz";
- sha256 = "1w99076da86qw2271hkknrjc0mfp7f0xi5544kbk76aanaj73wvm";
- name = "kwalletmanager-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kwalletmanager-16.08.2.tar.xz";
+ sha256 = "0nmriayyhxhf43kladp6bpzrrmdfgf6lbyr1ibpqp33mqrxqgiqf";
+ name = "kwalletmanager-16.08.2.tar.xz";
};
};
kwordquiz = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/kwordquiz-16.08.1.tar.xz";
- sha256 = "08n6ajpx5x2vpf63d4fnfw2a4hcfmca2q4nd5y04kl1sccx67zig";
- name = "kwordquiz-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/kwordquiz-16.08.2.tar.xz";
+ sha256 = "0xlhl3n1dl1y6d1kbbcw4p60hkyjlvavrslq1h7wwjp99pmqr333";
+ name = "kwordquiz-16.08.2.tar.xz";
};
};
libgravatar = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/libgravatar-16.08.1.tar.xz";
- sha256 = "1izh80plcd3ss3brl0mi0alics4y53d355smpgjkfqyc80zxs7wz";
- name = "libgravatar-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/libgravatar-16.08.2.tar.xz";
+ sha256 = "0nssi286sra4rggvljwvqwx5r2h0h26wmafq764vj97qqw2r3ikw";
+ name = "libgravatar-16.08.2.tar.xz";
};
};
libkcddb = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/libkcddb-16.08.1.tar.xz";
- sha256 = "1i9xb96xari03q8fw20laqh5d3fyvigzqkdw6lw61fwxzpjrphk8";
- name = "libkcddb-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/libkcddb-16.08.2.tar.xz";
+ sha256 = "0hvhl4266h1a05bvid1x7kfaxqa5fcnr4f243k5ksjp7sxcba1j2";
+ name = "libkcddb-16.08.2.tar.xz";
};
};
libkcompactdisc = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/libkcompactdisc-16.08.1.tar.xz";
- sha256 = "1qjij6kvvs8k650sg7skbgh0n4wgdkyjdsg8rydg93r0fqh5yagq";
- name = "libkcompactdisc-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/libkcompactdisc-16.08.2.tar.xz";
+ sha256 = "1vvhbqg7rzcfqadglvjrifnla6gi6aawh0ki36zshi48jhpg978w";
+ name = "libkcompactdisc-16.08.2.tar.xz";
};
};
libkdcraw = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/libkdcraw-16.08.1.tar.xz";
- sha256 = "05206lbf2j0pry640ja5ajdlmalz4szfg2xzddfp00m87bgxbr2b";
- name = "libkdcraw-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/libkdcraw-16.08.2.tar.xz";
+ sha256 = "179dv05qkn2h0szzqm6l09ln491q2jz6j0fwczakh7lvlrdb2zxa";
+ name = "libkdcraw-16.08.2.tar.xz";
};
};
libkdegames = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/libkdegames-16.08.1.tar.xz";
- sha256 = "11r5bf23fyymqqsj3ckbmya3f0zsdgrd4fw7jkfbxw7bfjjpr890";
- name = "libkdegames-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/libkdegames-16.08.2.tar.xz";
+ sha256 = "1zzpdlyrhhzqis9f9q3b1b50ljcsmpccxq0bdqkjm3ahzw8rvdig";
+ name = "libkdegames-16.08.2.tar.xz";
};
};
libkdepim = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/libkdepim-16.08.1.tar.xz";
- sha256 = "0p72dk6w0bvn7qikpqlxd7yhlrnn9wqnrq6b6p0ngnzhrsybjffm";
- name = "libkdepim-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/libkdepim-16.08.2.tar.xz";
+ sha256 = "1w7bkkcpyw4b14qz7jh9kw5z2q7qdk78lac3fh448xdhf1ci6svg";
+ name = "libkdepim-16.08.2.tar.xz";
};
};
libkeduvocdocument = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/libkeduvocdocument-16.08.1.tar.xz";
- sha256 = "113z6hi6v7mj4z6qk3gj04ah60ys8fn14jwlrxj8xf5qb0fvhzbn";
- name = "libkeduvocdocument-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/libkeduvocdocument-16.08.2.tar.xz";
+ sha256 = "1f0vyblxyha6c09nkya7q4v0j24463qpxxkkghm2z1xb0fwc852x";
+ name = "libkeduvocdocument-16.08.2.tar.xz";
};
};
libkexiv2 = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/libkexiv2-16.08.1.tar.xz";
- sha256 = "1h7bd3p03xap6m6qpb0ww8ganyb9z7sdk2hpp25ar12snjpfgh0y";
- name = "libkexiv2-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/libkexiv2-16.08.2.tar.xz";
+ sha256 = "00phw7qax09k2aapyx1rp5w7ifn73i7w83jpz3sr24njxbg49261";
+ name = "libkexiv2-16.08.2.tar.xz";
};
};
libkface = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/libkface-16.08.1.tar.xz";
- sha256 = "19fqg7xja2pk6wp4bvamanwpfcs5qiyzsgldpr0q4y650ipbrf4w";
- name = "libkface-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/libkface-16.08.2.tar.xz";
+ sha256 = "10arzszgjx8zs0d2b0i74bf00bs0csikny4d9j5w5hiim4qhxza6";
+ name = "libkface-16.08.2.tar.xz";
};
};
libkgeomap = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/libkgeomap-16.08.1.tar.xz";
- sha256 = "0zlcd4k8yfz9l5skky7vyc2p5hgx2wnan1g0jawi2f2xzsy655nz";
- name = "libkgeomap-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/libkgeomap-16.08.2.tar.xz";
+ sha256 = "1h91bdld51snajrws9g4pr7n3nlwmpnpg95xhh91fykiqlw919ig";
+ name = "libkgeomap-16.08.2.tar.xz";
};
};
libkipi = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/libkipi-16.08.1.tar.xz";
- sha256 = "1mksgr0x446ilbqmb0wb5lh5afj8q7a88r31wzf6x3698n0s9fdb";
- name = "libkipi-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/libkipi-16.08.2.tar.xz";
+ sha256 = "13gkcjx3x6j5150pkbb5ijzasl4418rhlfxq70966zrsn9a7v6ad";
+ name = "libkipi-16.08.2.tar.xz";
};
};
libkleo = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/libkleo-16.08.1.tar.xz";
- sha256 = "0a216q291vgf4v758l79aywp1f8wn40239jn9gx6ngw3p8zzf357";
- name = "libkleo-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/libkleo-16.08.2.tar.xz";
+ sha256 = "16k8qqhrchxc8hk4l6hi94nhn8pavqm0snh357bx293f5rxvk51g";
+ name = "libkleo-16.08.2.tar.xz";
};
};
libkmahjongg = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/libkmahjongg-16.08.1.tar.xz";
- sha256 = "1bvm86xcmx3cdslm98n5kg61rmyc9p86aj8scrp3gb8di1y987zx";
- name = "libkmahjongg-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/libkmahjongg-16.08.2.tar.xz";
+ sha256 = "12lnqpdpzcpljsdhj7y624g4iigam2cym7yv1czir26nfflk61ij";
+ name = "libkmahjongg-16.08.2.tar.xz";
};
};
libkomparediff2 = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/libkomparediff2-16.08.1.tar.xz";
- sha256 = "1cqd1amnxpylwzw5vdgy29wh1llhrvbqf5kmjxxb3a3kh2rafb53";
- name = "libkomparediff2-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/libkomparediff2-16.08.2.tar.xz";
+ sha256 = "0d08mgswjck9lfagf0wh556vy1k2k8414ps6jhikmsbff6s44i35";
+ name = "libkomparediff2-16.08.2.tar.xz";
};
};
libksane = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/libksane-16.08.1.tar.xz";
- sha256 = "0g8vhdknph32736inzf9xbrdi51asb9md254m12cabglb1mfhia3";
- name = "libksane-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/libksane-16.08.2.tar.xz";
+ sha256 = "1clk8yh3sb61xll0wpni2ccixsvxp4d0k5k8ygyb3m1glf802z5a";
+ name = "libksane-16.08.2.tar.xz";
};
};
libksieve = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/libksieve-16.08.1.tar.xz";
- sha256 = "1paq508fsb1q7nfry3za7ykz41ly3qb6splf65d9n9l8aqbfx9fx";
- name = "libksieve-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/libksieve-16.08.2.tar.xz";
+ sha256 = "0a0gym7y4qp83fs94y0xvm5i1qbh1vxy1wz2rw74k82cbj1yzviw";
+ name = "libksieve-16.08.2.tar.xz";
};
};
lokalize = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/lokalize-16.08.1.tar.xz";
- sha256 = "1dg6sw4zm7cq4di9zgjc4b1nk73sngc3ilshsr1wgdylpxaq9vrf";
- name = "lokalize-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/lokalize-16.08.2.tar.xz";
+ sha256 = "13misqakj232y7ib89clgcc7r6byw7n2894x0ylkahj8synm1y3c";
+ name = "lokalize-16.08.2.tar.xz";
};
};
lskat = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/lskat-16.08.1.tar.xz";
- sha256 = "08ds76m66ni7pfmz0cnqx6b1p6l7m8fy5mz54kh9aahchw8lwpmk";
- name = "lskat-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/lskat-16.08.2.tar.xz";
+ sha256 = "1i2s10csw9k6zjw9yk03l9p5xmg2gpw86xbsxp094xcncg7yml3v";
+ name = "lskat-16.08.2.tar.xz";
};
};
mailcommon = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/mailcommon-16.08.1.tar.xz";
- sha256 = "0f25z2s8bm51p2qxl2srdjf6df9h006ji6y9vn06m1vwsyfzmg3g";
- name = "mailcommon-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/mailcommon-16.08.2.tar.xz";
+ sha256 = "1s3n834i9c33ldrrsq8vqsllnnicaginrqj7cm6lm317q0mgiiiw";
+ name = "mailcommon-16.08.2.tar.xz";
};
};
mailimporter = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/mailimporter-16.08.1.tar.xz";
- sha256 = "18hy1brpl07zcwzwv83mikn17h7xrgyc5q8xqvl5awgn8cj1zk9d";
- name = "mailimporter-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/mailimporter-16.08.2.tar.xz";
+ sha256 = "08a0b7yk02df2fhr7cazm4x3v1qg67rzk0z2f14ssp7sz835bpia";
+ name = "mailimporter-16.08.2.tar.xz";
};
};
marble = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/marble-16.08.1.tar.xz";
- sha256 = "0fmgqx1nc77agrrcb6qxq0zkndxkxhqybvxpf0dxyd7mpwg00zd2";
- name = "marble-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/marble-16.08.2.tar.xz";
+ sha256 = "1y8mqafji4lr8q1caipdgbrqcbivirzi8r6vw1iz3fjfbhi71c77";
+ name = "marble-16.08.2.tar.xz";
};
};
messagelib = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/messagelib-16.08.1.tar.xz";
- sha256 = "0kjladmrj2plj5kjmjkhh35mlijc2k3q8pdmi91xq0paawlrziyc";
- name = "messagelib-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/messagelib-16.08.2.tar.xz";
+ sha256 = "1kmiww8051bfldxb1yx1b45k78ihvsm3z7pbmdnw06nlz8a8xycb";
+ name = "messagelib-16.08.2.tar.xz";
};
};
minuet = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/minuet-16.08.1.tar.xz";
- sha256 = "1qa2a3216p8x0vr9i3jw42i134qij4v0jj0625m606ihfs2mfhbq";
- name = "minuet-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/minuet-16.08.2.tar.xz";
+ sha256 = "1cshjbzdjfs0g8lqxq6n7hnh032scrymapfc8il58rb3hir2fa0s";
+ name = "minuet-16.08.2.tar.xz";
};
};
okteta = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/okteta-16.08.1.tar.xz";
- sha256 = "1q9pni82frj48lncj9ipkvdb120bg49f53p09vcpfxyax6hhnb5k";
- name = "okteta-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/okteta-16.08.2.tar.xz";
+ sha256 = "0gzriksvd8f409j63hyiqrj4j739f6apf99r4ic6271y50np9fk0";
+ name = "okteta-16.08.2.tar.xz";
};
};
okular = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/okular-16.08.1.tar.xz";
- sha256 = "0x3njxxwacy9cj4rzsgphl3za01d59wpbax9wxhxcdwqfi332a0d";
- name = "okular-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/okular-16.08.2.tar.xz";
+ sha256 = "1hih12hk0jckprfphb0l67qpsrc2vgxvvvjb9wnvxqyvy29sk37k";
+ name = "okular-16.08.2.tar.xz";
};
};
palapeli = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/palapeli-16.08.1.tar.xz";
- sha256 = "15dfh9802kdmlwzjfqciszf4lwy2pr9ypnk1s2i4aj69jwqygn62";
- name = "palapeli-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/palapeli-16.08.2.tar.xz";
+ sha256 = "1skx37v3vx45xdn8m3g69qw1rnkhzzmnfxv5z0yiqvc9jdxl1zrh";
+ name = "palapeli-16.08.2.tar.xz";
};
};
parley = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/parley-16.08.1.tar.xz";
- sha256 = "0pwwng4rx82l7j8n9llhwn6779jjhakl84nal1s6fc4i8vack49v";
- name = "parley-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/parley-16.08.2.tar.xz";
+ sha256 = "19m8czgzvr7rg5hcgig4sf28rngqdsx27c3p7qrmwg9xw2b3pgbr";
+ name = "parley-16.08.2.tar.xz";
};
};
picmi = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/picmi-16.08.1.tar.xz";
- sha256 = "0lfmswabkkj6snwmx27iv9w5c2qpw6z85rvi997ccrw5yg1627hc";
- name = "picmi-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/picmi-16.08.2.tar.xz";
+ sha256 = "1z90b98rf7b089kl4gcll86xlq4d49lh4nl6lngbb6vv7xgcz740";
+ name = "picmi-16.08.2.tar.xz";
};
};
pimcommon = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/pimcommon-16.08.1.tar.xz";
- sha256 = "1n15i70mgfx0jnl4952gkn05ynpnkqz4fkmwycj0ib0ry9wvi2vh";
- name = "pimcommon-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/pimcommon-16.08.2.tar.xz";
+ sha256 = "1gkx3qqnmckf9hy9kysgil2m6kg1h920ywj8kq0fafxhg57w6pc1";
+ name = "pimcommon-16.08.2.tar.xz";
};
};
poxml = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/poxml-16.08.1.tar.xz";
- sha256 = "0cwnpcagsg1dbvfhra473g7wqmk5x2frw8y3831zwr47y6kgdr0c";
- name = "poxml-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/poxml-16.08.2.tar.xz";
+ sha256 = "0kpimgj0mrdbpma0pm2la1686y2nac4y5zd61qlmsczk0sc0g1d5";
+ name = "poxml-16.08.2.tar.xz";
};
};
print-manager = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/print-manager-16.08.2.tar.xz";
+ sha256 = "06560241d1r4ca17n62r26yxdccnkx58k4w127z1xsi12bjihf1v";
+ name = "print-manager-16.08.2.tar.xz";
};
};
rocs = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/rocs-16.08.1.tar.xz";
- sha256 = "1qif7qj67rzljpkmbqjfm0gaji8wk7mc8fbddi7fpczgnz5jcmd5";
- name = "rocs-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/rocs-16.08.2.tar.xz";
+ sha256 = "0404sp8hf73r0mxn94j4371m2ks6gkwkm13mn8ycig2ys0w6dc6w";
+ name = "rocs-16.08.2.tar.xz";
};
};
signon-kwallet-extension = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/signon-kwallet-extension-16.08.2.tar.xz";
+ sha256 = "12vsk3fydpjwai3l4gm1irhc0157qn8hb81d96kr07zg8k3jqjhf";
+ name = "signon-kwallet-extension-16.08.2.tar.xz";
};
};
spectacle = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/spectacle-16.08.1.tar.xz";
- sha256 = "0a9gka5xllwcdvvdbr8fj91v8zg2hlzhrh6myb0ycj7ang45gc88";
- name = "spectacle-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/spectacle-16.08.2.tar.xz";
+ sha256 = "1aylgyfsmg2jmgg090glns2qmy5bqsf43fwglvwmmfbly0h5i03h";
+ name = "spectacle-16.08.2.tar.xz";
};
};
step = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/step-16.08.1.tar.xz";
- sha256 = "0135568xaccswfj8zfimh5fbpb8ib3lz2aq9qsw05bbmrjfv4398";
- name = "step-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/step-16.08.2.tar.xz";
+ sha256 = "1kiyc009cf0pw6qfn3ravfbch8cvsv5iv6cas8mcszh1wil3y14h";
+ name = "step-16.08.2.tar.xz";
};
};
svgpart = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/svgpart-16.08.1.tar.xz";
- sha256 = "0ws41853wcfj1nbd31mr5qr23rzlijprvbpr1y7wq6g9agdfdwxs";
- name = "svgpart-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/svgpart-16.08.2.tar.xz";
+ sha256 = "1idfmmmg65cqga1klmd2vwp8abpafda4z1fsd4p383wfjkmwgp09";
+ name = "svgpart-16.08.2.tar.xz";
};
};
sweeper = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/sweeper-16.08.1.tar.xz";
- sha256 = "0ywrpdhy61hm61drclk17mlmp8i0717871mc48b5rlpgkxa31aaz";
- name = "sweeper-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/sweeper-16.08.2.tar.xz";
+ sha256 = "0y777yz51rs9m9lrx41mrj0wmp83vz6xc353acdk8ilm8lfqc9qh";
+ name = "sweeper-16.08.2.tar.xz";
};
};
syndication = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/syndication-16.08.1.tar.xz";
- sha256 = "06hpw3lr3idrrbv92qd5smnnbv4yvpn5kn99bbx5rjwxbcnrklml";
- name = "syndication-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/syndication-16.08.2.tar.xz";
+ sha256 = "171swz7dqxp8c198hlprpj3lzdryvbz3603iawxh6663fa1da2lx";
+ name = "syndication-16.08.2.tar.xz";
};
};
umbrello = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.1/src/umbrello-16.08.1.tar.xz";
- sha256 = "14kalb7fpknsflkxychian1j724kfw4klcb4l361cn53imqq0ngk";
- name = "umbrello-16.08.1.tar.xz";
+ url = "${mirror}/stable/applications/16.08.2/src/umbrello-16.08.2.tar.xz";
+ sha256 = "0m32lxzilzyycw9jb72zxzprcwk19sj5h45hvz6w9nvrk9k80a6h";
+ name = "umbrello-16.08.2.tar.xz";
};
};
zeroconf-ioslave = {
- version = "16.08.1";
+ version = "16.08.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/16.08.2/src/zeroconf-ioslave-16.08.2.tar.xz";
+ sha256 = "0yl1cnpn86gkbdg0h8y1kdyjj4b3n3wmp9ifmczfd6jw7hsvwrm6";
+ name = "zeroconf-ioslave-16.08.2.tar.xz";
};
};
}
diff --git a/pkgs/desktops/kde-5/plasma/fetch.sh b/pkgs/desktops/kde-5/plasma/fetch.sh
index 5a19edffe9b..a5ddcf35677 100644
--- a/pkgs/desktops/kde-5/plasma/fetch.sh
+++ b/pkgs/desktops/kde-5/plasma/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.1/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.2/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/kde-5/plasma/srcs.nix b/pkgs/desktops/kde-5/plasma/srcs.nix
index 8ff8f210315..5fc836f10a8 100644
--- a/pkgs/desktops/kde-5/plasma/srcs.nix
+++ b/pkgs/desktops/kde-5/plasma/srcs.nix
@@ -3,323 +3,323 @@
{
bluedevil = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.1/bluedevil-5.8.1.tar.xz";
- sha256 = "0j2mrx2qchcl1s13j3bhqrbgx7myq901clb20x4v9bfdcv1j9cp1";
- name = "bluedevil-5.8.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.2/bluedevil-5.8.2.tar.xz";
+ sha256 = "1m8bhvh27af8hwqyicsrqbxsfl6mmwlyc9y9cv5fh4rkf0lkcsnd";
+ name = "bluedevil-5.8.2.tar.xz";
};
};
breeze = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.1/breeze-5.8.1.tar.xz";
- sha256 = "1s9z8j4jzs951yv1742lq5yh4pz82rkc1d80d7q2yh6964ck733p";
- name = "breeze-5.8.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.2/breeze-5.8.2.tar.xz";
+ sha256 = "1n87n2vaxgb7wpg5jmb6x6l1z6gwl8jh9kjrgaq0blm1qkhac3k8";
+ name = "breeze-5.8.2.tar.xz";
};
};
breeze-grub = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.1/breeze-grub-5.8.1.tar.xz";
- sha256 = "1d3skcj2yg82f5nqghpz9nbz1yb0b5kps3lf28hsq2k2vpqrp4mc";
- name = "breeze-grub-5.8.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.2/breeze-grub-5.8.2.tar.xz";
+ sha256 = "1q4i87xvxajz67lkdf9k9z6vy6l0wlirz31n043fyy32gw0mrmf1";
+ name = "breeze-grub-5.8.2.tar.xz";
};
};
breeze-gtk = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.1/breeze-gtk-5.8.1.tar.xz";
- sha256 = "0nmf6h9kvq5l73yqri3xvldyw669a3rgbjmjizzq1qisri3y0qsz";
- name = "breeze-gtk-5.8.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.2/breeze-gtk-5.8.2.tar.xz";
+ sha256 = "1vdn7nh1vn8cjxd6cvaj12imd523g7qjc7rlhih6q76ly6h9hv7k";
+ name = "breeze-gtk-5.8.2.tar.xz";
};
};
breeze-plymouth = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.1/breeze-plymouth-5.8.1.tar.xz";
- sha256 = "149af4ja38h9sln7sfi05zxwnd8whhmp849zyxgbvdrjc3xxsvcz";
- name = "breeze-plymouth-5.8.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.2/breeze-plymouth-5.8.2.tar.xz";
+ sha256 = "1dkp0h3idzpfbvwrmjzn5sbq0077ndr36qh087yyhdjwj1mlk98r";
+ name = "breeze-plymouth-5.8.2.tar.xz";
};
};
discover = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.1/discover-5.8.1.tar.xz";
- sha256 = "01njqp15qlqvkppn83m2y0yf64v53378f7l2zkzcyxx00pvq2ivk";
- name = "discover-5.8.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.2/discover-5.8.2.tar.xz";
+ sha256 = "00zmdr6di37rcqncss4z51557a8zzli7n01imjjv8h784vkn0p04";
+ name = "discover-5.8.2.tar.xz";
};
};
kactivitymanagerd = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.1/kactivitymanagerd-5.8.1.tar.xz";
- sha256 = "0pdr4m9qm62v7qansax1jl8va9j4iarmw0iw4cm60m7g6z1aaf4m";
- name = "kactivitymanagerd-5.8.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.2/kactivitymanagerd-5.8.2.tar.xz";
+ sha256 = "1dgdxpdxkdz0l498sadgfbp21by8d73r11ibb6mvxwmrba6q4lsc";
+ name = "kactivitymanagerd-5.8.2.tar.xz";
};
};
kde-cli-tools = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/plasma/5.8.2/kde-cli-tools-5.8.2.tar.xz";
+ sha256 = "1gwp6hkpfaijxxc1v4km6kcwrzvwagkn5dgl181xghra26ar0bca";
+ name = "kde-cli-tools-5.8.2.tar.xz";
};
};
kdecoration = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.1/kdecoration-5.8.1.tar.xz";
- sha256 = "09d59f10jsvhsh8dwnz9vd4ngiy22si5wcpj0idml4xvkq1sn1gj";
- name = "kdecoration-5.8.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.2/kdecoration-5.8.2.tar.xz";
+ sha256 = "0wbi6z3k9s18fi1vc7larnhwcdzrxrc13plpcnl365la8zrnp766";
+ name = "kdecoration-5.8.2.tar.xz";
};
};
kde-gtk-config = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/plasma/5.8.2/kde-gtk-config-5.8.2.tar.xz";
+ sha256 = "16kn6wy71x1zjpfppiwpmj6skw97ni5pyg2b2af733spfbkx0ca7";
+ name = "kde-gtk-config-5.8.2.tar.xz";
};
};
kdeplasma-addons = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.1/kdeplasma-addons-5.8.1.tar.xz";
- sha256 = "1148kxdkrdyspy5y3wbs4l7asig4imjjlmssn5g0p8h3q8ag8lbx";
- name = "kdeplasma-addons-5.8.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.2/kdeplasma-addons-5.8.2.tar.xz";
+ sha256 = "18d9a2iwvr4klgm10yvsjjhszkc6zk26kmsay4c2q4pqbsvq7nqq";
+ name = "kdeplasma-addons-5.8.2.tar.xz";
};
};
kgamma5 = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.1/kgamma5-5.8.1.tar.xz";
- sha256 = "1v390jlfd56v2pins903yx3z4i32dkjf4cg48ah66shxqp2lr55g";
- name = "kgamma5-5.8.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.2/kgamma5-5.8.2.tar.xz";
+ sha256 = "0l73w2arpvv7x4yawp044j781pwmwpijr23mwhfcmnw7bmc7g5vn";
+ name = "kgamma5-5.8.2.tar.xz";
};
};
khotkeys = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.1/khotkeys-5.8.1.tar.xz";
- sha256 = "1g3qd9v2mxi8a9556x8hrj30d0wcv0bqr414zxl631c8sm0rwami";
- name = "khotkeys-5.8.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.2/khotkeys-5.8.2.tar.xz";
+ sha256 = "17cmlny98ip0ckdafhlqm97p0rkrr9w2d18xf0hdxcypj13q4ba5";
+ name = "khotkeys-5.8.2.tar.xz";
};
};
kinfocenter = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.1/kinfocenter-5.8.1.tar.xz";
- sha256 = "0iarh97wpq0l5llasb2ikd2f53v41rilj4f6qj1flmxligs4pwdd";
- name = "kinfocenter-5.8.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.2/kinfocenter-5.8.2.tar.xz";
+ sha256 = "1j1l3fczw7sy43dff0mcwpvyvfz4r7ja7zg7x8vq5v2hi3c3f865";
+ name = "kinfocenter-5.8.2.tar.xz";
};
};
kmenuedit = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.1/kmenuedit-5.8.1.tar.xz";
- sha256 = "128cqnxw6rkb378p05s33i7yyz6yydnfdbf462ngiq628n6aqvrp";
- name = "kmenuedit-5.8.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.2/kmenuedit-5.8.2.tar.xz";
+ sha256 = "0r214s2pqm925l1mpzj4cwk73xvsf00wbm4g495dc63kwxpamx21";
+ name = "kmenuedit-5.8.2.tar.xz";
};
};
kscreen = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.1/kscreen-5.8.1.tar.xz";
- sha256 = "0m9ddmp4vi38vkzik8bi5mir1mw66il2dfrf77h7amwfsnkicvfi";
- name = "kscreen-5.8.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.2/kscreen-5.8.2.tar.xz";
+ sha256 = "03i2zwpalq4d1y38bkwacvkqfanzdsdpafpqw17qjcan3jgxkkwr";
+ name = "kscreen-5.8.2.tar.xz";
};
};
kscreenlocker = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.1/kscreenlocker-5.8.1.tar.xz";
- sha256 = "08ibp746w1xp6p5ccyl0p16giwcfrvq3nakwhwvhlwh0lirgvlrh";
- name = "kscreenlocker-5.8.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.2/kscreenlocker-5.8.2.tar.xz";
+ sha256 = "0may2h54yamzzd3jfv50skcxsws2liw36vb4smvyv9j8nvqvwyp1";
+ name = "kscreenlocker-5.8.2.tar.xz";
};
};
ksshaskpass = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.1/ksshaskpass-5.8.1.tar.xz";
- sha256 = "0yma28axv91zl0zjanrnwjjws9l187l6m4cjshy4ai77prcyzlqn";
- name = "ksshaskpass-5.8.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.2/ksshaskpass-5.8.2.tar.xz";
+ sha256 = "1wk8jrwlr7lndsbhngkffvpjrqwi88x19vrxivb18gcr28m6403s";
+ name = "ksshaskpass-5.8.2.tar.xz";
};
};
ksysguard = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.1/ksysguard-5.8.1.tar.xz";
- sha256 = "1msrxhlln561y78gi6rdqzkv9sc0pk3w0znca9fjlsnacl7dbcn9";
- name = "ksysguard-5.8.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.2/ksysguard-5.8.2.tar.xz";
+ sha256 = "1myg260bn7bjv18wadwzfwns9jc63r5plk3psdf6w727hcmizvnn";
+ name = "ksysguard-5.8.2.tar.xz";
};
};
kwallet-pam = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.1/kwallet-pam-5.8.1.tar.xz";
- sha256 = "1nl0lb71s2sqhdplyfn5xl01q8zrqj544vlmjd2vc1a18p6qlkcy";
- name = "kwallet-pam-5.8.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.2/kwallet-pam-5.8.2.tar.xz";
+ sha256 = "1iw8cyr44kwjfqhf1ybnjy0pjv4yk87w3vir8j91an4mxhdcc2sb";
+ name = "kwallet-pam-5.8.2.tar.xz";
};
};
kwayland-integration = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.1/kwayland-integration-5.8.1.tar.xz";
- sha256 = "1qwdlv7k6r7rzzihvmfhp4bsnz0nlfbi70fxxkdxdr49k1wqhxih";
- name = "kwayland-integration-5.8.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.2/kwayland-integration-5.8.2.tar.xz";
+ sha256 = "12zmf11117y5zp307ymfy5gsjpcf97sqw1n3nzk55p9kzlfln1pa";
+ name = "kwayland-integration-5.8.2.tar.xz";
};
};
kwin = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.1/kwin-5.8.1.tar.xz";
- sha256 = "0b1p6vz87ffy30ja5nz9n1q0i1nhjllcr0rfqnwa1b6wkiv7dabl";
- name = "kwin-5.8.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.2/kwin-5.8.2.tar.xz";
+ sha256 = "04c9bvbd487pgf4l7a7vxaydjr9hwdjg149mzcxzm5y1nx7ll08y";
+ name = "kwin-5.8.2.tar.xz";
};
};
kwrited = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.1/kwrited-5.8.1.tar.xz";
- sha256 = "0sk7lwrwl7h174x7bips9a4nzb4wrfqyby0whp8qjpxq891cxbgy";
- name = "kwrited-5.8.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.2/kwrited-5.8.2.tar.xz";
+ sha256 = "1659783rca0hcisrhxz1bnimn0q17825sbs6zlwxlwsh2qq8fq23";
+ name = "kwrited-5.8.2.tar.xz";
};
};
libkscreen = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.1/libkscreen-5.8.1.tar.xz";
- sha256 = "1pgpn49vgjx9ydqvnvvrs87sjc7zkfcyddw00270m6pk76zcxvc4";
- name = "libkscreen-5.8.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.2/libkscreen-5.8.2.tar.xz";
+ sha256 = "0p2nhgvr3cxq0js6zkcnhglwqffnrnws8vdi7lyl069y9r8lvp7c";
+ name = "libkscreen-5.8.2.tar.xz";
};
};
libksysguard = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.1/libksysguard-5.8.1.tar.xz";
- sha256 = "1l9gwirs6b3iingq6fcv3yfhkqifjwwg0vwpz9041rj4rry4h73p";
- name = "libksysguard-5.8.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.2/libksysguard-5.8.2.tar.xz";
+ sha256 = "158n30wbpsgbw3axhhsc58hnwhwdd02j3zc9hhcybmnbkfl5c96l";
+ name = "libksysguard-5.8.2.tar.xz";
};
};
milou = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.1/milou-5.8.1.tar.xz";
- sha256 = "0znxcmm0h3ghzy22bpcca3jkxypq9zhlwbka4a7skw7ckl55xszm";
- name = "milou-5.8.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.2/milou-5.8.2.tar.xz";
+ sha256 = "0ikba2xk2d4v66rhdln97d89avrkbhpjh1zir5ds3s103yyrj4q9";
+ name = "milou-5.8.2.tar.xz";
};
};
oxygen = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.1/oxygen-5.8.1.tar.xz";
- sha256 = "0fbj96614f59xkl7ia3k810in793jkmqmzb5csmng19qw1qjg5wk";
- name = "oxygen-5.8.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.2/oxygen-5.8.2.tar.xz";
+ sha256 = "1n0gfgn7m0953dd69nvl0ikp97zmcn3hjm01s43nxjma3gp8pqar";
+ name = "oxygen-5.8.2.tar.xz";
};
};
plasma-desktop = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.1/plasma-desktop-5.8.1.tar.xz";
- sha256 = "1da96cy3pkryhff6f5cnyvvicz8brjjjh17k0rg5vbrd53zgsz4r";
- name = "plasma-desktop-5.8.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.2/plasma-desktop-5.8.2.tar.xz";
+ sha256 = "0023wb3fnk0cap7v2zwig6h3vqvykrwwq9vyl0xbsj5vzx3f8yqj";
+ name = "plasma-desktop-5.8.2.tar.xz";
};
};
plasma-integration = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.1/plasma-integration-5.8.1.tar.xz";
- sha256 = "1xfc7nn5gcfccmby7ivwh7clrk1z4k8m1qag14r1rxfv8gnswm67";
- name = "plasma-integration-5.8.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.2/plasma-integration-5.8.2.tar.xz";
+ sha256 = "1z7pd5j7llac1iv4w4q4r9wysqi4shc65fcg6bh637gxqjgyq4rf";
+ name = "plasma-integration-5.8.2.tar.xz";
};
};
plasma-nm = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.1/plasma-nm-5.8.1.tar.xz";
- sha256 = "0v34nvc004zini3i3ya9xw6cvyyh3r7i7z2kijjaqi70vnhx1dp6";
- name = "plasma-nm-5.8.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.2/plasma-nm-5.8.2.tar.xz";
+ sha256 = "035nhs8z977gp3d041ywnam1y4vk7458mx81f2qrx2bv8g6znq22";
+ name = "plasma-nm-5.8.2.tar.xz";
};
};
plasma-pa = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.1/plasma-pa-5.8.1.tar.xz";
- sha256 = "1dhqljwn1ihr4wj4785ggja6gvjm5cwfyc5gvmkvb2ls226k2ihb";
- name = "plasma-pa-5.8.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.2/plasma-pa-5.8.2.tar.xz";
+ sha256 = "1j55q4brjh77i1imr7pb9gp9a8vaynnr2ljdsm4jqsijwcjj1yhi";
+ name = "plasma-pa-5.8.2.tar.xz";
};
};
plasma-sdk = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.1/plasma-sdk-5.8.1.tar.xz";
- sha256 = "0gav6b7bnxl9myf440lygiaymj8jmj6b5mf2nr4vnibymiiq6asm";
- name = "plasma-sdk-5.8.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.2/plasma-sdk-5.8.2.tar.xz";
+ sha256 = "0h6393qxwms0xdq69nyzs18kbyl6amzff26l20fqpp49xrqpq95y";
+ name = "plasma-sdk-5.8.2.tar.xz";
};
};
plasma-tests = {
- version = "5.8.1";
+ version = "5.8.2";
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";
+ url = "${mirror}/stable/plasma/5.8.2/plasma-tests-5.8.2.tar.xz";
+ sha256 = "0ls8mxabvw39xb8nrl89n1jn0bkgykzx7hcv45q17aw5jm8s0wy5";
+ name = "plasma-tests-5.8.2.tar.xz";
};
};
plasma-workspace = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.1/plasma-workspace-5.8.1.tar.xz";
- sha256 = "0p7d9a612qqhfm296gg2qda4cqnqy51znbapddyra5dq9ywkhnn0";
- name = "plasma-workspace-5.8.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.2/plasma-workspace-5.8.2.tar.xz";
+ sha256 = "1dxvxz9qvkg1h79j997qgs573l730w1g0n1dy78n344bnvn8zx44";
+ name = "plasma-workspace-5.8.2.tar.xz";
};
};
plasma-workspace-wallpapers = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/plasma/5.8.2/plasma-workspace-wallpapers-5.8.2.tar.xz";
+ sha256 = "0wkkpl1n6ggicgj6lszmb661wrmddhq9wx3djr3hyvvi5r586rxi";
+ name = "plasma-workspace-wallpapers-5.8.2.tar.xz";
};
};
polkit-kde-agent = {
- version = "1-5.8.1";
+ version = "1-5.8.2";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/plasma/5.8.2/polkit-kde-agent-1-5.8.2.tar.xz";
+ sha256 = "1ipli3xq4dc8lnyamqfzsjcfh3808gbw3qaaqksng2ki0i84aw8f";
+ name = "polkit-kde-agent-1-5.8.2.tar.xz";
};
};
powerdevil = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.1/powerdevil-5.8.1.tar.xz";
- sha256 = "0qkmdnck3im0wd1v9a24p8pxwxi38x7kx1a4z8zddsd8pd8d8sjv";
- name = "powerdevil-5.8.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.2/powerdevil-5.8.2.tar.xz";
+ sha256 = "0bjk08f3bliy4cz3pcs77qhsc3l82fqk3q0djiwgmsr77ksabj7x";
+ name = "powerdevil-5.8.2.tar.xz";
};
};
sddm-kcm = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.1/sddm-kcm-5.8.1.tar.xz";
- sha256 = "0kflarcq3q1gbd1blxpspq918cyxxwyigwv8jsmr29yfx947ik17";
- name = "sddm-kcm-5.8.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.2/sddm-kcm-5.8.2.tar.xz";
+ sha256 = "1n3r2hjwrsxiwzzgkpf4xgp2645kzzdl49i91qcsqznhiqp7kjx3";
+ name = "sddm-kcm-5.8.2.tar.xz";
};
};
systemsettings = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.1/systemsettings-5.8.1.tar.xz";
- sha256 = "04f0z4gq7zyyljb84na184q1wn6mkr9mg06mfv9zkbamsfaiazd8";
- name = "systemsettings-5.8.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.2/systemsettings-5.8.2.tar.xz";
+ sha256 = "157knafprh4b689jjr8w4bqrh9kp92ggvf40s4ny8cfyjr2bzcvi";
+ name = "systemsettings-5.8.2.tar.xz";
};
};
user-manager = {
- version = "5.8.1";
+ version = "5.8.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.1/user-manager-5.8.1.tar.xz";
- sha256 = "1bccibypnv58gkmh895w1b9lnmhwda1kypxbd34b9hcldq1dgag7";
- name = "user-manager-5.8.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.2/user-manager-5.8.2.tar.xz";
+ sha256 = "1344qvzrlswc69wvnaqic300wxra6ix6w6iczj29sprxsa5ycf91";
+ name = "user-manager-5.8.2.tar.xz";
};
};
}
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 981503cab95..76cde64494a 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -60,7 +60,9 @@ let
obconf-qt = callPackage ./optional/obconf-qt { };
lximage-qt = callPackage ./optional/lximage-qt { };
qps = callPackage ./optional/qps { };
-
+ screengrab = callPackage ./optional/screengrab { };
+ qlipper = callPackage ./optional/qlipper { };
+
};
in self
diff --git a/pkgs/desktops/lxqt/optional/qlipper/default.nix b/pkgs/desktops/lxqt/optional/qlipper/default.nix
new file mode 100644
index 00000000000..551259ac3a0
--- /dev/null
+++ b/pkgs/desktops/lxqt/optional/qlipper/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, cmake, qt5 }:
+
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "qlipper";
+ version = "2016-09-26";
+
+ srcs = fetchFromGitHub {
+ owner = "pvanek";
+ repo = pname;
+ rev = "48754f28fe1050df58f2d9f7cd2becc019e2f486";
+ sha256 = "0s35c08rlfnhp6j1hx5f19034q84ac56cs90wcb3p4spavdnzy2k";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ buildInputs = [ qt5.qtbase qt5.qttools ];
+
+ meta = with stdenv.lib; {
+ description = "Cross-platform clipboard history applet";
+ homepage = https://github.com/pvanek/qlipper;
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ romildo ];
+ platforms = with platforms; unix;
+ };
+}
diff --git a/pkgs/desktops/lxqt/optional/screengrab/default.nix b/pkgs/desktops/lxqt/optional/screengrab/default.nix
new file mode 100644
index 00000000000..99a372553a1
--- /dev/null
+++ b/pkgs/desktops/lxqt/optional/screengrab/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg }:
+
+stdenv.mkDerivation rec {
+ name = "screengrab-unstable-2016-09-12";
+
+ srcs = fetchFromGitHub {
+ owner = "QtDesktop";
+ repo = "screengrab";
+ rev = "3dbacb9d6f52825689846c798a6c4c95e3815bf6";
+ sha256 = "0rflb1q5b1mik8sm1wm63hwpyaah8liizxq1f5q33zapl1qafzi5";
+ };
+
+ nativeBuildInputs = [ cmake pkgconfig ];
+
+ buildInputs = [
+ qt5.qtbase
+ qt5.qttools
+ qt5.qtx11extras
+ qt5.qtsvg
+ kde5.kwindowsystem
+ lxqt.libqtxdg
+ xorg.libpthreadstubs
+ xorg.libXdmcp
+ ];
+
+ cmakeFlags = [ "-DSG_USE_SYSTEM_QXT=ON" "-DCMAKE_INSTALL_LIBDIR=lib" ];
+
+ meta = with stdenv.lib; {
+ description = "Crossplatform tool for fast making screenshots";
+ homepage = https://github.com/lxde/screengrab;
+ license = licenses.gpl2;
+ platforms = with platforms; unix;
+ maintainers = with maintainers; [ romildo ];
+ };
+}
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index f8ede8cae45..991ed0eb6be 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -22,7 +22,8 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
exo = callPackage ./core/exo.nix { };
garcon = callPackage ./core/garcon.nix { };
- gtk_xfce_engine = callPackage ./core/gtk-xfce-engine.nix { withGtk3 = true; }; # ToDo: when should be used?
+ gtk_xfce_engine = callPackage ./core/gtk-xfce-engine.nix
+ { withGtk3 = false; }; # = true; was completely breaking GTK3 app layout
libxfce4ui = callPackage ./core/libxfce4ui.nix { };
libxfce4ui_gtk3 = libxfce4ui.override { withGtk3 = true; };
libxfce4util = callPackage ./core/libxfce4util.nix { };
diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/arduino/ino/default.nix
index aeb0c5bf8ac..c96edcbeeb6 100644
--- a/pkgs/development/arduino/ino/default.nix
+++ b/pkgs/development/arduino/ino/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, pythonPackages, picocom
+{ stdenv, fetchurl, python2Packages, picocom
, avrdude, arduino-core, avrgcclibc }:
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
name = "ino-0.3.6";
namePrefix = "";
@@ -11,9 +11,15 @@ pythonPackages.buildPythonApplication rec {
};
# TODO: add avrgcclibc, it must be rebuild with C++ support
- propagatedBuildInputs =
- [ arduino-core avrdude picocom pythonPackages.configobj
- pythonPackages.jinja2 pythonPackages.pyserial pythonPackages.six ];
+ propagatedBuildInputs = with python2Packages; [
+ arduino-core
+ avrdude
+ picocom
+ configobj
+ jinja2
+ pyserial
+ six
+ ];
patchPhase = ''
echo "Patching Arduino distribution path"
diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix
index 51b3cf11823..d8dabaac779 100644
--- a/pkgs/development/compilers/ats2/default.nix
+++ b/pkgs/development/compilers/ats2/default.nix
@@ -1,17 +1,53 @@
-{ stdenv, fetchurl, gmp }:
+{ stdenv, fetchurl, gmp
+, withEmacsSupport ? true
+, withContrib ? true }:
+
+let
+ versionPkg = "0.2.11" ;
+
+ contrib = fetchurl {
+ url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-contrib-${versionPkg}.tgz" ;
+ sha256 = "0kc4nx1904745c1rkj9yfbayidw7rks1mwq0lxmvsgghn98dxwjn" ;
+ };
+
+ postInstallContrib = stdenv.lib.optionalString withContrib
+ ''
+ local contribDir=$out/lib/ats2-postiats-*/ ;
+ mkdir -p $contribDir ;
+ tar -xzf "${contrib}" --strip-components 1 -C $contribDir ;
+ '';
+
+ postInstallEmacs = stdenv.lib.optionalString withEmacsSupport
+ ''
+ local siteLispDir=$out/share/emacs/site-lisp/ats2 ;
+ mkdir -p $siteLispDir ;
+ install -m 0644 -v ./utils/emacs/*.el $siteLispDir ;
+ '';
+in
stdenv.mkDerivation rec {
name = "ats2-${version}";
- version = "0.2.7";
+ version = versionPkg;
src = fetchurl {
url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz";
- sha256 = "1w9cncahv0vkqsj4vlfnn7bn61jvgxgjhk7wbppcm3yhb48pkmda";
+ sha256 = "140xy129fr11bdf4bj6qya9mf0fhnv2x7ksb9j46pf2yzrsrks8g";
};
buildInputs = [ gmp ];
- setupHook = ./setup-hook.sh;
+ setupHook = with stdenv.lib;
+ let
+ hookFiles =
+ [ ./setup-hook.sh ]
+ ++ optional withContrib ./setup-contrib-hook.sh;
+ in
+ builtins.toFile "setupHook.sh"
+ (concatMapStringsSep "\n" builtins.readFile hookFiles);
+
+ patches = [ ./installed-lib-directory-version.patch ];
+
+ postInstall = postInstallContrib + postInstallEmacs;
meta = with stdenv.lib; {
description = "Functional programming language with dependent types";
diff --git a/pkgs/development/compilers/ats2/installed-lib-directory-version.patch b/pkgs/development/compilers/ats2/installed-lib-directory-version.patch
new file mode 100644
index 00000000000..d9e5ad2d21e
--- /dev/null
+++ b/pkgs/development/compilers/ats2/installed-lib-directory-version.patch
@@ -0,0 +1,99 @@
+Change the name of the library directory to match the version of the package.
+
+diff -Naur ATS2-Postiats-0.2.11/configure postiats-new/configure
+--- ATS2-Postiats-0.2.11/configure 2016-10-13 12:03:20.000000000 -0400
++++ postiats-new/configure 2016-10-23 20:17:29.912579618 -0400
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.69 for ATS2/Postiats 0.2.10.
++# Generated by GNU Autoconf 2.69 for ATS2/Postiats 0.2.11.
+ #
+ # Report bugs to .
+ #
+@@ -580,8 +580,8 @@
+ # Identity of this package.
+ PACKAGE_NAME='ATS2/Postiats'
+ PACKAGE_TARNAME='ats2-postiats'
+-PACKAGE_VERSION='0.2.10'
+-PACKAGE_STRING='ATS2/Postiats 0.2.10'
++PACKAGE_VERSION='0.2.11'
++PACKAGE_STRING='ATS2/Postiats 0.2.11'
+ PACKAGE_BUGREPORT='gmpostiats@gmail.com'
+ PACKAGE_URL=''
+
+@@ -1242,7 +1242,7 @@
+ # Omit some internal or obsolete options to make the list less imposing.
+ # This message is too long to be a string in the A/UX 3.1 sh.
+ cat <<_ACEOF
+-\`configure' configures ATS2/Postiats 0.2.10 to adapt to many kinds of systems.
++\`configure' configures ATS2/Postiats 0.2.11 to adapt to many kinds of systems.
+
+ Usage: $0 [OPTION]... [VAR=VALUE]...
+
+@@ -1304,7 +1304,7 @@
+
+ if test -n "$ac_init_help"; then
+ case $ac_init_help in
+- short | recursive ) echo "Configuration of ATS2/Postiats 0.2.10:";;
++ short | recursive ) echo "Configuration of ATS2/Postiats 0.2.11:";;
+ esac
+ cat <<\_ACEOF
+
+@@ -1384,7 +1384,7 @@
+ test -n "$ac_init_help" && exit $ac_status
+ if $ac_init_version; then
+ cat <<\_ACEOF
+-ATS2/Postiats configure 0.2.10
++ATS2/Postiats configure 0.2.11
+ generated by GNU Autoconf 2.69
+
+ Copyright (C) 2012 Free Software Foundation, Inc.
+@@ -1936,7 +1936,7 @@
+ This file contains any messages produced by compilers while
+ running configure, to aid debugging if configure makes a mistake.
+
+-It was created by ATS2/Postiats $as_me 0.2.10, which was
++It was created by ATS2/Postiats $as_me 0.2.11, which was
+ generated by GNU Autoconf 2.69. Invocation command line was
+
+ $ $0 $@
+@@ -4226,7 +4226,7 @@
+ # report actual input values of CONFIG_FILES etc. instead of their
+ # values after options handling.
+ ac_log="
+-This file was extended by ATS2/Postiats $as_me 0.2.10, which was
++This file was extended by ATS2/Postiats $as_me 0.2.11, which was
+ generated by GNU Autoconf 2.69. Invocation command line was
+
+ CONFIG_FILES = $CONFIG_FILES
+@@ -4288,7 +4288,7 @@
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ ac_cs_version="\\
+-ATS2/Postiats config.status 0.2.10
++ATS2/Postiats config.status 0.2.11
+ configured by $0, generated by GNU Autoconf 2.69,
+ with options \\"\$ac_cs_config\\"
+
+diff -Naur ATS2-Postiats-0.2.11/src/CBOOT/config.h postiats-new/src/CBOOT/config.h
+--- ATS2-Postiats-0.2.11/src/CBOOT/config.h 2016-10-13 12:03:20.000000000 -0400
++++ postiats-new/src/CBOOT/config.h 2016-10-23 20:16:34.613836556 -0400
+@@ -44,7 +44,7 @@
+ #define PACKAGE_NAME "ATS2/Postiats"
+
+ /* Define to the full name and version of this package. */
+-#define PACKAGE_STRING "ATS2/Postiats 0.2.10"
++#define PACKAGE_STRING "ATS2/Postiats 0.2.11"
+
+ /* Define to the one symbol short name of this package. */
+ #define PACKAGE_TARNAME "ats2-postiats"
+@@ -53,7 +53,7 @@
+ #define PACKAGE_URL ""
+
+ /* Define to the version of this package. */
+-#define PACKAGE_VERSION "0.2.10"
++#define PACKAGE_VERSION "0.2.11"
+
+ /* The size of `void*', as computed by sizeof. */
+ #define SIZEOF_VOIDP 8
diff --git a/pkgs/development/compilers/ats2/setup-contrib-hook.sh b/pkgs/development/compilers/ats2/setup-contrib-hook.sh
new file mode 100644
index 00000000000..8c5e123b61c
--- /dev/null
+++ b/pkgs/development/compilers/ats2/setup-contrib-hook.sh
@@ -0,0 +1 @@
+export PATSHOMERELOC=@out@/lib/ats2-postiats-@version@
diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix
index cf2833c5c6c..7799cab76a6 100644
--- a/pkgs/development/compilers/coreclr/default.nix
+++ b/pkgs/development/compilers/coreclr/default.nix
@@ -7,18 +7,24 @@
, libunwind
, gettext
, openssl
+, python2
+, icu
+, lttng-ust
+, liburcu
+, libuuid
+, ed
+, debug ? false
}:
stdenv.mkDerivation rec {
name = "coreclr-${version}";
- version = "git-" + (builtins.substring 0 10 rev);
- rev = "8c70800b5e8dc5535c379dec4a6fb32f7ab5e878";
+ version = "1.0.4";
src = fetchFromGitHub {
- owner = "dotnet";
- repo = "coreclr";
- inherit rev;
- sha256 = "1galskbnr9kdjjxpx5qywh49400swchhq5f54i16kxyr9k4mvq1f";
+ owner = "dotnet";
+ repo = "coreclr";
+ rev = "v${version}";
+ sha256 = "1wpig71q0kh2yrq162d32x00zlwrrs1wymkgijh49cqkn4cwkh91";
};
buildInputs = [
@@ -30,31 +36,61 @@ stdenv.mkDerivation rec {
libunwind
gettext
openssl
+ python2
+ icu
+ lttng-ust
+ liburcu
+ libuuid
+ ed
];
configurePhase = ''
# Prevent clang-3.5 (rather than just clang) from being selected as the compiler as that's
# not wrapped
- substituteInPlace src/pal/tools/gen-buildsys-clang.sh --replace "which \"clang-" "which \"clang-DoNotFindThisOne"
-
- # Prevent the -nostdinc++ flag to be passed to clang, which causes a compilation error
- substituteInPlace src/CMakeLists.txt --replace "if(NOT CLR_CMAKE_PLATFORM_DARWIN)" "if(FALSE)"
+ substituteInPlace src/pal/tools/gen-buildsys-clang.sh --replace "which \"clang-\$" "which \"clang-DoNotFindThisOne\$"
patchShebangs build.sh
patchShebangs src/pal/tools/gen-buildsys-clang.sh
+
+ # See https://github.com/dotnet/coreclr/issues/7573#issuecomment-253081323
+ ed -v ./src/pal/src/include/pal/palinternal.h << EOF
+ /^#undef memcpy
+ -1
+ d
+ +1
+ d
+ w
+ EOF
'';
- buildPhase = "./build.sh";
+ BuildArch = if stdenv.is64bit then "x64" else "x86";
+ BuildType = if debug then "Debug" else "Release";
+
+ hardeningDisable = [ "strictoverflow" "format" ];
+ NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-result" ];
+
+ buildPhase = ''
+ ./build.sh $BuildArch $BuildType
+
+ # Try to make some sensible hierarchy out of the output
+ pushd bin/Product/Linux.$BuildArch.$BuildType
+ mkdir lib2
+ mv *.so *.so.dbg lib2
+ mv bin lib3
+ mkdir lib4
+ mv Loader lib4
+ mv inc include
+ mv gcinfo include
+ mkdir bin
+ mkdir -p share/doc
+ mv sosdocsunix.txt share/doc
+ for f in * ; do test -f $f && mv -v $f bin; done
+ popd
+ '';
installPhase = ''
- pushd bin/Product/Linux.x64.Debug/
- mkdir -v -p $out/bin
- cp -v coreconsole corerun crossgen $out/bin
- cp -rv lib $out
- cp -v *.so $out/lib
- cp -rv inc $out/include
- cp -rv gcinfo $out/include
- popd
+ mkdir -p $out
+ cp -rv bin/Product/Linux.$BuildArch.$BuildType/* $out
'';
meta = {
diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix
index 4ddf580fae5..f51e3af25ee 100644
--- a/pkgs/development/compilers/edk2/default.nix
+++ b/pkgs/development/compilers/edk2/default.nix
@@ -1,6 +1,7 @@
-{ stdenv, fetchgit, libuuid, pythonFull, iasl }:
+{ stdenv, fetchgit, libuuid, python2, iasl }:
let
+ pythonEnv = python2.withPackages(ps: [ps.tkinter]);
targetArch = if stdenv.isi686 then
"IA32"
@@ -18,7 +19,7 @@ edk2 = stdenv.mkDerivation {
sha256 = "0s9ywb8w7xzlnmm4kwzykxkrdaw53b7pky121cc9wjkllzqwyxrb";
};
- buildInputs = [ libuuid pythonFull ];
+ buildInputs = [ libuuid pythonEnv];
makeFlags = "-C BaseTools";
@@ -40,7 +41,7 @@ edk2 = stdenv.mkDerivation {
passthru = {
setup = projectDscPath: attrs: {
- buildInputs = [ pythonFull ] ++
+ buildInputs = [ pythonEnv ] ++
stdenv.lib.optionals (attrs ? buildInputs) attrs.buildInputs;
configurePhase = ''
diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix
new file mode 100644
index 00000000000..63b4b4c2c4f
--- /dev/null
+++ b/pkgs/development/compilers/glslang/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, cmake, bison }:
+
+stdenv.mkDerivation rec {
+ name = "glslang-git-${version}";
+ version = "2016-08-26";
+
+ # `vulkan-loader` requires a specific version of `glslang` as specified in
+ # `/glslang_revision`.
+ src = fetchFromGitHub {
+ owner = "KhronosGroup";
+ repo = "glslang";
+ rev = "81cd764b5ffc475bc73f1fb35f75fd1171bb2343";
+ sha256 = "1vfwl6lzkjh9nh29q32b7zca4q1abf3q4nqkahskijgznw5lr59g";
+ };
+
+ patches = [ ./install-headers.patch ];
+
+ buildInputs = [ cmake bison ];
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ inherit (src.meta) homepage;
+ description = "Khronos reference front-end for GLSL and ESSL";
+ };
+}
diff --git a/pkgs/development/compilers/glslang/install-headers.patch b/pkgs/development/compilers/glslang/install-headers.patch
new file mode 100644
index 00000000000..9ad6f5e1906
--- /dev/null
+++ b/pkgs/development/compilers/glslang/install-headers.patch
@@ -0,0 +1,26 @@
+diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
+index 48a6c46..593d941 100755
+--- a/SPIRV/CMakeLists.txt
++++ b/SPIRV/CMakeLists.txt
+@@ -42,3 +42,8 @@ endif(WIN32)
+
+ install(TARGETS SPIRV SPVRemapper
+ ARCHIVE DESTINATION lib)
++
++foreach(file ${HEADERS} ${SPVREMAP_HEADERS})
++ get_filename_component(dir ${file} DIRECTORY)
++ install(FILES ${file} DESTINATION include/SPIRV/${dir})
++endforeach()
+diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
+index ff91135..4318279 100644
+--- a/glslang/CMakeLists.txt
++++ b/glslang/CMakeLists.txt
+@@ -90,3 +90,8 @@ endif(WIN32)
+
+ install(TARGETS glslang
+ ARCHIVE DESTINATION lib)
++
++foreach(file ${HEADERS})
++ get_filename_component(dir ${file} DIRECTORY)
++ install(FILES ${file} DESTINATION include/glslang/${dir})
++endforeach()
diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix
index 0f78646e1aa..3def735ec8d 100644
--- a/pkgs/development/compilers/go/1.7.nix
+++ b/pkgs/development/compilers/go/1.7.nix
@@ -138,7 +138,7 @@ stdenv.mkDerivation rec {
preFixup = ''
rm -r $out/share/go/pkg/bootstrap
- mv $out/share/go/bin $out/bin
+ ln -s $out/share/go/bin $out/bin
'';
setupHook = ./setup-hook.sh;
diff --git a/pkgs/development/compilers/jhc/default.nix b/pkgs/development/compilers/jhc/default.nix
index fa8a8c04b82..77e02f3a410 100644
--- a/pkgs/development/compilers/jhc/default.nix
+++ b/pkgs/development/compilers/jhc/default.nix
@@ -16,6 +16,11 @@ stdenv.mkDerivation rec {
buildInputs = [ perl ghc ];
+ preConfigure = ''
+ configureFlagsArray+=("CC=cc")
+ configureFlagsArray+=("--with-hsc2hs=${ghc}/bin/hsc2hs --cc=cc")
+ '';
+
meta = {
description = "Whole-program, globally optimizing Haskell compiler";
homepage = "http://repetae.net/computer/jhc/";
diff --git a/pkgs/development/compilers/llvm/3.7/default.nix b/pkgs/development/compilers/llvm/3.7/default.nix
index d7864d11d7b..3df20086f79 100644
--- a/pkgs/development/compilers/llvm/3.7/default.nix
+++ b/pkgs/development/compilers/llvm/3.7/default.nix
@@ -1,4 +1,4 @@
-{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC }:
+{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun }:
let
callPackage = newScope (self // { inherit stdenv isl version fetch; });
@@ -24,8 +24,19 @@ let
clang = wrapCC self.clang-unwrapped;
+ libcxxClang = ccWrapperFun {
+ cc = self.clang-unwrapped;
+ isClang = true;
+ inherit (self) stdenv;
+ /* FIXME is this right? */
+ inherit (stdenv.cc) libc nativeTools nativeLibc;
+ extraPackages = [ self.libcxx self.libcxxabi ];
+ };
+
stdenv = overrideCC stdenv self.clang;
+ libcxxStdenv = overrideCC stdenv self.libcxxClang;
+
lldb = callPackage ./lldb.nix {};
libcxx = callPackage ./libc++ {};
diff --git a/pkgs/development/compilers/llvm/3.7/lldb.nix b/pkgs/development/compilers/llvm/3.7/lldb.nix
index acd4892201a..434fdc7650f 100644
--- a/pkgs/development/compilers/llvm/3.7/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.7/lldb.nix
@@ -8,7 +8,7 @@
, libedit
, llvm
, clang-unwrapped
-, python
+, python2
, version
}:
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
scripts/Python/build-swig-Python.sh
'';
- buildInputs = [ cmake python which swig ncurses zlib libedit ];
+ buildInputs = [ cmake python2 which swig ncurses zlib libedit ];
preConfigure = ''
export CXXFLAGS="-pthread"
diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix
index ae9ba62a04c..c674b959c78 100644
--- a/pkgs/development/compilers/llvm/3.7/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.7/llvm.nix
@@ -3,7 +3,7 @@
, perl
, groff
, cmake
-, python
+, python2
, libffi
, binutils
, libxml2
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
mv compiler-rt-* $sourceRoot/projects/compiler-rt
'';
- buildInputs = [ perl groff cmake libxml2 python libffi ]
+ buildInputs = [ perl groff cmake libxml2 python2 libffi ]
++ stdenv.lib.optional stdenv.isDarwin libcxxabi;
propagatedBuildInputs = [ ncurses zlib ];
diff --git a/pkgs/development/compilers/llvm/3.8/default.nix b/pkgs/development/compilers/llvm/3.8/default.nix
index df1a775ef96..04cd9f791e6 100644
--- a/pkgs/development/compilers/llvm/3.8/default.nix
+++ b/pkgs/development/compilers/llvm/3.8/default.nix
@@ -1,4 +1,4 @@
-{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC }:
+{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun }:
let
callPackage = newScope (self // { inherit stdenv isl version fetch; });
@@ -24,8 +24,19 @@ let
clang = wrapCC self.clang-unwrapped;
+ libcxxClang = ccWrapperFun {
+ cc = self.clang-unwrapped;
+ isClang = true;
+ inherit (self) stdenv;
+ /* FIXME is this right? */
+ inherit (stdenv.cc) libc nativeTools nativeLibc;
+ extraPackages = [ self.libcxx self.libcxxabi ];
+ };
+
stdenv = overrideCC stdenv self.clang;
+ libcxxStdenv = overrideCC stdenv self.libcxxClang;
+
lldb = callPackage ./lldb.nix {};
libcxx = callPackage ./libc++ {};
diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/pkgs/development/compilers/llvm/3.9/default.nix
index a39f013d1a9..49fdad931b6 100644
--- a/pkgs/development/compilers/llvm/3.9/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/default.nix
@@ -1,4 +1,4 @@
-{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC }:
+{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC, darwin, ccWrapperFun }:
let
callPackage = newScope (self // { inherit stdenv isl version fetch; });
@@ -24,8 +24,19 @@ let
clang = wrapCC self.clang-unwrapped;
+ libcxxClang = ccWrapperFun {
+ cc = self.clang-unwrapped;
+ isClang = true;
+ inherit (self) stdenv;
+ /* FIXME is this right? */
+ inherit (stdenv.cc) libc nativeTools nativeLibc;
+ extraPackages = [ self.libcxx self.libcxxabi ];
+ };
+
stdenv = overrideCC stdenv self.clang;
+ libcxxStdenv = overrideCC stdenv self.libcxxClang;
+
lldb = callPackage ./lldb.nix {};
libcxx = callPackage ./libc++ {};
diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix
index 22dea611c79..8086f980bcf 100644
--- a/pkgs/development/compilers/llvm/3.9/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.9/llvm.nix
@@ -15,10 +15,16 @@
, libcxxabi
, debugVersion ? false
, enableSharedLibraries ? true
+, darwin
}:
let
src = fetch "llvm" "0j49lkd5d7nnpdqzaybs2472bvcxyx0i4r3iccwf3kj2v9wk3iv6";
+ shlib = if stdenv.isDarwin then "dylib" else "so";
+
+ # Used when creating a version-suffixed symlink of libLLVM.dylib
+ shortVersion = with stdenv.lib;
+ concatStringsSep "." (take 2 (splitString "." version));
in stdenv.mkDerivation rec {
name = "llvm-${version}";
@@ -33,7 +39,8 @@ in stdenv.mkDerivation rec {
outputs = [ "out" ] ++ stdenv.lib.optional enableSharedLibraries "lib";
buildInputs = [ perl groff cmake libxml2 python libffi ]
- ++ stdenv.lib.optional stdenv.isDarwin libcxxabi;
+ ++ stdenv.lib.optionals stdenv.isDarwin
+ [ libcxxabi darwin.cctools darwin.apple_sdk.libs.xpc ];
propagatedBuildInputs = [ ncurses zlib ];
@@ -70,6 +77,7 @@ in stdenv.mkDerivation rec {
++ stdenv.lib.optionals (isDarwin) [
"-DLLVM_ENABLE_LIBCXX=ON"
"-DCAN_TARGET_i386=false"
+ "-DCMAKE_LIBTOOL=${darwin.cctools}/bin/libtool"
];
postBuild = ''
@@ -81,13 +89,17 @@ in stdenv.mkDerivation rec {
postInstall = ""
+ stdenv.lib.optionalString (enableSharedLibraries) ''
moveToOutput "lib/libLLVM-*" "$lib"
- moveToOutput "lib/libLLVM.so" "$lib"
+ moveToOutput "lib/libLLVM.${shlib}" "$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
+ substituteInPlace "$out/lib/cmake/llvm/LLVMExports-release.cmake" \
+ --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib"
+ install_name_tool -id $lib/lib/libLLVM.dylib $lib/lib/libLLVM.dylib
+ install_name_tool -change @rpath/libLLVM.dylib $lib/lib/libLLVM.dylib $out/bin/llvm-config
+ ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
+ ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${version}.dylib
'';
enableParallelBuilding = true;
diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix
index 4233f87d576..0dfdea6d3d1 100644
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
- name = "nim-0.15.0";
+ name = "nim-0.15.2";
src = fetchurl {
url = "http://nim-lang.org/download/${name}.tar.xz";
- sha256 = "1yv9qvc1r7m0m4gwi8mgnabdjz70mwxf5rmv8xhibcmja1856565";
+ sha256 = "12pyzjx7x4hclzrf3zf6r1qjlp60bzsaqrz0rax2rak2c8qz4pch";
};
buildPhase = "sh build.sh";
diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix
index 2e691dc749d..a6969477844 100644
--- a/pkgs/development/compilers/opa/default.nix
+++ b/pkgs/development/compilers/opa/default.nix
@@ -63,5 +63,8 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.kkallio ];
platforms = with stdenv.lib.platforms; linux;
+ # opa was built with nodejs 0.10 which reached end of LTS
+ # in October 216, it doesn't built with nodejs 4.x
+ broken = true;
};
}
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index 2969dab9226..d0933b9a195 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -22,41 +22,41 @@ let
throw "openjdk requires i686-linux or x86_64 linux";
update = "122";
- build = "00";
+ build = "04";
baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u";
repover = "jdk8u${update}-b${build}";
paxflags = if stdenv.isi686 then "msp" else "m";
jdk8 = fetchurl {
url = "${baseurl}/archive/${repover}.tar.gz";
- sha256 = "0biy2xpb6krinmpj5pqsz0vryd2m6i819csvqnv88rc3750qh13d";
+ sha256 = "1zqqy5gzrx7f438j5pjdavj41plb04p6b1ikspksrgnhs5wrrr02";
};
langtools = fetchurl {
url = "${baseurl}/langtools/archive/${repover}.tar.gz";
- sha256 = "1wy9n64fvxybpd8lqd2zbiv2z23nfp10bd098lhqw7z46yxbm3ra";
+ sha256 = "0hhsm23mxvjxmf0jxlhm57s203k88s8xbmk71l8zlnjsz88ni4gx";
};
hotspot = fetchurl {
url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
- sha256 = "1hzliyjaz0dq7l934d16c3ddx6kiszl2hkc2cs0rhb09m7q4zcv7";
+ sha256 = "1r4a52brsg1xd2dc2b8lzd4w4yvcjdmj9a6avjihx1hpgcs4xzd1";
};
corba = fetchurl {
url = "${baseurl}/corba/archive/${repover}.tar.gz";
- sha256 = "0576r009my434fgv9m7lwd5bvvgbb182aw8z8fwwbi36mf5j3sr5";
+ sha256 = "0ixa6kdqkiq83817qdymiy772449iva11rh3pr68qpfnmbx1zzil";
};
jdk = fetchurl {
url = "${baseurl}/jdk/archive/${repover}.tar.gz";
- sha256 = "1hn40jm2fcs037zx30k1gxw6j24hr50a78zjjaaql73yhhzf74xh";
+ sha256 = "1kw4h3j93cvnlzh0vhj4xxdm90bk7hfg6kpqk09x0a12whh2ww3h";
};
jaxws = fetchurl {
url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
- sha256 = "1lbvaw3ck0inz9376qh9nw8d1ys93plfpsn1sp9mmwdjyglvznif";
+ sha256 = "0wrj3jyv3922m3pxfg0i9c3ap71b0rass7swvhi996c029rd12r7";
};
jaxp = fetchurl {
url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
- sha256 = "11viwry7fj70wgzfbpslb6j1zpqqzicdf8yyqhw3whf7l6wx2bav";
+ sha256 = "0b743mygzdavdd59l98b3l6a03dihs4ipd1xlpkacy778wzpr59d";
};
nashorn = fetchurl {
url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
- sha256 = "057g393kjb9via2a3x3zm7r4g9dslw0nkwn6yppzd8hal325s1wa";
+ sha256 = "10wkshhzj15wvx7i53dbkwi85f4fbbxi26zphr5b6daf3ib0hind";
};
openjdk8 = stdenv.mkDerivation {
name = "openjdk-8u${update}b${build}";
diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
index f1b27bdb54f..e8d737e0082 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
@@ -1,9 +1,9 @@
import ./jdk-linux-base.nix {
productVersion = "8";
- patchVersion = "101";
+ patchVersion = "111";
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
- sha256_i686 = "0p9nvaifb1mn7scmprbcyv9a4lyqy8i0mf7rsb59cli30vpi44mi";
- sha256_x86_64 = "0a0kb3c7xfh81vx5sicw2frgxq0gyv5qp0d725rviwldlcxk4zs6";
+ sha256_i686 = "07wyyds52c3fp4ha1fnzp6mbxwq0rs3vx59167b57gkggg7qz3ls";
+ sha256_x86_64 = "0x4937c3307v78wx1jf227b89cf5lsd5yarmbjrxs4pq6lidlzhq";
jceName = "jce_policy-8.zip";
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
index b760ac7135a..fc2e6448fc3 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
@@ -1,9 +1,9 @@
import ./jdk-linux-base.nix {
productVersion = "8";
- patchVersion = "102";
+ patchVersion = "112";
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
- sha256_i686 = "1bsypgf9va8jds0rlpnwp9n9p11hz77gqlmb0b0w2qwfmlmi227d";
- sha256_x86_64 = "1dq4kqi8k2k11sc28fnbp6cmncfj86jv57iy1gkap94i0fyf1yvw";
+ sha256_i686 = "19b9vwb7bd17s9p04y47zzjkccazzmpy4dqx4rgxd79k1fw2yz0y";
+ sha256_x86_64 = "19blsx81x5p2f6d9vig89z7cc8778cp6qdjy9ylsa2444vaxfyvp";
jceName = "jce_policy-8.zip";
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix
index ca790d027e0..084a0941d24 100644
--- a/pkgs/development/compilers/pakcs/default.nix
+++ b/pkgs/development/compilers/pakcs/default.nix
@@ -136,10 +136,10 @@ stdenv.mkDerivation rec {
--prefix PATH ":" "${tk}/bin" \
'';
- meta = {
+ meta = with stdenv.lib; {
homepage = "http://www.informatik.uni-kiel.de/~pakcs/";
description = "An implementation of the multi-paradigm declarative language Curry";
- license = stdenv.lib.licenses.bsd3;
+ license = licenses.bsd3;
longDescription = ''
PAKCS is an implementation of the multi-paradigm declarative language
@@ -153,7 +153,7 @@ stdenv.mkDerivation rec {
with dynamic web pages, prototyping embedded systems).
'';
- maintainers = [ stdenv.lib.maintainers.gnidorah ];
- platforms = stdenv.lib.platforms.unix;
+ maintainers = with maintainers; [ kkallio gnidorah ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index 93ce5037fed..122b9ff7ed1 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -1,16 +1,19 @@
-{stdenv, glibc, fetchFromGitHub, llvm, makeWrapper, openssl, pcre2, coreutils }:
+{ stdenv, fetchFromGitHub, llvm, makeWrapper, pcre2, coreutils, which, libressl,
+ cc ? stdenv.cc, lto ? !stdenv.isDarwin }:
-stdenv.mkDerivation {
- name = "ponyc-2016-07-26";
+stdenv.mkDerivation ( rec {
+ name = "ponyc-${version}";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "ponylang";
repo = "ponyc";
- rev = "4eec8a9b0d9936b2a0249bd17fd7a2caac6aaa9c";
- sha256 = "184x2jivp7826i60rf0dpx0a9dg5rsj56dv0cll28as4nyqfmna2";
+ rev = version;
+ sha256 = "10miwsyxl589b0n1h3dbbc2qckq8z8a58s0d53asq88w2gpc339q";
};
- buildInputs = [ llvm makeWrapper ];
+ buildInputs = [ llvm makeWrapper which ];
+ propagatedBuildInputs = [ cc ];
# Disable problematic networking tests
patches = [ ./disable-tests.patch ];
@@ -18,37 +21,69 @@ stdenv.mkDerivation {
preBuild = ''
# Fix tests
substituteInPlace packages/process/_test.pony \
- --replace "/bin/cat" "${coreutils}/bin/cat"
+ --replace '"/bin/' '"${coreutils}/bin/'
+ substituteInPlace packages/process/_test.pony \
+ --replace '=/bin' "${coreutils}/bin"
+
+
+ # Fix llvm-ar check for darwin
+ substituteInPlace Makefile \
+ --replace "llvm-ar-3.8" "llvm-ar"
+
+ # Remove impure system refs
+ substituteInPlace src/libponyc/pkg/package.c \
+ --replace "/usr/local/lib" ""
+ substituteInPlace src/libponyc/pkg/package.c \
+ --replace "/opt/local/lib" ""
+
+ for file in `grep -irl '/usr/local/opt/libressl/lib' ./*`; do
+ substituteInPlace $file --replace '/usr/local/opt/libressl/lib' "${stdenv.lib.getLib libressl}/lib"
+ done
+
+ # Fix ponypath issue
+ substituteInPlace Makefile \
+ --replace "PONYPATH=." "PONYPATH=.:\$(PONYPATH)"
export LLVM_CONFIG=${llvm}/bin/llvm-config
+ '' + stdenv.lib.optionalString ((!stdenv.isDarwin) && (!cc.isClang) && lto) ''
+ export LTO_PLUGIN=`find ${cc.cc}/ -name liblto_plugin.so`
+ '' + stdenv.lib.optionalString ((!stdenv.isDarwin) && (cc.isClang) && lto) ''
+ export LTO_PLUGIN=`find ${cc.cc}/ -name LLVMgold.so`
'';
- makeFlags = [ "config=release" ];
+ makeFlags = [ "config=release" ] ++ stdenv.lib.optionals stdenv.isDarwin [ "bits=64" ]
+ ++ stdenv.lib.optionals (stdenv.isDarwin && (!lto)) [ "lto=no" ];
enableParallelBuilding = true;
doCheck = true;
- checkTarget = "test";
+ checkTarget = "test-ci";
preCheck = ''
- export LIBRARY_PATH="$out/lib:${stdenv.lib.makeLibraryPath [ openssl pcre2 ]}"
+ export PONYPATH="$out/lib:${stdenv.lib.makeLibraryPath [ pcre2 libressl ]}"
'';
installPhase = ''
- make config=release prefix=$out install
+ make config=release prefix=$out ''
+ + stdenv.lib.optionalString stdenv.isDarwin '' bits=64 ''
+ + stdenv.lib.optionalString (stdenv.isDarwin && (!lto)) '' lto=no ''
+ + '' install
mv $out/bin/ponyc $out/bin/ponyc.wrapped
makeWrapper $out/bin/ponyc.wrapped $out/bin/ponyc \
- --prefix LIBRARY_PATH : "$out/lib" \
- --prefix LIBRARY_PATH : "${openssl.out}/lib" \
- --prefix LIBRARY_PATH : "${pcre2}/lib"
+ --prefix PONYPATH : "$out/lib" \
+ --prefix PONYPATH : "${stdenv.lib.getLib pcre2}/lib" \
+ --prefix PONYPATH : "${stdenv.lib.getLib libressl}/lib"
'';
+ # Stripping breaks linking for ponyc
+ dontStrip = true;
+
meta = {
description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language";
homepage = http://www.ponylang.org;
license = stdenv.lib.licenses.bsd2;
maintainers = [ stdenv.lib.maintainers.doublec ];
- platforms = stdenv.lib.platforms.linux;
+ platforms = stdenv.lib.platforms.unix;
};
-}
+})
diff --git a/pkgs/development/compilers/ponyc/disable-tests.patch b/pkgs/development/compilers/ponyc/disable-tests.patch
index 9335ebd6eea..696dc005f0a 100644
--- a/pkgs/development/compilers/ponyc/disable-tests.patch
+++ b/pkgs/development/compilers/ponyc/disable-tests.patch
@@ -1,16 +1,15 @@
diff --git a/packages/net/_test.pony b/packages/net/_test.pony
-index d6c3e56..dc37dd9 100644
+index ce26bd7..9a98cc7 100644
--- a/packages/net/_test.pony
+++ b/packages/net/_test.pony
-@@ -7,11 +7,6 @@ actor Main is TestList
+@@ -5,9 +5,7 @@ actor Main is TestList
+ new make() => None
+
fun tag tests(test: PonyTest) =>
- test(_TestReadBuffer)
- test(_TestWriteBuffer)
- test(_TestBroadcast)
-- ifdef not windows then
-- test(_TestTCPExpect)
-- test(_TestTCPWritev)
-- end
-
- class iso _TestReadBuffer is UnitTest
- """
+- test(_TestTCPWritev)
+- test(_TestTCPExpect)
++ None
+
+ class _TestPing is UDPNotify
+ let _h: TestHelper
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index 1dbc6c13e0b..7e29435b7d5 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.12.0";
+ shortVersion = "1.12.1";
isRelease = true;
forceBundledLLVM = false;
configureFlags = [ "--release-channel=stable" ];
- srcRev = "3191fbae9da539442351f883bdabcad0d72efcb6";
- srcSha = "1mpw6c5jfxy60g786wl8g0ncwikqfbcj67jrdpj3jacywxsxzlby";
+ srcRev = "d4f39402a0c2c2b94ec0375cd7f7f6d7918113cd";
+ srcSha = "1lpykjy96rwz4jy28rf7ijca0q9lvckgnbzvcdsrspd5rs2ywfwr";
patches = [
./patches/disable-lockfile-check.patch
diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix
index d452d0abe30..a1b131eac81 100644
--- a/pkgs/development/compilers/scala/default.nix
+++ b/pkgs/development/compilers/scala/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec {
- name = "scala-2.11.8";
+ name = "scala-2.12.0";
src = fetchurl {
url = "http://www.scala-lang.org/files/archive/${name}.tgz";
- sha256 = "1khs7673wca7gnxz2rxphv6v5k94jkpcarlqznsys9cpknhqdz47";
+ sha256 = "148wmk7gjiyfms9lrwgiky7vw78pwnvpnx71rg4l30zd6jfiknp9";
};
propagatedBuildInputs = [ jre ] ;
diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix
new file mode 100644
index 00000000000..df0c136d05f
--- /dev/null
+++ b/pkgs/development/compilers/shaderc/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, cmake, glslang, spirv-tools, python }:
+
+stdenv.mkDerivation rec {
+ name = "shaderc-git-${version}";
+ version = "2016-09-08";
+
+ # `vulkan-loader` requires a specific version of `glslang` as specified in
+ # `/glslang_revision`.
+ src = fetchFromGitHub {
+ owner = "google";
+ repo = "shaderc";
+ rev = "e17bb8ba3b8b0b9142b788d988612a40541c54ce";
+ sha256 = "17qfjqkz6j355qi130kixaz51svl09k9b5sfikksgnbmzglzcwki";
+ };
+
+ patchPhase = ''
+ cp -r ${spirv-tools.src} third_party/spirv-tools
+ chmod -R +w third_party/spirv-tools
+ ln -s ${spirv-tools.headers} third_party/spirv-tools/external/spirv-headers
+ '';
+
+ buildInputs = [ cmake glslang python ];
+ enableParallelBuilding = true;
+
+ cmakeFlags = [ "-DSHADERC_SKIP_TESTS=ON" "-DSHADERC_GLSLANG_DIR=${glslang.src}" ];
+
+ meta = with stdenv.lib; {
+ inherit (src.meta) homepage;
+ description = "A collection of tools, libraries and tests for shader compilation.";
+ };
+}
diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix
index 463481a1547..40d7ef06432 100644
--- a/pkgs/development/compilers/solc/default.nix
+++ b/pkgs/development/compilers/solc/default.nix
@@ -1,16 +1,20 @@
{ stdenv, fetchFromGitHub, boost, cmake, jsoncpp }:
stdenv.mkDerivation rec {
- version = "0.3.6";
+ version = "0.4.2";
name = "solc-${version}";
src = fetchFromGitHub {
owner = "ethereum";
repo = "solidity";
rev = "v${version}";
- sha256 = "1cynqwy8wr63l3l4wv9z6shhcy6lq0q8pbsh3nav0dg9qgj9sg57";
+ sha256 = "1d5x3psz8a9z9jnm30aspfvrpd9kblr14cn5vyl21p27x2vdlzr4";
};
+ patchPhase = ''
+ echo >commit_hash.txt af6afb0415761b53721f89c7f65064807f41cbd3
+ '';
+
buildInputs = [ boost cmake jsoncpp ];
meta = {
diff --git a/pkgs/development/coq-modules/fiat/HEAD.nix b/pkgs/development/coq-modules/fiat/HEAD.nix
new file mode 100644
index 00000000000..a92c14bdbff
--- /dev/null
+++ b/pkgs/development/coq-modules/fiat/HEAD.nix
@@ -0,0 +1,35 @@
+{stdenv, fetchgit, coq, python27}:
+
+stdenv.mkDerivation rec {
+
+ name = "coq-fiat-${coq.coq-version}-${version}";
+ version = "20161024";
+
+ src = fetchgit {
+ url = "https://github.com/mit-plv/fiat.git";
+ rev = "7feb6c64be9ebcc05924ec58fe1463e73ec8206a";
+ sha256 = "0griqc675yylf9rvadlfsabz41qy5f5idya30p5rv6ysiakxya64";
+ };
+
+ buildInputs = [ coq.ocaml coq.camlp5 python27 ];
+ propagatedBuildInputs = [ coq ];
+
+ doCheck = false;
+
+ enableParallelBuilding = false;
+ buildPhase = "make -j$NIX_BUILD_CORES";
+
+ installPhase = ''
+ COQLIB=$out/lib/coq/${coq.coq-version}/
+ mkdir -p $COQLIB/user-contrib/Fiat
+ cp -pR src/* $COQLIB/user-contrib/Fiat
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://plv.csail.mit.edu/fiat/;
+ description = "A library for the Coq proof assistant for synthesizing efficient correct-by-construction programs from declarative specifications";
+ maintainers = with maintainers; [ jwiegley ];
+ platforms = coq.meta.platforms;
+ };
+
+}
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index d4d2790b2a3..e076c6ca90e 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -1,4 +1,4 @@
-{ go, govers, parallel, lib, fetchgit, fetchhg }:
+{ go, govers, parallel, lib, fetchgit, fetchhg, rsync }:
{ name, buildInputs ? [], nativeBuildInputs ? [], passthru ? {}, preFixup ? ""
@@ -17,6 +17,10 @@
# Extra sources to include in the gopath
, extraSrcs ? [ ]
+# Extra gopaths containing src subfolder
+# with sources to include in the gopath
+, extraSrcPaths ? [ ]
+
# go2nix dependency file
, goDeps ? null
@@ -86,6 +90,9 @@ go.stdenv.mkDerivation (
mv goPath/* "go/src/${goPackagePath}"
rmdir goPath
+ '') + (lib.optionalString (extraSrcPaths != []) ''
+ ${rsync}/bin/rsync -a ${lib.concatMapStrings (p: "${p}/src") extraSrcPaths} go
+
'') + ''
export GOPATH=$NIX_BUILD_TOP/go:$GOPATH
diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix
index a5f12e2cfe3..291b410ef93 100644
--- a/pkgs/development/guile-modules/guile-ncurses/default.nix
+++ b/pkgs/development/guile-modules/guile-ncurses/default.nix
@@ -13,6 +13,13 @@ stdenv.mkDerivation rec {
preConfigure =
'' configureFlags="$configureFlags --with-guilesitedir=$out/share/guile/site" '';
+ postFixup =
+ '' for f in $out/share/guile/site/ncurses/**.scm; do \
+ substituteInPlace $f \
+ --replace "libguile-ncurses" "$out/lib/libguile-ncurses"; \
+ done
+ '';
+
doCheck = false; # XXX: 1 of 65 tests failed
meta = {
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index fa84e5ce508..50bb3695a71 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -8,7 +8,7 @@ self: super: {
cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_1_24_0_0; });
# Link statically to avoid runtime dependency on GHC.
- jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = dontJailbreak self.Cabal_1_20_0_4; };
+ jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = self.Cabal_1_20_0_4; };
# Apply NixOS-specific patches.
ghc-paths = appendPatch super.ghc-paths ./patches/ghc-paths-nix.patch;
@@ -43,10 +43,9 @@ self: super: {
src = pkgs.fetchFromGitHub {
owner = "joeyh";
repo = "git-annex";
- sha256 = "1j29ydbw86j3qd4qb4l348pcnjd24irgdra9ss2afi6w2pn60yjn";
+ sha256 = "1nd1q5c4jr9s6xczyv464zq4y10rk8c1av22nfb28abrskxagcjc";
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;
@@ -168,6 +167,13 @@ self: super: {
then addBuildDepend super.halive pkgs.darwin.apple_sdk.frameworks.AppKit
else super.halive;
+ # Hakyll's tests are broken on Darwin (3 failures); and they require util-linux
+ hakyll = if pkgs.stdenv.isDarwin
+ then dontCheck (overrideCabal super.hakyll (drv: {
+ testToolDepends = [];
+ }))
+ else super.hakyll;
+
# cabal2nix likes to generate dependencies on hinotify when hfsevents is really required
# on darwin: https://github.com/NixOS/cabal2nix/issues/146.
hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify;
@@ -457,7 +463,6 @@ self: super: {
translatable-intset = dontCheck super.translatable-intset;
ua-parser = dontCheck super.ua-parser;
unagi-chan = dontCheck super.unagi-chan;
- 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 = dontCheck super.webdriver;
@@ -781,19 +786,9 @@ self: super: {
src = pkgs.fetchFromGitHub {
owner = "chrisdone";
repo = "structured-haskell-mode";
- sha256 = "1vrycvqp4n2pp6sq7z2v0zkqz6662nvacm7cla5hrrzl157cg0j5";
- rev = "1ffb4db1e7049d4089fea430d4f20bce2eff263d";
+ rev = "dde5104ee28e1c63ca9fbc37c969f8e319b4b903";
+ sha256 = "0g5qpnxzr9qmgzvsld5mg94rb28xb8kd1a02q045r6zlmv1zx7lp";
};
- 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;
@@ -980,10 +975,10 @@ self: super: {
});
# https://github.com/commercialhaskell/stack/issues/2263
- stack = (dontJailbreak super.stack).overrideScope (self: super: {
- http-client = self.http-client_0_5_3_2;
+ stack = super.stack.overrideScope (self: super: {
+ http-client = self.http-client_0_5_3_3;
http-client-tls = self.http-client-tls_0_3_3;
- http-conduit = self.http-conduit_2_2_2_1;
+ http-conduit = self.http-conduit_2_2_3;
optparse-applicative = dontCheck self.optparse-applicative_0_13_0_0;
criterion = super.criterion.override { inherit (super) optparse-applicative; };
});
@@ -1026,10 +1021,24 @@ self: super: {
# https://github.com/fpco/store/issues/77
store = dontCheck super.store;
+ store_0_3 = super.store_0_3.overrideScope (self: super: {
+ store-core = self.store-core_0_3;
+ });
+
# https://github.com/bmillwood/applicative-quoters/issues/6
applicative-quoters = doJailbreak super.applicative-quoters;
+ # https://github.com/roelvandijk/terminal-progress-bar/issues/13
+ terminal-progress-bar = doJailbreak super.terminal-progress-bar;
+
# https://github.com/vshabanov/HsOpenSSL/issues/11
HsOpenSSL = doJailbreak super.HsOpenSSL;
+ # https://github.com/NixOS/nixpkgs/issues/19612
+ wai-app-file-cgi = (dontCheck super.wai-app-file-cgi).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_3;
+ });
+
}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
index 1207a8c68bc..32348f2c909 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
@@ -49,12 +49,6 @@ self: super: {
transformers = self.transformers_0_4_3_0;
xhtml = self.xhtml_3000_2_1;
- # The jailbreak is unnecessary in this package set.
- deepseq_1_3_0_1 = dontJailbreak super.deepseq_1_3_0_1;
-
- # Newer versions don't compile.
- Cabal_1_18_1_7 = dontJailbreak super.Cabal_1_18_1_7;
-
# We have no working cabal-install at the moment.
cabal-install = markBroken super.cabal-install;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
index 4cbe3b6b148..16c1ff4f065 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
@@ -46,12 +46,9 @@ self: super: {
# https://github.com/tibbe/hashable/issues/85
hashable = dontCheck super.hashable;
- # Newer versions don't compile.
- Cabal_1_18_1_7 = dontJailbreak super.Cabal_1_18_1_7;
-
# https://github.com/peti/jailbreak-cabal/issues/9
jailbreak-cabal = super.jailbreak-cabal.override {
- Cabal = dontJailbreak (self.Cabal_1_20_0_4.override { deepseq = dontJailbreak self.deepseq_1_3_0_1; });
+ Cabal = self.Cabal_1_20_0_4.override { deepseq = self.deepseq_1_3_0_1; };
};
# Haddock chokes on the prologue from the cabal file.
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 c06e0f7d11b..95629c37532 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -37,10 +37,7 @@ self: super: {
xhtml = null;
# Enable latest version of cabal-install.
- cabal-install = (doDistribute (dontJailbreak (dontCheck (super.cabal-install)))).overrideScope (self: super: { Cabal = self.Cabal_1_24_0_0; });
-
- # Jailbreaking is required for the test suite only (which we don't run).
- Cabal_1_24_0_0 = dontJailbreak (dontCheck super.Cabal_1_24_0_0);
+ cabal-install = (dontCheck (super.cabal-install)).overrideScope (self: super: { Cabal = self.Cabal_1_24_0_0; });
# Build jailbreak-cabal with the latest version of Cabal.
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_0_0; };
@@ -148,7 +145,7 @@ self: super: {
tasty-rerun = dontHaddock (appendConfigureFlag super.tasty-rerun "--ghc-option=-XFlexibleContexts");
# http://hub.darcs.net/ivanm/graphviz/issue/5
- graphviz = dontCheck (dontJailbreak (appendPatch super.graphviz ./patches/graphviz-fix-ghc710.patch));
+ graphviz = dontCheck (appendPatch super.graphviz ./patches/graphviz-fix-ghc710.patch);
# https://github.com/HugoDaniel/RFC3339/issues/14
timerep = dontCheck super.timerep;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
index 385df64fadb..5aea83e7567 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@@ -44,15 +44,12 @@ self: super: {
# https://github.com/haskell/cabal/issues/2322
Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_4_1; process = self.process_1_2_3_0; };
- # Newer versions don't compile.
- Cabal_1_18_1_7 = dontJailbreak super.Cabal_1_18_1_7;
-
# https://github.com/tibbe/hashable/issues/85
hashable = dontCheck super.hashable;
# https://github.com/peti/jailbreak-cabal/issues/9
jailbreak-cabal = super.jailbreak-cabal.override {
- Cabal = dontJailbreak (self.Cabal_1_20_0_4.override { deepseq = dontJailbreak self.deepseq_1_3_0_1; });
+ Cabal = self.Cabal_1_20_0_4.override { deepseq = self.deepseq_1_3_0_1; };
};
# Haddock chokes on the prologue from the cabal file.
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
index aca043e240b..32d3c89d5fe 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
@@ -50,7 +50,7 @@ self: super: {
hashable = dontCheck super.hashable;
# https://github.com/peti/jailbreak-cabal/issues/9
- jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_4; };
+ jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_20_0_4; };
# Haddock chokes on the prologue from the cabal file.
ChasingBottoms = dontHaddock super.ChasingBottoms;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
index 06836080bcf..1c579b9d6e2 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -49,7 +49,7 @@ self: super: {
hashable = dontCheck super.hashable;
# https://github.com/peti/jailbreak-cabal/issues/9
- jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_4; };
+ jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_20_0_4; };
# Haddock chokes on the prologue from the cabal file.
ChasingBottoms = dontHaddock super.ChasingBottoms;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
index 1b5f01c8475..f7410689866 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -38,7 +38,7 @@ self: super: {
xhtml = null;
# https://github.com/peti/jailbreak-cabal/issues/9
- jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_4; };
+ jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_20_0_4; };
# mtl 2.2.x needs the latest transformers.
mtl_2_2_1 = super.mtl.override { transformers = self.transformers_0_4_3_0; };
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 5c7348678b7..b01620e7a9a 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -60,4 +60,7 @@ self: super: {
sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy";
});
+ # https://github.com/christian-marie/xxhash/issues/3
+ xxhash = doJailbreak super.xxhash;
+
}
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 4daacce6376..2e89521fca8 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -32,7 +32,7 @@ core-packages:
- xhtml-3000.2.1
default-package-overrides:
- # LTS Haskell 7.3
+ # LTS Haskell 7.5
- abstract-deque ==0.3
- abstract-par ==0.3.3
- AC-Vector ==2.3.2
@@ -138,7 +138,7 @@ default-package-overrides:
- 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
+ - app-settings ==0.2.0.9
- appar ==0.1.4
- apply-refact ==0.3.0.0
- arbtt ==0.9.0.10
@@ -179,7 +179,7 @@ default-package-overrides:
- base64-bytestring ==1.0.0.1
- base64-string ==0.2
- basic-prelude ==0.6.1
- - bcrypt ==0.0.9
+ - bcrypt ==0.0.10
- benchpress ==0.2.2.8
- bencode ==0.6.0.0
- bento ==0.1.0
@@ -192,7 +192,7 @@ default-package-overrides:
- binary-orphans ==0.1.5.1
- binary-parser ==0.5.2
- binary-search ==1.0.0.3
- - binary-tagged ==0.1.4.0
+ - binary-tagged ==0.1.4.1
- binary-typed ==1.0
- bindings-DSL ==1.0.23
- bindings-GLFW ==3.1.2.2
@@ -305,8 +305,8 @@ default-package-overrides:
- 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-systemverilog ==0.6.10
+ - clash-verilog ==0.6.10
- clash-vhdl ==0.6.16
- classy-prelude ==1.0.0.2
- classy-prelude-conduit ==1.0.0
@@ -428,7 +428,7 @@ default-package-overrides:
- dependent-sum ==0.3.2.2
- dependent-sum-template ==0.0.0.5
- derive ==2.5.26
- - deriving-compat ==0.3.3
+ - deriving-compat ==0.3.4
- descriptive ==0.9.4
- diagrams ==1.3.0.1
- diagrams-cairo ==1.3.1.1
@@ -461,7 +461,7 @@ default-package-overrides:
- djinn-lib ==0.0.1.2
- dlist ==0.8.0.2
- dlist-instances ==0.1.1.1
- - dns ==2.0.6
+ - dns ==2.0.8
- do-list ==1.0.1
- dockerfile ==0.1.0.1
- docopt ==0.7.0.4
@@ -469,7 +469,7 @@ default-package-overrides:
- doctest-discover ==0.1.0.7
- doctest-prop ==0.2.0.1
- docvim ==0.3.2.1
- - dotenv ==0.3.0.3
+ - dotenv ==0.3.1.0
- dotnet-timespan ==0.0.1.0
- double-conversion ==2.0.1.0
- download ==0.3.2.4
@@ -576,7 +576,7 @@ default-package-overrides:
- fold-debounce-conduit ==0.1.0.4
- foldl ==1.2.1
- FontyFruity ==0.5.3.2
- - force-layout ==0.4.0.5
+ - force-layout ==0.4.0.6
- forecast-io ==0.2.0.0
- foreign-store ==0.2
- formatting ==6.2.2
@@ -780,7 +780,7 @@ default-package-overrides:
- HandsomeSoup ==0.4.2
- handwriting ==0.1.0.3
- hapistrano ==0.2.1.2
- - happstack-authenticate ==2.3.4.5
+ - happstack-authenticate ==2.3.4.6
- happstack-clientsession ==7.3.1
- happstack-hsp ==7.3.7.1
- happstack-jmacro ==7.0.11
@@ -826,7 +826,7 @@ default-package-overrides:
- heaps ==0.3.3
- hebrew-time ==0.1.1
- hedis ==0.9.4
- - here ==1.2.8
+ - here ==1.2.9
- heredoc ==0.2.0.0
- hex ==0.1.2
- hexstring ==0.11.1
@@ -844,7 +844,7 @@ default-package-overrides:
- histogram-fill ==0.8.4.1
- hit ==0.6.3
- hjsmin ==0.2.0.2
- - hjsonpointer ==1.0.0.1
+ - hjsonpointer ==1.0.0.2
- hjsonschema ==1.1.0.1
- hledger ==0.27.1
- hledger-interest ==1.4.4
@@ -892,13 +892,13 @@ default-package-overrides:
- hsemail ==1.7.7
- HSet ==0.0.0
- hset ==2.2.0
- - hsexif ==0.6.0.9
+ - hsexif ==0.6.0.10
- 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 ==0.11.3.2
- HsOpenSSL-x509-system ==0.1.0.3
- hsp ==0.10.0
- hspec ==2.2.3
@@ -946,7 +946,7 @@ default-package-overrides:
- human-readable-duration ==0.2.0.3
- HUnit ==1.3.1.2
- HUnit-approx ==1.0
- - hunit-dejafu ==0.3.0.2
+ - hunit-dejafu ==0.3.0.3
- hvect ==0.3.1.0
- hw-bits ==0.1.0.1
- hw-conduit ==0.0.0.11
@@ -958,12 +958,12 @@ default-package-overrides:
- hweblib ==0.6.3
- hworker ==0.1.0.1
- hworker-ses ==0.1.1.0
- - hxt ==9.3.1.15
+ - hxt ==9.3.1.16
- 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-regex-xmlschema ==9.2.0.3
- hxt-unicode ==9.0.2.4
- hybrid-vectors ==0.2.1
- hyphenation ==0.6
@@ -1004,8 +1004,8 @@ default-package-overrides:
- 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
+ - ip6addr ==0.5.1.4
+ - iproute ==1.7.1
- IPv6Addr ==0.6.1.0
- irc ==0.6.1.0
- irc-client ==0.4.4.0
@@ -1033,7 +1033,7 @@ default-package-overrides:
- json-rpc-generic ==0.2.1.2
- json-schema ==0.7.4.1
- JuicyPixels ==3.2.8
- - JuicyPixels-extra ==0.1.0
+ - JuicyPixels-extra ==0.1.1
- JuicyPixels-scale-dct ==0.1.1.2
- jwt ==0.7.2
- kan-extensions ==5.0.1
@@ -1113,7 +1113,7 @@ default-package-overrides:
- makefile ==0.1.0.5
- managed ==1.0.5
- mandrill ==0.5.2.3
- - markdown ==0.1.14
+ - markdown ==0.1.15
- markdown-unlit ==0.4.0
- markup ==3.1.0
- math-functions ==0.2.0.2
@@ -1261,7 +1261,7 @@ default-package-overrides:
- openpgp-asciiarmor ==0.1
- opensource ==0.1.0.0
- openssl-streams ==1.2.1.0
- - operational ==0.2.3.3
+ - operational ==0.2.3.4
- operational-class ==0.3.0.0
- opml-conduit ==0.5.0.1
- optional-args ==1.0.1
@@ -1274,13 +1274,13 @@ default-package-overrides:
- osdkeys ==0.0
- overloaded-records ==0.4.2.0
- package-description-remote ==0.2.0.0
- - packdeps ==0.4.2.1
+ - packdeps ==0.4.3
- 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-citeproc ==0.10.1.2
- pandoc-types ==1.16.1.1
- pango ==0.13.3.0
- parallel ==3.2.1.0
@@ -1330,7 +1330,7 @@ default-package-overrides:
- pipes-cliff ==0.12.0.0
- pipes-concurrency ==2.0.6
- pipes-csv ==1.4.3
- - pipes-extras ==1.0.5
+ - pipes-extras ==1.0.7
- pipes-fastx ==0.3.0.0
- pipes-group ==1.0.5
- pipes-http ==1.0.4
@@ -1390,7 +1390,7 @@ default-package-overrides:
- protobuf-simple ==0.1.0.2
- protocol-buffers ==2.4.0
- protocol-buffers-descriptor ==2.4.0
- - protolude ==0.1.7
+ - protolude ==0.1.8
- proxied ==0.2
- psql-helpers ==0.1.0.0
- PSQueue ==1.1
@@ -1411,7 +1411,7 @@ default-package-overrides:
- quickcheck-assertions ==0.2.0
- quickcheck-combinators ==0.0.1
- quickcheck-instances ==0.3.12
- - quickcheck-io ==0.1.3
+ - quickcheck-io ==0.1.4
- quickcheck-properties ==0.1
- quickcheck-simple ==0.1.0.1
- quickcheck-text ==0.1.2.1
@@ -1436,7 +1436,7 @@ default-package-overrides:
- readable ==0.3.1
- ReadArgs ==1.2.2
- readline ==1.0.3.0
- - rebase ==1
+ - rebase ==1.0.2.1
- redis-io ==0.7.0
- redis-resp ==0.4.0
- reducers ==3.12.1
@@ -1460,19 +1460,19 @@ default-package-overrides:
- 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 ==0.8.3.2
- 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 ==3.4.1.2
- 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
+ - resourcet ==1.1.8
- rest-client ==0.5.1.1
- rest-core ==0.39
- rest-gen ==0.19.0.3
@@ -1536,7 +1536,7 @@ default-package-overrides:
- servant-mock ==0.8.1.1
- servant-purescript ==0.3.1.5
- servant-server ==0.8.1
- - servant-subscriber ==0.5.0.2
+ - servant-subscriber ==0.5.0.3
- servant-swagger ==1.1.2
- servant-swagger-ui ==0.2.0.2.1.5
- servant-yaml ==0.1.0.0
@@ -1569,7 +1569,7 @@ default-package-overrides:
- simple-session ==0.10.1.1
- simple-smt ==0.6.0
- simple-templates ==0.8.0.1
- - singleton-bool ==0.1.1.0
+ - singleton-bool ==0.1.2.0
- singletons ==2.2
- siphash ==1.0.3
- skein ==1.0.9.4
@@ -1598,7 +1598,7 @@ default-package-overrides:
- speculation ==1.5.0.3
- speedy-slice ==0.1.3
- sphinx ==0.6.0.1
- - Spintax ==0.1.0.0
+ - Spintax ==0.1.0.1
- splice ==0.6.1.1
- split ==0.2.3.1
- Spock ==0.11.0.0
@@ -1658,7 +1658,7 @@ default-package-overrides:
- stylish-haskell ==0.6.1.0
- success ==0.2.6
- sundown ==0.6
- - svg-builder ==0.1.0.1
+ - svg-builder ==0.1.0.2
- svg-tree ==0.5.1.2
- SVGFonts ==1.5.0.1
- swagger ==0.2.2
@@ -1713,7 +1713,7 @@ default-package-overrides:
- test-framework-th ==0.2.4
- test-simple ==0.1.8
- testing-feat ==0.4.0.3
- - texmath ==0.8.6.5
+ - texmath ==0.8.6.6
- text ==1.2.2.1
- text-all ==0.3.0.2
- text-binary ==0.2.1.1
@@ -1780,7 +1780,7 @@ default-package-overrides:
- turtle ==1.2.8
- turtle-options ==0.1.0.4
- twitter-conduit ==0.2.1
- - twitter-feed ==0.2.0.9
+ - twitter-feed ==0.2.0.11
- twitter-types ==0.7.2.2
- twitter-types-lens ==0.7.2
- type-aligned ==0.9.6
@@ -1859,13 +1859,13 @@ default-package-overrides:
- vinyl ==0.5.2
- vinyl-utils ==0.3.0.0
- void ==0.7.1
- - vty ==5.11
+ - vty ==5.11.1
- 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-extra ==3.0.19
- wai-logger ==2.3.0
- wai-middleware-caching ==0.1.0.2
- wai-middleware-caching-lru ==0.1.0.0
@@ -1875,7 +1875,7 @@ default-package-overrides:
- 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-static ==0.8.1
- wai-middleware-throttle ==0.2.1.0
- wai-middleware-verbs ==0.3.2
- wai-predicates ==0.9.0
@@ -1904,7 +1904,7 @@ default-package-overrides:
- weigh ==0.0.3
- werewolf ==1.5.1.1
- werewolf-slack ==1.0.2.0
- - wikicfp-scraper ==0.1.0.4
+ - wikicfp-scraper ==0.1.0.5
- Win32 ==2.3.1.1
- Win32-extras ==0.2.0.1
- Win32-notify ==0.3.0.1
@@ -1950,13 +1950,13 @@ default-package-overrides:
- xmlhtml ==0.2.3.5
- xmonad ==0.12
- xss-sanitize ==0.3.5.7
- - yackage ==0.8.0
+ - yackage ==0.8.1
- yahoo-finance-api ==0.1.0.0
- - yaml ==0.8.18.7
+ - yaml ==0.8.20
- Yampa ==0.10.5
- YampaSynth ==0.2
- yarr ==1.4.0.2
- - yes-precure5-command ==5.5.2
+ - yes-precure5-command ==5.5.3
- yesod ==1.4.3
- yesod-auth ==1.4.13.5
- yesod-auth-account ==1.4.3
@@ -1976,7 +1976,7 @@ default-package-overrides:
- yesod-newsfeed ==1.6
- yesod-persistent ==1.4.0.6
- yesod-sitemap ==1.4.0.1
- - yesod-static ==1.5.0.4
+ - yesod-static ==1.5.0.5
- yesod-static-angular ==0.1.8
- yesod-table ==2.0.3
- yesod-test ==1.5.3
@@ -4518,7 +4518,7 @@ dont-distribute-packages:
HROOT-io: [ i686-linux, x86_64-linux, x86_64-darwin ]
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 ]
+ hruby: [ i686-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 ]
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index d18f4ca5125..114c40d6179 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1607,6 +1607,21 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "BitStringRandomMonad" = callPackage
+ ({ mkDerivation, base, bitstring, bytestring, mtl, parallel
+ , primitive, transformers, vector
+ }:
+ mkDerivation {
+ pname = "BitStringRandomMonad";
+ version = "0.1.0.0";
+ sha256 = "70acdb3e821d9fb17190b6bb9882217f31ae44e6d2ddf28f644a8f271156b785";
+ libraryHaskellDepends = [
+ base bitstring bytestring mtl parallel primitive transformers
+ vector
+ ];
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"BitSyntax" = callPackage
({ mkDerivation, base, bytestring, QuickCheck, template-haskell }:
mkDerivation {
@@ -1684,8 +1699,8 @@ self: {
}:
mkDerivation {
pname = "BlogLiterately";
- version = "0.8.4";
- sha256 = "1eb44830043ba01ddd186498d594a8b01c1ced908f2ea2dc6aa6085e2c91dd7d";
+ version = "0.8.4.1";
+ sha256 = "58b1f32660e20f13b6b6ce6b0668099a8ed4acc7939468108dcde283d2fe4429";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -1697,7 +1712,7 @@ self: {
executableHaskellDepends = [ base cmdargs ];
homepage = "http://byorgey.wordpress.com/blogliterately/";
description = "A tool for posting Haskelly articles to blogs";
- license = "GPL";
+ license = stdenv.lib.licenses.gpl3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -4484,15 +4499,15 @@ self: {
"EntrezHTTP" = callPackage
({ mkDerivation, base, biocore, bytestring, conduit, HTTP
- , http-conduit, hxt, mtl, network, Taxonomy, transformers
+ , http-conduit, hxt, mtl, network, Taxonomy, text, transformers
}:
mkDerivation {
pname = "EntrezHTTP";
- version = "1.0.1";
- sha256 = "54461cb1bd772129cc9e5d725ed6997b133bc7725ec1720de511918d07cdc01f";
+ version = "1.0.2";
+ sha256 = "547f087fcc10e85550775bb02c56b9eea6d2cd32d419cdbe0ab33ad28c0335e9";
libraryHaskellDepends = [
base biocore bytestring conduit HTTP http-conduit hxt mtl network
- Taxonomy transformers
+ Taxonomy text transformers
];
homepage = "https://github.com/eggzilla/EntrezHTTP";
description = "Libary to interface with the NCBI Entrez REST service";
@@ -5068,8 +5083,8 @@ self: {
({ mkDerivation, base, hspec }:
mkDerivation {
pname = "Files";
- version = "0.1.1.0";
- sha256 = "76171c4e0b341ee54297279be1345181e4532ece6455580d03f81900fd33949e";
+ version = "0.1.1.1";
+ sha256 = "9502b3b2b0dd3ea91da652ac616ebba1222882fabe9f540cf79c0e315a435b03";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base ];
@@ -6225,6 +6240,17 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "Grafos" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "Grafos";
+ version = "0.1.0.0";
+ sha256 = "1df102c60f5874fb7afaf4b1ab73663d998165a09628f70711c3fba2afc9f498";
+ libraryHaskellDepends = [ base ];
+ description = "Grafos Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"GrammarProducts" = callPackage
({ mkDerivation, ADPfusion, ansi-wl-pprint, base, bytestring
, containers, data-default, FormalGrammars, lens, newtype, parsers
@@ -8050,12 +8076,12 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "HUnit_1_4_0_0" = callPackage
+ "HUnit_1_5_0_0" = callPackage
({ mkDerivation, base, call-stack, deepseq, filepath }:
mkDerivation {
pname = "HUnit";
- version = "1.4.0.0";
- sha256 = "dce3bd1ac11ed34e0181f39aba16cb6ff0f5005f663bbe37e6ab0162dcf3ec95";
+ version = "1.5.0.0";
+ sha256 = "65c51d17ced1c0646d888cd8caf195df67f6fdc1394c34459bcfd1be0f9ddea0";
libraryHaskellDepends = [ base call-stack deepseq ];
testHaskellDepends = [ base call-stack deepseq filepath ];
homepage = "https://github.com/hspec/HUnit#readme";
@@ -8112,6 +8138,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "HUnit-approx_1_1" = callPackage
+ ({ mkDerivation, base, HUnit }:
+ mkDerivation {
+ pname = "HUnit-approx";
+ version = "1.1";
+ sha256 = "d7cc9e120092e8f845b3347a5da99fab59135eda34c57871f3ff1f09224830a6";
+ libraryHaskellDepends = [ base HUnit ];
+ testHaskellDepends = [ base HUnit ];
+ homepage = "https://github.com/goldfirere/HUnit-approx";
+ description = "Approximate equality for floating point numbers with HUnit";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"HXMPP" = callPackage
({ mkDerivation, base, base64-string, binary, bytestring
, crypto-api, enumerator, HLogger, network, pureMD5, random
@@ -8475,17 +8515,18 @@ self: {
"HarmTrace-Base" = callPackage
({ mkDerivation, base, binary, containers, ghc-prim, ListLike
- , QuickCheck, uu-parsinglib
+ , QuickCheck, random, uu-parsinglib
}:
mkDerivation {
pname = "HarmTrace-Base";
- version = "1.4.0.1";
- sha256 = "121c6b164587b95b487aad0ff197ae2ff3b4065ee567e3bcdfe7947148018a9c";
+ version = "1.5.3.1";
+ sha256 = "aea6ef3010517315c58508554550bdc05a89b1eee8f077b45f1715835c3e99de";
libraryHaskellDepends = [
base binary containers ghc-prim ListLike uu-parsinglib
];
testHaskellDepends = [
- base binary containers ghc-prim ListLike QuickCheck uu-parsinglib
+ base binary containers ghc-prim ListLike QuickCheck random
+ uu-parsinglib
];
homepage = "https://bitbucket.org/bash/harmtrace-base";
description = "Parsing and unambiguously representing musical chords";
@@ -9174,6 +9215,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "HsHTSLib" = callPackage
+ ({ mkDerivation, base, bytestring, bytestring-lexing
+ , conduit-combinators, containers, inline-c, mtl, template-haskell
+ }:
+ mkDerivation {
+ pname = "HsHTSLib";
+ version = "1.3.2.0";
+ sha256 = "d54c2cb03b042212b053011011249b24871155c32698cdc53694d618475b5555";
+ libraryHaskellDepends = [
+ base bytestring bytestring-lexing conduit-combinators containers
+ inline-c mtl template-haskell
+ ];
+ description = "High level bindings to htslib";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"HsHaruPDF" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -9219,20 +9276,18 @@ self: {
}) {Judy = null;};
"HsOpenSSL" = callPackage
- ({ mkDerivation, base, bytestring, HUnit, integer-gmp, network
- , openssl, test-framework, test-framework-hunit, time
+ ({ mkDerivation, base, bytestring, integer-gmp, network, openssl
+ , time
}:
mkDerivation {
pname = "HsOpenSSL";
- version = "0.11.2.4";
- sha256 = "9c38800459534966f12bf25380844c4d26fead17af4d0a8773a95e2c9e3bc1b8";
+ version = "0.11.3.2";
+ sha256 = "4b5ba629b64a0288faa35eccde5ce0ebb8b3127d17e064eb6f100c5fbbebce3f";
libraryHaskellDepends = [
base bytestring integer-gmp network time
];
librarySystemDepends = [ openssl ];
- testHaskellDepends = [
- base bytestring HUnit test-framework test-framework-hunit
- ];
+ testHaskellDepends = [ base bytestring ];
homepage = "https://github.com/vshabanov/HsOpenSSL";
description = "Partial OpenSSL binding for Haskell";
license = stdenv.lib.licenses.publicDomain;
@@ -9887,8 +9942,8 @@ self: {
({ mkDerivation, base, hspec, JuicyPixels }:
mkDerivation {
pname = "JuicyPixels-extra";
- version = "0.1.0";
- sha256 = "67f7b072929a5cf6bfb95d1b5c0d8f8ea7788cf0801a4d6d2fc2df4271947f84";
+ version = "0.1.1";
+ sha256 = "d37b257e7780e18a4e8335523b2f8962efb845da3b1dd84435a684b24a82b9fd";
libraryHaskellDepends = [ base JuicyPixels ];
testHaskellDepends = [ base hspec JuicyPixels ];
homepage = "https://github.com/mrkkrp/JuicyPixels-extra";
@@ -10494,15 +10549,16 @@ self: {
}) {};
"Lazy-Pbkdf2" = callPackage
- ({ mkDerivation, base, base16-bytestring, binary, bytestring, SHA
+ ({ mkDerivation, base, base16-bytestring, binary, bytestring
+ , cryptonite, memory
}:
mkDerivation {
pname = "Lazy-Pbkdf2";
- version = "1.0.2";
- sha256 = "6318c60db0b18877c0edf0a01ba21254b44e9624210bc59834e1dc8116ca86fc";
- libraryHaskellDepends = [ base binary bytestring SHA ];
+ version = "2.1.0";
+ sha256 = "b431835541f5c22467b58862ffe4fe27a046e215fff8440cd0dbea331a3c7f82";
+ libraryHaskellDepends = [ base binary bytestring ];
testHaskellDepends = [
- base base16-bytestring binary bytestring SHA
+ base base16-bytestring binary bytestring cryptonite memory
];
description = "Lazy PBKDF2 generator";
license = stdenv.lib.licenses.mit;
@@ -12860,8 +12916,8 @@ self: {
({ mkDerivation, base, containers }:
mkDerivation {
pname = "PPrinter";
- version = "0.0.4";
- sha256 = "b3841e572ab3dd8648938b6dbc566c9a7df6aa40f3a3e6d6ea28f267e9a94c04";
+ version = "0.1.0";
+ sha256 = "ec536f3b39f0e1cead0c1309af12bafa2298fe5cc395d7c817cc028275969bb9";
libraryHaskellDepends = [ base containers ];
description = "A generic derivable Haskell pretty printer";
license = stdenv.lib.licenses.bsd3;
@@ -14045,8 +14101,8 @@ self: {
}:
mkDerivation {
pname = "RNAlien";
- version = "1.1.3";
- sha256 = "d7d0c3fdbac52be1df3c122a400c3471c6bdeed5e148b742fb77364751029e5d";
+ version = "1.2.5";
+ sha256 = "ab604c7e96b0801d9dc4fa7f30335e918b485dc433efdfb1e56f4c4dc38be6cd";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -14058,8 +14114,8 @@ self: {
];
executableHaskellDepends = [
base biocore biofasta bytestring cassava cmdargs containers
- directory either-unwrap filepath process random split time vector
- ViennaRNAParser
+ directory either-unwrap filepath process random split text time
+ vector ViennaRNAParser
];
description = "Unsupervized construction of RNA family models";
license = stdenv.lib.licenses.gpl3;
@@ -14249,6 +14305,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "Rasterific_0_7" = callPackage
+ ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity
+ , free, JuicyPixels, mtl, primitive, transformers, vector
+ , vector-algorithms
+ }:
+ mkDerivation {
+ pname = "Rasterific";
+ version = "0.7";
+ sha256 = "96c466c40237643354cf4aa29cc6694b716009a825e61af8263da96011c7bda1";
+ libraryHaskellDepends = [
+ base bytestring containers dlist FontyFruity free JuicyPixels mtl
+ primitive transformers vector vector-algorithms
+ ];
+ description = "A pure haskell drawing engine";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ReadArgs" = callPackage
({ mkDerivation, base, hspec, system-filepath, text }:
mkDerivation {
@@ -14835,7 +14909,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "SVGFonts_1_6_0_0" = callPackage
+ "SVGFonts_1_6_0_1" = callPackage
({ mkDerivation, attoparsec, base, blaze-markup, blaze-svg
, bytestring, cereal, cereal-vector, containers, data-default-class
, diagrams-core, diagrams-lib, directory, parsec, split, text
@@ -14843,8 +14917,8 @@ self: {
}:
mkDerivation {
pname = "SVGFonts";
- version = "1.6.0.0";
- sha256 = "f83631b05b6acf45b6226c062a6762de9e6d07421baa881b914988e7c1ee1b7c";
+ version = "1.6.0.1";
+ sha256 = "f727ef24f8591c2d6aea64d85c569db56db5324093dcf569d417ac6b1582d0f0";
libraryHaskellDepends = [
attoparsec base blaze-markup blaze-svg bytestring cereal
cereal-vector containers data-default-class diagrams-core
@@ -15122,6 +15196,32 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
+ "ShellCheck_0_4_5" = callPackage
+ ({ mkDerivation, base, containers, directory, json, mtl, parsec
+ , process, QuickCheck, regex-tdfa
+ }:
+ mkDerivation {
+ pname = "ShellCheck";
+ version = "0.4.5";
+ sha256 = "53039ac314b99af691a99aec111572ee51b0579280c7fa5795ac48d0c4e02fa7";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base containers directory json mtl parsec process QuickCheck
+ regex-tdfa
+ ];
+ executableHaskellDepends = [
+ base containers directory json mtl parsec QuickCheck regex-tdfa
+ ];
+ testHaskellDepends = [
+ base containers directory json mtl parsec QuickCheck regex-tdfa
+ ];
+ homepage = "http://www.shellcheck.net/";
+ description = "Shell script analysis tool";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"Shellac" = callPackage
({ mkDerivation, base, directory, mtl, unix }:
mkDerivation {
@@ -15344,8 +15444,8 @@ self: {
}:
mkDerivation {
pname = "Slides";
- version = "0.1.0.8";
- sha256 = "1058d7ccedef0081bec5a4f7ebbb70e7e564d70ee642d3fd49920b0be569c57c";
+ version = "0.1.0.9";
+ sha256 = "2a969435dc7025a0e1d7ae2fe28db3dd8c71f010790c3545bceba118e65bd049";
libraryHaskellDepends = [
base colour diagrams-lib diagrams-svg file-embed regex-applicative
];
@@ -15570,8 +15670,8 @@ self: {
({ mkDerivation, attoparsec, base, extra, mwc-random, text }:
mkDerivation {
pname = "Spintax";
- version = "0.1.0.0";
- sha256 = "d9d115f107f3b9a8e44a605d4b44727ff385974f3fd2d1d5b5a40a380467feec";
+ version = "0.1.0.1";
+ sha256 = "bf749b240dcec32068ca1b94f34bfd824722f57c63c0c81473fd8ff88533dfe7";
libraryHaskellDepends = [ attoparsec base extra mwc-random text ];
homepage = "https://github.com/MichelBoucey/spintax";
description = "Random text generation based on spintax";
@@ -16226,10 +16326,8 @@ self: {
}:
mkDerivation {
pname = "Taxonomy";
- version = "1.0.1";
- sha256 = "22d434dc827c75c0ab2075f81e689de22ed7a79d955625fdee18f047570ca289";
- revision = "1";
- editedCabalFile = "b8a2e83455df8cc4f08354e0f28625d0a16c94a5d54fda667d7e3a8bfeb369f3";
+ version = "1.0.2";
+ sha256 = "343e94d5cd555a99b242b50d253b0862c2174f7d3ea2b4935cdac642a414d21c";
libraryHaskellDepends = [
aeson base bytestring either-unwrap fgl graphviz parsec text vector
];
@@ -17071,14 +17169,14 @@ self: {
license = "GPL";
}) {};
- "ViennaRNAParser_1_3_0" = callPackage
+ "ViennaRNAParser_1_3_1" = callPackage
({ mkDerivation, base, hspec, parsec, ParsecTools, process
, transformers
}:
mkDerivation {
pname = "ViennaRNAParser";
- version = "1.3.0";
- sha256 = "a0d10a770b194f3bf6ed5143f89ea3654eebe860bf980a85806c84889efea738";
+ version = "1.3.1";
+ sha256 = "a113dd5673a20802e3377ee1682c901c898e341a3cc0175e619c92eb96e49247";
libraryHaskellDepends = [
base parsec ParsecTools process transformers
];
@@ -17214,15 +17312,16 @@ self: {
}) {};
"WaveFront" = callPackage
- ({ mkDerivation, base, Cartesian, containers, filepath, GLUtil
- , lens, linear, OpenGL
+ ({ mkDerivation, attoparsec, base, Cartesian, containers, either
+ , filepath, lens, linear, QuickCheck, text, transformers, vector
}:
mkDerivation {
pname = "WaveFront";
- version = "0.1.2.0";
- sha256 = "7a169c00d1c008904ca827ddcf99db1026e3af9b3b4f48cf62486b269339bb80";
+ version = "0.5.0.0";
+ sha256 = "c2fa7005b6a6e5fc5ec0eb965b9fafe13f477f5fc8079fa4e0e0d417b785887d";
libraryHaskellDepends = [
- base Cartesian containers filepath GLUtil lens linear OpenGL
+ attoparsec base Cartesian containers either filepath lens linear
+ QuickCheck text transformers vector
];
description = "Parsers and utilities for the OBJ WaveFront 3D model format";
license = stdenv.lib.licenses.mit;
@@ -19353,14 +19452,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "active_0_2_0_11" = callPackage
+ "active_0_2_0_12" = callPackage
({ mkDerivation, base, lens, linear, QuickCheck, semigroupoids
, semigroups, vector
}:
mkDerivation {
pname = "active";
- version = "0.2.0.11";
- sha256 = "0305aefae4d0cecb0854536b1d2f3c9dc8f88eadb344f3684070538b3a3e4e18";
+ version = "0.2.0.12";
+ sha256 = "55281f8fad2b2776969d04d1769fb99498477b58570e02f7a5c69022e3a8b91e";
libraryHaskellDepends = [
base lens linear semigroupoids semigroups vector
];
@@ -19726,29 +19825,31 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "aeson_1_0_2_0" = callPackage
+ "aeson_1_0_2_1" = callPackage
({ mkDerivation, attoparsec, base, base-compat, base-orphans
- , bytestring, containers, deepseq, dlist, generic-deriving
- , ghc-prim, hashable, hashable-time, HUnit, QuickCheck
- , quickcheck-instances, scientific, tagged, template-haskell
- , test-framework, test-framework-hunit, test-framework-quickcheck2
- , text, time, time-locale-compat, unordered-containers, vector
+ , base16-bytestring, bytestring, containers, deepseq, dlist
+ , generic-deriving, ghc-prim, hashable, hashable-time, HUnit
+ , QuickCheck, quickcheck-instances, scientific, tagged
+ , template-haskell, test-framework, test-framework-hunit
+ , test-framework-quickcheck2, text, time, time-locale-compat
+ , unordered-containers, vector
}:
mkDerivation {
pname = "aeson";
- version = "1.0.2.0";
- sha256 = "c265f138a906caebeb8d539b9acf6006a7d2edcc2912e6346f0fb158b2135b6f";
+ version = "1.0.2.1";
+ sha256 = "e0a66fba0a9996063d0e241b0b868c6271b6aeb457821a78bfcaac5d84c89066";
libraryHaskellDepends = [
attoparsec base base-compat bytestring containers deepseq dlist
ghc-prim hashable scientific tagged template-haskell text time
time-locale-compat unordered-containers vector
];
testHaskellDepends = [
- attoparsec base base-compat base-orphans bytestring containers
- dlist generic-deriving ghc-prim hashable hashable-time HUnit
- QuickCheck quickcheck-instances scientific tagged template-haskell
- test-framework test-framework-hunit test-framework-quickcheck2 text
- time time-locale-compat unordered-containers vector
+ attoparsec base base-compat base-orphans base16-bytestring
+ bytestring containers dlist generic-deriving ghc-prim hashable
+ hashable-time HUnit QuickCheck quickcheck-instances scientific
+ tagged template-haskell test-framework test-framework-hunit
+ test-framework-quickcheck2 text time time-locale-compat
+ unordered-containers vector
];
homepage = "https://github.com/bos/aeson";
description = "Fast JSON parsing and encoding";
@@ -20719,14 +20820,30 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "aivika-realtime" = callPackage
+ ({ mkDerivation, aivika, aivika-transformers, async, base
+ , containers, mtl, stm, time
+ }:
+ mkDerivation {
+ pname = "aivika-realtime";
+ version = "0.1";
+ sha256 = "843febd0367be16058268bb2d3e5cb65b42018c69aa21dd1351089b72a4a81bf";
+ libraryHaskellDepends = [
+ aivika aivika-transformers async base containers mtl stm time
+ ];
+ homepage = "http://www.aivikasoft.com/en/products/aivika.html";
+ description = "Soft real-time simulation module for the Aivika library";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"aivika-transformers" = callPackage
({ mkDerivation, aivika, array, base, containers, mtl, random
, vector
}:
mkDerivation {
pname = "aivika-transformers";
- version = "4.5";
- sha256 = "c86a3db16ffcf528bed4b97cd764ebec3888dc39afa80d9bd7340e178f4b5111";
+ version = "4.5.1";
+ sha256 = "76bfd156d6e9d037adf65b22ea1b66c75ed15ec00fd6b773c34e1c60ac12444a";
libraryHaskellDepends = [
aivika array base containers mtl random vector
];
@@ -20828,14 +20945,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "alex_3_2_0" = callPackage
+ "alex_3_2_1" = callPackage
({ mkDerivation, array, base, containers, directory, happy, process
, QuickCheck
}:
mkDerivation {
pname = "alex";
- version = "3.2.0";
- sha256 = "8034ef1e7f66145295a5b0e70de5b6caa409e36888fe4123d0e022aac97a4d92";
+ version = "3.2.1";
+ sha256 = "a4e7f7ec729f4fae5a5c778bc48421a90acf65c7278f6970cf123fb3b6230e6c";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -20867,14 +20984,12 @@ self: {
}) {};
"alex-tools" = callPackage
- ({ mkDerivation, base, template-haskell, text }:
+ ({ mkDerivation, base, deepseq, template-haskell, text }:
mkDerivation {
pname = "alex-tools";
- version = "0.1.0.0";
- sha256 = "0e15fed255f7eb609c6cd4834c1f95888cd1f0ee4793e17c1759b12f2c6a58e6";
- revision = "1";
- editedCabalFile = "d0ac2206fc41c34888c991591aeba577f4d20d0ce7847e63604477322dc02053";
- libraryHaskellDepends = [ base template-haskell text ];
+ version = "0.1.1.0";
+ sha256 = "c0a1c33e24955a7e2536ef5ad7614b227523330ed4c68724fda47ba4ba368d86";
+ libraryHaskellDepends = [ base deepseq template-haskell text ];
description = "A set of functions for a common use case of Alex";
license = stdenv.lib.licenses.isc;
}) {};
@@ -21496,6 +21611,28 @@ self: {
license = "unknown";
}) {};
+ "amazonka_1_4_4_1" = callPackage
+ ({ mkDerivation, amazonka-core, base, bytestring, conduit
+ , conduit-extra, directory, exceptions, http-conduit, ini, mmorph
+ , monad-control, mtl, resourcet, retry, tasty, tasty-hunit, text
+ , time, transformers, transformers-base, transformers-compat
+ }:
+ mkDerivation {
+ pname = "amazonka";
+ version = "1.4.4.1";
+ sha256 = "0c0937d745ad39d34e1e6588497311721e4c7f995d0beab313def44893e47ede";
+ libraryHaskellDepends = [
+ amazonka-core base bytestring conduit conduit-extra directory
+ exceptions http-conduit ini mmorph monad-control mtl resourcet
+ retry text time transformers transformers-base transformers-compat
+ ];
+ testHaskellDepends = [ base tasty tasty-hunit ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Comprehensive Amazon Web Services SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-apigateway" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -21515,6 +21652,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "amazonka-apigateway_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-apigateway";
+ version = "1.4.4";
+ sha256 = "a32aab9e4c78b15f609de4718845e593dcd5c4c29ee18643dde47c9c33adba21";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon API Gateway SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-application-autoscaling" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -21533,6 +21689,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-application-autoscaling_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-application-autoscaling";
+ version = "1.4.4";
+ sha256 = "f45fc7dd0b3b7be5cd4fa188cf7b0a3007c48db11ee8c92cbf16e6e20ea66f7e";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Application Auto Scaling SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-autoscaling" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -21551,6 +21726,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-autoscaling_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-autoscaling";
+ version = "1.4.4";
+ sha256 = "bb54c9340d38d4b08cbb43321eaad731416a38dda4a36e768e12d0d54ec8ab13";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Auto Scaling SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-certificatemanager" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -21569,6 +21763,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-certificatemanager_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-certificatemanager";
+ version = "1.4.4";
+ sha256 = "dea7c0aaa3f69f3da3f8755ee47a4a402603aad8602f3a8ce92a302fabbf0fc6";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Certificate Manager SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-cloudformation" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -21587,6 +21800,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-cloudformation_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-cloudformation";
+ version = "1.4.4";
+ sha256 = "aee7abe767b8287213406e1e79db9be1d83f510f9239f8faf7e03cca3e40a923";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon CloudFormation SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-cloudfront" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -21605,6 +21837,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-cloudfront_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-cloudfront";
+ version = "1.4.4";
+ sha256 = "ef921bc77e37c6e0cc8ad8943fe11360ecc0f7ae3031fd99cfc4a28023201cfb";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon CloudFront SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-cloudhsm" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -21623,6 +21874,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-cloudhsm_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-cloudhsm";
+ version = "1.4.4";
+ sha256 = "cf37dcb18bd9baa0cd8ddcf334fdbf9a649a5aebacc63a11b7e9de70f994d5d4";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon CloudHSM SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-cloudsearch" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -21641,6 +21911,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-cloudsearch_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-cloudsearch";
+ version = "1.4.4";
+ sha256 = "27c1fe0dee9fbb1ec9f1d90e89527483133d14cf85b9199cbf9b7e96f3586e42";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon CloudSearch SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-cloudsearch-domains" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -21659,6 +21948,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-cloudsearch-domains_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-cloudsearch-domains";
+ version = "1.4.4";
+ sha256 = "f5516758925123c47a89ffb1abe120efca0ac2c0f218babc13089f7c6e78e1ff";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon CloudSearch Domain SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-cloudtrail" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -21677,6 +21985,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-cloudtrail_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-cloudtrail";
+ version = "1.4.4";
+ sha256 = "114a334efd63d9b5ef8b50425a96e8672e5d84f6cabb2b8d4c15784d1afa4b46";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon CloudTrail SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-cloudwatch" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -21695,6 +22022,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-cloudwatch_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-cloudwatch";
+ version = "1.4.4";
+ sha256 = "e76a1f166dd3f4ac110579961f4b142a42017e800d401a7fd8bfa85ecea0257c";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon CloudWatch SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-cloudwatch-events" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -21713,6 +22059,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-cloudwatch-events_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-cloudwatch-events";
+ version = "1.4.4";
+ sha256 = "cf7be01a292dbeb153560891f2eb65df1583df0248073668211320bf5fbe2559";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon CloudWatch Events SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-cloudwatch-logs" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -21731,6 +22096,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-cloudwatch-logs_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-cloudwatch-logs";
+ version = "1.4.4";
+ sha256 = "4c29612100b88bd6d9e611f20e555ed69939e66e9e1502561ae345095ba23060";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon CloudWatch Logs SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-codecommit" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -21749,6 +22133,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-codecommit_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-codecommit";
+ version = "1.4.4";
+ sha256 = "02d3c4988f82a20b2175a99203aec701efbeeb25a47bda53f6a755937f77d261";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon CodeCommit SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-codedeploy" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -21767,6 +22170,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-codedeploy_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-codedeploy";
+ version = "1.4.4";
+ sha256 = "d900d37a7f47aaeec516dd149a2d2a8595a2dfaa75168624d49fdb96d2246482";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon CodeDeploy SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-codepipeline" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -21785,6 +22207,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-codepipeline_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-codepipeline";
+ version = "1.4.4";
+ sha256 = "dca521df26d5f53de2780b72a3d9c922326cc48847519e1ad088f330a5c02a6e";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon CodePipeline SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-cognito-identity" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -21803,6 +22244,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-cognito-identity_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-cognito-identity";
+ version = "1.4.4";
+ sha256 = "61dc9389d62ee2f260dec8c3ba07a03afdb01c5150ac87b49ffba58561ce16df";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Cognito Identity SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-cognito-idp" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -21821,6 +22281,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-cognito-idp_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-cognito-idp";
+ version = "1.4.4";
+ sha256 = "8e7370f170810959f61aaf2030f570e4486f24c2741cd185339e6c06039dc263";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Cognito Identity Provider SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-cognito-sync" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -21839,6 +22318,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-cognito-sync_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-cognito-sync";
+ version = "1.4.4";
+ sha256 = "85c4ff9369475464be0c912557b7e05876a401240ed63eb9582293e39c655c59";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Cognito Sync SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-config" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -21857,6 +22355,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-config_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-config";
+ version = "1.4.4";
+ sha256 = "a0d2e3dc82dbdcf3387a2ba5be959442b261b31083e063453cf4c1a4fd1b9a91";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Config SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-core" = callPackage
({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
, case-insensitive, conduit, conduit-extra, cryptonite, deepseq
@@ -21889,6 +22406,37 @@ self: {
license = "unknown";
}) {};
+ "amazonka-core_1_4_4" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
+ , case-insensitive, conduit, conduit-extra, cryptonite, deepseq
+ , exceptions, hashable, http-conduit, http-types, lens, memory, mtl
+ , QuickCheck, quickcheck-unicode, resourcet, scientific, semigroups
+ , tagged, tasty, tasty-hunit, tasty-quickcheck, template-haskell
+ , text, time, transformers, transformers-compat
+ , unordered-containers, xml-conduit, xml-types
+ }:
+ mkDerivation {
+ pname = "amazonka-core";
+ version = "1.4.4";
+ sha256 = "ad0b79e5f369d079389250310ac865125f41b8025b18bbec93293e787112f45b";
+ libraryHaskellDepends = [
+ aeson attoparsec base bifunctors bytestring case-insensitive
+ conduit conduit-extra cryptonite deepseq exceptions hashable
+ http-conduit http-types lens memory mtl resourcet scientific
+ semigroups tagged text time transformers transformers-compat
+ unordered-containers xml-conduit xml-types
+ ];
+ testHaskellDepends = [
+ aeson base bytestring case-insensitive http-types QuickCheck
+ quickcheck-unicode tasty tasty-hunit tasty-quickcheck
+ template-haskell text time
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Core data types and functionality for Amazonka libraries";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-datapipeline" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -21907,6 +22455,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-datapipeline_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-datapipeline";
+ version = "1.4.4";
+ sha256 = "cd68a5f94435542e4a348b23931ab619f866ed9ce773d500f6575eb9e1b5c1cb";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Data Pipeline SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-devicefarm" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -21925,6 +22492,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-devicefarm_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-devicefarm";
+ version = "1.4.4";
+ sha256 = "242a32cdb5502ac586f2e1ffb2921280907cbf6eecaaf431206bb6f3aa5d8e3b";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Device Farm SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-directconnect" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -21943,6 +22529,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-directconnect_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-directconnect";
+ version = "1.4.4";
+ sha256 = "043dbd7e4ebc086155270118ca4329f3ad03a730c0b8aabe183958fba844de0d";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Direct Connect SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-discovery" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -21961,6 +22566,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-discovery_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-discovery";
+ version = "1.4.4";
+ sha256 = "9bbb7e4f2baec019ce8fb41ff6382e5fa1a7c3010012cad2f7d315f5220e8045";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Application Discovery Service SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-dms" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -21979,6 +22603,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-dms_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-dms";
+ version = "1.4.4";
+ sha256 = "a8f6b3684de4d1b190aebf1966e2497fc8f8b18bed3dea687e4603fe8b70caaa";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Database Migration Service SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-ds" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -21997,6 +22640,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-ds_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-ds";
+ version = "1.4.4";
+ sha256 = "5cae6b1926cfd6ea5f7fb4ad596a3d7fec80ad6e2ae6bb37f837ce5e5a9b48a0";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Directory Service SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-dynamodb" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22015,6 +22677,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-dynamodb_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-dynamodb";
+ version = "1.4.4";
+ sha256 = "9e0d23783e6e02eb3dd3edaa890a90a92be51024bd1e25967e680e8be257f49e";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon DynamoDB SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-dynamodb-streams" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22033,6 +22714,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-dynamodb-streams_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-dynamodb-streams";
+ version = "1.4.4";
+ sha256 = "575ee098e69bf18cb59549cac9ff4ce9c40ef54860b58210886290c933b04fa9";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon DynamoDB Streams SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-ec2" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22051,6 +22751,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-ec2_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-ec2";
+ version = "1.4.4";
+ sha256 = "6fef83cb09e9ca74a6f1fb18f3add1420fc6c237aeafdb450a97d3216037741c";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Elastic Compute Cloud SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-ecr" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22069,6 +22788,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-ecr_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-ecr";
+ version = "1.4.4";
+ sha256 = "d38d111fa1801b048fcadd67475b0a916a0813636607df2db48747c8190148db";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon EC2 Container Registry SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-ecs" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22087,6 +22825,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-ecs_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-ecs";
+ version = "1.4.4";
+ sha256 = "fd2b867115fcd1a0b0ea992f3d2e902d7a5b66cce7c62da66ee1ac49c93aa574";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon EC2 Container Service SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-efs" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22105,6 +22862,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-efs_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-efs";
+ version = "1.4.4";
+ sha256 = "fb10cf8284a036623620f80c5fd938d5200e4e5ba67a8352e5549479a5661544";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Elastic File System SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-elasticache" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22123,6 +22899,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-elasticache_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-elasticache";
+ version = "1.4.4";
+ sha256 = "70a1bfb0f6f48d4c7d650c20c0397b6722f9658e59c99b330ad1002bfdaedc2f";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon ElastiCache SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-elasticbeanstalk" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22141,6 +22936,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-elasticbeanstalk_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-elasticbeanstalk";
+ version = "1.4.4";
+ sha256 = "ebd1f78511256ff1592e71bd4368308689faec1fbee98d7217436a735cf93270";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Elastic Beanstalk SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-elasticsearch" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22159,6 +22973,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-elasticsearch_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-elasticsearch";
+ version = "1.4.4";
+ sha256 = "c69aefafbd4a6117fec49da4dac96bf26ac06f82474b6b515f99803f00c87222";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Elasticsearch Service SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-elastictranscoder" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22177,6 +23010,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-elastictranscoder_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-elastictranscoder";
+ version = "1.4.4";
+ sha256 = "1d66ce985ba936e20b13364c672b4e3f017edbeae2ecc5005899f20072844ec7";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Elastic Transcoder SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-elb" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22195,6 +23047,43 @@ self: {
license = "unknown";
}) {};
+ "amazonka-elb_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-elb";
+ version = "1.4.4";
+ sha256 = "1fac7fd383a58c8455e0de38fbafc9aff7fd6301594adafe3660380f16a63f4f";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Elastic Load Balancing SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "amazonka-elbv2" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-elbv2";
+ version = "1.4.4";
+ sha256 = "41587adac7111d7fd6e4c913bdb3a135fab0a81b90b8d137f4554043de7a9ba2";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Elastic Load Balancing SDK";
+ license = "unknown";
+ }) {};
+
"amazonka-emr" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22213,6 +23102,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-emr_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-emr";
+ version = "1.4.4";
+ sha256 = "5c9ad06a37ffa2d8c79ad068430c361c7e792f59528846aae18380f75453dcd7";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Elastic MapReduce SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-gamelift" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22231,6 +23139,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-gamelift_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-gamelift";
+ version = "1.4.4";
+ sha256 = "bfef8aeb54f867d9c818405082022492c47ff4bcea2239610b51d8529b73707b";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon GameLift SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-glacier" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22249,6 +23176,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-glacier_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-glacier";
+ version = "1.4.4";
+ sha256 = "551f1dd605fcd0d8efc2cf8db2fefd1385eefcbe40aee62ed7991acae8c19b7a";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Glacier SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-iam" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22267,6 +23213,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-iam_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-iam";
+ version = "1.4.4";
+ sha256 = "b2911ae52d1476f7109a96c2fc2e1ba58950aae6de57aefc1c4ad0c74be19067";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Identity and Access Management SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-importexport" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22285,6 +23250,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-importexport_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-importexport";
+ version = "1.4.4";
+ sha256 = "463e6ad69547306e34848a40382aea4ff187b1fc7e838481b08f9ad5970167df";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Import/Export SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-inspector" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22303,6 +23287,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-inspector_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-inspector";
+ version = "1.4.4";
+ sha256 = "76fe8fc64f948ed26e36c11fe7aa3650bd7f971726a2dbd5215d3be58ff1ba01";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Inspector SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-iot" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22321,6 +23324,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-iot_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-iot";
+ version = "1.4.4";
+ sha256 = "fde976b7e41af4cb3d3a6399f0a8e5b76993f11b94381a1fffdafbdc2c67a1bd";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon IoT SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-iot-dataplane" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22339,6 +23361,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-iot-dataplane_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-iot-dataplane";
+ version = "1.4.4";
+ sha256 = "ba3451574fbf7a49ec5f50e5c8479bfb3235db42a792760d01247968412900f5";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon IoT Data Plane SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-kinesis" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22357,6 +23398,43 @@ self: {
license = "unknown";
}) {};
+ "amazonka-kinesis_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-kinesis";
+ version = "1.4.4";
+ sha256 = "734f9f465eec775faa97f0379933d469ce35c8ac6651bfd47b530ccc3d0c739a";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Kinesis SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "amazonka-kinesis-analytics" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-kinesis-analytics";
+ version = "1.4.4";
+ sha256 = "fe628e5e65947849c7ec390140144d257bebf994ea2a76ddb6b11eaee69c02a9";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Kinesis Analytics SDK";
+ license = "unknown";
+ }) {};
+
"amazonka-kinesis-firehose" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22375,6 +23453,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-kinesis-firehose_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-kinesis-firehose";
+ version = "1.4.4";
+ sha256 = "33274c4050b98ce89cb5495a92642d9ea99edcff70a2c8e994c6761921a4bef9";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Kinesis Firehose SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-kms" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22393,6 +23490,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-kms_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-kms";
+ version = "1.4.4";
+ sha256 = "20537bfd340f26e2f78fde482754e362e2a9369d4697141192c1cd3e759a62ac";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Key Management Service SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-lambda" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22411,6 +23527,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-lambda_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-lambda";
+ version = "1.4.4";
+ sha256 = "0dd073dd98625b829ed38345f57615f65492158c6731b9ca7522414d24ba9eb3";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Lambda SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-marketplace-analytics" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22429,6 +23564,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-marketplace-analytics_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-marketplace-analytics";
+ version = "1.4.4";
+ sha256 = "0027736e24e0fe98388269a64c8d27fbec52e6c6944241c22a6d9d8dbd191d2d";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Marketplace Commerce Analytics SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-marketplace-metering" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22447,6 +23601,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-marketplace-metering_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-marketplace-metering";
+ version = "1.4.4";
+ sha256 = "047fa110ee9969017e81b1643dfc653c86efa7cb10999bb2185ebac1a4832397";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Marketplace Metering SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-ml" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22465,6 +23638,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-ml_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-ml";
+ version = "1.4.4";
+ sha256 = "f03c3da79b2e386f5355f2b5f8cab536f739b99aa44865a33876b751de15cd12";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Machine Learning SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-opsworks" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22483,6 +23675,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-opsworks_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-opsworks";
+ version = "1.4.4";
+ sha256 = "8b15270cfe54ff8ab6f427118771bc26878ac5f21bd2bd0785b74c6736bab2ba";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon OpsWorks SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-rds" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22502,6 +23713,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "amazonka-rds_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-rds";
+ version = "1.4.4";
+ sha256 = "dbc9ae2a6945ee1cad0c7ac0df9557dd362648b0ee8b73ccfc7e7da79f732f30";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Relational Database Service SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-redshift" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22520,6 +23750,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-redshift_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-redshift";
+ version = "1.4.4";
+ sha256 = "1329dfc9055b46d1539a871d2c148760f1f62802a2d7b3d4253aacd91b7caa2d";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Redshift SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-route53" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22538,6 +23787,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-route53_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-route53";
+ version = "1.4.4";
+ sha256 = "74cb1fa132aa0888c8c12acd1aca4e87360ae4a238052dcf21fc3070a10d609d";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Route 53 SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-route53-domains" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22556,6 +23824,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-route53-domains_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-route53-domains";
+ version = "1.4.4";
+ sha256 = "bbcdbda4a0f0a7bc408e033183bc46cc680b121d43d2ad44a66b07c70195a6f1";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Route 53 Domains SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-s3" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, lens, tasty, tasty-hunit, text, time, unordered-containers
@@ -22574,6 +23861,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-s3_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , lens, tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-s3";
+ version = "1.4.4";
+ sha256 = "bd32c46e99cca9c1acf6647813975411c5fec92690982fc2e00881da58759435";
+ libraryHaskellDepends = [ amazonka-core base lens text ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Simple Storage Service SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-sdb" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22592,6 +23898,43 @@ self: {
license = "unknown";
}) {};
+ "amazonka-sdb_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-sdb";
+ version = "1.4.4";
+ sha256 = "eae1f14a0ae2e0ea39ed9a1212d63fe9d7262e01d05bce8869b83525e690c58d";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon SimpleDB SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "amazonka-servicecatalog" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-servicecatalog";
+ version = "1.4.4";
+ sha256 = "6d2766375d3ed2b0f3b4f4604eab62887a23a7ecd64c1a8c8ed5411a1af0432a";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Service Catalog SDK";
+ license = "unknown";
+ }) {};
+
"amazonka-ses" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22610,6 +23953,43 @@ self: {
license = "unknown";
}) {};
+ "amazonka-ses_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-ses";
+ version = "1.4.4";
+ sha256 = "ceb5a1d20b2b2a2b5cbb6e54a731f82902552c01f5b7406cedd469256e74ec56";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Simple Email Service SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "amazonka-snowball" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-snowball";
+ version = "1.4.4";
+ sha256 = "d66c1d7ed36ff62a79a973ba9afbd2e050933d59350bfc65e7fc0a59d7b26103";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Import/Export Snowball SDK";
+ license = "unknown";
+ }) {};
+
"amazonka-sns" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22628,6 +24008,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-sns_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-sns";
+ version = "1.4.4";
+ sha256 = "335f380c3579f139ab5deff522fbfd07398ba6019214923e92657b322a8eadef";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Simple Notification Service SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-sqs" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22647,6 +24046,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "amazonka-sqs_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-sqs";
+ version = "1.4.4";
+ sha256 = "cfd9c9d4ee269a36a9f05f4fae6261f8707fcf43d738b57758bdbf43a9eff466";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Simple Queue Service SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-ssm" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22665,6 +24083,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-ssm_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-ssm";
+ version = "1.4.4";
+ sha256 = "fdf85f55da22e55c8569b2f5149e7f45acd99a6d3bd656d42977f8885a3e727f";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Simple Systems Management Service SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-storagegateway" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22683,6 +24120,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-storagegateway_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-storagegateway";
+ version = "1.4.4";
+ sha256 = "5375ce7683cd502795f810dbefd8207b823b1d74a63a29f1f3b9c3bd1bf458c7";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Storage Gateway SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-sts" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22701,6 +24157,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-sts_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-sts";
+ version = "1.4.4";
+ sha256 = "5eac6f9cb9b5710cf24fdae9f46362d05ae3f1d14a791c7439653b6f2a3f9b9f";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Security Token Service SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-support" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22719,6 +24194,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-support_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-support";
+ version = "1.4.4";
+ sha256 = "162469b9af326e2a6003a86783fb9275e6ba7c402452c200e94380bbd83455e2";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Support SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-swf" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22737,6 +24231,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-swf_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-swf";
+ version = "1.4.4";
+ sha256 = "f99a09b5d58a125c2cf3f52a2e20fec1b8d5f9b1aac40e01ee4f53872c67f574";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Simple Workflow Service SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-test" = callPackage
({ mkDerivation, aeson, amazonka-core, base, bifunctors, bytestring
, case-insensitive, conduit, conduit-extra, groom, http-client
@@ -22759,6 +24272,29 @@ self: {
license = "unknown";
}) {};
+ "amazonka-test_1_4_4" = callPackage
+ ({ mkDerivation, aeson, amazonka-core, base, bifunctors, bytestring
+ , case-insensitive, conduit, conduit-extra, groom, http-client
+ , http-types, process, resourcet, tasty, tasty-hunit
+ , template-haskell, temporary, text, time, unordered-containers
+ , yaml
+ }:
+ mkDerivation {
+ pname = "amazonka-test";
+ version = "1.4.4";
+ sha256 = "5491b4cc27f41dd85daacaab0cc5e6b8630c5bb1581e3997f65d0b7b2ef6e5f0";
+ libraryHaskellDepends = [
+ aeson amazonka-core base bifunctors bytestring case-insensitive
+ conduit conduit-extra groom http-client http-types process
+ resourcet tasty tasty-hunit template-haskell temporary text time
+ unordered-containers yaml
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Common functionality for Amazonka library test-suites";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-waf" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22777,6 +24313,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-waf_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-waf";
+ version = "1.4.4";
+ sha256 = "8a3b59a42d1344cd48418764b17afabacdc1720247af144f332282e41104e88b";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon WAF SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-workspaces" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22795,6 +24350,25 @@ self: {
license = "unknown";
}) {};
+ "amazonka-workspaces_1_4_4" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-workspaces";
+ version = "1.4.4";
+ sha256 = "ea89d4cd168dec09787c276ede32ce85536d46e15c88a3fcfe5b3205303307e7";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon WorkSpaces SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ampersand" = callPackage
({ mkDerivation, base, bytestring, conduit, containers, csv
, directory, filepath, graphviz, hashable, HStringTemplate, lens
@@ -22876,6 +24450,26 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "amqp-worker" = callPackage
+ ({ mkDerivation, aeson, amqp, base, bytestring, data-default
+ , exceptions, monad-control, mtl, resource-pool, split, tasty
+ , tasty-hunit, text, transformers-base
+ }:
+ mkDerivation {
+ pname = "amqp-worker";
+ version = "0.2.1";
+ sha256 = "f3b89e4286f84b4d1029d4750184831b2fcb5f194446fb1b1d938824abcf08a4";
+ libraryHaskellDepends = [
+ aeson amqp base bytestring data-default exceptions monad-control
+ mtl resource-pool split text transformers-base
+ ];
+ testHaskellDepends = [
+ aeson amqp base bytestring tasty tasty-hunit text
+ ];
+ description = "High level functions for working with message queues";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"amrun" = callPackage
({ mkDerivation, base, deepseq, parsec }:
mkDerivation {
@@ -23982,8 +25576,8 @@ self: {
}:
mkDerivation {
pname = "app-settings";
- version = "0.2.0.8";
- sha256 = "b31c0da1a2bde88f1e366dda17703c62ddc7ed97740221bc90f4aaaa483fea68";
+ version = "0.2.0.9";
+ sha256 = "ee844c5ed2847539c84d13d81e827fd2a4f0f9b0b53308f65d24244a027e9024";
libraryHaskellDepends = [
base containers directory mtl parsec text
];
@@ -24134,6 +25728,8 @@ self: {
pname = "apply-refact";
version = "0.3.0.0";
sha256 = "0d2a8845ed554c4a6742a3d0a130dac3f16d0d710b65b20dfeb8e773409ed70f";
+ revision = "1";
+ editedCabalFile = "372095fc0b1e53e884362d5650486b4c2fb624588271a7b4917903ea977899ea";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -24979,8 +26575,8 @@ self: {
({ mkDerivation, base, random-extras, random-fu, text }:
mkDerivation {
pname = "ascii-cows";
- version = "0.0.1.0";
- sha256 = "dd20c8858ae432ced8c34d0a8b0deb6bf5ff805a5283fc4735d852df92282aac";
+ version = "0.0.2.0";
+ sha256 = "f8a387478eba76fc0616bd0c891bf18afbb9ebc55f0cedfb143a6355b196b635";
libraryHaskellDepends = [ base random-extras random-fu text ];
homepage = "http://github.com/passy/cows-hs";
description = "A collection of ASCII cows. Moo.";
@@ -25098,6 +26694,30 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "asciidiagram_1_3_2" = callPackage
+ ({ mkDerivation, base, bytestring, containers, directory, filepath
+ , FontyFruity, JuicyPixels, lens, linear, mtl, optparse-applicative
+ , rasterific-svg, svg-tree, text, vector
+ }:
+ mkDerivation {
+ pname = "asciidiagram";
+ version = "1.3.2";
+ sha256 = "11eb37084513a6b510f88f043a10c2cdc9b039041b6e5d3ae0decd7c40de4784";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring containers FontyFruity JuicyPixels lens linear mtl
+ rasterific-svg svg-tree text vector
+ ];
+ executableHaskellDepends = [
+ base bytestring directory filepath FontyFruity JuicyPixels
+ optparse-applicative rasterific-svg svg-tree text
+ ];
+ description = "Pretty rendering of Ascii diagram into svg or png";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"asic" = callPackage
({ mkDerivation, asil, base, bytestring, utf8-string }:
mkDerivation {
@@ -25624,8 +27244,8 @@ self: {
}:
mkDerivation {
pname = "atom-basic";
- version = "0.2.3";
- sha256 = "eeda4762c5f41029a6cddc56005db42d7761f4bbe23fe275f3223ef3afe6b4f9";
+ version = "0.2.4";
+ sha256 = "b37fb9757b78ff4a8e6586815cb2b9768c73f58cc3f27f635a4ab63736d529eb";
libraryHaskellDepends = [
base base64-bytestring bytestring network network-uri text time
];
@@ -26122,18 +27742,22 @@ self: {
}) {};
"aur" = callPackage
- ({ mkDerivation, aeson, base, http-client, http-client-tls, mtl
- , servant, servant-client, text, transformers
+ ({ mkDerivation, aeson, base, http-client, http-client-tls, servant
+ , servant-client, tasty, tasty-hunit, text
}:
mkDerivation {
pname = "aur";
- version = "5.0.1";
- sha256 = "84182e6288734890c02582814009185a6644760cc4ad0f2a83acc5c6f916227b";
+ version = "6.0.0";
+ sha256 = "d70c3c5954b7003b6ea71266acf1de22e8ecd9e6a4288368ec7a084db02dcdbe";
+ revision = "1";
+ editedCabalFile = "4a58f5e075ddc72a9701937c3d1dd1da4d13095ee307e0918cad04311c99578e";
libraryHaskellDepends = [
- aeson base http-client http-client-tls mtl servant servant-client
- text transformers
+ aeson base http-client servant servant-client text
];
- homepage = "https://github.com/fosskers/haskell-aur";
+ testHaskellDepends = [
+ base http-client http-client-tls tasty tasty-hunit
+ ];
+ homepage = "https://github.com/aurapm/aura";
description = "Access metadata from the Arch Linux User Repository";
license = stdenv.lib.licenses.gpl3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -26318,6 +27942,22 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "autom" = callPackage
+ ({ mkDerivation, base, bytestring, colour, ghc-prim, gloss
+ , JuicyPixels, random, vector
+ }:
+ mkDerivation {
+ pname = "autom";
+ version = "0.1.0.3";
+ sha256 = "40ddb2e519a584624d2e7228f52f48ad5ee57675d46edf2ef4f55b703663c6bf";
+ libraryHaskellDepends = [
+ base bytestring colour ghc-prim gloss JuicyPixels random vector
+ ];
+ homepage = "https://qlfiles.net/the-ql-files/next-nearest-neighbors-cellular-automata";
+ description = "Generates and displays patterns from next nearest neighbors cellular automata";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"automitive-cse" = callPackage
({ mkDerivation, base, bytestring, cereal, cryptonite, memory
, quickcheck-simple
@@ -27365,6 +29005,40 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "bake_0_5" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, cmdargs, containers
+ , deepseq, direct-sqlite, directory, disk-free-space, extra
+ , filepath, hashable, HTTP, http-client, http-conduit, http-types
+ , old-locale, process, random, safe, shake, smtp-mail
+ , sqlite-simple, text, time, transformers, unordered-containers
+ , wai, wai-extra, warp
+ }:
+ mkDerivation {
+ pname = "bake";
+ version = "0.5";
+ sha256 = "1cc3b57b6270a2c80f0b0a8b90fc3929eb0d1da9e113d18bc10d92b40a2d60f5";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base bytestring cmdargs containers deepseq direct-sqlite
+ directory disk-free-space extra filepath hashable HTTP http-client
+ http-conduit http-types old-locale random safe shake smtp-mail
+ sqlite-simple text time transformers unordered-containers wai
+ wai-extra warp
+ ];
+ executableHaskellDepends = [
+ aeson base bytestring cmdargs containers deepseq direct-sqlite
+ directory disk-free-space extra filepath hashable HTTP http-client
+ http-conduit http-types old-locale process random safe shake
+ smtp-mail sqlite-simple text time transformers unordered-containers
+ wai wai-extra warp
+ ];
+ homepage = "https://github.com/ndmitchell/bake#readme";
+ description = "Continuous integration system";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"bamboo" = callPackage
({ mkDerivation, base, bytestring, containers, data-default
, directory, filepath, gravatar, hack, hack-contrib, haskell98, mps
@@ -28162,8 +29836,8 @@ self: {
({ mkDerivation, base, bytestring, data-default, entropy, memory }:
mkDerivation {
pname = "bcrypt";
- version = "0.0.9";
- sha256 = "33b87031fe80d2be666df7e892b11dcb35f630d7fb93dd95e3920d86b5c91553";
+ version = "0.0.10";
+ sha256 = "0498f9ff8df2bd0bcb4cd718c6fccd01f29837de164e24624fa32e0bfeed0eb6";
libraryHaskellDepends = [
base bytestring data-default entropy memory
];
@@ -29070,6 +30744,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "binary-ieee754" = callPackage
+ ({ mkDerivation, array, base, binary }:
+ mkDerivation {
+ pname = "binary-ieee754";
+ version = "0.1.0.0";
+ sha256 = "15c489898bcd346b4067a27579cb5fc62e2fafecbec81ea0446165a24aee4d54";
+ libraryHaskellDepends = [ array base binary ];
+ homepage = "https://github.com/winterland1989/binary-ieee754";
+ description = "Backport ieee754 float double combinators to older binary";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"binary-indexed-tree" = callPackage
({ mkDerivation, array, base }:
mkDerivation {
@@ -29299,27 +30985,26 @@ self: {
}) {};
"binary-tagged" = callPackage
- ({ mkDerivation, aeson, array, base, bifunctors, binary
- , binary-orphans, bytestring, containers, generics-sop, hashable
- , nats, quickcheck-instances, scientific, semigroups, SHA, tagged
- , tasty, tasty-quickcheck, text, time, unordered-containers, vector
+ ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors
+ , binary, binary-orphans, bytestring, containers, generics-sop
+ , hashable, nats, quickcheck-instances, scientific, semigroups, SHA
+ , tagged, tasty, tasty-quickcheck, text, time, unordered-containers
+ , vector
}:
mkDerivation {
pname = "binary-tagged";
- version = "0.1.4.0";
- sha256 = "dc25744ebd21f8a050341cd7c25c69f66734b2930aaad89b411cf68c28605671";
- revision = "1";
- editedCabalFile = "0448d0fe13530497a639b2bd8fc290522fa526aee5e3486bc15003797cd84bc7";
+ version = "0.1.4.1";
+ sha256 = "86ae562f528dd85e1d87f2e4c886be168e1b1dd78c42e22ae3e9bf36ff879acd";
libraryHaskellDepends = [
- aeson array base binary bytestring containers generics-sop hashable
- nats scientific semigroups SHA tagged text time
- unordered-containers vector
+ aeson array base base16-bytestring binary bytestring containers
+ generics-sop hashable nats scientific semigroups SHA tagged text
+ time unordered-containers vector
];
testHaskellDepends = [
- aeson array base bifunctors binary binary-orphans bytestring
- containers generics-sop hashable nats quickcheck-instances
- scientific semigroups SHA tagged tasty tasty-quickcheck text time
- unordered-containers vector
+ aeson array base base16-bytestring bifunctors binary binary-orphans
+ bytestring containers generics-sop hashable nats
+ quickcheck-instances scientific semigroups SHA tagged tasty
+ tasty-quickcheck text time unordered-containers vector
];
homepage = "https://github.com/phadej/binary-tagged#readme";
description = "Tagged binary serialisation";
@@ -30350,14 +32035,14 @@ self: {
, conduit-combinators, containers, data-default-class
, 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
+ , parallel, primitive, random, shelly, split, statistics, tasty
+ , tasty-golden, tasty-hunit, text, transformers
, unordered-containers, vector, vector-algorithms, word8
}:
mkDerivation {
pname = "bioinformatics-toolkit";
- version = "0.2.3";
- sha256 = "e83249daa14c7d71319fc167288f791ba3045d43a5fbe9f43ef64eaa918ff2f9";
+ version = "0.2.4";
+ sha256 = "e9ef7a074e8d7fd0d6fb7270f18010dd3d61c69bb06f421acf0930010181a25c";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -30365,8 +32050,8 @@ self: {
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
+ split statistics text transformers unordered-containers vector
+ vector-algorithms word8
];
executableHaskellDepends = [
base bytestring clustering data-default-class double-conversion
@@ -30588,6 +32273,30 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "bitcoin-hs" = callPackage
+ ({ mkDerivation, array, base, binary, bytestring, containers
+ , deepseq, directory, filepath, ghc-prim, HTTP, json, mtl, network
+ , network-uri, old-locale, QuickCheck, random, tasty, tasty-hunit
+ , tasty-quickcheck, time, transformers
+ }:
+ mkDerivation {
+ pname = "bitcoin-hs";
+ version = "0.0.1";
+ sha256 = "a9782eee40af1ab626c030cbfbec4a0302aefbf670b1006a3fe321f9f0707507";
+ libraryHaskellDepends = [
+ array base binary bytestring containers deepseq directory filepath
+ ghc-prim HTTP json mtl network network-uri old-locale random time
+ transformers
+ ];
+ testHaskellDepends = [
+ array base binary bytestring containers mtl old-locale QuickCheck
+ random tasty tasty-hunit tasty-quickcheck time transformers
+ ];
+ homepage = "http://code.haskell.org/~bkomuves/";
+ description = "Partial implementation of the Bitcoin protocol (as of 2013)";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"bitcoin-payment-channel" = callPackage
({ mkDerivation, aeson, base, base16-bytestring, base58string
, base64-bytestring, bytestring, cereal, errors, haskoin-core
@@ -30613,25 +32322,24 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "bitcoin-payment-channel_0_4_0_1" = callPackage
+ "bitcoin-payment-channel_0_6_0_0" = callPackage
({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring
, bytestring, cereal, errors, haskoin-core, hexstring, QuickCheck
- , scientific, string-conversions, text, time
+ , scientific, string-conversions, tagged, test-framework
+ , test-framework-quickcheck2, text, time
}:
mkDerivation {
pname = "bitcoin-payment-channel";
- version = "0.4.0.1";
- sha256 = "98f5f1bd94d6c828404f5fdda6976cffb226bcbfd8321d73e7eb0367c6442f62";
- isLibrary = true;
- isExecutable = true;
+ version = "0.6.0.0";
+ sha256 = "487e5bb74a3a6c6829971d1071576b302c70298160f9b03654911e2094bcc011";
libraryHaskellDepends = [
- aeson base base16-bytestring base64-bytestring bytestring cereal
- errors haskoin-core hexstring scientific string-conversions text
- time
+ aeson base base16-bytestring bytestring cereal errors haskoin-core
+ hexstring QuickCheck scientific string-conversions tagged text time
];
- executableHaskellDepends = [
+ testHaskellDepends = [
aeson base base16-bytestring base64-bytestring bytestring cereal
- haskoin-core hexstring QuickCheck string-conversions text time
+ haskoin-core hexstring QuickCheck string-conversions test-framework
+ test-framework-quickcheck2 text time
];
homepage = "https://github.com/runeksvendsen/bitcoin-payment-channel";
description = "Library for working with Bitcoin payment channels";
@@ -31532,6 +33240,24 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "blazeT" = callPackage
+ ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup
+ , bytestring, Cabal, mtl, text, transformers
+ }:
+ mkDerivation {
+ pname = "blazeT";
+ version = "0.0.4";
+ sha256 = "8ff74e6a75f4c77b13d122e57b9ef61e7365a7df0ca5efa7f1aba3a42a39c204";
+ setupHaskellDepends = [ base Cabal ];
+ libraryHaskellDepends = [
+ base blaze-builder blaze-html blaze-markup bytestring mtl text
+ transformers
+ ];
+ homepage = "http://johannesgerer.com/blazeT";
+ description = "A true monad (transformer) version of the blaze-markup and blaze-html libraries";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"blink1" = callPackage
({ mkDerivation, base, bytestring, text, unix, usb, vector }:
mkDerivation {
@@ -34615,8 +36341,8 @@ self: {
}:
mkDerivation {
pname = "cabal2nix";
- version = "2.0.2";
- sha256 = "f0c61d4674bbc9ba82d306adbb9fb39527aa73309fdea088489940fe39b02867";
+ version = "2.0.3";
+ sha256 = "d3e2f376bf255daab8ea476831c8f4948e774e7307b19dbceb15a7f0df882654";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -34956,26 +36682,28 @@ self: {
}) {};
"cake3" = callPackage
- ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq
- , directory, filepath, haskell-src-meta, language-javascript
+ ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring
+ , containers, deepseq, directory, filepath, haskell-src-meta
, mime-types, monadloc, mtl, optparse-applicative, parsec, process
, syb, system-filepath, template-haskell, text, text-format
+ , transformers, utf8-string
}:
mkDerivation {
pname = "cake3";
- version = "0.6.0";
- sha256 = "b8419752bc8fe97ae83193137d423261cd87d3adf403adfad615ee68312e044c";
+ version = "0.6.5";
+ sha256 = "7b6ec21ac935a057e6c78d0509cd0df0520954cfea2395e25b6767a352bd1bb9";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
attoparsec base bytestring containers deepseq directory filepath
- haskell-src-meta language-javascript mime-types monadloc mtl parsec
- process syb system-filepath template-haskell text text-format
+ haskell-src-meta mime-types monadloc mtl parsec process syb
+ system-filepath template-haskell text text-format
];
executableHaskellDepends = [
- attoparsec base bytestring containers directory filepath
- haskell-src-meta language-javascript mime-types monadloc mtl
+ array attoparsec base blaze-builder bytestring containers directory
+ filepath haskell-src-meta mime-types monadloc mtl
optparse-applicative parsec process syb template-haskell text
+ transformers utf8-string
];
homepage = "https://github.com/grwlf/cake3";
description = "Third cake the Makefile EDSL";
@@ -37479,6 +39207,33 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "choose" = callPackage
+ ({ mkDerivation, base, MonadRandom }:
+ mkDerivation {
+ pname = "choose";
+ version = "0.1.0.0";
+ sha256 = "e369ec4b733c8ad0e2eb151e171cb1fd4b1f13536975ace6533a437d6ca0fecf";
+ libraryHaskellDepends = [ base MonadRandom ];
+ description = "Choose random elements from a stream";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
+ "choose-exe" = callPackage
+ ({ mkDerivation, base, choose, optparse-applicative, text }:
+ mkDerivation {
+ pname = "choose-exe";
+ version = "0.1.0.0";
+ sha256 = "f842c1f033185fe429a777f65476494a9ce1e9b8d4d3d42f1e6335978c1d8b1b";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base choose optparse-applicative text ];
+ executableHaskellDepends = [
+ base choose optparse-applicative text
+ ];
+ description = "Command-line program to choose random element from a stream";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"chorale" = callPackage
({ mkDerivation, base, containers, HUnit, ieee754, QuickCheck, safe
, test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -38255,10 +40010,8 @@ self: {
}:
mkDerivation {
pname = "clash-ghc";
- version = "0.6.23";
- sha256 = "ec13dd8c85c452751860d761f44744c9a1d70ad81c053fc8a5747c6359a3378c";
- revision = "2";
- editedCabalFile = "8755a6b93d6722500034289e29e12fed3c0845fcc33179a9c51b1a0059b375e4";
+ version = "0.6.24";
+ sha256 = "03fddd334133dafc57110657542b1024749fd06d66cecad62853aad4d402acf8";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -38285,6 +40038,8 @@ self: {
pname = "clash-lib";
version = "0.6.21";
sha256 = "2b0135d15e5e3b66a59ccdb40a3bf38bb8895bf67c49eb9b54a80082752b98ad";
+ revision = "1";
+ editedCabalFile = "4dc5af7e94897c9afc254661bb7e19a09acd0467be034c8d82bbe5b2582bd262";
libraryHaskellDepends = [
aeson attoparsec base bytestring clash-prelude concurrent-supply
containers deepseq directory errors fgl filepath ghc hashable
@@ -38308,6 +40063,8 @@ self: {
pname = "clash-prelude";
version = "0.10.14";
sha256 = "bf99eabf5a0ac6a86523c95a122242d3f5631d1b1870ba83d8e7319f245ef7f2";
+ revision = "1";
+ editedCabalFile = "badae6cf81fc1997c660b45485f9779eeeda298e676b2df6c07b060919b63f19";
libraryHaskellDepends = [
array base data-default deepseq ghc-prim ghc-typelits-extra
ghc-typelits-natnormalise integer-gmp lens QuickCheck reflection
@@ -38338,8 +40095,8 @@ self: {
}:
mkDerivation {
pname = "clash-systemverilog";
- version = "0.6.9";
- sha256 = "502f2c31093762ce8d4dc8dcb9a13b69c3a298fdfd1f417581d4f0438ed865ff";
+ version = "0.6.10";
+ sha256 = "20c33d2966648ecf383793308b0292437cccd06c4bd5535c1f280689180a2d6b";
libraryHaskellDepends = [
base clash-lib clash-prelude fgl lens mtl text unordered-containers
wl-pprint-text
@@ -38356,8 +40113,8 @@ self: {
}:
mkDerivation {
pname = "clash-verilog";
- version = "0.6.9";
- sha256 = "a4daac5e9c67349de419e301ab969922d63bd4680061288a8b24bb10b2f78e3b";
+ version = "0.6.10";
+ sha256 = "943c2c8752a3b44badce60595ffc5bbea2c87316681cd69460d75053e00fb26c";
libraryHaskellDepends = [
base clash-lib clash-prelude fgl lens mtl text unordered-containers
wl-pprint-text
@@ -38376,6 +40133,8 @@ self: {
pname = "clash-vhdl";
version = "0.6.16";
sha256 = "42f4be26a545144c0e950c2a0b3d59516e93e73ed2c6d32d3c449e233d32b0c8";
+ revision = "1";
+ editedCabalFile = "b2816898222a54367e8426adb2f3359fd32b1ec8e00d546f32ff3f2839c01b3c";
libraryHaskellDepends = [
base clash-lib clash-prelude fgl lens mtl text unordered-containers
wl-pprint-text
@@ -39999,14 +41758,17 @@ self: {
}) {};
"colonnade" = callPackage
- ({ mkDerivation, base, bytestring, contravariant, text, vector }:
+ ({ mkDerivation, base, bytestring, contravariant, doctest, text
+ , vector
+ }:
mkDerivation {
pname = "colonnade";
- version = "0.4.5";
- sha256 = "df6608adc72dfa980e93ba09ee226ed161aacb810d513662b8557997a8059f0a";
+ version = "0.4.7";
+ sha256 = "45bdd0a8d67e483f52d3212149d3dda99813aef4c00a6d4118b425d7d7e49457";
libraryHaskellDepends = [
base bytestring contravariant text vector
];
+ testHaskellDepends = [ base doctest ];
homepage = "https://github.com/andrewthad/colonnade#readme";
description = "Generic types and functions for columnar encoding and decoding";
license = stdenv.lib.licenses.bsd3;
@@ -40132,8 +41894,8 @@ self: {
}:
mkDerivation {
pname = "combinat";
- version = "0.2.8.1";
- sha256 = "5a6c09490085056f2b042c814df6f7333b394581dba1c5c7b788bcad81861937";
+ version = "0.2.8.2";
+ sha256 = "d0426b33f1b948f6fbe2a396ff1cabfb3acf6072ab27fffaeebc47140a9af044";
libraryHaskellDepends = [
array base containers random transformers
];
@@ -40660,6 +42422,23 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "compiler-warnings" = callPackage
+ ({ mkDerivation, base, binary, parsec, tasty, tasty-hunit
+ , tasty-quickcheck, tasty-th, text
+ }:
+ mkDerivation {
+ pname = "compiler-warnings";
+ version = "0.1.0";
+ sha256 = "8cf4c57e1b4d61b1163969faa6e9f2cb8f22073fa75bf982d9b8a328225f5ce3";
+ libraryHaskellDepends = [ base binary parsec text ];
+ testHaskellDepends = [
+ base binary parsec tasty tasty-hunit tasty-quickcheck tasty-th text
+ ];
+ homepage = "https://github.com/yi-editor/compiler-warnings#readme";
+ description = "Parser for common compiler warning formats";
+ license = stdenv.lib.licenses.bsd2;
+ }) {};
+
"complex-generic" = callPackage
({ mkDerivation, base, template-haskell }:
mkDerivation {
@@ -41835,6 +43614,29 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "configurator-ng" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, critbit
+ , data-ordlist, directory, dlist, fail, filepath, hashable, HUnit
+ , scientific, test-framework, test-framework-hunit, text
+ , unix-compat, unordered-containers
+ }:
+ mkDerivation {
+ pname = "configurator-ng";
+ version = "0.0.0.0";
+ sha256 = "4995a132a0fcbf80c47198daab2530dd09ff87f227b265354236e188d8ec8aa5";
+ libraryHaskellDepends = [
+ attoparsec base bytestring critbit data-ordlist directory dlist
+ fail hashable scientific text unix-compat unordered-containers
+ ];
+ testHaskellDepends = [
+ base bytestring directory filepath HUnit test-framework
+ test-framework-hunit text
+ ];
+ homepage = "http://github.com/lpsmith/configurator-ng";
+ description = "The next generation of configuration management";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"confsolve" = callPackage
({ mkDerivation, attoparsec, base, cmdargs, process, system-fileio
, system-filepath, text, time, unordered-containers
@@ -42040,8 +43842,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "constraint-classes";
- version = "0.3.0";
- sha256 = "369f8b61d20c1f83e6460768a8316b029c32f61c4bfe38e2538c9c075802e8f2";
+ version = "0.4.0";
+ sha256 = "0a5dda19ad7688081e43ec1445eac7a1ae0c4ae54139c4b92fd91e5f872a45b8";
libraryHaskellDepends = [ base ];
homepage = "http://github.com/guaraqe/constraint-classes#readme";
description = "Prelude classes using ConstraintKinds";
@@ -42732,6 +44534,30 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "convert-annotation" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, cassava, containers, HTTP
+ , lens, lens-aeson, optparse-generic, pipes, pipes-bytestring
+ , pipes-csv, safe, text, wreq
+ }:
+ mkDerivation {
+ pname = "convert-annotation";
+ version = "0.2.0.1";
+ sha256 = "93db09c63eed3c744673d89e20560c028f6e424396933d9a67fb49f78a764449";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base bytestring containers HTTP lens lens-aeson safe text
+ wreq
+ ];
+ executableHaskellDepends = [
+ base bytestring cassava lens optparse-generic pipes
+ pipes-bytestring pipes-csv text
+ ];
+ homepage = "http://github.com/GregorySchwartz/convert-annotation#readme";
+ description = "Convert the annotation of a gene to another in a delimited file using a variety of different databases";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"convertible" = callPackage
({ mkDerivation, base, bytestring, containers, mtl, old-locale
, old-time, text, time
@@ -43380,8 +45206,8 @@ self: {
}:
mkDerivation {
pname = "cplex-hs";
- version = "0.4.0.4";
- sha256 = "2c9e5f8719d53ffb0121a2c88e5bb43a627a54de3ce3028713c0f8426ba175eb";
+ version = "0.5.0.0";
+ sha256 = "22a3fbe663b18effaff54269d16e76aa9513d8a00d4773c3f5555d1a2f5d1567";
libraryHaskellDepends = [
base containers hashable mtl primitive transformers
unordered-containers vector
@@ -44777,6 +46603,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "cryptohash-sha512" = callPackage
+ ({ mkDerivation, base, base16-bytestring, bytestring, SHA, tasty
+ , tasty-hunit, tasty-quickcheck
+ }:
+ mkDerivation {
+ pname = "cryptohash-sha512";
+ version = "0.11.100.1";
+ sha256 = "10698bb9575eaa414a65d9644caa9408f9276c63447406e0a4faef91db1071a9";
+ libraryHaskellDepends = [ base bytestring ];
+ testHaskellDepends = [
+ base base16-bytestring bytestring SHA tasty tasty-hunit
+ tasty-quickcheck
+ ];
+ homepage = "https://github.com/hvr/cryptohash-sha512";
+ description = "Fast, pure and practical SHA-512 implementation";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"cryptol" = callPackage
({ mkDerivation, alex, ansi-terminal, array, async, base
, base-compat, bytestring, containers, deepseq, directory, filepath
@@ -45377,10 +47221,8 @@ self: {
}:
mkDerivation {
pname = "cuda";
- version = "0.7.5.0";
- sha256 = "125ce9d7d8e782272ed0a00b0a15ee2273477c4a9f1aa34e86220f2ab4573e6b";
- revision = "1";
- editedCabalFile = "9abe02e16497b7969918e53356b456f650ca1d11927fc9f37980c2da9141dee1";
+ version = "0.7.5.1";
+ sha256 = "0910d9e4f0b3a46d9bda2de495ae9024799c21764bc543b99edea64e65180385";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal directory filepath ];
@@ -45548,8 +47390,8 @@ self: {
({ mkDerivation, base, mtl, tasty, tasty-hunit }:
mkDerivation {
pname = "curryrs";
- version = "0.1.0.0";
- sha256 = "428b80a547271ac00a78a78c457ff827085514e80ff89286d83bb3d4cf3aae42";
+ version = "0.2.0";
+ sha256 = "1cdb55745936dbca5224dbb36a7006b85164a3bcc3e6af0c2670c0c0f8bb9adb";
libraryHaskellDepends = [ base mtl ];
testHaskellDepends = [ base tasty tasty-hunit ];
homepage = "https://github.com/mgattozzi/curryrs#readme";
@@ -47263,22 +49105,22 @@ self: {
"data-msgpack" = callPackage
({ mkDerivation, base, binary, bytestring, containers
, data-binary-ieee754, deepseq, groom, hashable, hspec, QuickCheck
- , text, unordered-containers
+ , text, unordered-containers, vector, void
}:
mkDerivation {
pname = "data-msgpack";
- version = "0.0.4";
- sha256 = "77e894dd366c77352cc52787546ff0419831b312f4b6b86e864e2e2e5b1e33af";
+ version = "0.0.8";
+ sha256 = "069552052ce2f62b64621513df5e4eec4a9dc9aa02f28e8095373724fc696ae0";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base binary bytestring containers data-binary-ieee754 deepseq
- hashable QuickCheck text unordered-containers
+ hashable QuickCheck text unordered-containers vector void
];
executableHaskellDepends = [ base bytestring groom ];
testHaskellDepends = [
base bytestring containers hashable hspec QuickCheck text
- unordered-containers
+ unordered-containers vector void
];
homepage = "http://msgpack.org/";
description = "A Haskell implementation of MessagePack";
@@ -48110,32 +49952,83 @@ self: {
"dbmigrations" = callPackage
({ mkDerivation, base, bytestring, configurator, containers
- , directory, fgl, filepath, HDBC, HDBC-postgresql, HDBC-sqlite3
- , HUnit, MissingH, mtl, mysql, mysql-simple, process, random, split
- , template-haskell, text, time, yaml-light
+ , directory, fgl, filepath, HDBC, HUnit, MissingH, mtl, process
+ , random, split, template-haskell, text, time, yaml-light
}:
mkDerivation {
pname = "dbmigrations";
- version = "1.1.1";
- sha256 = "d36742052ed45f933e7883bb542c070c881685df721e526d4abc25e7a1444c9f";
+ version = "2.0.0";
+ sha256 = "bd95b2082c34487277f4b6cf1407729881a847a837829d5b68307931a0a11bfe";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base bytestring configurator containers directory fgl filepath HDBC
- HDBC-postgresql HDBC-sqlite3 mtl mysql mysql-simple random split
- template-haskell text time yaml-light
+ HUnit mtl random split template-haskell text time yaml-light
];
executableHaskellDepends = [ base configurator ];
testHaskellDepends = [
base bytestring configurator containers directory fgl filepath HDBC
- HDBC-postgresql HDBC-sqlite3 HUnit MissingH mtl mysql mysql-simple
- process split template-haskell text time yaml-light
+ HUnit MissingH mtl process split template-haskell text time
+ yaml-light
];
description = "An implementation of relational database \"migrations\"";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "dbmigrations-mysql" = callPackage
+ ({ mkDerivation, base, dbmigrations, HUnit, mysql, mysql-simple
+ , process, split, time
+ }:
+ mkDerivation {
+ pname = "dbmigrations-mysql";
+ version = "2.0.0";
+ sha256 = "45bd44c9e46bff2923634030ea6f54b9df93ef3b2ea38749c5263f7e00421f5c";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base dbmigrations mysql mysql-simple split time
+ ];
+ executableHaskellDepends = [ base dbmigrations ];
+ testHaskellDepends = [
+ base dbmigrations HUnit mysql mysql-simple process
+ ];
+ description = "The dbmigrations tool built for MySQL databases";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "dbmigrations-postgresql" = callPackage
+ ({ mkDerivation, base, dbmigrations, HDBC, HDBC-postgresql, HUnit
+ , process
+ }:
+ mkDerivation {
+ pname = "dbmigrations-postgresql";
+ version = "2.0.0";
+ sha256 = "fcf753778e2e071c8fa452c585b93c27c973bedee5fe9cb608e3fdbfe83ec92f";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [ base dbmigrations HDBC-postgresql ];
+ testHaskellDepends = [
+ base dbmigrations HDBC HDBC-postgresql HUnit process
+ ];
+ description = "The dbmigrations tool built for PostgreSQL databases";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "dbmigrations-sqlite" = callPackage
+ ({ mkDerivation, base, dbmigrations, HDBC, HDBC-sqlite3, HUnit }:
+ mkDerivation {
+ pname = "dbmigrations-sqlite";
+ version = "2.0.0";
+ sha256 = "0ca8140ac27919890c93f45c20bdd25b4c190eec60a330069d89cb8b9a481320";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [ base dbmigrations HDBC-sqlite3 ];
+ testHaskellDepends = [ base dbmigrations HDBC HDBC-sqlite3 HUnit ];
+ description = "The dbmigrations tool built for SQLite databases";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"dbus" = callPackage
({ mkDerivation, base, bytestring, cereal, chell, chell-quickcheck
, containers, directory, filepath, libxml-sax, network, parsec
@@ -49674,8 +51567,8 @@ self: {
}:
mkDerivation {
pname = "deriving-compat";
- version = "0.3.3";
- sha256 = "b977e5f819c84443a355521579712a0cf138d5102d383e823381576a87898c21";
+ version = "0.3.4";
+ sha256 = "77c68a5c69be9c4385a163501da2d8dacf590a3d948bb1d01f570ef4abb0bf3d";
libraryHaskellDepends = [
base containers ghc-boot-th ghc-prim template-haskell transformers
transformers-compat
@@ -49958,6 +51851,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "diagrams_1_4" = callPackage
+ ({ mkDerivation, diagrams-contrib, diagrams-core, diagrams-lib
+ , diagrams-svg
+ }:
+ mkDerivation {
+ pname = "diagrams";
+ version = "1.4";
+ sha256 = "8608f6fa682b8c43b9fbe7c42c033c7a6de0680bd7383f6a81ea8bca37999139";
+ libraryHaskellDepends = [
+ diagrams-contrib diagrams-core diagrams-lib diagrams-svg
+ ];
+ doHaddock = false;
+ homepage = "http://projects.haskell.org/diagrams";
+ description = "Embedded domain-specific language for declarative vector graphics";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"diagrams-boolean" = callPackage
({ mkDerivation, base, cubicbezier, diagrams-lib }:
mkDerivation {
@@ -49974,19 +51885,20 @@ self: {
({ 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
- , mtl, split, svg-builder, transformers
+ , filepath, hashable, haskell-src-exts, haskell-src-exts-simple
+ , hint, JuicyPixels, lens, mtl, split, svg-builder, transformers
}:
mkDerivation {
pname = "diagrams-builder";
- version = "0.7.2.4";
- sha256 = "34e7fbb9952cd5e3444f34bce5e1f3431017a18a42abc7174bc8b4635c496ebc";
+ version = "0.8";
+ sha256 = "28633d2a5374ba3c9e56ff798242889986b9a5958e0bd2b35df342b4ac4c5744";
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
+ filepath hashable haskell-src-exts haskell-src-exts-simple hint
+ lens mtl split transformers
];
executableHaskellDepends = [
base bytestring cmdargs diagrams-cairo diagrams-lib
@@ -50019,7 +51931,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "diagrams-cairo_1_3_1_2" = callPackage
+ "diagrams-cairo_1_4" = callPackage
({ mkDerivation, array, base, bytestring, cairo, colour, containers
, data-default-class, diagrams-core, diagrams-lib, filepath
, hashable, JuicyPixels, lens, mtl, optparse-applicative, pango
@@ -50027,8 +51939,8 @@ self: {
}:
mkDerivation {
pname = "diagrams-cairo";
- version = "1.3.1.2";
- sha256 = "099ffe00c3fa0b6522ac2b5c4ed8beb0ff82884b164c147f3ec900dc773126f4";
+ version = "1.4";
+ sha256 = "a94ec8bfdba325cf317368355eaa282bef3c75ed78e153ef400b8627575cea81";
libraryHaskellDepends = [
array base bytestring cairo colour containers data-default-class
diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl
@@ -50061,15 +51973,15 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "diagrams-canvas_1_3_0_7" = callPackage
+ "diagrams-canvas_1_4" = 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.7";
- sha256 = "dd8477ed65f58d3137b5541e3c42994144af6ffc7e7f4b72b41754a86f1600da";
+ version = "1.4";
+ sha256 = "30622ff2478391caf31dd8cc6842043f33409e97a3e5fd9f9ca6ee8264b576e9";
libraryHaskellDepends = [
base blank-canvas cmdargs containers data-default-class
diagrams-core diagrams-lib lens mtl NumInstances
@@ -50108,6 +52020,34 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "diagrams-contrib_1_4" = callPackage
+ ({ mkDerivation, base, circle-packing, colour, containers
+ , cubicbezier, data-default, data-default-class, diagrams-core
+ , diagrams-lib, diagrams-solve, force-layout, hashable, HUnit, lens
+ , linear, mfsolve, MonadRandom, monoid-extras, mtl, mtl-compat
+ , parsec, QuickCheck, random, semigroups, split, test-framework
+ , test-framework-hunit, test-framework-quickcheck2, text
+ }:
+ mkDerivation {
+ pname = "diagrams-contrib";
+ version = "1.4";
+ sha256 = "1b06f7d5fb4ae77a851ef2c6e6f7193418e679198b757bbd75b81798c6f8dceb";
+ libraryHaskellDepends = [
+ base circle-packing colour containers cubicbezier data-default
+ data-default-class diagrams-core diagrams-lib diagrams-solve
+ force-layout hashable lens linear mfsolve MonadRandom monoid-extras
+ mtl mtl-compat 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-core" = callPackage
({ mkDerivation, adjunctions, base, containers, distributive
, dual-tree, lens, linear, monoid-extras, mtl, semigroups
@@ -50126,14 +52066,33 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "diagrams-core_1_4" = callPackage
+ ({ mkDerivation, adjunctions, base, containers, distributive
+ , dual-tree, lens, linear, monoid-extras, mtl, profunctors
+ , semigroups, unordered-containers
+ }:
+ mkDerivation {
+ pname = "diagrams-core";
+ version = "1.4";
+ sha256 = "e5502f483dadb86056523d601a1037596ff49380b4c1cd00600183eab7992ae7";
+ libraryHaskellDepends = [
+ adjunctions base containers distributive dual-tree lens linear
+ monoid-extras mtl profunctors semigroups unordered-containers
+ ];
+ homepage = "http://projects.haskell.org/diagrams";
+ description = "Core libraries for diagrams EDSL";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"diagrams-graphviz" = callPackage
({ mkDerivation, base, containers, diagrams-lib, fgl, graphviz
, split
}:
mkDerivation {
pname = "diagrams-graphviz";
- version = "1.3.1";
- sha256 = "09ae6f6d08d3ed43f6f6bf711e3749f1979b2e2e6976cbd7da05bd2a8f0d6a04";
+ version = "1.4";
+ sha256 = "483a41aaa9d73681ada40f8cfd3e967cf669f313200041eaf54db0800cca61d1";
libraryHaskellDepends = [
base containers diagrams-lib fgl graphviz split
];
@@ -50156,27 +52115,39 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "diagrams-gtk_1_4" = callPackage
+ ({ mkDerivation, base, cairo, diagrams-cairo, diagrams-lib, gtk }:
+ mkDerivation {
+ pname = "diagrams-gtk";
+ version = "1.4";
+ sha256 = "b66bde621a09b79b99185af50b2d1ed0b2bd3988c95ed27c7e92e5383917eae9";
+ libraryHaskellDepends = [
+ base cairo diagrams-cairo diagrams-lib gtk
+ ];
+ homepage = "http://projects.haskell.org/diagrams/";
+ description = "Backend for rendering diagrams directly to GTK windows";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"diagrams-haddock" = callPackage
({ mkDerivation, ansi-terminal, base, base64-bytestring, bytestring
, Cabal, cautious-file, cmdargs, containers, cpphs
, diagrams-builder, diagrams-lib, diagrams-svg, directory, filepath
- , haskell-src-exts, lens, linear, lucid-svg, mtl, parsec
- , QuickCheck, split, strict, tasty, tasty-quickcheck, text
- , uniplate
+ , haskell-src-exts, lens, linear, mtl, parsec, QuickCheck, split
+ , strict, svg-builder, tasty, tasty-quickcheck, text, uniplate
}:
mkDerivation {
pname = "diagrams-haddock";
- version = "0.3.0.10";
- sha256 = "49ed17c49c1aae075892e9992b691867e418944a37141f028a7a2e6220d6f0af";
- revision = "1";
- editedCabalFile = "c77d5d5a908d03ba9fc545f977ced5d393a22e6de5b9d00deb4fb7fddd4a366d";
+ version = "0.4";
+ sha256 = "79dbb7fa0b28b04cf0804fb993e04b22f7e1261089c0aa4e7fe06894edcce0b9";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
ansi-terminal base base64-bytestring bytestring cautious-file
containers cpphs diagrams-builder diagrams-lib diagrams-svg
- directory filepath haskell-src-exts lens linear lucid-svg mtl
- parsec split strict text uniplate
+ directory filepath haskell-src-exts lens linear mtl parsec split
+ strict svg-builder text uniplate
];
executableHaskellDepends = [
base Cabal cmdargs cpphs directory filepath
@@ -50228,6 +52199,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "diagrams-html5_1_4" = 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.4";
+ sha256 = "43653c946a4c2215d1fdf62e93f4b65ccd19c960aa8e1c7b8a4bd638fd71c1aa";
+ 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;
+ }) {};
+
"diagrams-lib" = callPackage
({ mkDerivation, active, adjunctions, array, base, colour
, containers, data-default-class, diagrams-core, diagrams-solve
@@ -50254,6 +52245,38 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "diagrams-lib_1_4" = callPackage
+ ({ mkDerivation, active, adjunctions, array, base, cereal, colour
+ , containers, data-default-class, deepseq, diagrams-core
+ , diagrams-solve, directory, distributive, dual-tree, exceptions
+ , filepath, fingertree, fsnotify, hashable, intervals, JuicyPixels
+ , lens, linear, monoid-extras, mtl, numeric-extras
+ , optparse-applicative, process, profunctors, semigroups, tagged
+ , tasty, tasty-hunit, tasty-quickcheck, text, transformers
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "diagrams-lib";
+ version = "1.4";
+ sha256 = "5aed2074a86e6f6cc030ff062d8a3a743aaf8fa9d7d9cd14c6d7b0b1d32112ad";
+ libraryHaskellDepends = [
+ active adjunctions array base cereal 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 profunctors semigroups tagged text
+ transformers unordered-containers
+ ];
+ testHaskellDepends = [
+ base deepseq diagrams-solve lens numeric-extras tasty tasty-hunit
+ tasty-quickcheck
+ ];
+ 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-pandoc" = callPackage
({ mkDerivation, base, diagrams-builder, diagrams-cairo
, diagrams-lib, directory, filepath, linear, optparse-applicative
@@ -50305,8 +52328,8 @@ self: {
}:
mkDerivation {
pname = "diagrams-pgf";
- version = "0.1.0.5";
- sha256 = "6f5a4274b447614599603b5cc819f723e262ba0794c3ed2bbe842079a48f6898";
+ version = "1.4";
+ sha256 = "068f1fbc8c3ebdfa37d47e96e060b8040c7425c014aecd8e4f022477a51e6687";
libraryHaskellDepends = [
base bytestring bytestring-builder colour containers diagrams-core
diagrams-lib directory filepath hashable JuicyPixels mtl
@@ -50337,6 +52360,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "diagrams-postscript_1_4" = callPackage
+ ({ mkDerivation, base, containers, data-default-class
+ , diagrams-core, diagrams-lib, dlist, filepath, hashable, lens
+ , monoid-extras, mtl, semigroups, split, statestack
+ }:
+ mkDerivation {
+ pname = "diagrams-postscript";
+ version = "1.4";
+ sha256 = "fe58f0010520716f66802adb0c1f70f48e77e9c4fcea5441e5343f4c1a5f8db4";
+ libraryHaskellDepends = [
+ base containers data-default-class diagrams-core diagrams-lib dlist
+ filepath hashable lens monoid-extras mtl semigroups split
+ statestack
+ ];
+ homepage = "http://projects.haskell.org/diagrams/";
+ description = "Postscript backend for diagrams drawing EDSL";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"diagrams-qrcode" = callPackage
({ mkDerivation, array, base, colour, diagrams-core, diagrams-lib
}:
@@ -50375,20 +52418,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "diagrams-rasterific_1_3_1_9" = callPackage
+ "diagrams-rasterific_1_4" = callPackage
({ mkDerivation, base, bytestring, containers, data-default-class
- , diagrams-core, diagrams-lib, filepath, FontyFruity, hashable
- , JuicyPixels, lens, mtl, optparse-applicative, Rasterific, split
- , unix
+ , diagrams-core, diagrams-lib, file-embed, filepath, FontyFruity
+ , hashable, JuicyPixels, lens, mtl, optparse-applicative
+ , Rasterific
}:
mkDerivation {
pname = "diagrams-rasterific";
- version = "1.3.1.9";
- sha256 = "b3305657391f75b9f69c3a30905724c1151ea7cab78561c800657f7a81166ab8";
+ version = "1.4";
+ sha256 = "daea2cddf5175044f606c36388e12a14b13fe0aa2b5ce9c039c349e9c46015a4";
libraryHaskellDepends = [
base bytestring containers data-default-class diagrams-core
- diagrams-lib filepath FontyFruity hashable JuicyPixels lens mtl
- optparse-applicative Rasterific split unix
+ diagrams-lib file-embed filepath FontyFruity hashable JuicyPixels
+ lens mtl optparse-applicative Rasterific
];
homepage = "http://projects.haskell.org/diagrams/";
description = "Rasterific backend for diagrams";
@@ -50416,13 +52459,15 @@ self: {
}) {};
"diagrams-rubiks-cube" = callPackage
- ({ mkDerivation, base, data-default-class, diagrams-lib, lens }:
+ ({ mkDerivation, adjunctions, base, data-default-class
+ , diagrams-lib, distributive, lens
+ }:
mkDerivation {
pname = "diagrams-rubiks-cube";
- version = "0.2.0.0";
- sha256 = "ab91576655c3f7ca9fa859d8c9fff6bbefe2eb8405d3563cad6734cb71d4d5e7";
+ version = "0.2.0.1";
+ sha256 = "f8f54e7f03489d737dd979a1cd35f8c5411b3c8de7379ba07c365d480ec38592";
libraryHaskellDepends = [
- base data-default-class diagrams-lib lens
+ adjunctions base data-default-class diagrams-lib distributive lens
];
homepage = "https://github.com/timjb/rubiks-cube";
description = "Library for drawing the Rubik's Cube";
@@ -50464,22 +52509,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "diagrams-svg_1_4_0_4" = callPackage
+ "diagrams-svg_1_4_1" = callPackage
({ mkDerivation, base, base64-bytestring, bytestring, colour
- , containers, diagrams-core, diagrams-lib, directory, filepath
- , hashable, JuicyPixels, lens, monoid-extras, mtl, old-time
- , optparse-applicative, process, semigroups, split, svg-builder
- , text, time
+ , containers, diagrams-core, diagrams-lib, filepath, hashable
+ , JuicyPixels, lens, monoid-extras, mtl, optparse-applicative
+ , semigroups, split, svg-builder, text
}:
mkDerivation {
pname = "diagrams-svg";
- version = "1.4.0.4";
- sha256 = "b9843885cd30a70b3acf97a0ce41934776d535777584b670f5b3ec4a39b6668c";
+ version = "1.4.1";
+ sha256 = "ce691378025835c7e794898a5f03299341f5f1e35a20de4afd12b1f9b0667f87";
libraryHaskellDepends = [
base base64-bytestring bytestring colour containers diagrams-core
- diagrams-lib directory filepath hashable JuicyPixels lens
- monoid-extras mtl old-time optparse-applicative process semigroups
- split svg-builder text time
+ diagrams-lib filepath hashable JuicyPixels lens monoid-extras mtl
+ optparse-applicative semigroups split svg-builder text
];
homepage = "http://projects.haskell.org/diagrams/";
description = "SVG backend for diagrams drawing EDSL";
@@ -51629,8 +53672,8 @@ self: {
}:
mkDerivation {
pname = "distributed-process";
- version = "0.6.4";
- sha256 = "013d53a6768cb1bbb14b50898cc75033cc058c6f289e6e5add30852a0449414f";
+ version = "0.6.6";
+ sha256 = "e881775dabea50ccd3370242c8a3acd87c9b8ce9e47f3d4c2d0a6b2ec7b3b7d0";
libraryHaskellDepends = [
base binary bytestring containers data-accessor deepseq
distributed-static exceptions hashable mtl network-transport random
@@ -51943,10 +53986,8 @@ self: {
}:
mkDerivation {
pname = "distributed-process-simplelocalnet";
- version = "0.2.3.2";
- sha256 = "c3351cf8a782dda756689b3747ede1e3879dcb913a07065eb4ec0052a963825f";
- revision = "1";
- editedCabalFile = "6cc30bffb992a3af6027e6563720ab3b6a994037066125ffde7024081b58c8e7";
+ version = "0.2.3.3";
+ sha256 = "7b98498f2d6ce185ae0a855ff35e97a9ad1bd1ec7872b2d75aa0bb1f1fb24316";
libraryHaskellDepends = [
base binary bytestring containers data-accessor distributed-process
network network-multicast network-transport network-transport-tcp
@@ -52038,8 +54079,8 @@ self: {
}:
mkDerivation {
pname = "distributed-process-tests";
- version = "0.4.6";
- sha256 = "ba64f41f3e5a5ebd14a9a8e7c4114ea988b1554a80310c528c464746dcd6bf53";
+ version = "0.4.7";
+ sha256 = "8be7d1adf75753957925705fa1b5af20f3d90f71803352bd74e82484c46917b1";
libraryHaskellDepends = [
ansi-terminal base binary bytestring distributed-process
distributed-static HUnit network network-transport random rematch
@@ -52337,8 +54378,8 @@ self: {
}:
mkDerivation {
pname = "dns";
- version = "2.0.6";
- sha256 = "148342aaca67c4c6f4a7c15bc50eb13d7f145943277e6f55c1a455208531c0f2";
+ version = "2.0.8";
+ sha256 = "ca9ba04f3fdc277033a9b16bf39d290e2b2fdc4d79c9c0c9b9aa5b8cf21bd5c9";
libraryHaskellDepends = [
attoparsec base binary bytestring bytestring-builder conduit
conduit-extra containers iproute mtl network random resourcet safe
@@ -52873,20 +54914,27 @@ self: {
}) {};
"dotenv" = callPackage
- ({ mkDerivation, base, base-compat, hspec, megaparsec
- , optparse-applicative, process, text
+ ({ mkDerivation, base, base-compat, exceptions, hspec
+ , hspec-megaparsec, megaparsec, optparse-applicative, process, text
+ , transformers
}:
mkDerivation {
pname = "dotenv";
- version = "0.3.0.3";
- sha256 = "df2dc890652e6a5dcec035c5050ebc71d8024583d73fe2164fc07b276b640760";
+ version = "0.3.1.0";
+ sha256 = "7f4e7c1717e486fd71a6d5507494d314a541e1c308787c7b49bfdbd77c868476";
isLibrary = true;
isExecutable = true;
- libraryHaskellDepends = [ base base-compat megaparsec text ];
+ libraryHaskellDepends = [
+ base base-compat exceptions megaparsec text transformers
+ ];
executableHaskellDepends = [
base base-compat megaparsec optparse-applicative process text
+ transformers
+ ];
+ testHaskellDepends = [
+ base base-compat exceptions hspec hspec-megaparsec megaparsec text
+ transformers
];
- testHaskellDepends = [ base base-compat hspec megaparsec text ];
homepage = "https://github.com/stackbuilders/dotenv-hs";
description = "Loads environment variables from dotenv files";
license = stdenv.lib.licenses.mit;
@@ -54326,8 +56374,8 @@ self: {
}:
mkDerivation {
pname = "ec2-unikernel";
- version = "0.9.1";
- sha256 = "0d35dc753f634dcb5d324843c4914d8271e09356708385c462a1c1759f5e57a1";
+ version = "0.9.2";
+ sha256 = "61485223a42a58d52045c2a44ec7c125f636246cb6152548e706192aae6cde0a";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -55108,6 +57156,24 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "ekg-prometheus-adapter" = callPackage
+ ({ mkDerivation, base, containers, ekg-core, microlens-th
+ , prometheus, text, transformers, unordered-containers
+ }:
+ mkDerivation {
+ pname = "ekg-prometheus-adapter";
+ version = "0.1.0.3";
+ sha256 = "4dc997621c16c704a2cb19629385c76d7736f6e0bff1400cc1a83d5fd65f724a";
+ libraryHaskellDepends = [
+ base containers ekg-core microlens-th prometheus text transformers
+ unordered-containers
+ ];
+ testHaskellDepends = [ base ];
+ homepage = "https://github.com/adinapoli/ekg-prometheus-adapter#readme";
+ description = "Easily expose your EKG metrics to Prometheus";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"ekg-push" = callPackage
({ mkDerivation, base, bytestring, ekg-core, text, time
, unordered-containers
@@ -56264,6 +58330,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "envelope_0_2_1_0" = callPackage
+ ({ mkDerivation, aeson, base, doctest, Glob, http-api-data, mtl
+ , text
+ }:
+ mkDerivation {
+ pname = "envelope";
+ version = "0.2.1.0";
+ sha256 = "af8a043b4a1890e927ecc23827c2018d816071cd2cc5344543287897457276fe";
+ libraryHaskellDepends = [ aeson base http-api-data mtl text ];
+ testHaskellDepends = [ base doctest Glob ];
+ homepage = "https://github.com/cdepillabout/envelope#readme";
+ description = "Defines generic 'Envelope' type to wrap reponses from a JSON API";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"envparse" = callPackage
({ mkDerivation, base, containers, hspec, text }:
mkDerivation {
@@ -56387,22 +58469,22 @@ self: {
"epub-metadata" = callPackage
({ mkDerivation, base, bytestring, containers, directory, filepath
- , HUnit, hxt, mtl, regex-compat, zip-archive
+ , HUnit, hxt, mtl, regex-compat-tdfa, utf8-string, zip-archive
}:
mkDerivation {
pname = "epub-metadata";
- version = "4.4";
- sha256 = "ca4f9ff02676a1abcbe5433deb655747a11f28e8f4dfcb4b94d7a073ab50bb62";
+ version = "4.5";
+ sha256 = "19ae3914df5936908c8d7264ae5f1e310262fa06bd7e4390838892840e4c0349";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base bytestring containers directory filepath hxt mtl regex-compat
- zip-archive
+ base bytestring containers directory filepath hxt mtl
+ regex-compat-tdfa utf8-string zip-archive
];
executableHaskellDepends = [ base mtl ];
testHaskellDepends = [
- base bytestring directory filepath HUnit hxt mtl regex-compat
- zip-archive
+ base bytestring directory filepath HUnit hxt mtl regex-compat-tdfa
+ utf8-string zip-archive
];
homepage = "http://hub.darcs.net/dino/epub-metadata";
description = "Library for parsing epub document metadata";
@@ -56416,8 +58498,8 @@ self: {
}:
mkDerivation {
pname = "epub-tools";
- version = "2.8";
- sha256 = "16a5004b4a408919a48e09f65f8ab1007132ddc2d9d0ffb2c5c1609f09395434";
+ version = "2.9";
+ sha256 = "eb550fbc268852c3e3c29eab32c9c2d171b5b1326f5e9676f42d4802dafb0ea5";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -57638,8 +59720,8 @@ self: {
}:
mkDerivation {
pname = "exhaustive";
- version = "1.1.2";
- sha256 = "658e1542d9f11f608a8898a7d4a7953b558095ea337d47dc1ab9996fc060127b";
+ version = "1.1.3";
+ sha256 = "4cda23481da99bf008046726ed4c31ecec5eb41222a11e067a4d7e0f2dda783a";
libraryHaskellDepends = [
base generics-sop template-haskell transformers
];
@@ -57687,12 +59769,14 @@ self: {
}) {inherit (pkgs) exif;};
"exinst" = callPackage
- ({ mkDerivation, base, constraints, singletons }:
+ ({ mkDerivation, base, constraints, profunctors, singletons }:
mkDerivation {
pname = "exinst";
- version = "0.1.2";
- sha256 = "61f1ad1d9ea25e7ff6edca9ac4b01681e6ab5d0af577c1c07c78afdac1ef5cfa";
- libraryHaskellDepends = [ base constraints singletons ];
+ version = "0.2";
+ sha256 = "64c8d5a121db7274436f4e0fdb5c7ea3c9746419a84c0f16e6edb92bb83c7a3b";
+ libraryHaskellDepends = [
+ base constraints profunctors singletons
+ ];
homepage = "https://github.com/k0001/exinst";
description = "Derive instances for your existential types";
license = stdenv.lib.licenses.bsd3;
@@ -57703,8 +59787,8 @@ self: {
({ mkDerivation, aeson, base, constraints, exinst, singletons }:
mkDerivation {
pname = "exinst-aeson";
- version = "0.1.0.2";
- sha256 = "da509d6ab2c73c22cf718c3b08dcf2327b42abb0f5d0273d38ae4c530f737fa1";
+ version = "0.2";
+ sha256 = "595b0b7b597f73c823a2ceb4758090f09a03b340351ce9abed2f94ece661168b";
libraryHaskellDepends = [
aeson base constraints exinst singletons
];
@@ -57718,8 +59802,8 @@ self: {
({ mkDerivation, base, bytes, constraints, exinst, singletons }:
mkDerivation {
pname = "exinst-bytes";
- version = "0.1.0.2";
- sha256 = "cc830f4af107b32738f83ef87eb1f77f08453758645bd0519d734beb311dec29";
+ version = "0.2";
+ sha256 = "d25e758ddd2353046204415655b20f7f3f0639db1cb8b8f5b6b24e498777b267";
libraryHaskellDepends = [
base bytes constraints exinst singletons
];
@@ -57733,8 +59817,8 @@ self: {
({ mkDerivation, base, constraints, deepseq, exinst }:
mkDerivation {
pname = "exinst-deepseq";
- version = "0.1.0.1";
- sha256 = "078e2bb2f7759555976305fcabae776e7ae331f21a9ac3e5d563f923198f3799";
+ version = "0.2";
+ sha256 = "3fc11e61a23996cd923189bc1ef6d67f0c0d2190a021b73cc623476a78c12e61";
libraryHaskellDepends = [ base constraints deepseq exinst ];
homepage = "https://github.com/k0001/exinst";
description = "Derive instances for the `deepseq` library for your existential types";
@@ -57746,8 +59830,8 @@ self: {
({ mkDerivation, base, constraints, exinst, hashable, singletons }:
mkDerivation {
pname = "exinst-hashable";
- version = "0.1.0.2";
- sha256 = "3a3051b1a0ccdd13317dcf190944609604f6ce5004a7b05d8327b7202a90ee65";
+ version = "0.2";
+ sha256 = "be4da58f52ffeb99730063d8adc24a1b4635611b3f08f5bbff49fe9cc620e5f0";
libraryHaskellDepends = [
base constraints exinst hashable singletons
];
@@ -58231,14 +60315,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "extra_1_5" = callPackage
+ "extra_1_5_1" = callPackage
({ mkDerivation, base, clock, directory, filepath, process
, QuickCheck, time, unix
}:
mkDerivation {
pname = "extra";
- version = "1.5";
- sha256 = "d6d78604f87b6ade3f3b4ec8af3d08efd2c981652b3ec9a9e8d5865018667b7f";
+ version = "1.5.1";
+ sha256 = "8f3397c7a176045f1bb3b2a181e36b54192cb6fb5e99a9d28552975130ec49fc";
libraryHaskellDepends = [
base clock directory filepath process time unix
];
@@ -58964,6 +61048,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "fay-simplejson" = callPackage
+ ({ mkDerivation, fay-base }:
+ mkDerivation {
+ pname = "fay-simplejson";
+ version = "0.1.1.0";
+ sha256 = "78dbb8ad24149e93706d3630d5c9dcab9b263c0614e437eb14a6983953833c04";
+ libraryHaskellDepends = [ fay-base ];
+ homepage = "https://github.com/Lupino/fay-simplejson";
+ description = "SimpleJSON library for Fay";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"fay-text" = callPackage
({ mkDerivation, fay, fay-base, text }:
mkDerivation {
@@ -59319,28 +61415,28 @@ self: {
, concurrent-extra, conduit, conduit-extra, containers, data-hash
, directory, distributed-process, distributed-process-async
, distributed-process-client-server, distributed-process-extras
- , distributed-process-simplelocalnet, exceptions, file-embed
- , filepath, free, fsnotify, HUnit, logging, managed, network-uri
+ , distributed-process-p2p, exceptions, extra, file-embed, filepath
+ , free, fsnotify, HUnit, logging, managed, network-uri
, optparse-applicative, process, reactive-banana, SafeSemaphore
, tasty, tasty-hspec, tasty-hunit, tasty-quickcheck
, tasty-smallcheck, temporary, text, time, transformers, yaml
}:
mkDerivation {
pname = "feed-gipeda";
- version = "0.2.0.0";
- sha256 = "def3da09a8795ea8e86aead8360e86bf4142e0b28f8fb964b152f0ce48f628fe";
+ version = "0.3.0.0";
+ sha256 = "8a440f45d32a3eb0db3785b20601bd3031560da5776569d4c20762de3c44a98d";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson async base binary bytestring concurrent-extra conduit
conduit-extra containers data-hash directory distributed-process
distributed-process-async distributed-process-client-server
- distributed-process-extras distributed-process-simplelocalnet
- file-embed filepath fsnotify logging network-uri process
- reactive-banana SafeSemaphore temporary text time transformers yaml
+ distributed-process-extras distributed-process-p2p file-embed
+ filepath fsnotify logging network-uri process reactive-banana
+ SafeSemaphore temporary text time transformers yaml
];
executableHaskellDepends = [
- base directory filepath logging optparse-applicative
+ base directory extra filepath logging optparse-applicative
];
testHaskellDepends = [
async base bytestring conduit conduit-extra directory exceptions
@@ -60691,12 +62787,17 @@ self: {
}) {};
"fixplate" = callPackage
- ({ mkDerivation, base, containers }:
+ ({ mkDerivation, base, containers, QuickCheck, tasty
+ , tasty-quickcheck
+ }:
mkDerivation {
pname = "fixplate";
- version = "0.1.6";
- sha256 = "c3227c94b7ccaf27991384bee8bef3288a4a9a87691b50121da1f4b84edc2e43";
+ version = "0.1.7";
+ sha256 = "5e515d0d6256482b13cb1bafcdbcc1e87d094a0e2cd3150b0d648c3577a1342f";
libraryHaskellDepends = [ base containers ];
+ testHaskellDepends = [
+ base containers QuickCheck tasty tasty-quickcheck
+ ];
homepage = "http://code.haskell.org/~bkomuves/";
description = "Uniplate-style generic traversals for optionally annotated fixed-point types";
license = stdenv.lib.licenses.bsd3;
@@ -60827,6 +62928,25 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "flat-mcmc_1_1_1" = callPackage
+ ({ mkDerivation, base, mcmc-types, monad-par, monad-par-extras
+ , mwc-probability, pipes, primitive, transformers, vector
+ }:
+ mkDerivation {
+ pname = "flat-mcmc";
+ version = "1.1.1";
+ sha256 = "24e2bc1b4728dd54326908332322f227cc2bf3548e6e1b07f0695a1c3167a88c";
+ libraryHaskellDepends = [
+ base mcmc-types monad-par monad-par-extras mwc-probability pipes
+ primitive transformers vector
+ ];
+ testHaskellDepends = [ base vector ];
+ homepage = "http://jtobin.github.com/flat-mcmc";
+ description = "Painless general-purpose sampling";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"flat-tex" = callPackage
({ mkDerivation, base, directory, parsec }:
mkDerivation {
@@ -61653,6 +63773,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {foma = null;};
+ "font-awesome-type" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "font-awesome-type";
+ version = "0.1";
+ sha256 = "f01932a0d8a2262c79b3eedc57611c53eb66997cd44882706ca2549ddf8c5cda";
+ libraryHaskellDepends = [ base ];
+ homepage = "https://github.com/spl/font-awesome-type";
+ description = "A Font Awesome data type enumerating all icon classes";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"font-opengl-basic4x6" = callPackage
({ mkDerivation, base, GLFW-b, OpenGL }:
mkDerivation {
@@ -61745,8 +63877,8 @@ self: {
}:
mkDerivation {
pname = "force-layout";
- version = "0.4.0.5";
- sha256 = "eac5d4804abe042448fe29cf42d56d782b4853a8c686cd01f0c7b499b2bf65cb";
+ version = "0.4.0.6";
+ sha256 = "f7729855b1b14e0b255325faaca9f4834004e02bd21def6a865d2c55c734259d";
libraryHaskellDepends = [
base containers data-default-class lens linear
];
@@ -62946,8 +65078,8 @@ self: {
({ mkDerivation, base, doctest, Glob }:
mkDerivation {
pname = "from-sum";
- version = "0.1.0.0";
- sha256 = "cfc80660a6986b2a2dc07605a26a6bc3b010b9aecfbeb4a852e671106b37475c";
+ version = "0.1.2.0";
+ sha256 = "29449f195710ecdc601375ad0f853666bb93baf11f279b6f9f31783455cc51d9";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base doctest Glob ];
homepage = "https://github.com/cdepillabout/from-sum";
@@ -63867,14 +65999,15 @@ self: {
}) {};
"game-of-life" = callPackage
- ({ mkDerivation, array, base, hscurses, random, text }:
+ ({ mkDerivation, array, base, hscurses, hspec, random, text }:
mkDerivation {
pname = "game-of-life";
- version = "0.1.0.4";
- sha256 = "5f500e662d6a158853950c69fe729cecdbaf2183275d20d770ffb5b196f050b4";
+ version = "0.1.0.5";
+ sha256 = "8bd15d6d2ede2bae8b49d057d6c742a677e68e518159cd99c660b9fed8b53fda";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [ array base hscurses random text ];
+ testHaskellDepends = [ array base hspec ];
homepage = "http://github.com/marcusbuffett/game-of-life";
description = "Conway's Game of Life";
license = stdenv.lib.licenses.mit;
@@ -66148,8 +68281,8 @@ self: {
({ mkDerivation, base, ghcjs-dom-jsaddle, text, transformers }:
mkDerivation {
pname = "ghcjs-dom";
- version = "0.4.1.0";
- sha256 = "aa3c9e44ae5ff47b224c8624ea8131cfb02d54f8d7d98935e649a8011f3593c8";
+ version = "0.5.0.2";
+ sha256 = "78b95464b0101d3ffe9d23452c738bdb924c7a3737121e2a938fde863627bd8e";
libraryHaskellDepends = [
base ghcjs-dom-jsaddle text transformers
];
@@ -66163,8 +68296,8 @@ self: {
({ mkDerivation, base, ghcjs-dom, mtl }:
mkDerivation {
pname = "ghcjs-dom-hello";
- version = "3.0.0.0";
- sha256 = "1cf743f986fe9cd97951efb6182ebf6e5d7b6c920cb92354c11ebea86273b7e5";
+ version = "4.0.0.0";
+ sha256 = "c4ce7931a8121f7f3c78df896af8449eeca4fd11abdd90b4fa338fa207da6c6d";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [ base ghcjs-dom mtl ];
@@ -66178,8 +68311,8 @@ self: {
({ mkDerivation, jsaddle-dom }:
mkDerivation {
pname = "ghcjs-dom-jsaddle";
- version = "0.4.1.0";
- sha256 = "e9906ab7606eb22dbb7e48147e1602f0bb62787f3baacda79550d3e9225c14d8";
+ version = "0.5.0.0";
+ sha256 = "8886b7ee0f737b23139845d5dd5c56b79e891df15f632378a064f26d404bbda8";
libraryHaskellDepends = [ jsaddle-dom ];
doHaddock = false;
description = "DOM library that supports both GHCJS and GHC using jsaddle";
@@ -66191,8 +68324,8 @@ self: {
({ mkDerivation }:
mkDerivation {
pname = "ghcjs-dom-jsffi";
- version = "0.4.1.0";
- sha256 = "5cf3d984c17817d0104d7792003d14fd21978571a7b3c977edbd266c8a68c1fe";
+ version = "0.5.0.2";
+ sha256 = "4e7042c09170af65a486a87a134d40519c1cecf663956349f26729490063d878";
isLibrary = false;
isExecutable = false;
description = "DOM library using JSFFI and GHCJS";
@@ -66249,11 +68382,13 @@ self: {
pname = "ghcjs-websockets";
version = "0.3.0.5";
sha256 = "f879f2ccfd4a98dfbe23b7e12aebda5207acfe10bcf3d67ec7d00ca06e83a7ce";
+ revision = "1";
+ editedCabalFile = "1901cc0693c96bc77c6484ac202ce8e6302c2eb2eb6b986a054aaaad9901b2ff";
libraryHaskellDepends = [
base base64-bytestring binary bytestring text
];
homepage = "http://github.com/mstksg/ghcjs-websockets";
- description = "GHCJS interface for the Javascript Websocket API";
+ description = "Deprecated: use ghcjs-base's native websockets";
license = stdenv.lib.licenses.mit;
}) {};
@@ -67454,8 +69589,8 @@ self: {
}:
mkDerivation {
pname = "git-annex";
- version = "6.20161012";
- sha256 = "38dab20236f36780278d49a345fb8850305e994d6c83ff010b4d9fd04cd85cdc";
+ version = "6.20161027";
+ sha256 = "1e4d859434d5175bbe29843e3be03350e7412063bc340d12a1e31e04c80791cf";
configureFlags = [
"-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
"-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
@@ -68494,8 +70629,8 @@ self: {
}:
mkDerivation {
pname = "glirc";
- version = "2.20.1";
- sha256 = "1ddfb3fea3ccb962abacdd5556116ba0799a836201a757fb185abc641800f08d";
+ version = "2.20.1.1";
+ sha256 = "63f0f8d82ea8d2f90103faf9ccd9fa301275b9400bbf1c3db62f8c51cbfa40fe";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal filepath ];
@@ -68532,6 +70667,24 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "glob-posix" = callPackage
+ ({ mkDerivation, base, directory, filepath, tasty
+ , tasty-expected-failure, tasty-hunit, unix
+ }:
+ mkDerivation {
+ pname = "glob-posix";
+ version = "0.1.0.1";
+ sha256 = "3245382c77ebaceea958ef62510d073b96e10a43bf69536cf9079d69da363caf";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [
+ base directory filepath tasty tasty-expected-failure tasty-hunit
+ unix
+ ];
+ homepage = "https://github.com/rdnetto/glob-posix#readme";
+ description = "Haskell bindings for POSIX glob library";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"global" = callPackage
({ mkDerivation, base, haskell-src-exts, haskell-src-exts-qq
, loch-th, SafeSemaphore, stm, syntax-trees-fork-bairyn, tagged
@@ -68868,8 +71021,8 @@ self: {
}:
mkDerivation {
pname = "glue-common";
- version = "0.4.8";
- sha256 = "93e860fbbff04561621cd923081b111602a900dd2eb9306e1c77dc26b63b1912";
+ version = "0.4.9";
+ sha256 = "4c83dc5503aab468fa198433d0601eed88f55f366adde9bd329730bb4ecd9d95";
libraryHaskellDepends = [
base hashable lifted-base monad-control text time transformers
transformers-base unordered-containers
@@ -68892,8 +71045,8 @@ self: {
}:
mkDerivation {
pname = "glue-core";
- version = "0.4.8";
- sha256 = "145a86d1ef7c2a8c0dd10b258a6b93497986ae3789fe79b1389ecb02ab5b8178";
+ version = "0.4.9";
+ sha256 = "56c4a2782f74ee90aec320e2b393bae098ff7d0786bd5cf143260446ba23bd0c";
libraryHaskellDepends = [
base glue-common hashable lifted-base monad-control text time
transformers transformers-base unordered-containers
@@ -68916,8 +71069,8 @@ self: {
}:
mkDerivation {
pname = "glue-ekg";
- version = "0.4.8";
- sha256 = "9612eb9054420ae4f467b167356f1cbe1ed43ad2f62726810dbdd012c38a4501";
+ version = "0.4.9";
+ sha256 = "373c5792acba3ebc4f032a8e718681b89e0f3807c7e5c6563fa28cdf0e42203f";
libraryHaskellDepends = [
base ekg-core glue-common hashable lifted-base monad-control text
time transformers transformers-base unordered-containers
@@ -68939,8 +71092,8 @@ self: {
}:
mkDerivation {
pname = "glue-example";
- version = "0.4.8";
- sha256 = "3e75fea965b3d83e57c1ade5354811a96707111b912840b5c7c46c2d02ae330a";
+ version = "0.4.9";
+ sha256 = "2bea50121582b00107e452b48a6d70de47d8942461448efaec46cbf6739b977c";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -69062,8 +71215,8 @@ self: {
}:
mkDerivation {
pname = "gnss-converters";
- version = "0.1.15";
- sha256 = "4fd123578ac8037646072ce98ae2b0d34269fbc27649922b377a398fd3cb28cc";
+ version = "0.1.17";
+ sha256 = "4f40d2896ac66c3a42daaa8849639e4a98bc8152c1d28933a6aaaceb8679dfe6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -70629,8 +72782,8 @@ self: {
}:
mkDerivation {
pname = "google-translate";
- version = "0.2";
- sha256 = "92b07c3ed6f1a815f4ef456c1612a3412701493afd665a0133200f7ef51676d7";
+ version = "0.3";
+ sha256 = "b89c6761fe3a8f4331f35a48b6758968449c2228fa00a68a69ccc9b11d9a1f64";
libraryHaskellDepends = [
aeson base bytestring http-api-data http-client servant
servant-client text transformers
@@ -71803,8 +73956,8 @@ self: {
}:
mkDerivation {
pname = "grid";
- version = "7.8.5";
- sha256 = "dc5841ddffcc2dacd6667031fc78d2c0df86a7c8e112b76ba134831e84741fb8";
+ version = "7.8.6";
+ sha256 = "a511a0146446018536176c84e5a134c9bc5ad477717c24bff3e92d52d40bf352";
libraryHaskellDepends = [ base cereal containers ];
testHaskellDepends = [
base containers QuickCheck test-framework
@@ -73276,12 +75429,12 @@ self: {
"hablog" = callPackage
({ mkDerivation, base, bifunctors, blaze-html, blaze-markup
, bytestring, containers, directory, filepath, markdown, mime-types
- , mtl, scotty, scotty-tls, text, transformers
+ , mtl, optparse-applicative, scotty, scotty-tls, text, transformers
}:
mkDerivation {
pname = "hablog";
- version = "0.4.0";
- sha256 = "c7bb65866e22621196cac657afc610a578a5bab290af06e5b8d221ea3da2b80d";
+ version = "0.5.1";
+ sha256 = "1a533a209b3db3035f155461ab900f6bdfd5654658a7450586257a34b604129d";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -73289,7 +75442,7 @@ self: {
directory filepath markdown mime-types mtl scotty scotty-tls text
transformers
];
- executableHaskellDepends = [ base ];
+ executableHaskellDepends = [ base optparse-applicative text ];
description = "A blog system";
license = stdenv.lib.licenses.mit;
}) {};
@@ -74042,19 +76195,25 @@ self: {
}) {};
"hackernews" = callPackage
- ({ mkDerivation, aeson, attoparsec, base, bytestring, either
- , HsOpenSSL, hspec, http-streams, io-streams, text, time
- , transformers
+ ({ mkDerivation, aeson, base, hspec, http-client, http-client-tls
+ , http-types, QuickCheck, quickcheck-instances, servant
+ , servant-client, string-conversions, text
}:
mkDerivation {
pname = "hackernews";
- version = "0.5.0.1";
- sha256 = "dfef879e6256945f2348996dc0c8b8db0d69887e55ef99cae93a46e14c79720e";
+ version = "1.1.1.0";
+ sha256 = "6544eb03de96d0c9b6de1556b8efba3b4265f84ab65a351068fdad199c9fe844";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [
- aeson attoparsec base bytestring either HsOpenSSL http-streams
- io-streams text time transformers
+ aeson base http-client http-types QuickCheck quickcheck-instances
+ servant servant-client string-conversions text
+ ];
+ executableHaskellDepends = [ base http-client http-client-tls ];
+ testHaskellDepends = [
+ aeson base hspec http-client http-client-tls QuickCheck
+ quickcheck-instances
];
- testHaskellDepends = [ base hspec transformers ];
description = "API for Hacker News";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -74711,39 +76870,40 @@ self: {
"hakyll" = callPackage
({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
- , cmdargs, containers, cryptohash, data-default, deepseq, directory
- , filepath, fsnotify, http-conduit, http-types, HUnit, lrucache
- , mtl, network, network-uri, pandoc, pandoc-citeproc, parsec
- , process, QuickCheck, random, regex-base, regex-tdfa, resourcet
- , scientific, snap-core, snap-server, system-filepath, tagsoup
- , test-framework, test-framework-hunit, test-framework-quickcheck2
- , text, time, time-locale-compat, unordered-containers, utillinux
- , vector, yaml
+ , containers, cryptohash, data-default, deepseq, directory
+ , filepath, fsnotify, http-conduit, http-types, lrucache, mtl
+ , network, network-uri, optparse-applicative, pandoc
+ , pandoc-citeproc, parsec, process, QuickCheck, random, regex-base
+ , regex-tdfa, resourcet, scientific, system-filepath, tagsoup
+ , tasty, tasty-hunit, tasty-quickcheck, text, time
+ , time-locale-compat, unordered-containers, utillinux, vector, wai
+ , wai-app-static, warp, yaml
}:
mkDerivation {
pname = "hakyll";
- version = "4.8.3.2";
- sha256 = "ddc8c659590d29ba34afdced18ff1e60dc9d1bfb102a5cc7df447e31ee5e0b39";
+ version = "4.9.0.0";
+ sha256 = "6c21697efaf30166a1afc508f1122e2b828ade9d8d4d53408b13c1216337295e";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base binary blaze-html blaze-markup bytestring cmdargs containers
+ base binary blaze-html blaze-markup bytestring containers
cryptohash data-default deepseq directory filepath fsnotify
- http-conduit http-types lrucache mtl network network-uri pandoc
- pandoc-citeproc parsec process random regex-base regex-tdfa
- resourcet scientific snap-core snap-server system-filepath tagsoup
- text time time-locale-compat unordered-containers vector yaml
+ http-conduit http-types lrucache mtl network network-uri
+ optparse-applicative pandoc pandoc-citeproc parsec process random
+ regex-base regex-tdfa resourcet scientific system-filepath tagsoup
+ text time time-locale-compat unordered-containers vector wai
+ wai-app-static warp yaml
];
executableHaskellDepends = [ base directory filepath ];
testHaskellDepends = [
- base binary blaze-html blaze-markup bytestring cmdargs containers
+ base binary blaze-html blaze-markup bytestring containers
cryptohash data-default deepseq directory filepath fsnotify
- http-conduit http-types HUnit lrucache mtl network network-uri
- pandoc pandoc-citeproc parsec process QuickCheck random regex-base
- regex-tdfa resourcet scientific snap-core snap-server
- system-filepath tagsoup test-framework test-framework-hunit
- test-framework-quickcheck2 text time time-locale-compat
- unordered-containers vector yaml
+ http-conduit http-types lrucache mtl network network-uri
+ optparse-applicative pandoc pandoc-citeproc parsec process
+ QuickCheck random regex-base regex-tdfa resourcet scientific
+ system-filepath tagsoup tasty tasty-hunit tasty-quickcheck text
+ time time-locale-compat unordered-containers vector wai
+ wai-app-static warp yaml
];
testToolDepends = [ utillinux ];
homepage = "http://jaspervdj.be/hakyll";
@@ -75129,6 +77289,27 @@ self: {
license = stdenv.lib.licenses.gpl2;
}) {};
+ "halvm-web" = callPackage
+ ({ mkDerivation, async, base, bytestring, cereal, containers
+ , HALVMCore, hans, HTTP, mime-types, network-uri, simple-tar, text
+ , XenDevice
+ }:
+ mkDerivation {
+ pname = "halvm-web";
+ version = "0.3.0.0";
+ sha256 = "d1f2da05f50c235cf01112b5d31dfc4e7aa0b0cfc7b3bdaaf735190dd3535992";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ async base bytestring cereal containers HALVMCore hans HTTP
+ mime-types network-uri simple-tar text XenDevice
+ ];
+ homepage = "http://halvm.org";
+ description = "A simple, static HaLVM web server";
+ license = stdenv.lib.licenses.bsd3;
+ broken = true;
+ }) {HALVMCore = null; XenDevice = null;};
+
"hamid" = callPackage
({ mkDerivation, base, HCodecs, newtype }:
mkDerivation {
@@ -75173,26 +77354,26 @@ self: {
}) {};
"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, aeson, base, bytestring, containers, 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";
+ version = "0.9.0.0";
+ sha256 = "bb8c90e637cbe5fce26ef80ea6c2a078cdbdc06b927ba08f63b7b0ad23bb90b9";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson base bytestring directory doctemplates file-embed filepath
- frontmatter groom network-uri optparse-applicative
+ aeson base bytestring containers 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";
+ description = "Interpreter for SQL-structure definitions in YAML (YamSql)";
license = stdenv.lib.licenses.gpl3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -75639,8 +77820,8 @@ self: {
}:
mkDerivation {
pname = "happstack-authenticate";
- version = "2.3.4.5";
- sha256 = "65553a742d47f7209e0f42234c2e6f790a98f68386eea108a42b9c3a46fc4cd2";
+ version = "2.3.4.6";
+ sha256 = "633fb4d68122bd33725adb4f39e348b0ca293041abbf9941a3e5e2ce784d641a";
libraryHaskellDepends = [
acid-state aeson authenticate base base64-bytestring boomerang
bytestring containers data-default email-validate filepath
@@ -76249,6 +78430,22 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) capstone;};
+ "haquery" = callPackage
+ ({ mkDerivation, base, containers, parsec, split, tagsoup, text
+ , transformers
+ }:
+ mkDerivation {
+ pname = "haquery";
+ version = "0.1.1.3";
+ sha256 = "6a07f654bee6628fee163d7203380ac8b55f1e916ad47d22d8ec43c841803096";
+ libraryHaskellDepends = [
+ base containers parsec split tagsoup text transformers
+ ];
+ homepage = "https://github.com/crufter/haquery";
+ description = "jQuery for Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"har" = callPackage
({ mkDerivation, aeson, base, bytestring, directory, filepath, text
}:
@@ -77407,20 +79604,6 @@ self: {
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";
- description = "Foundation for libraries generated by haskell-gi";
- license = stdenv.lib.licenses.lgpl21;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {inherit (pkgs) glib;};
-
"haskell-google-trends" = callPackage
({ mkDerivation, base, bytestring, haskell-fake-user-agent, lens
, regex-base, regex-posix, tagsoup, text, wreq
@@ -79469,15 +81652,16 @@ self: {
}) {};
"hasql-backend" = callPackage
- ({ mkDerivation, base-prelude, bytestring, either, free, list-t
- , text, transformers, vector
+ ({ mkDerivation, base, base-prelude, bytestring, either, free
+ , list-t, text, transformers, vector
}:
mkDerivation {
pname = "hasql-backend";
- version = "0.4.2";
- sha256 = "541a37b288ec5300e9830416a764ef54cce82415b3678c08af526f569e88c20a";
+ version = "0.4.3";
+ sha256 = "4df97b42c47d026b6371e423211805a061ffed4df464a9cecfe7f378c8362a88";
libraryHaskellDepends = [
- base-prelude bytestring either free list-t text transformers vector
+ base base-prelude bytestring either free list-t text transformers
+ vector
];
homepage = "https://github.com/nikita-volkov/hasql-backend";
description = "API for backends of \"hasql\"";
@@ -79616,8 +81800,8 @@ self: {
}:
mkDerivation {
pname = "hasql-postgres-options";
- version = "0.1.5";
- sha256 = "a2204c448f7a494d16f37ae36624914f73fc12bd7f25154d19706ea7302a5a90";
+ version = "0.1.6";
+ sha256 = "079556e632a048df511add7252ecd965e9df4b9e4af356a2c86f90ea64e713b3";
libraryHaskellDepends = [
base-prelude hasql-postgres optparse-applicative
];
@@ -80893,8 +83077,8 @@ self: {
}:
mkDerivation {
pname = "hdo";
- version = "0.1";
- sha256 = "feb54ee5c028b828d752fba4a086b43227f14a5ed3d0b4fd4d3ccfb09745d11a";
+ version = "0.2";
+ sha256 = "4d031d84de97173db977731938918166f9dc54240ee53cac24d0ccf79b96c547";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -81093,18 +83277,23 @@ self: {
}) {};
"heckle" = callPackage
- ({ mkDerivation, base, blaze-html, dates, directory, pandoc
- , pandoc-types, process, split, tagsoup
+ ({ mkDerivation, base, blaze-html, dates, directory, filepath
+ , optparse-applicative, optparse-generic, pandoc, pandoc-types
+ , process, split, tagsoup
}:
mkDerivation {
pname = "heckle";
- version = "2.0.0.4";
- sha256 = "cd6664f6b969d0f884a2826b7faeed0bd40bdfd99a74521aad080c706d827320";
- isLibrary = false;
+ version = "2.0.1.1";
+ sha256 = "ba4defee459e282b1308ee66ed9148ea9bd936eae41136f82c6ffbb71981dd14";
+ isLibrary = true;
isExecutable = true;
+ libraryHaskellDepends = [
+ base blaze-html dates directory filepath pandoc pandoc-types
+ process split tagsoup
+ ];
executableHaskellDepends = [
- base blaze-html dates directory pandoc pandoc-types process split
- tagsoup
+ base directory filepath optparse-applicative optparse-generic
+ process split
];
homepage = "https://github.com/2016rshah/heckle";
description = "Jekyll in Haskell (feat. LaTeX)";
@@ -81285,39 +83474,28 @@ self: {
"heist" = callPackage
({ mkDerivation, aeson, attoparsec, base, bifunctors, blaze-builder
- , blaze-html, bytestring, containers, criterion, directory
- , directory-tree, dlist, errors, filepath, hashable, HUnit, lens
- , lifted-base, map-syntax, monad-control, mtl, process, QuickCheck
- , random, statistics, test-framework, test-framework-hunit
- , test-framework-quickcheck2, text, time, transformers
- , transformers-base, unordered-containers, vector, xmlhtml
+ , blaze-html, bytestring, containers, directory, directory-tree
+ , dlist, filepath, hashable, HUnit, lens, lifted-base, map-syntax
+ , monad-control, mtl, process, QuickCheck, random, test-framework
+ , test-framework-hunit, test-framework-quickcheck2, text, time
+ , transformers, transformers-base, unordered-containers, vector
+ , xmlhtml
}:
mkDerivation {
pname = "heist";
- version = "1.0.0.0";
- sha256 = "6c637ee835488dc716bf6fd929ea4de12578119ccf07766cb601910d160fec4f";
- revision = "2";
- editedCabalFile = "6da6ec8736d1cb25caa9ca7b82e0eab1ebd2c99804fa7ac23b933589f550a637";
- isLibrary = true;
- isExecutable = true;
+ version = "1.0.1.0";
+ sha256 = "fd4ff3c1bfc1473feb9e913a5cdecaf56bc9db022abc27a76768cb6345c68bcb";
libraryHaskellDepends = [
aeson attoparsec base blaze-builder blaze-html bytestring
containers directory directory-tree dlist filepath hashable
lifted-base map-syntax monad-control mtl process random text time
transformers transformers-base unordered-containers vector xmlhtml
];
- executableHaskellDepends = [
- aeson attoparsec base blaze-builder blaze-html bytestring
- containers criterion directory directory-tree dlist errors filepath
- hashable HUnit lifted-base map-syntax monad-control mtl process
- random statistics test-framework test-framework-hunit text time
- transformers transformers-base unordered-containers vector xmlhtml
- ];
testHaskellDepends = [
aeson attoparsec base bifunctors blaze-builder blaze-html
- bytestring containers directory directory-tree dlist errors
- filepath hashable HUnit lens lifted-base map-syntax monad-control
- mtl process QuickCheck random test-framework test-framework-hunit
+ bytestring containers directory directory-tree dlist filepath
+ hashable HUnit lens lifted-base map-syntax monad-control mtl
+ process QuickCheck random test-framework test-framework-hunit
test-framework-quickcheck2 text time transformers transformers-base
unordered-containers vector xmlhtml
];
@@ -81765,8 +83943,8 @@ self: {
}:
mkDerivation {
pname = "here";
- version = "1.2.8";
- sha256 = "2e6fcb0c498c787973f033455b4bc579cbfd0f86f0f958a05fc8502a3759c7ec";
+ version = "1.2.9";
+ sha256 = "c6e87d889bbfa414b7a4dcad0dc55aae1158630065d5f52408fe8b72adc8ff38";
libraryHaskellDepends = [
base haskell-src-meta mtl parsec template-haskell
];
@@ -84012,8 +86190,8 @@ self: {
}:
mkDerivation {
pname = "hjsonpointer";
- version = "1.0.0.1";
- sha256 = "e438e501f48cadbe7352cf0fc93b5fb744c99acba465f7280afdb0d3c504713f";
+ version = "1.0.0.2";
+ sha256 = "98e2675781d11e1c9eb903b6a7c35020137625e305efb0fcb8f7614f09e6e8f2";
libraryHaskellDepends = [
aeson base QuickCheck text unordered-containers vector
];
@@ -84053,7 +86231,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "hjsonschema_1_2_0_1" = callPackage
+ "hjsonschema_1_2_0_2" = callPackage
({ mkDerivation, aeson, async, base, bytestring, containers
, directory, file-embed, filepath, hjsonpointer, hspec, http-client
, http-types, pcre-heavy, profunctors, QuickCheck, scientific
@@ -84062,8 +86240,8 @@ self: {
}:
mkDerivation {
pname = "hjsonschema";
- version = "1.2.0.1";
- sha256 = "85df5af566ed80b814b5b1757dee2acbde8f0c979747b34d28094552dcf5a960";
+ version = "1.2.0.2";
+ sha256 = "dc6aa03f842609ed43910510a3d5bf58bab38e94d3117ec9f669ef50ce33dd00";
libraryHaskellDepends = [
aeson base bytestring containers file-embed filepath hjsonpointer
http-client http-types pcre-heavy profunctors QuickCheck scientific
@@ -84214,6 +86392,71 @@ self: {
license = "GPL";
}) {};
+ "hledger_1_0_1" = callPackage
+ ({ mkDerivation, base, base-compat, bytestring, cmdargs, containers
+ , csv, data-default, directory, file-embed, filepath, hashable
+ , haskeline, hledger-lib, HUnit, megaparsec, mtl, mtl-compat
+ , old-time, parsec, pretty-show, process, regex-tdfa, safe
+ , shakespeare, split, tabular, temporary, terminfo, test-framework
+ , test-framework-hunit, text, time, transformers
+ , unordered-containers, utf8-string, wizards
+ }:
+ mkDerivation {
+ pname = "hledger";
+ version = "1.0.1";
+ sha256 = "835de42bebfbf55a53714c24ea4df31b625ee12f0766aa83aa552ba6c39b7104";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base base-compat bytestring cmdargs containers csv data-default
+ directory file-embed filepath hashable haskeline hledger-lib HUnit
+ megaparsec mtl mtl-compat old-time pretty-show process regex-tdfa
+ safe shakespeare split tabular temporary terminfo text time
+ transformers unordered-containers utf8-string wizards
+ ];
+ executableHaskellDepends = [
+ base base-compat bytestring cmdargs containers csv data-default
+ directory file-embed filepath haskeline hledger-lib HUnit mtl
+ mtl-compat old-time parsec pretty-show process regex-tdfa safe
+ shakespeare split tabular temporary terminfo text time
+ unordered-containers utf8-string wizards
+ ];
+ testHaskellDepends = [
+ base base-compat bytestring cmdargs containers csv data-default
+ directory file-embed filepath haskeline hledger-lib HUnit mtl
+ mtl-compat old-time parsec pretty-show process regex-tdfa safe
+ shakespeare split tabular temporary terminfo test-framework
+ test-framework-hunit text time unordered-containers utf8-string
+ wizards
+ ];
+ homepage = "http://hledger.org";
+ description = "Command-line interface for the hledger accounting tool";
+ license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "hledger-api" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, Decimal
+ , docopt, either, hledger, hledger-lib, microlens
+ , microlens-platform, safe, servant-server, servant-swagger
+ , swagger2, text, transformers, wai, wai-extra, warp
+ }:
+ mkDerivation {
+ pname = "hledger-api";
+ version = "1.0";
+ sha256 = "80f4f4eef2c1df68e8013e78a1c5165a0f7c5150f7c4249353698afa078056fd";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ aeson base bytestring containers Decimal docopt either hledger
+ hledger-lib microlens microlens-platform safe servant-server
+ servant-swagger swagger2 text transformers wai wai-extra warp
+ ];
+ homepage = "http://hledger.org";
+ description = "Web API server for the hledger accounting tool";
+ license = "GPL";
+ }) {};
+
"hledger-chart" = callPackage
({ mkDerivation, base, Chart, cmdargs, colour, containers, hledger
, hledger-lib, HUnit, safe, time
@@ -84235,14 +86478,14 @@ self: {
}) {};
"hledger-diff" = callPackage
- ({ mkDerivation, base, hledger-lib, time }:
+ ({ mkDerivation, base, hledger-lib, text, time }:
mkDerivation {
pname = "hledger-diff";
- version = "0.2.0.5";
- sha256 = "437034c916d99bfc13240e0cc7a563bef4029ddda526eb4bf0e452ef29be8e67";
+ version = "0.2.0.6";
+ sha256 = "0ef38d60055fb632f3a686b5ce8aee0af5637e51b17d4c5a27764dd485c52b75";
isLibrary = false;
isExecutable = true;
- executableHaskellDepends = [ base hledger-lib time ];
+ executableHaskellDepends = [ base hledger-lib text time ];
homepage = "https://github.com/gebner/hledger-diff";
description = "Compares the transactions in two ledger files";
license = stdenv.lib.licenses.gpl3;
@@ -84266,18 +86509,37 @@ self: {
maintainers = with stdenv.lib.maintainers; [ peti ];
}) {};
- "hledger-irr" = callPackage
- ({ mkDerivation, base, Cabal, Decimal, hledger-lib, statistics
- , time
+ "hledger-interest_1_5" = callPackage
+ ({ mkDerivation, base, Cabal, Decimal, hledger-lib, mtl, text, time
}:
mkDerivation {
- pname = "hledger-irr";
- version = "0.1.1.8";
- sha256 = "7dd9f5c870c508534c1c00d653ee4319cead5b912a446a8c3b4ef941caae3162";
+ pname = "hledger-interest";
+ version = "1.5";
+ sha256 = "77fb04190160de91eb791f2326691133e1be26c0984fabf30581ba1f0af3fab1";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- base Cabal Decimal hledger-lib statistics time
+ base Cabal Decimal hledger-lib mtl text time
+ ];
+ homepage = "http://github.com/peti/hledger-interest";
+ description = "computes interest for a given account";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ maintainers = with stdenv.lib.maintainers; [ peti ];
+ }) {};
+
+ "hledger-irr" = callPackage
+ ({ mkDerivation, base, Cabal, Decimal, hledger-lib, statistics
+ , text, time
+ }:
+ mkDerivation {
+ pname = "hledger-irr";
+ version = "0.1.1.9";
+ sha256 = "76266868cb7a1a82483f1f622b3a5f88bc1d2eec8691f264c12761df74147016";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base Cabal Decimal hledger-lib statistics text time
];
description = "computes the internal rate of return of an investment";
license = stdenv.lib.licenses.bsd3;
@@ -84311,21 +86573,54 @@ self: {
license = "GPL";
}) {};
+ "hledger-lib_1_0_1" = callPackage
+ ({ mkDerivation, array, base, base-compat, blaze-markup, bytestring
+ , cmdargs, containers, csv, data-default, Decimal, deepseq
+ , directory, doctest, filepath, Glob, HUnit, megaparsec, mtl
+ , mtl-compat, old-time, parsec, pretty-show, regex-tdfa, safe
+ , semigroups, split, test-framework, test-framework-hunit, text
+ , time, transformers, uglymemo, utf8-string
+ }:
+ mkDerivation {
+ pname = "hledger-lib";
+ version = "1.0.1";
+ sha256 = "9a30c51859a4e75a9d3fdd123cb1d13e250f345911ce2b3acefbd921e4248ac6";
+ libraryHaskellDepends = [
+ array base base-compat blaze-markup bytestring cmdargs containers
+ csv data-default Decimal deepseq directory filepath HUnit
+ megaparsec mtl mtl-compat old-time parsec pretty-show regex-tdfa
+ safe semigroups split text time transformers uglymemo utf8-string
+ ];
+ testHaskellDepends = [
+ array base base-compat blaze-markup bytestring cmdargs containers
+ csv data-default Decimal deepseq directory doctest filepath Glob
+ HUnit megaparsec mtl mtl-compat old-time pretty-show regex-tdfa
+ safe split test-framework test-framework-hunit text time
+ transformers uglymemo utf8-string
+ ];
+ homepage = "http://hledger.org";
+ description = "Core data types, parsers and functionality for the hledger accounting tools";
+ license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hledger-ui" = 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, ansi-terminal, base, base-compat, brick, cmdargs
+ , containers, data-default, filepath, hledger, hledger-lib, HUnit
+ , megaparsec, microlens, microlens-platform, pretty-show, process
+ , safe, split, text, text-zipper, time, transformers, vector, vty
}:
mkDerivation {
pname = "hledger-ui";
- version = "0.27.5";
- sha256 = "0864f4b63629681c5db8be6edeff2474ed9407266f8dcb01f7ab2ed77c0ad0d9";
+ version = "1.0.2";
+ sha256 = "0a1ec9ecb14bfe6726cc7d27a8adf1f4ea198362423a024402975f79f30e2b2c";
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
+ ansi-terminal base base-compat brick cmdargs containers
+ data-default filepath hledger hledger-lib HUnit megaparsec
+ microlens microlens-platform pretty-show process safe split text
+ text-zipper time transformers vector vty
];
homepage = "http://hledger.org";
description = "Curses-style user interface for the hledger accounting tool";
@@ -84356,23 +86651,23 @@ self: {
({ mkDerivation, base, base-compat, blaze-html, blaze-markup
, bytestring, clientsession, cmdargs, conduit-extra, data-default
, directory, filepath, hjsmin, hledger, hledger-lib, hspec
- , http-client, http-conduit, HUnit, json, parsec, safe, shakespeare
- , template-haskell, text, time, transformers, wai, wai-extra
- , wai-handler-launch, warp, yaml, yesod, yesod-core, yesod-form
- , yesod-static, yesod-test
+ , http-client, http-conduit, HUnit, json, megaparsec, mtl, parsec
+ , safe, shakespeare, template-haskell, text, time, transformers
+ , wai, wai-extra, wai-handler-launch, warp, yaml, yesod, yesod-core
+ , yesod-form, yesod-static, yesod-test
}:
mkDerivation {
pname = "hledger-web";
- version = "0.27";
- sha256 = "92722fa89b09b9d1fd2f66703083e84e0a03a97b6aea08c9064723d4858df1ef";
+ version = "1.0.1";
+ sha256 = "e552af5e781ecc8e46bc7ff5a17333c739b18b9cbdcdca08840703b0b7cc59f8";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base base-compat blaze-html blaze-markup bytestring clientsession
cmdargs conduit-extra data-default directory filepath hjsmin
- hledger hledger-lib http-client http-conduit HUnit json parsec safe
- shakespeare template-haskell text time transformers wai wai-extra
- wai-handler-launch warp yaml yesod yesod-core yesod-form
+ hledger hledger-lib http-client http-conduit HUnit json megaparsec
+ mtl safe shakespeare template-haskell text time transformers wai
+ wai-extra wai-handler-launch warp yaml yesod yesod-core yesod-form
yesod-static
];
executableHaskellDepends = [
@@ -84386,9 +86681,9 @@ self: {
testHaskellDepends = [
base base-compat blaze-html blaze-markup bytestring clientsession
cmdargs conduit-extra data-default directory filepath hjsmin
- hledger hledger-lib hspec http-client http-conduit HUnit json
- parsec safe shakespeare template-haskell text time transformers wai
- wai-extra wai-handler-launch warp yaml yesod yesod-core yesod-form
+ hledger hledger-lib hspec http-client http-conduit HUnit json safe
+ shakespeare template-haskell text time transformers wai wai-extra
+ wai-handler-launch warp yaml yesod yesod-core yesod-form
yesod-static yesod-test
];
homepage = "http://hledger.org";
@@ -85103,8 +87398,8 @@ self: {
}:
mkDerivation {
pname = "hnix";
- version = "0.3.3";
- sha256 = "8c14d3e86b3b2a0e9834ade0f2c3595a96b27d1cc114873887a84f6ed8bee44f";
+ version = "0.3.4";
+ sha256 = "ec890845cc8a782ff8a2e7a2dcbaf763d5ddb3ff202293f701828d04a85adbf2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -87028,6 +89323,38 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hpio_0_8_0_4" = callPackage
+ ({ mkDerivation, async, base, base-compat, bytestring, containers
+ , directory, doctest, exceptions, filepath, hlint, hspec, mtl
+ , mtl-compat, optparse-applicative, QuickCheck, text, transformers
+ , transformers-compat, unix, unix-bytestring
+ }:
+ mkDerivation {
+ pname = "hpio";
+ version = "0.8.0.4";
+ sha256 = "68a97e2a83f2b21143e96ee607726bcf23251ce36bff901bdc60024bb3fbe4f3";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base base-compat bytestring containers directory exceptions
+ filepath mtl mtl-compat QuickCheck text transformers
+ transformers-compat unix unix-bytestring
+ ];
+ executableHaskellDepends = [
+ async base base-compat exceptions mtl mtl-compat
+ optparse-applicative transformers transformers-compat
+ ];
+ testHaskellDepends = [
+ async base base-compat bytestring containers directory doctest
+ exceptions filepath hlint hspec mtl mtl-compat QuickCheck text
+ transformers transformers-compat unix unix-bytestring
+ ];
+ homepage = "https://github.com/dhess/hpio";
+ description = "Monads for GPIO in Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hplayground" = callPackage
({ mkDerivation, base, containers, data-default, haste-compiler
, haste-perch, monads-tf, transformers
@@ -87385,6 +89712,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hreader-lens" = callPackage
+ ({ mkDerivation, base, hreader, hset, lens, profunctors }:
+ mkDerivation {
+ pname = "hreader-lens";
+ version = "0.1.1.0";
+ sha256 = "3b4cef769b0589e042c65876ebd343eb3a00d5ed449b8c6678604ac8b755d647";
+ libraryHaskellDepends = [ base hreader hset lens profunctors ];
+ homepage = "http://github.com/dredozubov/hreader-lens";
+ description = "Optics for hreader package";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"hricket" = callPackage
({ mkDerivation, base, containers }:
mkDerivation {
@@ -87418,7 +89757,7 @@ self: {
];
description = "Embed a Ruby intepreter in your Haskell program !";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
+ hydraPlatforms = [ "x86_64-linux" ];
}) {inherit (pkgs) ruby;};
"hs-GeoIP" = callPackage
@@ -88985,8 +91324,8 @@ self: {
}:
mkDerivation {
pname = "hsexif";
- version = "0.6.0.9";
- sha256 = "411c9ff2fc0a0c4bbb28691085887a0f7ebffd2d2c589df763b1104135adc404";
+ version = "0.6.0.10";
+ sha256 = "64cb8abfa31085475ae45fddfc2716cb40764714d47c0fc6146fec2b8ab65d33";
libraryHaskellDepends = [
base binary bytestring containers iconv text time
];
@@ -89195,8 +91534,8 @@ self: {
({ mkDerivation, base, directory, filepath }:
mkDerivation {
pname = "hsinstall";
- version = "1.4";
- sha256 = "d0be47492395a079e447bcebd54f63522b6f957c51bee9f78b5d4cddaa548869";
+ version = "1.5";
+ sha256 = "77848b03600f68d6cceab565aa6ac165c11855c061cbd27b03b4edb3985c1a1c";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base directory filepath ];
@@ -89285,8 +91624,8 @@ self: {
}:
mkDerivation {
pname = "hslogger-reader";
- version = "1.0.1";
- sha256 = "61d0b5f870ef3b5a436ad7e89a2f97ecd4c2bdd3b65998ffe4c71480313dc148";
+ version = "1.0.2";
+ sha256 = "b41559e1f35f0fa38dde62c79c408aaf7452bdb347c726041db67914f83c204f";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ attoparsec base hslogger text time ];
@@ -89679,15 +92018,15 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "hspec_2_3_1" = callPackage
+ "hspec_2_3_2" = 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";
+ version = "2.3.2";
+ sha256 = "e852f69cd585cc945c2a9aa191ae6f8894f2e7e10685d60bfed29b521f032fb4";
libraryHaskellDepends = [
base call-stack hspec-core hspec-discover hspec-expectations HUnit
QuickCheck transformers
@@ -89773,7 +92112,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "hspec-core_2_3_1" = callPackage
+ "hspec-core_2_3_2" = callPackage
({ mkDerivation, ansi-terminal, async, base, call-stack, deepseq
, hspec-expectations, hspec-meta, HUnit, process, QuickCheck
, quickcheck-io, random, setenv, silently, tf-random, time
@@ -89781,8 +92120,8 @@ self: {
}:
mkDerivation {
pname = "hspec-core";
- version = "2.3.1";
- sha256 = "3136a34ae0ff45aec4449b1aab90a9dbb61ae57d7adfa4ef567eb39728fd9008";
+ version = "2.3.2";
+ sha256 = "1c6d5d07475a4de72837b1739e0e94cfa2896e762af403d1978ee4df683541b9";
libraryHaskellDepends = [
ansi-terminal async base call-stack deepseq hspec-expectations
HUnit QuickCheck quickcheck-io random setenv tf-random time
@@ -89815,12 +92154,12 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "hspec-discover_2_3_1" = callPackage
+ "hspec-discover_2_3_2" = callPackage
({ mkDerivation, base, directory, filepath, hspec-meta }:
mkDerivation {
pname = "hspec-discover";
- version = "2.3.1";
- sha256 = "3c8fa99104ca21a6aa247d4b9db9211b2cf800d48f61e6396c184aaff8d92d97";
+ version = "2.3.2";
+ sha256 = "fd36c9b91d417d0bb9041e0c2f148fa593dd752d4d62a8ca156fb3d8f88fe35f";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base directory filepath ];
@@ -89844,12 +92183,12 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "hspec-expectations_0_8_0" = callPackage
+ "hspec-expectations_0_8_2" = callPackage
({ mkDerivation, base, call-stack, HUnit, nanospec }:
mkDerivation {
pname = "hspec-expectations";
- version = "0.8.0";
- sha256 = "e861250530897df93716a198b147f2cf90e02c34149bef3c41584ba0c90d4baa";
+ version = "0.8.2";
+ sha256 = "819607ea1faf35ce5be34be61c6f50f3389ea43892d56fb28c57a9f5d54fb4ef";
libraryHaskellDepends = [ base call-stack HUnit ];
testHaskellDepends = [ base call-stack HUnit nanospec ];
homepage = "https://github.com/hspec/hspec-expectations#readme";
@@ -90065,17 +92404,15 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "hspec-meta_2_3_1" = callPackage
+ "hspec-meta_2_3_2" = 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";
+ version = "2.3.2";
+ sha256 = "59b1ba3f32f443fdcdef345905a4d0b60c31c36894e56d34a9ac6cf406578a8b";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -90619,6 +92956,22 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hsqml-demo-manic" = callPackage
+ ({ mkDerivation, base, containers, hsqml, MonadRandom, text }:
+ mkDerivation {
+ pname = "hsqml-demo-manic";
+ version = "0.3.4.0";
+ sha256 = "a663ed9f750a0d0f0a37a2640212ea992dc025912d723e8944e9875295699626";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base containers hsqml MonadRandom text
+ ];
+ homepage = "http://www.gekkou.co.uk/software/hsqml/";
+ description = "HsQML-based clone of Pipe Mania";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hsqml-demo-morris" = callPackage
({ mkDerivation, base, containers, deepseq, directory, hsqml
, OddWord, text
@@ -91429,8 +93782,8 @@ self: {
}:
mkDerivation {
pname = "html-tokenizer";
- version = "0.4.0.0";
- sha256 = "8767075be6ce5efbec5cd27fdd5efa21fdf16546730789e08861429078978428";
+ version = "0.4.1";
+ sha256 = "1076a72985763dec5d5da3793ae3e4c11cc5c8993b56a31b60f192eee0ed17c1";
libraryHaskellDepends = [
attoparsec base-prelude case-insensitive conversion
conversion-case-insensitive conversion-text text
@@ -91652,7 +94005,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "http-api-data_0_3_1" = callPackage
+ "http-api-data_0_3_2" = callPackage
({ mkDerivation, base, bytestring, containers, directory, doctest
, filepath, hashable, hspec, HUnit, QuickCheck
, quickcheck-instances, text, time, time-locale-compat
@@ -91660,8 +94013,8 @@ self: {
}:
mkDerivation {
pname = "http-api-data";
- version = "0.3.1";
- sha256 = "d5ab6897aae064ac8278fff3b4ce3289446990735f71798b4815cf0eb6ad94c7";
+ version = "0.3.2";
+ sha256 = "015fb4167f807c31af465cd8991454c3ed72ad5935ff0839993f4fcb038958f2";
libraryHaskellDepends = [
base bytestring containers hashable text time time-locale-compat
unordered-containers uri-bytestring uuid-types
@@ -91719,7 +94072,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "http-client_0_5_3_2" = callPackage
+ "http-client_0_5_3_3" = callPackage
({ mkDerivation, array, async, base, base64-bytestring
, blaze-builder, bytestring, case-insensitive, containers, cookie
, deepseq, directory, exceptions, filepath, ghc-prim, hspec
@@ -91728,8 +94081,8 @@ self: {
}:
mkDerivation {
pname = "http-client";
- version = "0.5.3.2";
- sha256 = "cda16be6802d2b65b410090225e5143e4516527e4732b3664dd416297aef5292";
+ version = "0.5.3.3";
+ sha256 = "8faeb55e45f578c9aa7a17dab5a6cb4aa858fb8d64a18c18497c3af4569164ce";
libraryHaskellDepends = [
array base base64-bytestring blaze-builder bytestring
case-insensitive containers cookie deepseq exceptions filepath
@@ -91972,7 +94325,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "http-conduit_2_2_2_1" = callPackage
+ "http-conduit_2_2_3" = callPackage
({ mkDerivation, aeson, base, blaze-builder, bytestring
, case-insensitive, conduit, conduit-extra, connection, cookie
, data-default-class, exceptions, hspec, http-client
@@ -91982,8 +94335,8 @@ self: {
}:
mkDerivation {
pname = "http-conduit";
- version = "2.2.2.1";
- sha256 = "1ec7feb0ee0263559ccccc729e760990f4908cf1b1eeb2af221afeec34d23c57";
+ version = "2.2.3";
+ sha256 = "eee51e80fe76b3bf4b4041545f452e126e0593f70a0623a5a35ee47d72fe0dc3";
libraryHaskellDepends = [
aeson base bytestring conduit conduit-extra exceptions http-client
http-client-tls http-types lifted-base monad-control mtl resourcet
@@ -92246,15 +94599,16 @@ self: {
}) {};
"http-pony" = callPackage
- ({ mkDerivation, base, bytestring, network, pipes, pipes-network
- , pipes-safe, transformers
+ ({ mkDerivation, base, bytestring, exceptions, network, pipes
+ , pipes-network, pipes-safe, transformers
}:
mkDerivation {
pname = "http-pony";
- version = "0.1.0.3";
- sha256 = "b65e845f84d98fd9fc774049f0c3aaa2e0183e875085d793cfa9b9705d1cd1fa";
+ version = "0.1.0.5";
+ sha256 = "255ca693eeb4cff7c3315e75fe63414b987f56a0424ec80e579d2c0f357f78e1";
libraryHaskellDepends = [
- base bytestring network pipes pipes-network pipes-safe transformers
+ base bytestring exceptions network pipes pipes-network pipes-safe
+ transformers
];
homepage = "https://github.com/nfjinjing/http-pony";
description = "A type unsafe http library";
@@ -92285,10 +94639,11 @@ self: {
({ mkDerivation, base, case-insensitive, lens, profunctors }:
mkDerivation {
pname = "http-pony-transformer-case-insensitive";
- version = "0.1.0.1";
- sha256 = "6a2ebc104954c62b91444e1789f1672ee6bc1237ca3e1b0d86b43c3455881c1c";
+ version = "0.1.0.2";
+ sha256 = "399b3dffbe4ee4f6723ac92c3f6914bfa261499977919752de7e69bc0ac7cb91";
libraryHaskellDepends = [ base case-insensitive lens profunctors ];
homepage = "https://github.com/nfjinjing/http-pony-transformer-case-insensitive";
+ description = "Tag http headers as case insensitive";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -92298,11 +94653,12 @@ self: {
}:
mkDerivation {
pname = "http-pony-transformer-http";
- version = "0.1.0.0";
- sha256 = "645623db8c4bf92746358fbbc0cf4e7d19392565f4c019f9dc8d1df515efeba3";
+ version = "0.1.0.3";
+ sha256 = "b5e19a0a77ede213c89524609ef401c6d8d5c0c4350a3aae1d161d9c1e294fdd";
libraryHaskellDepends = [
attoparsec base bytestring pipes pipes-attoparsec transformers
];
+ description = "Transform raw TCP stream to a basic HTTP type";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -92310,8 +94666,8 @@ self: {
({ mkDerivation, attoparsec, base, bytestring, http-types, lens }:
mkDerivation {
pname = "http-pony-transformer-startline";
- version = "0.1.0.0";
- sha256 = "a0aa55e3ce44b1256588c7c584622b3f6685dd2134f499532e2afd99ab034bb3";
+ version = "0.1.0.1";
+ sha256 = "797995f992cc366b94c16f3e85d5c5cadec3fc4475f72511472d12f2ec67bf39";
libraryHaskellDepends = [
attoparsec base bytestring http-types lens
];
@@ -92373,8 +94729,8 @@ self: {
}:
mkDerivation {
pname = "http-response-decoder";
- version = "0.2.2";
- sha256 = "9769eec587a8b17450d6b0cda30c57e043cc595fb6f3d7f58a0a8e372299b513";
+ version = "0.2.3";
+ sha256 = "4e0f0ac43f33b811ef8b35715f207318034625547259f8b65c1566702a909f31";
libraryHaskellDepends = [
base base-prelude bytestring bytestring-tree-builder
case-insensitive http-client http-types matcher profunctors text
@@ -92412,6 +94768,34 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "http-reverse-proxy_0_4_3_2" = callPackage
+ ({ mkDerivation, async, base, blaze-builder, bytestring
+ , case-insensitive, conduit, conduit-extra, containers
+ , data-default-class, hspec, http-client, http-conduit, http-types
+ , lifted-base, monad-control, network, resourcet, streaming-commons
+ , text, transformers, wai, wai-logger, warp, word8
+ }:
+ mkDerivation {
+ pname = "http-reverse-proxy";
+ version = "0.4.3.2";
+ sha256 = "c2b3300bf43a9810e8642dd7fa44ecfb5e0ce1055dc01e0b604ae9a99fbfd77a";
+ 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-server" = callPackage
({ mkDerivation, base, HTTP, mime, network, network-uri, text, unix
, url, utf8-string
@@ -92879,8 +95263,8 @@ self: {
({ mkDerivation, base, dejafu, exceptions, HUnit }:
mkDerivation {
pname = "hunit-dejafu";
- version = "0.3.0.2";
- sha256 = "eba6ff1b350a7b4a1e09abfc694d4c3ac47bbc36fea23439f512a763c531a7a3";
+ version = "0.3.0.3";
+ sha256 = "c9adfd6bd611e296c4e78b67d23d73cdec71cadd0f876be9a508ce5dc414b120";
libraryHaskellDepends = [ base dejafu exceptions HUnit ];
homepage = "https://github.com/barrucadu/dejafu";
description = "Deja Fu support for the HUnit test framework";
@@ -93166,6 +95550,25 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hw-balancedparens" = callPackage
+ ({ mkDerivation, base, hspec, hw-bits, hw-excess, hw-prim
+ , hw-rankselect-base, QuickCheck, vector
+ }:
+ mkDerivation {
+ pname = "hw-balancedparens";
+ version = "0.1.0.0";
+ sha256 = "c56ec15ed8f59afa54289362cf936564535843ea8f7ef9758093fd0a438169fe";
+ libraryHaskellDepends = [
+ base hw-bits hw-excess hw-prim hw-rankselect-base vector
+ ];
+ testHaskellDepends = [
+ base hspec hw-bits hw-prim hw-rankselect-base QuickCheck vector
+ ];
+ homepage = "http://github.com/haskell-works/hw-balancedparens#readme";
+ description = "Balanced parentheses";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hw-bits" = callPackage
({ mkDerivation, base, bytestring, criterion, hspec, hw-prim, mmap
, parsec, QuickCheck, resourcet, safe, vector
@@ -93191,27 +95594,22 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "hw-bits_0_2_0_2" = callPackage
- ({ mkDerivation, base, bytestring, criterion, hspec, hw-prim, mmap
- , parsec, QuickCheck, resourcet, safe, vector
+ "hw-bits_0_5_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, hspec, hw-int, hw-prim
+ , hw-string-parse, QuickCheck, safe, vector
}:
mkDerivation {
pname = "hw-bits";
- version = "0.2.0.2";
- sha256 = "32dd71a6265b6c7ab296dbf23eb865247f111a4e3bfba01ea18d8e5d7e169641";
- isLibrary = true;
- isExecutable = true;
+ version = "0.5.0.0";
+ sha256 = "414f2603df8291564eb86edf445cb6a0945143e9ea49faedfc5aa99e950a235f";
libraryHaskellDepends = [
- base bytestring hw-prim parsec safe vector
- ];
- executableHaskellDepends = [
- base criterion mmap resourcet vector
+ base bytestring hw-int hw-prim hw-string-parse safe vector
];
testHaskellDepends = [
base bytestring hspec hw-prim QuickCheck vector
];
homepage = "http://github.com/haskell-works/hw-bits#readme";
- description = "Conduits for tokenizing streams";
+ description = "Bit manipulation";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -93237,6 +95635,27 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hw-conduit_0_1_0_0" = callPackage
+ ({ mkDerivation, array, base, bytestring, conduit, criterion, hspec
+ , hw-bits, resourcet, word8
+ }:
+ mkDerivation {
+ pname = "hw-conduit";
+ version = "0.1.0.0";
+ sha256 = "28bc7f865c5366b442743143fa5d5af9cd970bbd2acc549d27993ea49901491b";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ array base bytestring conduit hw-bits resourcet word8
+ ];
+ executableHaskellDepends = [ base criterion ];
+ testHaskellDepends = [ base bytestring hspec ];
+ homepage = "http://github.com/haskell-works/hw-conduit#readme";
+ description = "Conduits for tokenizing streams";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hw-diagnostics" = callPackage
({ mkDerivation, base, hspec, QuickCheck }:
mkDerivation {
@@ -93253,39 +95672,136 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hw-diagnostics_0_0_0_5" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "hw-diagnostics";
+ version = "0.0.0.5";
+ sha256 = "5ceaec01c446c5a507e889f514201e4739ea6f1cc22a4c68894bb023257bd931";
+ libraryHaskellDepends = [ base ];
+ homepage = "http://github.com/haskell-works/hw-diagnostics#readme";
+ description = "Diagnostics library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "hw-eliasfano" = callPackage
+ ({ mkDerivation, base, hspec, hw-bits, hw-int, hw-packed-vector
+ , hw-prim, QuickCheck, safe, vector
+ }:
+ mkDerivation {
+ pname = "hw-eliasfano";
+ version = "0.1.0.1";
+ sha256 = "14710bcbfe4e44bfe683fa0db73d9546268c24101770968c13083defca2048e6";
+ libraryHaskellDepends = [
+ base hw-bits hw-int hw-packed-vector hw-prim safe vector
+ ];
+ testHaskellDepends = [
+ base hspec hw-bits hw-int hw-prim QuickCheck vector
+ ];
+ homepage = "http://github.com/haskell-works/hw-eliasfano#readme";
+ description = "Elias-Fano";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "hw-excess" = callPackage
+ ({ mkDerivation, base, hspec, hw-bits, hw-prim, hw-rankselect-base
+ , QuickCheck, safe, vector
+ }:
+ mkDerivation {
+ pname = "hw-excess";
+ version = "0.1.0.0";
+ sha256 = "4df4b44ec9c0ac60f11f1e9baf1aed39691dc214855980ab5d778a0a6f1742bb";
+ libraryHaskellDepends = [
+ base hw-bits hw-prim hw-rankselect-base safe vector
+ ];
+ testHaskellDepends = [
+ base hspec hw-bits hw-prim QuickCheck vector
+ ];
+ homepage = "http://github.com/haskell-works/hw-excess#readme";
+ description = "Excess";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "hw-int" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "hw-int";
+ version = "0.0.0.1";
+ sha256 = "2f0759f63a77640a61300a2bb292518adca8782e7d099db4804bffac2d2da7cb";
+ libraryHaskellDepends = [ base ];
+ homepage = "http://github.com/haskell-works/hw-int#readme";
+ description = "Integers";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hw-json" = callPackage
({ mkDerivation, ansi-wl-pprint, array, attoparsec, base
- , bytestring, conduit, containers, criterion, errors, hspec
- , hw-bits, hw-conduit, hw-diagnostics, hw-parser, hw-prim
- , hw-rankselect, mmap, mono-traversable, parsec, QuickCheck
- , resourcet, text, transformers, vector, word8
+ , bytestring, conduit, containers, criterion, dlist, hspec
+ , hw-balancedparens, hw-bits, hw-conduit, hw-diagnostics, hw-mquery
+ , hw-parser, hw-prim, hw-rankselect, hw-rankselect-base, mmap
+ , mono-traversable, parsec, QuickCheck, resourcet, text
+ , transformers, vector, word8
}:
mkDerivation {
pname = "hw-json";
- version = "0.2.0.4";
- sha256 = "771c33414a125d75417a546aa7a9e26210541407460da61294fa3a0e05a22eed";
+ version = "0.4.0.0";
+ sha256 = "addf66d70ee97249797e4967161f52cad0fe4c2cd1c426f51d349b0cbf31cc85";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
ansi-wl-pprint array attoparsec base bytestring conduit containers
- hw-bits hw-conduit hw-diagnostics hw-parser hw-prim hw-rankselect
- mmap mono-traversable resourcet text vector word8
+ dlist hw-balancedparens hw-bits hw-conduit hw-diagnostics hw-mquery
+ hw-parser hw-prim hw-rankselect hw-rankselect-base mmap
+ mono-traversable resourcet text vector word8
];
executableHaskellDepends = [
- base bytestring conduit criterion errors hw-bits hw-conduit
- hw-diagnostics hw-prim hw-rankselect mmap resourcet vector
+ ansi-wl-pprint array attoparsec base bytestring conduit containers
+ criterion dlist hw-balancedparens hw-bits hw-conduit hw-diagnostics
+ hw-mquery hw-parser hw-prim hw-rankselect hw-rankselect-base mmap
+ mono-traversable resourcet text vector word8
];
testHaskellDepends = [
- attoparsec base bytestring conduit containers hspec hw-bits
- hw-conduit hw-prim hw-rankselect mmap parsec QuickCheck resourcet
- transformers vector
+ attoparsec base bytestring conduit containers hspec
+ hw-balancedparens hw-bits hw-conduit hw-prim hw-rankselect
+ hw-rankselect-base mmap parsec QuickCheck resourcet transformers
+ vector
];
homepage = "http://github.com/haskell-works/hw-json#readme";
- description = "Conduits for tokenizing streams";
+ description = "Memory efficient JSON parser";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hw-json-lens" = callPackage
+ ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base
+ , bytestring, conduit, containers, dlist, hspec, hw-balancedparens
+ , hw-bits, hw-conduit, hw-diagnostics, hw-json, hw-parser, hw-prim
+ , hw-rankselect, lens, mmap, mono-traversable, parsec, QuickCheck
+ , resourcet, scientific, text, transformers, unordered-containers
+ , vector, word8
+ }:
+ mkDerivation {
+ pname = "hw-json-lens";
+ version = "0.0.0.1";
+ sha256 = "5f14595e525ddc73f564acc702d5828c639b0d23f06a421dde75ab7084100fe4";
+ libraryHaskellDepends = [
+ ansi-wl-pprint array attoparsec base bytestring conduit containers
+ dlist hw-balancedparens hw-bits hw-conduit hw-diagnostics hw-json
+ hw-parser hw-prim hw-rankselect lens mmap mono-traversable
+ resourcet scientific text unordered-containers vector word8
+ ];
+ testHaskellDepends = [
+ attoparsec base bytestring conduit containers hspec
+ hw-balancedparens hw-bits hw-conduit hw-json hw-prim hw-rankselect
+ lens mmap parsec QuickCheck resourcet scientific transformers
+ unordered-containers vector
+ ];
+ homepage = "http://github.com/haskell-works/hw-json-lens#readme";
+ description = "Lens for hw-json";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"hw-mquery" = callPackage
({ mkDerivation, ansi-wl-pprint, base, dlist, hspec, QuickCheck }:
mkDerivation {
@@ -93302,6 +95818,25 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hw-packed-vector" = callPackage
+ ({ mkDerivation, base, bytestring, hspec, hw-bits, hw-int, hw-prim
+ , hw-string-parse, QuickCheck, safe, vector
+ }:
+ mkDerivation {
+ pname = "hw-packed-vector";
+ version = "0.0.0.1";
+ sha256 = "b6980a80cb23cd6e889a4bb6302f684a158c9d81d7b80873812ea6b3c6014931";
+ libraryHaskellDepends = [
+ base bytestring hw-bits hw-int hw-prim hw-string-parse safe vector
+ ];
+ testHaskellDepends = [
+ base bytestring hspec hw-bits hw-prim QuickCheck vector
+ ];
+ homepage = "http://github.com/haskell-works/hw-packed-vector#readme";
+ description = "Packed Vector";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hw-parser" = callPackage
({ mkDerivation, attoparsec, base, bytestring, hw-prim
, mono-traversable, text
@@ -93338,24 +95873,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "hw-prim_0_3_0_4" = callPackage
- ({ mkDerivation, base, bytestring, hspec, QuickCheck, random
- , vector
- }:
+ "hw-prim_0_4_0_2" = callPackage
+ ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }:
mkDerivation {
pname = "hw-prim";
- version = "0.3.0.4";
- sha256 = "7ca79714de0458c5506fc5b73a5c7a6702beed53a8cb484cd0287ae49d7ffb40";
- isLibrary = true;
- isExecutable = true;
+ version = "0.4.0.2";
+ sha256 = "1702b32260020864157ccf118151012ca6856bf4618238032cd2f6d9b70a672a";
libraryHaskellDepends = [ base bytestring vector ];
- executableHaskellDepends = [ base ];
- testHaskellDepends = [
- base bytestring hspec QuickCheck random vector
- ];
+ testHaskellDepends = [ base bytestring hspec QuickCheck vector ];
homepage = "http://github.com/haskell-works/hw-prim#readme";
description = "Primitive functions and data types";
- license = stdenv.lib.licenses.mit;
+ license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -93379,17 +95907,56 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hw-rankselect_0_8_0_0" = callPackage
+ ({ mkDerivation, base, hspec, hw-balancedparens, hw-bits, hw-prim
+ , hw-rankselect-base, QuickCheck, vector
+ }:
+ mkDerivation {
+ pname = "hw-rankselect";
+ version = "0.8.0.0";
+ sha256 = "db85437b77a44d887522b0019af08c8132c6132b5eaa9a2ebb0e4310b6ebaab5";
+ libraryHaskellDepends = [
+ base hw-balancedparens hw-bits hw-prim hw-rankselect-base vector
+ ];
+ testHaskellDepends = [
+ base hspec hw-bits hw-prim hw-rankselect-base QuickCheck vector
+ ];
+ homepage = "http://github.com/haskell-works/hw-rankselect#readme";
+ description = "Rank-select";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "hw-rankselect-base" = callPackage
+ ({ mkDerivation, base, hspec, hw-bits, hw-int, hw-prim
+ , hw-string-parse, QuickCheck, safe, vector
+ }:
+ mkDerivation {
+ pname = "hw-rankselect-base";
+ version = "0.2.0.0";
+ sha256 = "c853c19e0f3a7a388a0f315db36843d9e05bb986f6183641b7a04fe16f28afa4";
+ libraryHaskellDepends = [
+ base hw-bits hw-int hw-prim hw-string-parse safe vector
+ ];
+ testHaskellDepends = [
+ base hspec hw-bits hw-prim QuickCheck vector
+ ];
+ homepage = "http://github.com/haskell-works/hw-rankselect-base#readme";
+ description = "Rank-select base";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hw-string-parse" = callPackage
({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }:
mkDerivation {
pname = "hw-string-parse";
- version = "0.0.0.2";
- sha256 = "2b915afcc3ef29a61b17e7a37c047059bf87eb0d22d0f970892292b959ed562e";
+ version = "0.0.0.3";
+ sha256 = "6f5898c63b0b1e0fe7f7d8825f00a728904eba18eefc1353fc72d88a3aabee0a";
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;
+ description = "String parser";
+ license = stdenv.lib.licenses.bsd3;
}) {};
"hw-succinct" = callPackage
@@ -93411,6 +95978,77 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hw-succinct_0_1_0_1" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, conduit, containers
+ , hw-balancedparens, hw-bits, hw-prim, hw-rankselect
+ , hw-rankselect-base, mmap, mono-traversable, text, vector, word8
+ }:
+ mkDerivation {
+ pname = "hw-succinct";
+ version = "0.1.0.1";
+ sha256 = "002c578c1ff7a33cbef089b2a943218777c14125629f6bf63dea9e7c8e3749db";
+ libraryHaskellDepends = [
+ attoparsec base bytestring conduit containers hw-balancedparens
+ hw-bits hw-prim hw-rankselect hw-rankselect-base mmap
+ mono-traversable text vector word8
+ ];
+ homepage = "http://github.com/haskell-works/hw-succinct#readme";
+ description = "Succint datastructures";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "hw-vector" = callPackage
+ ({ mkDerivation, base, bytestring, hspec, hw-prim, QuickCheck
+ , vector
+ }:
+ mkDerivation {
+ pname = "hw-vector";
+ version = "0.0.0.1";
+ sha256 = "0381d90756d46dc2aff60ce122a128234a7ab23d2285c37bf775b4a03d1ab074";
+ libraryHaskellDepends = [ base bytestring hw-prim vector ];
+ testHaskellDepends = [ base hspec QuickCheck vector ];
+ homepage = "http://github.com/haskell-works/hw-vector#readme";
+ description = "Vector type with convenient typeclass instances";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "hw-xml" = callPackage
+ ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base
+ , bytestring, conduit, containers, criterion, hspec
+ , hw-balancedparens, hw-bits, hw-conduit, hw-diagnostics, hw-parser
+ , hw-prim, hw-rankselect, hw-rankselect-base, mmap
+ , mono-traversable, parsec, QuickCheck, resourcet, text
+ , transformers, vector, word8
+ }:
+ mkDerivation {
+ pname = "hw-xml";
+ version = "0.0.0.1";
+ sha256 = "79ff61e2ea455ca08924e223a9285b016af8e16b216dd25f039709eac4846a15";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ ansi-wl-pprint array attoparsec base bytestring conduit containers
+ hw-balancedparens hw-bits hw-conduit hw-parser hw-prim
+ hw-rankselect hw-rankselect-base mono-traversable resourcet text
+ vector word8
+ ];
+ executableHaskellDepends = [
+ base bytestring conduit criterion hw-balancedparens hw-bits
+ hw-conduit hw-diagnostics hw-prim hw-rankselect mmap resourcet
+ vector
+ ];
+ testHaskellDepends = [
+ attoparsec base bytestring conduit containers hspec
+ hw-balancedparens hw-bits hw-conduit hw-prim hw-rankselect
+ hw-rankselect-base mmap parsec QuickCheck resourcet transformers
+ vector
+ ];
+ homepage = "http://github.com/haskell-works/hw-xml#readme";
+ description = "Conduits for tokenizing streams";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hwall-auth-iitk" = callPackage
({ mkDerivation, base, bytestring, haskeline, http-conduit
, http-types, mtl, regex-compat, unix
@@ -93612,15 +96250,15 @@ self: {
"hxt" = callPackage
({ mkDerivation, base, binary, bytestring, containers, deepseq
- , directory, filepath, HUnit, hxt-charproperties
- , hxt-regex-xmlschema, hxt-unicode, mtl, network-uri, parsec
+ , directory, filepath, hxt-charproperties, hxt-regex-xmlschema
+ , hxt-unicode, mtl, network-uri, parsec
}:
mkDerivation {
pname = "hxt";
- version = "9.3.1.15";
- sha256 = "723e7b3c22f58771087e7763d11702b3ae3aa910158a2beee70e973722966560";
+ version = "9.3.1.16";
+ sha256 = "0d55e35cc718891d0987b7c8e6c43499efa727c68bc92e88e8b99461dff403e3";
libraryHaskellDepends = [
- base binary bytestring containers deepseq directory filepath HUnit
+ base binary bytestring containers deepseq directory filepath
hxt-charproperties hxt-regex-xmlschema hxt-unicode mtl network-uri
parsec
];
@@ -93648,15 +96286,15 @@ self: {
"hxt-cache" = callPackage
({ mkDerivation, base, binary, bytestring, containers, deepseq
- , directory, filepath, hxt, SHA, time, unix
+ , directory, filepath, hxt, SHA, time, unix-compat
}:
mkDerivation {
pname = "hxt-cache";
- version = "9.1.0.1";
- sha256 = "f470012bcde9fe0a534b540abddd3434b61814c89f596858b88619147a8223ce";
+ version = "9.1.0.2";
+ sha256 = "5899644e5fa375ec8417febd8dbdcbdda50822963f91a9fdedfc95e706a6e41f";
libraryHaskellDepends = [
base binary bytestring containers deepseq directory filepath hxt
- SHA time unix
+ SHA time unix-compat
];
homepage = "https://github.com/UweSchmidt/hxt";
description = "Cache for HXT XML Documents and other binary data";
@@ -93777,8 +96415,8 @@ self: {
}:
mkDerivation {
pname = "hxt-regex-xmlschema";
- version = "9.2.0.2";
- sha256 = "4744676dde2b29c4bb75a579345145225a1f1b7ba15d46b7f868c37c6e696cc2";
+ version = "9.2.0.3";
+ sha256 = "f4743ba65498d6001cdfcf5cbc3317d4bc43941be5c7030b60beb83408c892b0";
libraryHaskellDepends = [
base bytestring hxt-charproperties parsec text
];
@@ -94204,8 +96842,8 @@ self: {
}:
mkDerivation {
pname = "hylide";
- version = "0.1.4.0";
- sha256 = "23887424cba4466f674bddc88ba65e751a690d4455469075de617f5c0595da3b";
+ version = "0.1.4.1";
+ sha256 = "e0c98883073da1513757698c2c70cee419db20e351127e83c31e01239c66a94e";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base hylogen vector-space ];
@@ -94214,7 +96852,7 @@ self: {
process text wai warp websockets
];
homepage = "https://github.com/sleexyz/hylide";
- description = "Livecoding WebGL renderer for Hylogen";
+ description = "WebGL renderer for livecoding shaders with Hylogen";
license = stdenv.lib.licenses.mit;
}) {};
@@ -94236,8 +96874,8 @@ self: {
}:
mkDerivation {
pname = "hylolib";
- version = "1.5.2";
- sha256 = "6aa2533ab21c08b9d55036d67c6a10f6836f42dbeabe18673bfda28f764d7082";
+ version = "1.5.3";
+ sha256 = "8b3c5ffe38b149ba990bf2afd508dfa372b44eb09930497cc8c45276f87df5ca";
libraryHaskellDepends = [
array base containers mtl pretty random uniplate
];
@@ -94276,6 +96914,50 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hyper" = callPackage
+ ({ mkDerivation, base, blaze-html, deepseq, text }:
+ mkDerivation {
+ pname = "hyper";
+ version = "0.1.0.0";
+ sha256 = "04c76c0c88f658e9878f8090cc2e1351977128861ce4c03ce52d11c42e44b3da";
+ libraryHaskellDepends = [ base blaze-html deepseq text ];
+ description = "Display class for the HyperHaskell graphical Haskell interpreter";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "hyper-extra" = callPackage
+ ({ mkDerivation, base, diagrams-lib, diagrams-svg, hyper
+ , svg-builder, text
+ }:
+ mkDerivation {
+ pname = "hyper-extra";
+ version = "0.1.0.0";
+ sha256 = "1c36de58e0f51cfc3f47c83185c9d08539491d208c3b956f7de1119cd94858c8";
+ libraryHaskellDepends = [
+ base diagrams-lib diagrams-svg hyper svg-builder text
+ ];
+ description = "Display instances for the HyperHaskell graphical Haskell interpreter";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "hyper-haskell-server" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions, hint
+ , hyper, scotty, text, transformers
+ }:
+ mkDerivation {
+ pname = "hyper-haskell-server";
+ version = "0.1.0.0";
+ sha256 = "dcbd3d4e9b4026d6531fb54041e5ce595cec4094098a902d9e24c8f7b69516b8";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ aeson base bytestring deepseq exceptions hint hyper scotty text
+ transformers
+ ];
+ description = "Server back-end for the HyperHaskell graphical Haskell interpreter";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hyperdrive" = callPackage
({ mkDerivation, base, bytestring, bytestring-lexing
, extensible-exceptions, mtl, network, pipes, pretty
@@ -94648,6 +97330,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "iconv-typed" = callPackage
+ ({ mkDerivation, base, bytestring, iconv, shelly, template-haskell
+ , text
+ }:
+ mkDerivation {
+ pname = "iconv-typed";
+ version = "0.2.0.0";
+ sha256 = "3d43bb14e87d77ffbe2bfe9d5d8de7df8c83561eb46ca834a2086a27b090a2a8";
+ libraryHaskellDepends = [
+ base bytestring iconv shelly template-haskell text
+ ];
+ testHaskellDepends = [ base ];
+ homepage = "https://github.com/adinapoli/iconv-typed#readme";
+ description = "Type safe iconv wrapper";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"ide-backend" = callPackage
({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring
, bytestring-trie, Cabal-ide-backend, containers, crypto-api
@@ -94817,6 +97516,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "identicon_0_2_0" = callPackage
+ ({ mkDerivation, base, bytestring, hspec, JuicyPixels }:
+ mkDerivation {
+ pname = "identicon";
+ version = "0.2.0";
+ sha256 = "c9d22c41893f50ac6c096c11ac037f91153cd3b324c76bcbdd3277b2761cb346";
+ libraryHaskellDepends = [ base bytestring JuicyPixels ];
+ testHaskellDepends = [ base bytestring hspec JuicyPixels ];
+ homepage = "https://github.com/mrkkrp/identicon";
+ description = "Flexible generation of identicons";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"identifiers" = callPackage
({ mkDerivation, base, binary, cereal, containers, deepseq
, hashable, ListLike, QuickCheck, test-framework
@@ -95677,6 +98390,41 @@ self: {
license = "unknown";
}) {};
+ "imm_1_1_0_0" = callPackage
+ ({ mkDerivation, aeson, ansi-wl-pprint, atom-conduit, base
+ , blaze-html, blaze-markup, bytestring, case-insensitive
+ , chunked-data, comonad, conduit, conduit-combinators, connection
+ , containers, directory, dyre, fast-logger, filepath, free
+ , hashable, HaskellNet, HaskellNet-SSL, http-client
+ , http-client-tls, http-types, mime-mail, mono-traversable
+ , monoid-subclasses, network, opml-conduit, optparse-applicative
+ , rainbow, rainbox, rss-conduit, safe-exceptions, tagged, text
+ , time, timerep, tls, transformers, uri-bytestring, xml
+ , xml-conduit
+ }:
+ mkDerivation {
+ pname = "imm";
+ version = "1.1.0.0";
+ sha256 = "528437eaca7d756d2c0787504018f532a4ea531f97b5401e58161f9bd6c03f56";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson ansi-wl-pprint atom-conduit base blaze-html blaze-markup
+ bytestring case-insensitive chunked-data comonad conduit
+ conduit-combinators connection containers directory dyre
+ fast-logger filepath free hashable HaskellNet HaskellNet-SSL
+ http-client http-client-tls http-types mime-mail mono-traversable
+ monoid-subclasses network opml-conduit optparse-applicative rainbow
+ rainbox rss-conduit safe-exceptions tagged text time timerep tls
+ transformers uri-bytestring xml xml-conduit
+ ];
+ executableHaskellDepends = [ base free ];
+ homepage = "https://github.com/k0ral/imm";
+ description = "Execute arbitrary actions for each unread element of RSS/Atom feeds";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"immortal" = callPackage
({ mkDerivation, base, lifted-base, monad-control, stm, tasty
, tasty-hunit, transformers, transformers-base
@@ -96541,23 +99289,26 @@ self: {
"inline-java" = callPackage
({ mkDerivation, base, binary, bytestring, containers
- , distributed-closure, inline-c, jvm, singletons, text
- , thread-local-storage, vector
+ , distributed-closure, filepath, ghc-heap-view, hspec, inline-c
+ , jni, jvm, language-java, monad-loops, process, singletons, syb
+ , template-haskell, temporary, text, thread-local-storage, vector
}:
mkDerivation {
pname = "inline-java";
- version = "0.1";
- sha256 = "ec4a751af5749b1b12dd9fd20ae40745f0410375024bd895293d52b8386f5dcb";
+ version = "0.5.1";
+ sha256 = "b134f3a7904da62a23118bffe7f42bee1ea0c6fa4b84216679609520faeea098";
libraryHaskellDepends = [
- base binary bytestring containers distributed-closure inline-c
- singletons text thread-local-storage vector
+ base binary bytestring containers distributed-closure filepath
+ ghc-heap-view inline-c jni jvm language-java monad-loops process
+ singletons syb template-haskell temporary text thread-local-storage
+ vector
];
- librarySystemDepends = [ jvm ];
+ testHaskellDepends = [ base bytestring hspec jvm singletons text ];
homepage = "http://github.com/tweag/inline-java#readme";
description = "Java interop via inline Java code in Haskell modules";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {jvm = null;};
+ }) {};
"inline-r" = callPackage
({ mkDerivation, aeson, base, bytestring, c2hs, containers
@@ -97057,6 +99808,30 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "intero_0_1_19" = callPackage
+ ({ mkDerivation, array, base, bytestring, containers, directory
+ , filepath, ghc, ghc-boot-th, ghc-paths, ghci, haskeline, hspec
+ , process, regex-compat, syb, temporary, time, transformers, unix
+ }:
+ mkDerivation {
+ pname = "intero";
+ version = "0.1.19";
+ sha256 = "77dbd2811296b7b6a57a2d90d59580ea6d0d13f7611528233e020978408521ad";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ array base bytestring containers directory filepath ghc ghc-boot-th
+ ghc-paths ghci haskeline process syb time transformers unix
+ ];
+ testHaskellDepends = [
+ base directory hspec process regex-compat temporary transformers
+ ];
+ homepage = "https://github.com/commercialhaskell/intero";
+ description = "Complete interactive development program for Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"interpol" = callPackage
({ mkDerivation, base, haskell-src-exts, HUnit, regex-posix, syb
, test-framework, test-framework-hunit
@@ -97558,6 +100333,8 @@ self: {
pname = "ion";
version = "1.0.0.0";
sha256 = "24a364e30e6baeb531c8f040d3cea6d368c6457cabe58a21fb98f21333b7cc0d";
+ revision = "1";
+ editedCabalFile = "468bd67b256d96d6a7950870abb2c90f98815b759f89658022ece91fe234c3d9";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -97663,8 +100440,8 @@ self: {
({ mkDerivation, base, cmdargs, IPv6Addr, text }:
mkDerivation {
pname = "ip6addr";
- version = "0.5.1.3";
- sha256 = "4edd17f9cf77b0e6ae59c9016d5dc72b3467959bd779264783a4fe7c02aa9340";
+ version = "0.5.1.4";
+ sha256 = "fe5f93753026cc82123cbf626473d9353c94d8f681e90771b63dfebdd2f1f2f8";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [ base cmdargs IPv6Addr text ];
@@ -97759,8 +100536,8 @@ self: {
}:
mkDerivation {
pname = "iproute";
- version = "1.7.0";
- sha256 = "65dd0033101702cd3ba291ff52d5d2563a89087fda7bb7e4bd5a301042049ede";
+ version = "1.7.1";
+ sha256 = "57b8d03ca8ce92f8ec1334564f3edff53a0621ccbc43c00ba02eaa5007ee3eee";
libraryHaskellDepends = [
appar base byteorder containers network
];
@@ -97886,6 +100663,26 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "irc-client_0_4_4_1" = callPackage
+ ({ mkDerivation, base, bytestring, conduit, connection, irc-conduit
+ , irc-ctcp, network-conduit-tls, old-locale, stm, stm-conduit, text
+ , time, tls, transformers, x509, x509-store, x509-validation
+ }:
+ mkDerivation {
+ pname = "irc-client";
+ version = "0.4.4.1";
+ sha256 = "38d105cd429eb4937be8e5586c3ae268d420ce927894940670993abcc863ecf6";
+ libraryHaskellDepends = [
+ base bytestring conduit connection irc-conduit irc-ctcp
+ network-conduit-tls old-locale stm stm-conduit text time tls
+ transformers x509 x509-store x509-validation
+ ];
+ homepage = "https://github.com/barrucadu/irc-client";
+ description = "An IRC client library";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"irc-colors" = callPackage
({ mkDerivation, base, text }:
mkDerivation {
@@ -97915,6 +100712,25 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "irc-conduit_0_2_1_1" = callPackage
+ ({ mkDerivation, async, base, bytestring, conduit, conduit-extra
+ , connection, irc, irc-ctcp, network-conduit-tls, text, time, tls
+ , transformers, x509-validation
+ }:
+ mkDerivation {
+ pname = "irc-conduit";
+ version = "0.2.1.1";
+ sha256 = "ae575fcb8f8b2e1450387cad47fbae00d4f48f16238e656867678fd344ead51b";
+ 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-core" = callPackage
({ mkDerivation, attoparsec, base, bytestring, hashable, HUnit
, memory, primitive, text, time, vector
@@ -98583,6 +101399,8 @@ self: {
pname = "ivory";
version = "0.1.0.3";
sha256 = "e842ec8c195c2f148c393d09471c96bcae09c1fd5260f102df6b26b591da91e6";
+ revision = "1";
+ editedCabalFile = "2149b10ef5f9149f362f51960ddd252205c4ee348869741e70d3a33892fe66be";
libraryHaskellDepends = [
array base base-compat containers dlist filepath monadLib pretty
template-haskell text th-lift
@@ -99375,6 +102193,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "jni" = callPackage
+ ({ mkDerivation, base, bytestring, containers, inline-c, jvm
+ , singletons, thread-local-storage
+ }:
+ mkDerivation {
+ pname = "jni";
+ version = "0.1";
+ sha256 = "1e9545909b89552fb3c65ae6454a40912bf31f2a66fe0d3dcbadfc2af21c255b";
+ libraryHaskellDepends = [
+ base bytestring containers inline-c singletons thread-local-storage
+ ];
+ librarySystemDepends = [ jvm ];
+ homepage = "https://github.com/tweag/inline-java/tree/master/jni#readme";
+ description = "Complete JNI raw bindings";
+ license = stdenv.lib.licenses.bsd3;
+ }) {jvm = null;};
+
"jobqueue" = callPackage
({ mkDerivation, aeson, async, attoparsec, base, bytestring
, containers, data-default, directory, fast-logger, HDBC
@@ -99597,17 +102432,17 @@ self: {
"jsaddle" = callPackage
({ 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
+ , filepath, http-types, lens, primitive, process, QuickCheck
+ , ref-tf, stm, template-haskell, text, time, transformers, vector
+ , wai, wai-app-static, wai-websockets, warp, websockets
}:
mkDerivation {
pname = "jsaddle";
- version = "0.5.1.0";
- sha256 = "b97d31c176d1862103cabd8fe948c059f04de5c4ca4e4404001625827a5a506c";
+ version = "0.5.2.0";
+ sha256 = "216fe089de60352956df2aa3abcb1e28861e81d1943ae1a17ac7947aad18a4fb";
libraryHaskellDepends = [
aeson base bytestring containers filepath http-types lens primitive
- process stm template-haskell text time transformers wai
+ process ref-tf stm template-haskell text time transformers wai
wai-app-static wai-websockets warp websockets
];
testHaskellDepends = [
@@ -99625,8 +102460,8 @@ self: {
}:
mkDerivation {
pname = "jsaddle-dom";
- version = "0.4.1.0";
- sha256 = "c9038d2d124dfd330112470caee81a69b3918de186135f0c24525f4f81ec1b74";
+ version = "0.5.0.1";
+ sha256 = "fb64e3a7924c6191e39f61845fec44acc14502b5d70e6ec3b8fd12dbadb9904a";
libraryHaskellDepends = [
base base-compat jsaddle lens text transformers
];
@@ -99857,6 +102692,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "json-bytes-builder" = callPackage
+ ({ mkDerivation, base, base-prelude, bytestring, scientific
+ , semigroups, text
+ }:
+ mkDerivation {
+ pname = "json-bytes-builder";
+ version = "0.4";
+ sha256 = "f4f6084ee679640c97a62e0bf108fc7526fab7d69e786c881281c94e416e2e97";
+ libraryHaskellDepends = [
+ base base-prelude bytestring scientific semigroups text
+ ];
+ homepage = "https://github.com/nikita-volkov/json-bytes-builder";
+ description = "Direct-to-bytes JSON Builder";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"json-encoder" = callPackage
({ mkDerivation, base, base-prelude, bytestring
, bytestring-tree-builder, contravariant, contravariant-extras
@@ -100572,6 +103423,23 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "jvm" = callPackage
+ ({ mkDerivation, base, bytestring, distributed-closure, hspec, jni
+ , singletons, text, vector
+ }:
+ mkDerivation {
+ pname = "jvm";
+ version = "0.1.2";
+ sha256 = "0d20fc48b951e3decaa96e9ec13b60d4d45213b54d0f41323340fec1c27e2136";
+ libraryHaskellDepends = [
+ base bytestring distributed-closure jni singletons text vector
+ ];
+ testHaskellDepends = [ base bytestring hspec text ];
+ homepage = "http://github.com/tweag/inline-java/tree/master/jvm#readme";
+ description = "Call JVM methods from Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"jvm-parser" = callPackage
({ mkDerivation, array, base, binary, bytestring, containers
, data-binary-ieee754, fgl, fingertree, pretty, zlib
@@ -101580,29 +104448,28 @@ self: {
"keysafe" = callPackage
({ 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, token-bucket, transformers
- , unbounded-delays, unix, unix-compat, utf8-string, wai, warp
- , zxcvbn-c
+ , bytestring, containers, 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
}:
mkDerivation {
pname = "keysafe";
- version = "0.20161006";
- sha256 = "ae5d4445467d7f381a2c8ecd2142d64c31f1697418c5892b2f0e50f1857e034e";
+ version = "0.20161022";
+ sha256 = "2b6cc28f249b18dcdb0263ccb649598ddc8196f449e14130a20b0358711151a1";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
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
+ 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
];
homepage = "https://joeyh.name/code/keysafe/";
description = "back up a secret key securely to the cloud";
@@ -102362,6 +105229,24 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "lambda-calculator" = callPackage
+ ({ mkDerivation, base, hspec, HUnit, parsec, Shellac
+ , Shellac-readline
+ }:
+ mkDerivation {
+ pname = "lambda-calculator";
+ version = "0.5.0";
+ sha256 = "b6f3da4fbb70574ad0131b0ca2ff509031eebf17b8ab650c71651b2aedda26a1";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base parsec ];
+ executableHaskellDepends = [ base Shellac Shellac-readline ];
+ testHaskellDepends = [ base hspec HUnit ];
+ homepage = "https://github.com/sgillespie/lambda-calculus#readme";
+ description = "A lambda calculus interpreter";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"lambda-canvas" = callPackage
({ mkDerivation, base, GLUT, mtl, OpenGL, time }:
mkDerivation {
@@ -103265,6 +106150,32 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
+ "language-dockerfile_0_3_5_0" = callPackage
+ ({ mkDerivation, base, bytestring, directory, filepath, free, Glob
+ , hspec, HUnit, mtl, parsec, pretty, process, QuickCheck
+ , ShellCheck, split, template-haskell, test-framework
+ , test-framework-hunit, th-lift, th-lift-instances, transformers
+ }:
+ mkDerivation {
+ pname = "language-dockerfile";
+ version = "0.3.5.0";
+ sha256 = "9667fd70217ebf229369fbaf906bf74926a8ef1651fd965862c47082d09342e5";
+ libraryHaskellDepends = [
+ base bytestring free mtl parsec pretty ShellCheck split
+ template-haskell th-lift th-lift-instances transformers
+ ];
+ testHaskellDepends = [
+ base bytestring directory filepath free Glob hspec HUnit mtl parsec
+ pretty process QuickCheck ShellCheck split template-haskell
+ test-framework test-framework-hunit th-lift th-lift-instances
+ transformers
+ ];
+ homepage = "https://github.com/beijaflor-io/language-dockerfile#readme";
+ description = "Dockerfile linter, parser, pretty-printer and embedded DSL";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"language-dot" = callPackage
({ mkDerivation, base, mtl, parsec, pretty }:
mkDerivation {
@@ -104644,8 +107555,8 @@ self: {
}:
mkDerivation {
pname = "legion";
- version = "0.5.0.0";
- sha256 = "d9361ee7d554b7700d71ca13a258773513f5931ebfa5d7874cfbb45b6f794c44";
+ version = "0.6.0.0";
+ sha256 = "dab609f13594fd58d78ac5775d9e1027247d17ef5a29ca319140afa2f05f49d2";
libraryHaskellDepends = [
aeson attoparsec base binary binary-conduit bytestring
canteven-http canteven-log conduit conduit-extra containers
@@ -104659,14 +107570,59 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "legion-discovery" = callPackage
+ ({ mkDerivation, aeson, base, binary, bytestring, Cabal
+ , canteven-http, canteven-log, conduit, containers
+ , data-default-class, http-types, legion, legion-extra
+ , monad-logger, scotty, scotty-resource, SHA, text, time
+ , transformers, wai, wai-extra, warp
+ }:
+ mkDerivation {
+ pname = "legion-discovery";
+ version = "0.2.1.1";
+ sha256 = "9ecb4471cf9a52fd973d95c356d35542e4b12306eb7078f43e4a279d0c478131";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base binary bytestring Cabal canteven-http canteven-log
+ conduit containers data-default-class http-types legion
+ legion-extra monad-logger scotty scotty-resource SHA text time
+ transformers wai wai-extra warp
+ ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [ base ];
+ homepage = "https://github.com/owensmurray/legion-discovery#readme";
+ description = "Initial project template from stack";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
+ "legion-discovery-client" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, Cabal, containers
+ , data-default-class, http-client, http-types, load-balancing
+ , network, text
+ }:
+ mkDerivation {
+ pname = "legion-discovery-client";
+ version = "0.1.0.1";
+ sha256 = "6235b5f23411bfe0807274e4e31b5e9f805045b214f63a2cfbefed29d9fe27f1";
+ libraryHaskellDepends = [
+ aeson base bytestring Cabal containers data-default-class
+ http-client http-types load-balancing network text
+ ];
+ testHaskellDepends = [ base ];
+ homepage = "https://github.com/owensmurray/legion-discovery-client#readme";
+ description = "Client library for communicating with legion-discovery";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"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";
+ version = "0.1.0.4";
+ sha256 = "6961f3d40eac0bef0a6aa9301e6057ee79bf92ccec82cd6f60957b759dc1c048";
libraryHaskellDepends = [
aeson base bytestring canteven-log containers data-default-class
legion network safe split yaml
@@ -106235,6 +109191,29 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "lightning-haskell" = callPackage
+ ({ mkDerivation, aeson, api-builder, base, blaze-html, bytestring
+ , data-default-class, free, hspec, http-client, http-client-tls
+ , http-types, mtl, network, text, transformers
+ }:
+ mkDerivation {
+ pname = "lightning-haskell";
+ version = "0.1.0.2";
+ sha256 = "f6616270f8a15bc6a1efb5fe3431f97112c6c2a144c0f90f88e9df6a931b04d7";
+ libraryHaskellDepends = [
+ aeson api-builder base blaze-html bytestring data-default-class
+ free http-client http-client-tls http-types mtl network text
+ transformers
+ ];
+ testHaskellDepends = [
+ aeson api-builder base bytestring hspec http-client http-client-tls
+ http-types network text transformers
+ ];
+ homepage = "https://github.com/cmoresid/lightning-haskell#readme";
+ description = "Haskell client for lightning-viz REST API";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"lighttpd-conf" = callPackage
({ mkDerivation, alex, array, base, bytestring, happy, packedstring
, pretty, template-haskell
@@ -106497,8 +109476,8 @@ self: {
}:
mkDerivation {
pname = "linear-opengl";
- version = "0.2.0.10";
- sha256 = "9dc10dc309a2b6eb64da004106fa6a4c50beabc6c06e5fbb917e46ce5133217d";
+ version = "0.3.0.0";
+ sha256 = "d95cc9b0cce5162c0942550d4b8884fc13664994395237a8362279c0aa7ee01f";
libraryHaskellDepends = [
base distributive lens linear OpenGL OpenGLRaw tagged
];
@@ -107273,8 +110252,8 @@ self: {
}:
mkDerivation {
pname = "list-t-attoparsec";
- version = "0.4.0.2";
- sha256 = "614950a96b0f465b6bd084c250f4c399f433e305928305934623237ef129590b";
+ version = "0.4.1";
+ sha256 = "49d74a5f8abd9246566231d8c26ff9d29a2ed91c3ff61ab182de133e7b0bfd44";
libraryHaskellDepends = [
attoparsec base-prelude either list-t text transformers
];
@@ -107295,8 +110274,8 @@ self: {
}:
mkDerivation {
pname = "list-t-html-parser";
- version = "0.4.1.1";
- sha256 = "42f9b2c5e77acfa154a56ac538b29888d943d451487a45a70040d32458c24f27";
+ version = "0.4.2";
+ sha256 = "42bd5a8ad206aeb4ae4934c747164243084392ecdcf40ad5acc05a1760ad5836";
libraryHaskellDepends = [
base-prelude case-insensitive conversion
conversion-case-insensitive conversion-text either html-entities
@@ -107335,8 +110314,8 @@ self: {
}:
mkDerivation {
pname = "list-t-libcurl";
- version = "0.3.0.0";
- sha256 = "257b5f7b2121b88e2dcbc18cb70e0d0bdb53e17be412a9638f661e7c50ee8fc1";
+ version = "0.3.1";
+ sha256 = "f0c8aa894d73b5db7a6bfc5dcca9f7a83d43e722df7b1aa6fa485b34e6f8de2d";
libraryHaskellDepends = [
base base-prelude bytestring curlhs either list-t mtl-prelude
resource-pool stm
@@ -107353,8 +110332,8 @@ self: {
}:
mkDerivation {
pname = "list-t-text";
- version = "0.2.0.2";
- sha256 = "95e2d3647608d2e8a527f4ab0666a4fe98ed7f67b17e4831fc2e5f59b78e4bc3";
+ version = "0.2.1";
+ sha256 = "697fdc68a95e625ba02ee67737e647645da1da4d244f1ebc74fd3ba13b3d22b0";
libraryHaskellDepends = [
base-prelude bytestring list-t mtl-prelude text
];
@@ -107492,8 +110471,8 @@ self: {
}:
mkDerivation {
pname = "live-sequencer";
- version = "0.0.4";
- sha256 = "d4981f43c98752a8258a67b40e2ecd49821a03c0795176a5fbd48b73aed0c812";
+ version = "0.0.5.1";
+ sha256 = "d4453e597c7804b14554b873b1b2d40c043d79b488868e7c1879e50346927ac1";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base event-list non-negative ];
@@ -107986,6 +110965,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "load-balancing" = callPackage
+ ({ mkDerivation, base, containers, hslogger, PSQueue, stm }:
+ mkDerivation {
+ pname = "load-balancing";
+ version = "1.0.1.0";
+ sha256 = "332a7c437b9115b33913becd78d855ff7dc0407f58cfe065e8cd14ce0f7eb99f";
+ libraryHaskellDepends = [ base containers hslogger PSQueue stm ];
+ homepage = "https://github.com/SumAll/haskell-load-balancing";
+ description = "Client-side load balancing utilities";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"load-env" = callPackage
({ mkDerivation, base, directory, hspec, HUnit, parsec }:
mkDerivation {
@@ -109525,8 +112516,8 @@ self: {
}:
mkDerivation {
pname = "lzma";
- version = "0.0.0.2";
- sha256 = "09b45eb9fd47913c2cd2aa8e1e9544df21b96f24ea21615fde3b681ecde26b9a";
+ version = "0.0.0.3";
+ sha256 = "af8321c3511bde3e2745093fa3bd74c642e386db7d2e7c43b3a54814f1338144";
libraryHaskellDepends = [ base bytestring ];
librarySystemDepends = [ lzma ];
testHaskellDepends = [
@@ -110673,6 +113664,8 @@ self: {
pname = "map-syntax";
version = "0.2.0.1";
sha256 = "f45f0e09da98dc749eae15f403e30674e874c57f81c4bdd8db818028a25b5c55";
+ revision = "1";
+ editedCabalFile = "1e17d3b0d97cd033dd95b227ab387d6c3118a9b3191a290a593542f2ef0c4698";
libraryHaskellDepends = [ base containers mtl ];
testHaskellDepends = [
base containers deepseq hspec HUnit mtl QuickCheck transformers
@@ -110724,30 +113717,6 @@ self: {
}) {};
"markdown" = 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.14";
- sha256 = "204e9e0c100c8477266ab6b43990a5215ba07ac9ea280912794c32eef38dd42f";
- 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;
- }) {};
-
- "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
@@ -110769,7 +113738,6 @@ self: {
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
@@ -111365,21 +114333,21 @@ self: {
"maxsharing" = callPackage
({ mkDerivation, base, base-unicode-symbols, boxes, containers
- , containers-unicode-symbols, HaLeX, IndentParser, mtl, parsec
+ , containers-unicode-symbols, fgl, HaLeX, indentparser, mtl, parsec
, process, uuagc, uuagc-cabal
}:
mkDerivation {
pname = "maxsharing";
- version = "1.0.3";
- sha256 = "4b9ae7230c590b7d9e6060d791e01d9bda953ae41d47c6e88912325b30e8a284";
+ version = "1.1";
+ sha256 = "1cd275f8fc8994ba00320a243a2acad13f457eb2f0e2a9e4797a8b0f54f0646f";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
base base-unicode-symbols boxes containers
- containers-unicode-symbols HaLeX IndentParser mtl parsec process
- uuagc uuagc-cabal
+ containers-unicode-symbols fgl HaLeX indentparser mtl parsec
+ process uuagc uuagc-cabal
];
- homepage = "http://rochel.info/maxsharing/";
+ homepage = "http://arxiv.org/abs/1401.1460";
description = "Maximal sharing of terms in the lambda calculus with letrec";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -111678,6 +114646,19 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "median-stream" = callPackage
+ ({ mkDerivation, base, heap, QuickCheck }:
+ mkDerivation {
+ pname = "median-stream";
+ version = "0.3.0.0";
+ sha256 = "579c8c60b7376f78e02fa5cdd950c1116198126114c610a3561109d3b2dd2b74";
+ libraryHaskellDepends = [ base heap ];
+ testHaskellDepends = [ base QuickCheck ];
+ homepage = "https://github.com/caneroj1/median-stream#readme";
+ description = "Constant-time queries for the median of a stream of numeric data";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"mediawiki" = callPackage
({ mkDerivation, base, HTTP, mime, network, pretty, utf8-string
, xml
@@ -113328,6 +116309,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "minisat-solver" = callPackage
+ ({ mkDerivation, base, containers, transformers }:
+ mkDerivation {
+ pname = "minisat-solver";
+ version = "0.1";
+ sha256 = "c12098dee034afb98b31ce7ac346398b93a3537c11e30e7573d25160120fd37d";
+ libraryHaskellDepends = [ base containers transformers ];
+ homepage = "http://www.mathstat.dal.ca/~selinger/minisat-solver/";
+ description = "High-level Haskell bindings for the MiniSat SAT solver";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"ministg" = callPackage
({ mkDerivation, base, containers, directory, filepath, monads-tf
, parsec, pretty, transformers, xhtml
@@ -116506,14 +119499,18 @@ self: {
}) {};
"multifile" = callPackage
- ({ mkDerivation, base, HaXml }:
+ ({ mkDerivation, base, directory, HaXml, optparse-applicative
+ , pretty
+ }:
mkDerivation {
pname = "multifile";
- version = "0.1.0.0";
- sha256 = "a0d4e0c033e8f17991fa62be64efd16d04b76befbe74cd84f547fbbdd17bef9d";
+ version = "0.1.0.2";
+ sha256 = "acfcdc40b0ec9a11cd0de2efaa6fb1b4164907b24d3326ea78b5576ee51ac784";
isLibrary = false;
isExecutable = true;
- executableHaskellDepends = [ base HaXml ];
+ executableHaskellDepends = [
+ base directory HaXml optparse-applicative pretty
+ ];
homepage = "xy30.com";
description = "create many files from one";
license = stdenv.lib.licenses.bsd3;
@@ -116756,6 +119753,8 @@ self: {
pname = "multistate";
version = "0.7.1.1";
sha256 = "609650cbbfd102c775b44be3fd7bb4f6732127e64b21dd45ea1af057c5ffb8a6";
+ revision = "1";
+ editedCabalFile = "a5bd571eb919e74f8ba5313ffca801dce8c1fe1dd2c6699eadab39b0e37ae13b";
libraryHaskellDepends = [
base monad-control mtl tagged transformers transformers-base
];
@@ -117356,6 +120355,19 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "mwc-probability_1_2_2" = callPackage
+ ({ mkDerivation, base, mwc-random, primitive, transformers }:
+ mkDerivation {
+ pname = "mwc-probability";
+ version = "1.2.2";
+ sha256 = "a54e9e9e51c7b67e0eb8244d584fcfc999ab7af00e5146ffdf3efed837d5915a";
+ libraryHaskellDepends = [ base mwc-random primitive transformers ];
+ homepage = "http://github.com/jtobin/mwc-probability";
+ description = "Sampling function-based probability distributions";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"mwc-random" = callPackage
({ mkDerivation, base, primitive, time, vector }:
mkDerivation {
@@ -117485,14 +120497,17 @@ self: {
}) {};
"mysql" = callPackage
- ({ mkDerivation, base, bytestring, containers, mysql }:
+ ({ mkDerivation, base, bytestring, Cabal, containers, hspec, mysql
+ }:
mkDerivation {
pname = "mysql";
- version = "0.1.1.8";
- sha256 = "90f02af1c81e2189f65dcef0f78327eba4b0ef40bea5bde5cb74920727f9bd84";
+ version = "0.1.3";
+ sha256 = "282e9dc78d9b0f8f4e99ef7d1cd257a3a41a66a4e890bc6823dade4af6317a0d";
+ setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [ base bytestring containers ];
librarySystemDepends = [ mysql ];
- homepage = "https://github.com/bos/mysql";
+ testHaskellDepends = [ base bytestring hspec ];
+ homepage = "https://github.com/paul-rouse/mysql";
description = "A low-level MySQL client library";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -117518,46 +120533,47 @@ self: {
}) {};
"mysql-haskell" = callPackage
- ({ mkDerivation, base, binary, blaze-textual, bytestring
- , bytestring-lexing, cryptonite, HsOpenSSL, io-streams, memory
- , monad-loops, network, openssl, optparse-applicative, scientific
- , tasty, tasty-hunit, tcp-streams, text, time, tls, wire-streams
- , word24
+ ({ mkDerivation, base, binary, binary-ieee754, binary-parsers
+ , blaze-textual, bytestring, bytestring-lexing, cryptonite
+ , HsOpenSSL, io-streams, memory, monad-loops, network
+ , optparse-applicative, scientific, tasty, tasty-hunit, tcp-streams
+ , text, time, tls, vector, wire-streams, word24
}:
mkDerivation {
pname = "mysql-haskell";
- version = "0.5.0.0";
- sha256 = "90441f149ae5720c0842cadac775d8bd5f59f7f56c4f297bac19318ce3603258";
+ version = "0.6.0.0";
+ sha256 = "c1d577ccf0f38a1e0c54409c6e2dfc55bc77c88a3a22537679c4a742d5674429";
libraryHaskellDepends = [
- base binary blaze-textual bytestring bytestring-lexing cryptonite
- HsOpenSSL io-streams memory monad-loops network scientific
- tcp-streams text time tls wire-streams word24
+ base binary binary-ieee754 binary-parsers blaze-textual bytestring
+ bytestring-lexing cryptonite HsOpenSSL io-streams memory
+ monad-loops network scientific tcp-streams text time tls vector
+ wire-streams word24
];
- librarySystemDepends = [ openssl ];
testHaskellDepends = [
base bytestring io-streams optparse-applicative tasty tasty-hunit
- text time
+ text time vector
];
homepage = "https://github.com/winterland1989/mysql-haskell";
description = "pure haskell MySQL driver";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {inherit (pkgs) openssl;};
+ }) {};
"mysql-simple" = callPackage
({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
- , blaze-textual, bytestring, mysql, old-locale, pcre-light, text
- , time
+ , blaze-textual, bytestring, hspec, mysql, old-locale, pcre-light
+ , text, time
}:
mkDerivation {
pname = "mysql-simple";
- version = "0.2.2.5";
- sha256 = "86a30893c6e0eb0316b52780d6ca0464c7a1e048a50d03d203ecce975f7d518c";
+ version = "0.4.0.0";
+ sha256 = "0f5ce026b8d45016dc90a543b394a72dae25aa115bfa5e7ae0095a516bb9f04d";
libraryHaskellDepends = [
attoparsec base base16-bytestring blaze-builder blaze-textual
bytestring mysql old-locale pcre-light text time
];
- homepage = "https://github.com/bos/mysql-simple";
+ testHaskellDepends = [ base hspec ];
+ homepage = "https://github.com/paul-rouse/mysql-simple";
description = "A mid-level MySQL client library";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -117625,8 +120641,8 @@ self: {
}:
mkDerivation {
pname = "mywatch";
- version = "0.2.0";
- sha256 = "1276a8f25aab080e7765f277af8567f7b1a411f1716228fd658557e7236a7144";
+ version = "0.2.1";
+ sha256 = "f0cf3ba9a265b60e02feb118bfab66810f188bd34414a7d6a9be6318644d21fa";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -118835,13 +121851,13 @@ self: {
}:
mkDerivation {
pname = "netwire";
- version = "5.0.1";
- sha256 = "199dd2bb49fdf31ed125e4063ba3545a0d73eff36c3ed38014df30965524f4c7";
+ version = "5.0.2";
+ sha256 = "4d790f19642c62e555d167d53d88da56cc83daf093ff4ee37c83e21a2112cd83";
libraryHaskellDepends = [
base containers deepseq parallel profunctors random semigroups time
transformers
];
- homepage = "http://hub.darcs.net/ertes/netwire";
+ homepage = "https://github.com/esoeylemez/netwire";
description = "Functional reactive programming library";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -118851,8 +121867,8 @@ self: {
({ mkDerivation, base, netwire }:
mkDerivation {
pname = "netwire-input";
- version = "0.0.4";
- sha256 = "06821950dd44925e208f740d747675ab42a51f0cf1b7eb0b5ed10566df670db8";
+ version = "0.0.6";
+ sha256 = "4a04c52371358471eaef127ed37547ec35fe58bef2cd6b22ce8b1074fb0db88e";
libraryHaskellDepends = [ base netwire ];
homepage = "https://www.github.com/Mokosha/netwire-input";
description = "Input handling abstractions for netwire";
@@ -118865,8 +121881,8 @@ self: {
}:
mkDerivation {
pname = "netwire-input-glfw";
- version = "0.0.4";
- sha256 = "8fb6ba62fe7b122d204ff8af390de98a1631af370b231d4a4e5e57b0166a7298";
+ version = "0.0.6";
+ sha256 = "dd095cf915005ca6d72fa75a1ea7d890e2cdde2b8f16f45a994e413e97d9dd06";
libraryHaskellDepends = [
base containers GLFW-b mtl netwire-input stm
];
@@ -118893,6 +121909,27 @@ self: {
broken = true;
}) {ghcjs-base = null;};
+ "netwire-vinylglfw-examples" = callPackage
+ ({ mkDerivation, array, base, bytestring, containers, directory
+ , filepath, GLFW-b, GLUtil, lens, linear, mtl, netwire
+ , netwire-input, netwire-input-glfw, OpenGL, transformers, vinyl
+ , vinyl-gl
+ }:
+ mkDerivation {
+ pname = "netwire-vinylglfw-examples";
+ version = "1.0.0";
+ sha256 = "c99688b25885c0148cf274182c51a9376e4aafb7c3dd99a22fe1b85d2f1dc09a";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ array base bytestring containers directory filepath GLFW-b GLUtil
+ lens linear mtl netwire netwire-input netwire-input-glfw OpenGL
+ transformers vinyl vinyl-gl
+ ];
+ description = "Netwire/GLFW/VinylGL input handling demo";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"network" = callPackage
({ mkDerivation, base, bytestring, doctest, HUnit, test-framework
, test-framework-hunit, unix
@@ -119367,8 +122404,8 @@ self: {
({ mkDerivation, base, network }:
mkDerivation {
pname = "network-multicast";
- version = "0.1.1";
- sha256 = "f44c0b10569a10349d6e5a587ba3ed85a61a56a001939f1b6fb1b15911e8b742";
+ version = "0.1.2";
+ sha256 = "82dcd07dd7f62d0ba23f4b37469768f07bcf6bd888dd54ebe61603f6fd2ccefb";
libraryHaskellDepends = [ base network ];
description = "Simple multicast library";
license = stdenv.lib.licenses.publicDomain;
@@ -119790,8 +122827,8 @@ self: {
pname = "networked-game";
version = "0.1.0.1";
sha256 = "dfaa45c867596131bcd454390a95171f71bd38baf63300b9c75567fcd8495e8b";
- revision = "1";
- editedCabalFile = "01590db1085c70805c76e7f752dfa741336d1647cb6c7cee46f361c83c67a99d";
+ revision = "2";
+ editedCabalFile = "3cffaedec9a17f0faad461fc0e7ecfc342d36644071ed59f06ce9ce0044bce2e";
libraryHaskellDepends = [
base binary bytestring containers network time transformers
];
@@ -119920,8 +122957,8 @@ self: {
({ mkDerivation, base, hspec, HUnit }:
mkDerivation {
pname = "newtype-generics";
- version = "0.4.1";
- sha256 = "a5ed63130601fa2f97b105adeced7e691ee7924bcfd3f7da6605495f7a655fe2";
+ version = "0.5";
+ sha256 = "dc63ac2c9e682ee292a8f88fa3eb1af1b66d5860f7dcec0d09319c5ef96e7f9c";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base hspec HUnit ];
description = "A typeclass and set of functions for working with newtypes, with generics support";
@@ -120018,8 +123055,8 @@ self: {
({ mkDerivation, async, base, bytestring, template-haskell, unix }:
mkDerivation {
pname = "ngx-export";
- version = "0.2.0.0";
- sha256 = "fce59fdf3b552509a291d50c485a5847a28cfd6f6199158c2621a13f07ddd26c";
+ version = "0.2.2.0";
+ sha256 = "d9d97e8b1f7ce0dd3c183dabe9b1856e4c0594617a1da5a22e34782648deadef";
libraryHaskellDepends = [
async base bytestring template-haskell unix
];
@@ -121367,6 +124404,31 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "obd" = callPackage
+ ({ mkDerivation, base, bytestring, dimensional, either, haskeline
+ , io-streams, lens, mtl, optparse-applicative, serialport, split
+ , stm, stm-chans, transformers
+ }:
+ mkDerivation {
+ pname = "obd";
+ version = "0.2.1.1";
+ sha256 = "38478d38d59aa39603023f93733b00df17d105f91d94f94182e753721c65ec3d";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring dimensional either io-streams lens mtl serialport
+ split stm stm-chans transformers
+ ];
+ executableHaskellDepends = [
+ base bytestring haskeline lens mtl optparse-applicative
+ transformers
+ ];
+ testHaskellDepends = [ base ];
+ homepage = "https://github.com/hverr/haskell-obd#readme";
+ description = "Communicate to OBD interfaces over ELM327";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"obdd" = callPackage
({ mkDerivation, array, base, containers, mtl, random }:
mkDerivation {
@@ -121820,10 +124882,8 @@ self: {
}:
mkDerivation {
pname = "ombra";
- version = "0.1.0.0";
- sha256 = "2d89e1b8630c71973aa69c2aa8ea7c52367705f4661d37b8f68528c9377def93";
- revision = "1";
- editedCabalFile = "ce10c9b1257110bbfec5edbd403abe27e43dfa7a7cdf7d62890530a5ace21376";
+ version = "0.1.1.0";
+ sha256 = "d23a834bfd3195eadc37e9f8b443dfec9b2d223bec8ab1e7eecfb1278055de72";
libraryHaskellDepends = [
base gl hashable hashtables transformers unordered-containers vect
vector
@@ -122276,8 +125336,8 @@ self: {
({ mkDerivation, atomspace-cwrapper, base, transformers }:
mkDerivation {
pname = "opencog-atomspace";
- version = "0.1.0.3";
- sha256 = "c4848b27f3c2d6f7e2fc22d338a9bc1547c5282d970c0d7d4d83672a948e4dd0";
+ version = "0.1.0.6";
+ sha256 = "2925f1fe014f33e003558db6692354b12368ee9fcad835f669470b74b9daab1a";
libraryHaskellDepends = [ base transformers ];
librarySystemDepends = [ atomspace-cwrapper ];
homepage = "github.com/opencog/atomspace/tree/master/opencog/haskell";
@@ -122826,8 +125886,8 @@ self: {
({ mkDerivation, base, mtl, random }:
mkDerivation {
pname = "operational";
- version = "0.2.3.3";
- sha256 = "25489ee5475e5dd8bc5fb415a0189ef6f7e84253f4e392ff5f40b3c3ff1e406c";
+ version = "0.2.3.4";
+ sha256 = "51cc8751432201f4cbef15a187ee668bca13d774eb0ef28c8e3d36f633866810";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base mtl ];
@@ -123752,8 +126812,8 @@ self: {
}:
mkDerivation {
pname = "packdeps";
- version = "0.4.2.1";
- sha256 = "468fd8d83023865bb240c5b8fd5615501ffb2dcced9eaa2f15d22502d208c85c";
+ version = "0.4.3";
+ sha256 = "a8d4bd6ab9158d7fcd2ef4070b6a4c9196755f36bd9b5c8345bb7d76c6f1116b";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -124122,39 +127182,40 @@ self: {
maintainers = with stdenv.lib.maintainers; [ peti ];
}) {};
- "pandoc_1_17_2" = callPackage
+ "pandoc_1_18" = callPackage
({ mkDerivation, aeson, ansi-terminal, array, base
, base64-bytestring, binary, blaze-html, blaze-markup, bytestring
, cmark, containers, data-default, deepseq, Diff, directory
- , executable-path, extensible-exceptions, filemanip, filepath
- , ghc-prim, haddock-library, highlighting-kate, hslua, HTTP
- , http-client, http-client-tls, http-types, HUnit, JuicyPixels, mtl
- , network, network-uri, old-time, pandoc-types, parsec, process
- , QuickCheck, random, scientific, SHA, syb, tagsoup, temporary
- , test-framework, test-framework-hunit, test-framework-quickcheck2
- , texmath, text, time, unordered-containers, vector, xml, yaml
- , zip-archive, zlib
+ , doctemplates, executable-path, extensible-exceptions, filemanip
+ , filepath, ghc-prim, haddock-library, highlighting-kate, hslua
+ , HTTP, http-client, http-client-tls, http-types, HUnit
+ , JuicyPixels, mtl, network, network-uri, old-time, pandoc-types
+ , parsec, process, QuickCheck, random, scientific, SHA, syb
+ , tagsoup, temporary, test-framework, test-framework-hunit
+ , test-framework-quickcheck2, texmath, text, time, unix
+ , unordered-containers, vector, xml, yaml, zip-archive, zlib
}:
mkDerivation {
pname = "pandoc";
- version = "1.17.2";
- sha256 = "81727d054dfb26de816ea59ed541ebaf60d66d440012c12ec02f9c2b02fee8ec";
+ version = "1.18";
+ sha256 = "3ea4b977f31d71dedd99a4584a895659efbbab02b00fdc9daaf7781787ce4e92";
configureFlags = [ "-fhttps" "-f-trypandoc" ];
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson array base base64-bytestring binary blaze-html blaze-markup
bytestring cmark containers data-default deepseq directory
- extensible-exceptions filemanip filepath ghc-prim haddock-library
- highlighting-kate hslua HTTP http-client http-client-tls http-types
- JuicyPixels mtl network network-uri old-time pandoc-types parsec
- process random scientific SHA syb tagsoup temporary texmath text
- time unordered-containers vector xml yaml zip-archive zlib
+ doctemplates extensible-exceptions filemanip filepath ghc-prim
+ haddock-library highlighting-kate hslua HTTP http-client
+ http-client-tls http-types JuicyPixels mtl network network-uri
+ old-time pandoc-types parsec process random scientific SHA syb
+ tagsoup temporary texmath text time unordered-containers vector xml
+ yaml zip-archive zlib
];
executableHaskellDepends = [
aeson base bytestring containers directory extensible-exceptions
filepath highlighting-kate HTTP network network-uri pandoc-types
- text yaml
+ text unix yaml
];
testHaskellDepends = [
ansi-terminal base bytestring containers Diff directory
@@ -124179,8 +127240,8 @@ self: {
}:
mkDerivation {
pname = "pandoc-citeproc";
- version = "0.10.1.1";
- sha256 = "67ea382f068ecc5eea1ad44c515e7aaa56d3e60e6be18ed3d2ec5cfd85eb8432";
+ version = "0.10.1.2";
+ sha256 = "be7b3776a338c4fc46565978bc8c89783e90c3853fe5bc447ddc9bf053bf5f39";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -124203,6 +127264,40 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "pandoc-citeproc_0_10_2_2" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
+ , containers, data-default, directory, filepath, hs-bibutils, mtl
+ , old-locale, pandoc, pandoc-types, parsec, process, rfc5051
+ , setenv, split, syb, tagsoup, temporary, text, time
+ , unordered-containers, vector, xml-conduit, yaml
+ }:
+ mkDerivation {
+ pname = "pandoc-citeproc";
+ version = "0.10.2.2";
+ sha256 = "1475a2e0a13922df9c931c0480154fa4f02bd81ef34b166596b035898c94dd7a";
+ 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-preamble" = callPackage
({ mkDerivation, base, directory, filepath, pandoc-types, process
}:
@@ -124327,8 +127422,8 @@ self: {
}:
mkDerivation {
pname = "pandoc-placetable";
- version = "0.4";
- sha256 = "e7f6e9cf7da0c49e00f47fdddd50ec80d1adb24dbe5f05faaa0682d27fe607e0";
+ version = "0.4.1";
+ sha256 = "8c1e03f5bd538301eda3c5b83b594693638b805b6fead191a10d9b73a7c18383";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -124378,6 +127473,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "pandoc-types_1_17_0_4" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, deepseq
+ , ghc-prim, HUnit, QuickCheck, string-qq, syb, test-framework
+ , test-framework-hunit, test-framework-quickcheck2
+ }:
+ mkDerivation {
+ pname = "pandoc-types";
+ version = "1.17.0.4";
+ sha256 = "531996e547714e34a2e4134e9e80dad9929bbc6814ebb5515f95538fa76c3f74";
+ libraryHaskellDepends = [
+ aeson base bytestring containers deepseq ghc-prim QuickCheck syb
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers HUnit QuickCheck string-qq
+ test-framework test-framework-hunit test-framework-quickcheck2
+ ];
+ homepage = "http://johnmacfarlane.net/pandoc";
+ description = "Types for representing a structured document";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"pandoc-unlit" = callPackage
({ mkDerivation, base, pandoc }:
mkDerivation {
@@ -124874,6 +127991,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "pareto" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "pareto";
+ version = "0.2.0.0";
+ sha256 = "c0126578a4cef2349a4df6f12900a6a27cedf04039a2f7b4fa0c863d58fe052c";
+ libraryHaskellDepends = [ base ];
+ homepage = "http://bitbucket.org/hyllos/pareto-haskell";
+ description = "A library for cause-effect relationships";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"parport" = callPackage
({ mkDerivation, array, base }:
mkDerivation {
@@ -125319,6 +128448,19 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "partial-handler_1_0_2" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "partial-handler";
+ version = "1.0.2";
+ sha256 = "fae9f291f4146631eb3be173299bbc7755343a0e9b74e62ee1921e209a6aa4f1";
+ libraryHaskellDepends = [ base ];
+ homepage = "https://github.com/nikita-volkov/partial-handler";
+ description = "A composable exception handler";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"partial-isomorphisms" = callPackage
({ mkDerivation, base, template-haskell }:
mkDerivation {
@@ -125477,19 +128619,21 @@ self: {
}) {};
"patat" = callPackage
- ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, containers
- , directory, filepath, mtl, optparse-applicative, pandoc
- , terminal-size, time
+ ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base
+ , bytestring, containers, directory, filepath, highlighting-kate
+ , mtl, optparse-applicative, pandoc, terminal-size, text, time
+ , yaml
}:
mkDerivation {
pname = "patat";
- version = "0.1.0.0";
- sha256 = "565b5885113d5805e15cb29be37feb1a45b10bd3202b474acc04a14bfe82c87e";
+ version = "0.3.2.0";
+ sha256 = "be251bdd996fe8bc89dfe95fb86d9abeda2cd6b6b6044a7ab79900f6c8d27e0b";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- ansi-terminal ansi-wl-pprint base containers directory filepath mtl
- optparse-applicative pandoc terminal-size time
+ aeson ansi-terminal ansi-wl-pprint base bytestring containers
+ directory filepath highlighting-kate mtl optparse-applicative
+ pandoc terminal-size text time yaml
];
homepage = "http://github.com/jaspervdj/patat";
description = "Terminal-based presentations using Pandoc";
@@ -126810,6 +129954,8 @@ self: {
pname = "persistent-mysql";
version = "2.6";
sha256 = "a34c9f34feab49af156870a4c09df98d9cda54a3dd08944e3e0d326e86993be7";
+ revision = "2";
+ editedCabalFile = "58089479bffd093a76438ed244837a885f9b0a78fa814c92d3a6aad86ed3d206";
libraryHaskellDepends = [
aeson base blaze-builder bytestring conduit containers
monad-control monad-logger mysql mysql-simple persistent
@@ -127291,8 +130437,8 @@ self: {
}:
mkDerivation {
pname = "pgdl";
- version = "10.0";
- sha256 = "be71f949ba02b8ef5b094527346a9a9202cf2e50f2801cac0f70aa5ee57458c3";
+ version = "10.2";
+ sha256 = "8b27c1af6318c385027b1fa89c7459a0cbb274383148ec1d434c16cf8111216a";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -127413,8 +130559,8 @@ self: {
({ mkDerivation, base, bytestring, text }:
mkDerivation {
pname = "phaser";
- version = "0.1.1.0";
- sha256 = "54ecb42b832a83dba458c0974c07ce956e274d579b72aa7ba3e85fee039b063e";
+ version = "0.2.0.0";
+ sha256 = "2026931bbcd25bd60809bada559f82126ce357c60f536da103a33ab3700fda88";
libraryHaskellDepends = [ base bytestring text ];
homepage = "https://github.com/quickdudley/phaser";
description = "Incremental multiple pass parser library";
@@ -128372,8 +131518,8 @@ self: {
}:
mkDerivation {
pname = "pipes-extras";
- version = "1.0.5";
- sha256 = "5250cb5da34d3d880e129e6294c19d2fab6747e9dab3446d93a01b579a0c78aa";
+ version = "1.0.7";
+ sha256 = "f4d441160cf5d50ad83c15c88c80b835e39d7a73a4e7943c6a6d4c796df28be2";
libraryHaskellDepends = [ base foldl pipes transformers ];
testHaskellDepends = [
base HUnit pipes test-framework test-framework-hunit transformers
@@ -128475,12 +131621,12 @@ self: {
}) {};
"pipes-interleave" = callPackage
- ({ mkDerivation, base, containers, pipes }:
+ ({ mkDerivation, base, containers, heaps, pipes }:
mkDerivation {
pname = "pipes-interleave";
- version = "0.2.2";
- sha256 = "31427ee2c164449fa3119dfc08bd6912f0287bcac74c9c811755a9c716c21d4a";
- libraryHaskellDepends = [ base containers pipes ];
+ version = "1.1.0";
+ sha256 = "bd083ec1cc9f35ee393763b18581835d8124b358480ae91c6473308af642d8c4";
+ libraryHaskellDepends = [ base containers heaps pipes ];
homepage = "http://github.com/bgamari/pipes-interleave";
description = "Interleave and merge streams of elements";
license = stdenv.lib.licenses.bsd3;
@@ -128669,8 +131815,8 @@ self: {
}:
mkDerivation {
pname = "pipes-protolude";
- version = "0.1.0.0";
- sha256 = "e4ac3b48483efe76378cfbc1c6401f44de735f3431a5900d36e3b920c27f4979";
+ version = "0.1.0.1";
+ sha256 = "7f3d93fb093250f6d85c7e9262bd243c6966451ed867fe204af3fe0b56abea73";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -129418,8 +132564,8 @@ self: {
}:
mkDerivation {
pname = "ply-loader";
- version = "0.4.1";
- sha256 = "e1e16f2451f9be85cdc684e57854ef1f626e353e847dca2854cd6ff988152342";
+ version = "0.4.2";
+ sha256 = "60adbcb9323fd221b70ed106b9c418636112e989b3364a2eb0227fefce47afaf";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -129977,8 +133123,8 @@ self: {
({ mkDerivation, base, containers, deepseq, polyparse, tagsoup }:
mkDerivation {
pname = "polysoup";
- version = "0.6.2";
- sha256 = "bdb28b4e47cba223a9c9f3c3454b87e3210cdcd67af2cf570edcd4d8bc84e295";
+ version = "0.6.3";
+ sha256 = "9af6228977d331fe2ad7e8d0d48fd5acffadf3070ea06b503ffb493b7a994f48";
libraryHaskellDepends = [
base containers deepseq polyparse tagsoup
];
@@ -130293,6 +133439,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "portable-template-haskell-lens" = callPackage
+ ({ mkDerivation, base, lens, template-haskell }:
+ mkDerivation {
+ pname = "portable-template-haskell-lens";
+ version = "0.1.0.0";
+ sha256 = "b81c8c159b168688e38e6965d921d342e393cc5867e6b724eab2d0eadb07af93";
+ libraryHaskellDepends = [ base lens template-haskell ];
+ description = "Lenses for the AST of Template Haskell 2.11 and Template Haskell < 2.11";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"portaudio" = callPackage
({ mkDerivation, base, containers, portaudio }:
mkDerivation {
@@ -130660,8 +133817,8 @@ self: {
}:
mkDerivation {
pname = "postgresql-orm";
- version = "0.4.1";
- sha256 = "649d995c7eb7890b2826cda2d930651a0906e9ce0173342180d83e5527dc7b5a";
+ version = "0.5.0";
+ sha256 = "5e5892c081bd462671f6af8399c1300fae3c14c03af66b7d65370aa4c12faf4f";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -130804,6 +133961,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "postgresql-simple-opts" = callPackage
+ ({ mkDerivation, base, bytestring, hspec, markdown-unlit
+ , optparse-applicative, optparse-generic, postgresql-simple
+ }:
+ mkDerivation {
+ pname = "postgresql-simple-opts";
+ version = "0.1.0.4";
+ sha256 = "e404a87d6e51bf7ed9318cc86a14e09d4229545d70d5b991762a080b404260e5";
+ libraryHaskellDepends = [
+ base bytestring markdown-unlit optparse-applicative
+ optparse-generic postgresql-simple
+ ];
+ testHaskellDepends = [
+ base bytestring hspec optparse-applicative postgresql-simple
+ ];
+ homepage = "https://github.com/jfischoff/postgresql-simple-opts#readme";
+ description = "An optparse-applicative parser for postgresql-simple's connection options";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"postgresql-simple-sop" = callPackage
({ mkDerivation, base, generics-sop, postgresql-simple }:
mkDerivation {
@@ -131213,6 +134390,23 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "precursor" = callPackage
+ ({ mkDerivation, base, bifunctors, bytestring, containers, doctest
+ , mtl, QuickCheck, text, text-show
+ }:
+ mkDerivation {
+ pname = "precursor";
+ version = "0.1.0.0";
+ sha256 = "34b17a44555d8c18ed0ebf6633e5d5da03d10c23acd3f085452d5cc5dfe65861";
+ libraryHaskellDepends = [
+ base bifunctors bytestring containers mtl text text-show
+ ];
+ testHaskellDepends = [ base doctest QuickCheck ];
+ homepage = "https://github.com/oisdk/precursor#readme";
+ description = "Prelude replacement";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"pred-set" = callPackage
({ mkDerivation, base, hashable, hashtables, HSet }:
mkDerivation {
@@ -132430,6 +135624,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "profiteur_0_3_0_3" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, bytestring, filepath
+ , text, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "profiteur";
+ version = "0.3.0.3";
+ sha256 = "4f9929059826c24be4c4cbfae00cfea5985c20c4c2ddb03d56a47cd72c18e144";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ aeson attoparsec base bytestring filepath text unordered-containers
+ vector
+ ];
+ homepage = "http://github.com/jaspervdj/profiteur";
+ description = "Treemap visualiser for GHC prof files";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"profunctor-extras" = callPackage
({ mkDerivation, base, profunctors }:
mkDerivation {
@@ -132672,8 +135886,8 @@ self: {
}:
mkDerivation {
pname = "prometheus";
- version = "0.4.0";
- sha256 = "ec0f31a99e223e31db093af5e62225a723f1f709b859cfa5137e713d3c4e0fe8";
+ version = "0.4.1";
+ sha256 = "3a32953351a2829e6bb0bf5fd30654ce703397e5e65ffb8665fa367eff7277bb";
libraryHaskellDepends = [
atomic-primops base bytestring containers http-types text
transformers wai warp
@@ -133134,23 +136348,6 @@ self: {
}) {};
"protolude" = callPackage
- ({ mkDerivation, async, base, bytestring, containers, deepseq
- , ghc-prim, mtl, safe, stm, text, transformers
- }:
- mkDerivation {
- pname = "protolude";
- version = "0.1.7";
- sha256 = "7b8386d3e6d15f477bbbe4e8901ae840509bb6d0d63c6e98f8ca7c13f2473b79";
- 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;
- }) {};
-
- "protolude_0_1_8" = callPackage
({ mkDerivation, async, base, bytestring, containers, deepseq
, ghc-prim, mtl, safe, stm, text, transformers
}:
@@ -133165,7 +136362,6 @@ self: {
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
@@ -133417,12 +136613,12 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "publicsuffix_0_20161003" = callPackage
+ "publicsuffix_0_20161014" = callPackage
({ mkDerivation, base, filepath, hspec, template-haskell }:
mkDerivation {
pname = "publicsuffix";
- version = "0.20161003";
- sha256 = "f3a94499b546da47dea02e260ada8d0ca7444d3261a88fdaf13dad7041999ce7";
+ version = "0.20161014";
+ sha256 = "7fe7abfe8727dc20951c6c7dec35c8ca71ddc34972615f5abe24ae7d3ce99622";
libraryHaskellDepends = [ base filepath template-haskell ];
testHaskellDepends = [ base hspec ];
homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
@@ -133805,23 +137001,24 @@ self: {
}) {};
"pure-zlib" = callPackage
- ({ mkDerivation, base, bytestring, containers, fingertree, HUnit
- , monadLib, QuickCheck, test-framework, test-framework-hunit
- , test-framework-quickcheck2
+ ({ mkDerivation, base, base-compat, bytestring, bytestring-builder
+ , containers, filepath, fingertree, HUnit, monadLib, QuickCheck
+ , tasty, tasty-hunit, tasty-quickcheck
}:
mkDerivation {
pname = "pure-zlib";
- version = "0.4";
- sha256 = "0a9722791fb96fadec325b2e5b1e1f8c1a2ebedd53d0b7db5e6ec84eaf6cd3c1";
+ version = "0.5";
+ sha256 = "b7cf6e9d02c9ab7d246651b4a49696448dd35cbd2146ace84ff4a9ea5afc30ab";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base bytestring containers fingertree monadLib
+ base base-compat bytestring bytestring-builder containers
+ fingertree monadLib
];
- executableHaskellDepends = [ base bytestring ];
+ executableHaskellDepends = [ base base-compat bytestring ];
testHaskellDepends = [
- base bytestring HUnit QuickCheck test-framework
- test-framework-hunit test-framework-quickcheck2
+ base base-compat bytestring filepath HUnit QuickCheck tasty
+ tasty-hunit tasty-quickcheck
];
homepage = "http://github.com/GaloisInc/pure-zlib";
description = "A Haskell-only implementation of zlib / DEFLATE";
@@ -134805,6 +138002,27 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "quickbench" = callPackage
+ ({ mkDerivation, base, containers, directory, docopt, pretty-show
+ , process, safe, split, tabular, time
+ }:
+ mkDerivation {
+ pname = "quickbench";
+ version = "1.0";
+ sha256 = "8bfe252e50a683346e753db312e9542f8d43256947ab215fcfd24af03787b926";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base containers directory docopt pretty-show process safe split
+ tabular time
+ ];
+ executableHaskellDepends = [ base process ];
+ testHaskellDepends = [ base ];
+ homepage = "https://github.com/simonmichael/quickbench#readme";
+ description = "quick & easy benchmarking of command-line programs";
+ license = "GPL";
+ }) {};
+
"quickbooks" = callPackage
({ mkDerivation, aeson, authenticate-oauth, base, bytestring
, email-validate, fast-logger, http-client, http-client-tls
@@ -134889,8 +138107,8 @@ self: {
({ mkDerivation, base, HUnit, QuickCheck }:
mkDerivation {
pname = "quickcheck-io";
- version = "0.1.3";
- sha256 = "d798584e26c51e4cbb0dadd1097cf14472c917240d09fc3d9a2b74961673c8b4";
+ version = "0.1.4";
+ sha256 = "6b3750590871b03908530764cdaa69ce67d5b514f533c1a4a6f4755f8267389d";
libraryHaskellDepends = [ base HUnit QuickCheck ];
homepage = "https://github.com/hspec/quickcheck-io#readme";
description = "Use HUnit assertions as QuickCheck properties";
@@ -134999,6 +138217,21 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "quickcheck-report" = callPackage
+ ({ mkDerivation, base, lens, QuickCheck, template-haskell
+ , th-printf
+ }:
+ mkDerivation {
+ pname = "quickcheck-report";
+ version = "0.1.0.0";
+ sha256 = "34c50e79d89b21b79b52d0392ad4d7dab451cef0dd720ab35a44f99781124b5c";
+ libraryHaskellDepends = [
+ base lens QuickCheck template-haskell th-printf
+ ];
+ description = "Customizable reports for quickcheck properties";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"quickcheck-script" = callPackage
({ mkDerivation, base, directory, process, QuickCheck }:
mkDerivation {
@@ -135547,8 +138780,8 @@ self: {
}:
mkDerivation {
pname = "raft";
- version = "0.3.7.0";
- sha256 = "5f54a03b971f1853ee4d8033aaa134c6765d254d070e1d31b5871b2e187839b3";
+ version = "0.3.7.2";
+ sha256 = "40c46755aa43abd764d59610b7b8a7af75b5e5efe7c509c34ede6a157ee2a0e9";
libraryHaskellDepends = [
aeson attoparsec base binary bytestring containers data-default
ghc-prim mtl parallel scientific split text time tostring zlib
@@ -136108,14 +139341,14 @@ self: {
({ mkDerivation, async, base, containers, foreign-store, stm }:
mkDerivation {
pname = "rapid";
- version = "0.1.2";
- sha256 = "f65a4fc1560266c9e51c6efe19d2797ef4af51850b23a458167c087da4079035";
+ version = "0.1.3";
+ sha256 = "163a894363584b712ab44598f17a8bcd90e0814327cf2cecf0ddc4dc6cf29758";
libraryHaskellDepends = [
async base containers foreign-store stm
];
- homepage = "http://hub.darcs.net/esz/rapid";
+ homepage = "https://github.com/esoeylemez/rapid";
description = "Rapid prototyping with GHCi: hot reloading of running components and reload-surviving values";
- license = stdenv.lib.licenses.asl20;
+ license = stdenv.lib.licenses.bsd3;
}) {};
"rascal" = callPackage
@@ -136175,6 +139408,32 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "rasterific-svg_0_3_2" = callPackage
+ ({ mkDerivation, base, binary, bytestring, containers, directory
+ , filepath, FontyFruity, JuicyPixels, lens, linear, mtl
+ , optparse-applicative, primitive, Rasterific, scientific, svg-tree
+ , text, transformers, vector
+ }:
+ mkDerivation {
+ pname = "rasterific-svg";
+ version = "0.3.2";
+ sha256 = "ab43e8e6d2800f88becc1c619691ce7b2b63f35ce6007a904c5119b8c1711d23";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base binary bytestring containers directory filepath FontyFruity
+ JuicyPixels lens linear mtl primitive Rasterific scientific
+ svg-tree text transformers vector
+ ];
+ executableHaskellDepends = [
+ base bytestring directory filepath FontyFruity JuicyPixels
+ optparse-applicative Rasterific svg-tree
+ ];
+ description = "SVG renderer based on Rasterific";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"rate-limit" = callPackage
({ mkDerivation, base, time-units }:
mkDerivation {
@@ -136234,6 +139493,32 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "rattletrap" = callPackage
+ ({ mkDerivation, aeson, aeson-casing, base, bimap, binary
+ , binary-bits, bytestring, containers, data-binary-ieee754
+ , filepath, hlint, regex-compat, tasty, tasty-hspec
+ , template-haskell, text, vector
+ }:
+ mkDerivation {
+ pname = "rattletrap";
+ version = "0.1.0";
+ sha256 = "4a2b0ca12153d467d09c623a09a497028346f8838cbb0ce45c333f812539cfe9";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bimap binary binary-bits bytestring containers
+ data-binary-ieee754 regex-compat text vector
+ ];
+ executableHaskellDepends = [
+ aeson aeson-casing base binary bytestring template-haskell
+ ];
+ testHaskellDepends = [
+ base binary bytestring filepath hlint tasty tasty-hspec
+ ];
+ description = "Parse and generate Rocket League replays";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"raven-haskell" = callPackage
({ mkDerivation, aeson, base, bytestring, hspec, http-conduit
, network, random, text, time, unordered-containers, uuid
@@ -136309,6 +139594,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "rawfilepath" = callPackage
+ ({ mkDerivation, base, bytestring, unix }:
+ mkDerivation {
+ pname = "rawfilepath";
+ version = "0.1.0.0";
+ sha256 = "1673897fbcb4a4a194bb66ff8514a21db6c1d9f6ba0d960dc20677c9902c2614";
+ libraryHaskellDepends = [ base bytestring unix ];
+ testHaskellDepends = [ base ];
+ homepage = "https://github.com/xtendo-org/rawfilepath#readme";
+ description = "Use RawFilePath instead of FilePath";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"rawr" = callPackage
({ mkDerivation, base, deepseq, doctest, ghc-datasize, ghc-prim
, lens, tasty, tasty-hunit, template-haskell
@@ -136452,8 +139750,8 @@ self: {
}:
mkDerivation {
pname = "rdf4h";
- version = "3.0.0";
- sha256 = "aa50b95e37655e3abdfb4f83679096bd6c188750a8cb3a61132e2e8399e928db";
+ version = "3.0.1";
+ sha256 = "a4ecf539e33f038a13f40e5b2b21ee1b364ed259b66f2d435439c0de287f8534";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -137080,8 +140378,8 @@ self: {
}:
mkDerivation {
pname = "rebase";
- version = "1";
- sha256 = "cb4338a1993a7ef39c35c022f848d964151e2b1a05834f5f3deb2f68efbfd79a";
+ version = "1.0.2.1";
+ sha256 = "beae3eb88c71e817ebfde0b16ce17875f33cefc1371c3e4c72f5a5feb1c2a69e";
libraryHaskellDepends = [
base base-prelude bifunctors bytestring containers contravariant
contravariant-extras deepseq dlist either fail hashable mtl
@@ -137111,8 +140409,8 @@ self: {
}:
mkDerivation {
pname = "record";
- version = "0.4.1.1";
- sha256 = "efb51262d06872cc7881b000842e46fd593468a4e6823e80cf0c0d58196b2d96";
+ version = "0.4.2";
+ sha256 = "beac089c7fdca32bf4f577b04ffbc4ddfbd12e85dd4c05d4906fba299f167276";
libraryHaskellDepends = [
base base-prelude basic-lens template-haskell transformers
];
@@ -137170,8 +140468,8 @@ self: {
}:
mkDerivation {
pname = "record-preprocessor";
- version = "0.1.0.3";
- sha256 = "7e64e05e5769c6c48e699701c45c2004af68f7187d6096fdbee95122a790d16d";
+ version = "0.1.1.1";
+ sha256 = "b0cb4a1da915964c6f70300c1fbe9fcc5c2d559ebc82f1ad57ef09dee1cbe55e";
isLibrary = true;
isExecutable = true;
executableHaskellDepends = [
@@ -137191,8 +140489,8 @@ self: {
}:
mkDerivation {
pname = "record-syntax";
- version = "0.1.0.2";
- sha256 = "6798aa9a4fdc0ade9dd608efa42ea4d716a2c0bdbc28491d5577fb0224f0ff9c";
+ version = "0.1.1";
+ sha256 = "a574878bb9fe14f65f1a5616cc27d9b317f0697df3140c8c27d51be1c55efe97";
libraryHaskellDepends = [
base base-prelude conversion conversion-text haskell-src-exts
parsec record template-haskell text transformers
@@ -137756,15 +141054,15 @@ self: {
"reflex-dom-colonnade" = callPackage
({ mkDerivation, base, colonnade, containers, contravariant, reflex
- , reflex-dom, semigroups, vector
+ , reflex-dom, semigroups, text, vector
}:
mkDerivation {
pname = "reflex-dom-colonnade";
- version = "0.4.4";
- sha256 = "e75354a6d37c854349566471e27248cbdfcfca4e0cfaf1ed46f5adc1f9a980ff";
+ version = "0.4.6";
+ sha256 = "b67ce02af09d3c2c30569cfac2758cc7439cbe1dab27323e6119ef5cc7267c17";
libraryHaskellDepends = [
base colonnade containers contravariant reflex reflex-dom
- semigroups vector
+ semigroups text vector
];
homepage = "https://github.com/andrewthad/colonnade#readme";
description = "Use colonnade with reflex-dom";
@@ -138757,8 +142055,8 @@ self: {
}:
mkDerivation {
pname = "relational-query";
- version = "0.8.3.1";
- sha256 = "58451604364d41e9ec1db6ab80064485a24b20917bc979e0de6fab71ec0c8375";
+ version = "0.8.3.2";
+ sha256 = "20899f2fcf142e11036e6e6b7360c873e17ded7bb856616e9d40f92d0298d09b";
libraryHaskellDepends = [
array base bytestring containers dlist names-th persistable-record
sql-words template-haskell text th-reify-compat time
@@ -139127,8 +142425,8 @@ self: {
}:
mkDerivation {
pname = "repa";
- version = "3.4.1.1";
- sha256 = "c6f6aeb84e7167b50ec7fc241329bf966a4865ffc824e38f75be3f8bb1734917";
+ version = "3.4.1.2";
+ sha256 = "57f80bbbf6df1c7bca0045a9de8694a25bebe0e5696f59276cc72f165b01dc57";
libraryHaskellDepends = [
base bytestring ghc-prim QuickCheck template-haskell vector
];
@@ -139814,8 +143112,8 @@ self: {
}:
mkDerivation {
pname = "resourcet";
- version = "1.1.7.5";
- sha256 = "05d30e225eb96a300718ec0534ffb03cb3bb8c7f87d463dbddb115d01c7f405a";
+ version = "1.1.8";
+ sha256 = "b36c9900ef4d330281b413684bcf13b53036303187dc3ca0f0d83b56152c5c4b";
libraryHaskellDepends = [
base containers exceptions lifted-base mmorph monad-control mtl
transformers transformers-base transformers-compat
@@ -143117,6 +146415,25 @@ self: {
license = stdenv.lib.licenses.asl20;
}) {};
+ "scalpel_0_4_0" = callPackage
+ ({ mkDerivation, base, bytestring, containers, curl, data-default
+ , fail, HUnit, regex-base, regex-tdfa, tagsoup, text, vector
+ }:
+ mkDerivation {
+ pname = "scalpel";
+ version = "0.4.0";
+ sha256 = "ed252c502b138e3a3d87d8fa4b1bf88836c6bd297870532e0bf445c2f72415d8";
+ libraryHaskellDepends = [
+ base bytestring containers curl data-default fail regex-base
+ regex-tdfa tagsoup text vector
+ ];
+ testHaskellDepends = [ base HUnit regex-base regex-tdfa tagsoup ];
+ homepage = "https://github.com/fimad/scalpel";
+ description = "A high level web scraping library for Haskell";
+ license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"scan" = callPackage
({ mkDerivation, base, parsec }:
mkDerivation {
@@ -144142,6 +147459,27 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "sdl2-gfx" = callPackage
+ ({ mkDerivation, base, bytestring, lifted-base, linear
+ , monad-control, SDL2, sdl2, SDL2_gfx, template-haskell, text
+ , transformers, vector
+ }:
+ mkDerivation {
+ pname = "sdl2-gfx";
+ version = "0.2";
+ sha256 = "8c1e10b7a675d782cd650820c75c4ef9225718ad6aaa3f8db02e869b7720c50d";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring lifted-base linear monad-control sdl2
+ template-haskell text transformers vector
+ ];
+ libraryPkgconfigDepends = [ SDL2 SDL2_gfx ];
+ executableHaskellDepends = [ base linear sdl2 vector ];
+ description = "Bindings to SDL2_gfx";
+ license = stdenv.lib.licenses.mit;
+ }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_gfx;};
+
"sdl2-image" = callPackage
({ mkDerivation, base, SDL2, sdl2, SDL2_image }:
mkDerivation {
@@ -144156,6 +147494,28 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_image;};
+ "sdl2-mixer" = callPackage
+ ({ mkDerivation, base, bytestring, data-default-class, lifted-base
+ , monad-control, sdl2, SDL2_mixer, template-haskell, text
+ , transformers, vector
+ }:
+ mkDerivation {
+ pname = "sdl2-mixer";
+ version = "0.1";
+ sha256 = "d924f31d9e1c87eed92d357ce20273dba44637861927188b8a44db2c0b2e2bc0";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring data-default-class lifted-base monad-control sdl2
+ template-haskell text transformers vector
+ ];
+ librarySystemDepends = [ SDL2_mixer ];
+ libraryPkgconfigDepends = [ SDL2_mixer ];
+ executableHaskellDepends = [ base data-default-class sdl2 vector ];
+ description = "Bindings to SDL2_mixer";
+ license = stdenv.lib.licenses.bsd3;
+ }) {inherit (pkgs) SDL2_mixer;};
+
"sdl2-ttf" = callPackage
({ mkDerivation, base, linear, SDL2, sdl2, SDL2_ttf, transformers
}:
@@ -144581,6 +147941,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "semdoc" = callPackage
+ ({ mkDerivation, base, containers, data-default-class, ghc
+ , ghc-paths, Glob, groom, mtl, pandoc, pandoc-types, regex-tdfa
+ }:
+ mkDerivation {
+ pname = "semdoc";
+ version = "0.1.1";
+ sha256 = "05a2a838a25125bf8d8cf9f696f3745486e5d1d2c8a778b16c54a746b970882a";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base containers data-default-class ghc ghc-paths Glob groom mtl
+ pandoc pandoc-types regex-tdfa
+ ];
+ executableHaskellDepends = [ base ];
+ homepage = "https://toktok.github.io/semdoc";
+ description = "Evaluate code snippets in Literate Haskell";
+ license = stdenv.lib.licenses.agpl3;
+ }) {};
+
"semi-iso" = callPackage
({ mkDerivation, base, lens, profunctors, semigroupoids
, transformers, tuple-morph
@@ -144778,16 +148158,14 @@ self: {
"sensei" = callPackage
({ mkDerivation, ansi-terminal, base, base-compat, bytestring
- , directory, filepath, fsnotify, hspec, hspec-wai, http-client
- , http-types, interpolate, mockery, network, process, silently, stm
- , text, time, unix, wai, warp
+ , directory, filepath, fsnotify, hspec, hspec-meta, hspec-wai
+ , http-client, http-types, interpolate, mockery, network, process
+ , silently, stm, text, time, unix, wai, warp
}:
mkDerivation {
pname = "sensei";
- version = "0.1.0";
- sha256 = "fd3c1edc901298173782bf8c65744dd4fb25cdfb9d1012e28a6e5038dc7114ab";
- revision = "1";
- editedCabalFile = "315d7e05f9dbe6eb51d2a1f569f884e66c3edaf12d4973230e47d6c799de2854";
+ version = "0.2.0";
+ sha256 = "aa38cfab092cbb256ea8a4a64cd171fe241b7a7f964bd13bf1b6e402327cf4b0";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -144797,8 +148175,9 @@ self: {
];
testHaskellDepends = [
ansi-terminal base base-compat bytestring directory filepath
- fsnotify hspec hspec-wai http-client http-types interpolate mockery
- network process silently stm text time unix wai warp
+ fsnotify hspec hspec-meta hspec-wai http-client http-types
+ interpolate mockery network process silently stm text time unix wai
+ warp
];
homepage = "https://github.com/hspec/sensei#readme";
description = "Automatically run Hspec tests on file modifications";
@@ -145245,7 +148624,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "servant_0_9_0_1" = callPackage
+ "servant_0_9_1_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
@@ -145254,8 +148633,8 @@ self: {
}:
mkDerivation {
pname = "servant";
- version = "0.9.0.1";
- sha256 = "997fa97c5e84f6a16ff7ec3390510ae8d83bca4d7680f3427060f6bad7daa34e";
+ version = "0.9.1.1";
+ sha256 = "fb3372f676ab07dfab1695ccd0e23d98c948318f4b4d5ae827a6fa5284c4e5fa";
libraryHaskellDepends = [
aeson attoparsec base base-compat bytestring case-insensitive
http-api-data http-media http-types mmorph mtl network-uri
@@ -145605,27 +148984,27 @@ self: {
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
+ "servant-client_0_9_1_1" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, base-compat
+ , 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";
+ version = "0.9.1.1";
+ sha256 = "6e085faa1a8ecab076ffdec61b97b6e7c8fff7eb18a9a4cf3538c26b7b99c724";
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
+ aeson attoparsec base base-compat 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
+ aeson base base-compat 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/";
@@ -145655,6 +149034,40 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "servant-db" = callPackage
+ ({ mkDerivation, base, servant }:
+ mkDerivation {
+ pname = "servant-db";
+ version = "0.2.0.1";
+ sha256 = "99c618f6be7a7bc58217cc209b395cbcdd1a9cd573f484ee96b1835dd96dda8a";
+ libraryHaskellDepends = [ base servant ];
+ description = "Servant types for defining API with relational DBs";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "servant-db-postgresql" = callPackage
+ ({ mkDerivation, base, bytestring, containers, derive, hspec, HUnit
+ , monad-logger, optparse-applicative, postgresql-query
+ , postgresql-simple, QuickCheck, quickcheck-instances, servant
+ , servant-db, text, time, transformers-base
+ }:
+ mkDerivation {
+ pname = "servant-db-postgresql";
+ version = "0.2.1.0";
+ sha256 = "6f3cefb7b24bf3d4e50efe84d903e79edc936b85950cc260855af4a50ac11071";
+ libraryHaskellDepends = [
+ base bytestring containers postgresql-query postgresql-simple
+ servant servant-db text
+ ];
+ testHaskellDepends = [
+ base bytestring derive hspec HUnit monad-logger
+ optparse-applicative postgresql-query QuickCheck
+ quickcheck-instances servant-db text time transformers-base
+ ];
+ description = "Derive a postgres client to database API specified by servant-db";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"servant-docs" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring
, bytestring-conversion, case-insensitive, control-monad-omega
@@ -145685,7 +149098,7 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "servant-docs_0_9_0_1" = callPackage
+ "servant-docs_0_9_1_1" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring
, case-insensitive, control-monad-omega, hashable, hspec
, http-media, http-types, lens, servant, string-conversions, text
@@ -145693,8 +149106,8 @@ self: {
}:
mkDerivation {
pname = "servant-docs";
- version = "0.9.0.1";
- sha256 = "a93955e71706421dcd82a6f7aafb0d599cd736c09b065bd4cad26159c6aac54e";
+ version = "0.9.1.1";
+ sha256 = "7c4205d25caa926355221e62842c3e58337d05022b1e4341045ac385e568bc79";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -145794,12 +149207,12 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "servant-foreign_0_9_0_1" = callPackage
+ "servant-foreign_0_9_1_1" = callPackage
({ mkDerivation, base, hspec, http-types, lens, servant, text }:
mkDerivation {
pname = "servant-foreign";
- version = "0.9.0.1";
- sha256 = "133429124fa786185b2511150cf8b50779b1c23d41cd3d624877f1d40757c8a5";
+ version = "0.9.1.1";
+ sha256 = "da9baf46c97b3ef3009a69c8d1ca40e188409c0027490c9e173b9ebd3da7c9ca";
libraryHaskellDepends = [ base http-types lens servant text ];
testHaskellDepends = [ base hspec ];
description = "Helpers for generating clients for servant APIs in any programming language";
@@ -145959,17 +149372,19 @@ self: {
"servant-matrix-param" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, doctest
- , hspec, http-types, servant, servant-aeson-specs, servant-server
- , text, transformers, wai, wai-extra
+ , hspec, http-client, http-types, servant, servant-aeson-specs
+ , servant-client, servant-server, text, transformers, wai
+ , wai-extra, warp
}:
mkDerivation {
pname = "servant-matrix-param";
- version = "0.3";
- sha256 = "8b74bc16a7948862e509dc5692989de8e471be4b8933f4e2152a9d4b575c2997";
+ version = "0.3.1";
+ sha256 = "2559133dee1629ddfca41aca6d7ac0f3b0283ae3470228bd5bd71ce4c79f6641";
libraryHaskellDepends = [ base servant ];
testHaskellDepends = [
- aeson base bytestring containers doctest hspec http-types servant
- servant-aeson-specs servant-server text transformers wai wai-extra
+ aeson base bytestring containers doctest hspec http-client
+ http-types servant servant-aeson-specs servant-client
+ servant-server text transformers wai wai-extra warp
];
description = "Matrix parameter combinator for servant";
license = stdenv.lib.licenses.mit;
@@ -146115,8 +149530,8 @@ self: {
}:
mkDerivation {
pname = "servant-quickcheck";
- version = "0.0.2.1";
- sha256 = "4ac4467627724f118c1d735724b961a5b69d79f83b67d94b6cb60acef950e84d";
+ version = "0.0.2.2";
+ sha256 = "72878553ed9d7f134bd10e11ca7eaf69ba3d341e591aa3af4c73c43c7af866c5";
libraryHaskellDepends = [
aeson base base-compat bytestring case-insensitive clock
data-default-class hspec http-client http-media http-types mtl
@@ -146124,7 +149539,7 @@ self: {
split string-conversions temporary text time warp
];
testHaskellDepends = [
- base base-compat hspec hspec-core http-client QuickCheck
+ base base-compat bytestring hspec hspec-core http-client QuickCheck
quickcheck-io servant servant-client servant-server transformers
warp
];
@@ -146222,7 +149637,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "servant-server_0_9_0_1" = callPackage
+ "servant-server_0_9_1_1" = callPackage
({ mkDerivation, aeson, attoparsec, base, base-compat
, base64-bytestring, bytestring, containers, directory, doctest
, exceptions, filemanip, filepath, hspec, hspec-wai, http-api-data
@@ -146233,8 +149648,8 @@ self: {
}:
mkDerivation {
pname = "servant-server";
- version = "0.9.0.1";
- sha256 = "c353df6cdfe2d97648ea3e912dfa61a62d567b9b7431a037bab2b08ccdfade70";
+ version = "0.9.1.1";
+ sha256 = "1e0683557ece1f7a8a7b11e5c7cd1fd042783777157d95a67e28a0518c91bdd1";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -146330,8 +149745,8 @@ self: {
}:
mkDerivation {
pname = "servant-subscriber";
- version = "0.5.0.2";
- sha256 = "5da646e0b2170b23febf11024aaa367553874b284cb33f57bde6063d65f0d671";
+ version = "0.5.0.3";
+ sha256 = "0530f47c565c12624524c028dcc4f12517bd05d31ef1fed1b6a4aa084507842a";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -147242,8 +150657,8 @@ self: {
({ mkDerivation, base, bytestring, bzlib, shake, tar }:
mkDerivation {
pname = "shake-pack";
- version = "0.1.2";
- sha256 = "413dc10d9b141ba885b3067b2ab76aee7f2978a930e874885fa0baf3d8b1c247";
+ version = "0.2.0";
+ sha256 = "5fad6c240305f85bfa1c2001d9d52cb23ecdce006f98e590efe335dba2b9698f";
libraryHaskellDepends = [ base bytestring bzlib shake tar ];
homepage = "https://github.com/LukeHoersten/shake-pack";
description = "Shake File Pack Rule";
@@ -147665,8 +151080,8 @@ self: {
}:
mkDerivation {
pname = "shellmate";
- version = "0.3.3";
- sha256 = "4b104089f1c46f05c1c86592ecfeee507092106d862c31c6ca4d95e52180c689";
+ version = "0.3.4";
+ sha256 = "b2db36ff28c21d78bdac8142e35b4ab002d70193f55f7e603c8c3d0eb49c0ce8";
libraryHaskellDepends = [
base bytestring directory filepath process temporary transformers
unix
@@ -147677,16 +151092,16 @@ self: {
}) {};
"shellmate-extras" = callPackage
- ({ mkDerivation, base, bytestring, feed, HTTP, mime-types
- , network-uri, shellmate, tagsoup, text, xml
+ ({ mkDerivation, base, bytestring, feed, http-conduit, http-types
+ , mime-types, shellmate, tagsoup, text, utf8-string, xml
}:
mkDerivation {
pname = "shellmate-extras";
- version = "0.3.3";
- sha256 = "fa3ade318f08c7b4d21bff10a82703480fb9ee3e572083be5cb99c0974e7a6a3";
+ version = "0.3.4";
+ sha256 = "46aecef64462ab34789f63dd338dc1b72aff77f4eaa2ecbf97c32dd9b6130b52";
libraryHaskellDepends = [
- base bytestring feed HTTP mime-types network-uri shellmate tagsoup
- text xml
+ base bytestring feed http-conduit http-types mime-types shellmate
+ tagsoup text utf8-string xml
];
homepage = "https://github.com/valderman/shellmate";
description = "Extra functionality for shellmate";
@@ -148010,8 +151425,8 @@ self: {
}:
mkDerivation {
pname = "sibe";
- version = "0.1.0.0";
- sha256 = "456846a9c4bcd467e9f95899677d216d21bf94e0d51b70e22b173272526a8db8";
+ version = "0.2.0.1";
+ sha256 = "964a03b7ba59444dcd0a776da94164840e402d6ca737ca2619a678080571046c";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -148025,7 +151440,7 @@ self: {
];
testHaskellDepends = [ base hmatrix ];
homepage = "https://github.com/mdibaiee/sibe";
- description = "Initial project template from stack";
+ description = "Machine Learning algorithms";
license = stdenv.lib.licenses.gpl3;
}) {};
@@ -148084,6 +151499,28 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {gdk_x11 = null; gtk_x11 = null;};
+ "sigma-ij" = callPackage
+ ({ mkDerivation, array, base, combinat, containers
+ , optparse-applicative, parsec2, random, time
+ }:
+ mkDerivation {
+ pname = "sigma-ij";
+ version = "0.2.0.2";
+ sha256 = "6ca35a8cbb816509c0110cf53c5ce3d34167cafa25a80d7064694d01970a9a19";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ array base combinat containers optparse-applicative parsec2 random
+ time
+ ];
+ executableHaskellDepends = [
+ base combinat optparse-applicative time
+ ];
+ homepage = "http://code.haskell.org/~bkomuves/";
+ description = "Thom polynomials of second order Thom-Boardman singularities";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"sign" = callPackage
({ mkDerivation, base, containers, deepseq, hashable, HUnit
, lattices, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
@@ -148849,13 +152286,19 @@ self: {
}) {};
"simple-vec3" = callPackage
- ({ mkDerivation, base, vector }:
+ ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck
+ , tasty-th, vector, vector-th-unbox
+ }:
mkDerivation {
pname = "simple-vec3";
- version = "0.1.0.1";
- sha256 = "441b08acf63ad72fc20acd3f5e02cb5c2957dab2e4ff765652803c9e1b42fdef";
- libraryHaskellDepends = [ base vector ];
- homepage = "http://github.com/dzhus/simple-vec3/";
+ version = "0.2";
+ sha256 = "65a8987ee8ebff519c2702a8df038f77a28dda711feb1a6e556eb8c19be0f680";
+ libraryHaskellDepends = [ base QuickCheck vector vector-th-unbox ];
+ testHaskellDepends = [
+ base QuickCheck tasty tasty-quickcheck tasty-th vector
+ vector-th-unbox
+ ];
+ homepage = "https://github.com/dzhus/simple-vec3#readme";
description = "Three-dimensional vectors of doubles with basic operations";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -149096,8 +152539,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "singleton-bool";
- version = "0.1.1.0";
- sha256 = "c196a542ff65f3357219f8c8b294b31e84b0f1a5341c426160bb2909f1523d95";
+ version = "0.1.2.0";
+ sha256 = "33bbd0460a5363260f56b29b130babfc16921ba87cb4576569ecc0a0664d449d";
libraryHaskellDepends = [ base ];
homepage = "https://github.com/phadej/singleton-bool#readme";
description = "Type level booleans";
@@ -149513,19 +152956,22 @@ self: {
"slack-api" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, errors
- , HsOpenSSL, io-streams, lens, lens-aeson, monad-loops, mtl
- , network, network-uri, openssl-streams, text, time
- , time-locale-compat, transformers, websockets, wreq
+ , hashable, io-streams, lens, lens-aeson, monad-loops, mtl, network
+ , network-uri, text, time, time-locale-compat, tls, transformers
+ , websockets, wreq, wuss
}:
mkDerivation {
pname = "slack-api";
- version = "0.9";
- sha256 = "397967f49fbdd25afac310b27baeb6d46ac7f095a9699bb01a0326857ddd4e38";
+ version = "0.10";
+ sha256 = "0b9b6688858b85d9c40a6cfd670658330671173ac309326936ff07c931afb452";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [
- aeson base bytestring containers errors HsOpenSSL io-streams lens
- lens-aeson monad-loops mtl network network-uri openssl-streams text
- time time-locale-compat transformers websockets wreq
+ aeson base bytestring containers errors hashable io-streams lens
+ lens-aeson monad-loops mtl network network-uri text time
+ time-locale-compat tls transformers websockets wreq wuss
];
+ executableHaskellDepends = [ base lens mtl text ];
testHaskellDepends = [ base ];
description = "Bindings to the Slack RTM API";
license = stdenv.lib.licenses.mit;
@@ -151918,8 +155364,8 @@ self: {
}:
mkDerivation {
pname = "solr";
- version = "0.3.2";
- sha256 = "945f9e6ba4f967d1b2ec2bf5b482b1df56df40ab1524dba4a0fce841e70c46c2";
+ version = "0.3.3";
+ sha256 = "5703365d767023c7dd9fe5584968655f0115a5ad6b65bf28762dfeb959ed325c";
libraryHaskellDepends = [
base base-prelude bytestring bytestring-tree-builder
case-insensitive contravariant http-client http-response-decoder
@@ -152264,20 +155710,18 @@ self: {
"sparkle" = callPackage
({ mkDerivation, base, binary, bytestring, distributed-closure
- , filepath, inline-java, process, regex-tdfa, singletons, text
- , vector, zip-archive
+ , filepath, jni, jvm, process, regex-tdfa, singletons, text, vector
+ , zip-archive
}:
mkDerivation {
pname = "sparkle";
- version = "0.2";
- sha256 = "28c80bbc72dd4f0fdf6ae11f7e0dc4a1f6b47f2681ac71cd62158bb0ad4439e6";
- revision = "1";
- editedCabalFile = "6cee669a8e79fde86256c9d018f9d20490cbad97e80f051853a10d00f81bf642";
+ version = "0.3";
+ sha256 = "72b97e6fe8867bbaa797bb1416df14bbfd61e7bd1e1b0c9b9b2c97cc0e37b7d5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base binary bytestring distributed-closure inline-java singletons
- text vector
+ base binary bytestring distributed-closure jni jvm singletons text
+ vector
];
executableHaskellDepends = [
base bytestring filepath process regex-tdfa text zip-archive
@@ -152332,6 +155776,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "sparse-linear-algebra" = callPackage
+ ({ mkDerivation, base, containers, criterion, hspec, mtl
+ , mwc-random, primitive, QuickCheck
+ }:
+ mkDerivation {
+ pname = "sparse-linear-algebra";
+ version = "0.2.0.9";
+ sha256 = "e71d62721edb02d38e578d6c286af76ad7a98638a8b4e398efd3ca7e280371de";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base containers hspec mtl mwc-random primitive QuickCheck
+ ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [
+ base containers criterion hspec mtl mwc-random primitive
+ ];
+ homepage = "https://github.com/ocramz/sparse-linear-algebra";
+ description = "Numerical computation in native Haskell";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"sparsebit" = callPackage
({ mkDerivation, base, haskell98 }:
mkDerivation {
@@ -152614,6 +156080,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "sphinx_0_6_0_2" = callPackage
+ ({ mkDerivation, base, binary, bytestring, data-binary-ieee754
+ , network, text, text-icu, xml
+ }:
+ mkDerivation {
+ pname = "sphinx";
+ version = "0.6.0.2";
+ sha256 = "76a977c6ce6e71c220bd5fed7acd0be500c2a1b5c8d081a29564a8e37ba7a6df";
+ libraryHaskellDepends = [
+ base binary bytestring data-binary-ieee754 network text text-icu
+ xml
+ ];
+ homepage = "https://github.com/gregwebs/haskell-sphinx-client";
+ description = "Haskell bindings to the Sphinx full-text searching daemon";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"sphinx-cli" = callPackage
({ mkDerivation, base, sphinx }:
mkDerivation {
@@ -153204,8 +156688,8 @@ self: {
({ mkDerivation, base, mtl, parsec, sqlite-simple, text }:
mkDerivation {
pname = "sqlite-simple-errors";
- version = "0.3.0.0";
- sha256 = "0d8cb4b9b51aeadc6daf112ae75b2b38a13f2da2fba574c2b4d2fafa18600c9d";
+ version = "0.6.0.0";
+ sha256 = "e697ba5ff6b4df227d782cb2d2327ce5df4282acdb17e8087ae76adbfabfd980";
libraryHaskellDepends = [ base parsec sqlite-simple text ];
testHaskellDepends = [ base mtl sqlite-simple text ];
homepage = "https://github.com/caneroj1/sqlite-simple-errors";
@@ -154516,6 +158000,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "staversion" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, directory, filepath
+ , hspec, optparse-applicative, text, unordered-containers, yaml
+ }:
+ mkDerivation {
+ pname = "staversion";
+ version = "0.1.0.0";
+ sha256 = "df252adb8010dbe2553fcd467044a6f99b43ce0ad223762ead0f755484806073";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base bytestring directory filepath optparse-applicative text
+ unordered-containers yaml
+ ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [ base filepath hspec text ];
+ homepage = "https://github.com/debug-ito/staversion";
+ description = "What version is the package X in stackage lts-Y.ZZ?";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"stb-image" = callPackage
({ mkDerivation, base, bitmap, bytestring }:
mkDerivation {
@@ -154529,13 +158034,13 @@ self: {
}) {};
"stb-image-redux" = callPackage
- ({ mkDerivation, base, hspec, QuickCheck, vector }:
+ ({ mkDerivation, base, hspec, primitive, vector }:
mkDerivation {
pname = "stb-image-redux";
- version = "0.1.0.3";
- sha256 = "7a3519a1832f39b3d621207cddd679e7e8bb4f1057f33bfd170de2d3e07313b7";
- libraryHaskellDepends = [ base vector ];
- testHaskellDepends = [ base hspec QuickCheck vector ];
+ version = "0.2.0.0";
+ sha256 = "1ad898ff99f7c1d6532dea98c6acdb1f786bc7c6095f72b179e423aaac3b9515";
+ libraryHaskellDepends = [ base primitive vector ];
+ testHaskellDepends = [ base hspec vector ];
homepage = "https://github.com/sasinestro/stb-image-redux#readme";
description = "Image loading and writing microlibrary";
license = stdenv.lib.licenses.bsd3;
@@ -155242,6 +158747,49 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "store_0_3" = callPackage
+ ({ mkDerivation, array, async, base, base-orphans
+ , base64-bytestring, bytestring, cereal, cereal-vector, conduit
+ , containers, criterion, cryptohash, deepseq, directory, filepath
+ , free, ghc-prim, hashable, hspec, hspec-smallcheck, integer-gmp
+ , lifted-base, monad-control, mono-traversable, network, primitive
+ , resourcet, safe, semigroups, smallcheck, store-core
+ , streaming-commons, syb, template-haskell, text, th-lift
+ , th-lift-instances, th-orphans, th-reify-many, th-utilities, time
+ , transformers, unordered-containers, vector
+ , vector-binary-instances, void, weigh
+ }:
+ mkDerivation {
+ pname = "store";
+ version = "0.3";
+ sha256 = "bdefbf35d52ef36d33b57eed5f24761e33feb689ef38fba3eebcfab723491b5b";
+ libraryHaskellDepends = [
+ array async base base-orphans base64-bytestring bytestring conduit
+ containers cryptohash deepseq directory filepath free ghc-prim
+ hashable hspec hspec-smallcheck integer-gmp lifted-base
+ monad-control mono-traversable network primitive resourcet safe
+ semigroups smallcheck store-core streaming-commons syb
+ template-haskell text th-lift th-lift-instances th-orphans
+ th-reify-many th-utilities time transformers unordered-containers
+ vector void
+ ];
+ testHaskellDepends = [
+ array async base base-orphans base64-bytestring bytestring cereal
+ cereal-vector conduit containers criterion cryptohash deepseq
+ directory filepath free ghc-prim hashable hspec hspec-smallcheck
+ integer-gmp lifted-base monad-control mono-traversable network
+ primitive resourcet safe semigroups smallcheck store-core
+ streaming-commons syb template-haskell text th-lift
+ th-lift-instances th-orphans th-reify-many th-utilities time
+ transformers unordered-containers vector vector-binary-instances
+ void weigh
+ ];
+ homepage = "https://github.com/fpco/store#readme";
+ description = "Fast binary serialization";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"store-core" = callPackage
({ mkDerivation, base, bytestring, fail, ghc-prim, primitive, text
, transformers
@@ -155258,6 +158806,23 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "store-core_0_3" = callPackage
+ ({ mkDerivation, base, bytestring, fail, ghc-prim, primitive, text
+ , transformers
+ }:
+ mkDerivation {
+ pname = "store-core";
+ version = "0.3";
+ sha256 = "8793230b634a310a91db98727dfa6f34a0b7f5ded55985342066d33d98507087";
+ libraryHaskellDepends = [
+ base bytestring fail ghc-prim primitive text transformers
+ ];
+ homepage = "https://github.com/fpco/store#readme";
+ description = "Fast and lightweight binary serialization";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"str" = callPackage
({ mkDerivation, base, base16-bytestring, bytestring, Crypto
, hashable, MissingH, text, utf8-string
@@ -155304,6 +158869,29 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "stratosphere_0_2_0" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
+ , hlint, lens, tasty, tasty-hspec, template-haskell, text
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "stratosphere";
+ version = "0.2.0";
+ sha256 = "7a5b78bbcf125e5fec7e377ddb6917111341bab23a7bf5567e1393a910f9085e";
+ libraryHaskellDepends = [
+ 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;
+ }) {};
+
"stratum-tool" = callPackage
({ mkDerivation, aeson, async, base, bytestring, bytestring-builder
, cmdargs, connection, containers, curl, curl-aeson, network, stm
@@ -156530,16 +160118,15 @@ self: {
}) {};
"sump" = callPackage
- ({ mkDerivation, base, bytestring, data-default, either, lens
- , serialport, transformers, vector
+ ({ mkDerivation, base, bytestring, data-default, lens, serialport
+ , transformers, vector
}:
mkDerivation {
pname = "sump";
- version = "0.1.0.1";
- sha256 = "b7fa21630a6965fffd913280a7dd08a77a6e3f05b2bf04ad61c41ed601a0d1f7";
+ version = "0.1.0.2";
+ sha256 = "aab5fe4a465a328586fe5b25f6a808b90071e976f0570b35a30a537565cc43bc";
libraryHaskellDepends = [
- base bytestring data-default either lens serialport transformers
- vector
+ base bytestring data-default lens serialport transformers vector
];
homepage = "http://github.com/bgamari/sump";
description = "A Haskell interface to SUMP-compatible logic analyzers";
@@ -156810,22 +160397,6 @@ self: {
}) {};
"svg-builder" = callPackage
- ({ mkDerivation, base, blaze-builder, bytestring, hashable, text
- , unordered-containers
- }:
- mkDerivation {
- pname = "svg-builder";
- version = "0.1.0.1";
- sha256 = "91c1a879e4b656355e9c843f29761a46dba6fd6c96c38a073dbb61b101923c9d";
- 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;
- }) {};
-
- "svg-builder_0_1_0_2" = callPackage
({ mkDerivation, base, blaze-builder, bytestring, hashable, text
, unordered-containers
}:
@@ -156839,7 +160410,6 @@ self: {
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
@@ -156859,6 +160429,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "svg-tree_0_6" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, containers
+ , JuicyPixels, lens, linear, mtl, scientific, text, transformers
+ , vector, xml
+ }:
+ mkDerivation {
+ pname = "svg-tree";
+ version = "0.6";
+ sha256 = "7b055b1f66fe8aeacb91bb01315275b3669ddb84b057bd28fdbed17d1e1c5732";
+ libraryHaskellDepends = [
+ attoparsec base bytestring containers JuicyPixels lens linear mtl
+ scientific text transformers vector xml
+ ];
+ description = "SVG file loader and serializer";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"svg2q" = callPackage
({ mkDerivation, base, haskell98, language-c, pretty, svgutils, syb
, xml
@@ -159260,6 +162848,8 @@ self: {
pname = "tasty-hspec";
version = "1.1.3";
sha256 = "3c597d948cad9c61355a56811533abbad130eb6e4068fd930ab5514c759bfe31";
+ revision = "1";
+ editedCabalFile = "01a77505da91de5d767129a556b345bf6b26265fa047a9f2b7cd8677adab1412";
libraryHaskellDepends = [
base hspec hspec-core QuickCheck random tagged tasty
tasty-quickcheck tasty-smallcheck
@@ -159737,10 +163327,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "teeth";
- version = "0.1.0.0";
- sha256 = "94f544c6bb663b37f7999ce59d24b67120d795e76f1107025cac374c4e89b1c3";
- revision = "1";
- editedCabalFile = "84bb818fc4cb06bf91450e31e9a023926449a6157ce1e5de60649cda931db416";
+ version = "0.2.0.2";
+ sha256 = "0c59db4fc490591772fd5b1c216c341fd10393b5751e5c4d0128fa9d2f716a6e";
libraryHaskellDepends = [ base ];
homepage = "https://github.com/expipiplus1/teeth";
description = "Dental data types";
@@ -159765,19 +163353,19 @@ self: {
}) {};
"telegram-api" = 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, aeson, ansi-wl-pprint, base, bytestring, filepath
+ , hjpath, hspec, http-api-data, http-client, http-client-tls
+ , http-media, http-types, mime-types, mtl, optparse-applicative
+ , servant, servant-client, string-conversions, text, transformers
+ , utf8-string
}:
mkDerivation {
pname = "telegram-api";
- version = "0.5.0.1";
- sha256 = "24eca611772e6810f837b372dca1b0fb7492cff8b72b68d66d886193da030ef3";
+ version = "0.5.1.1";
+ sha256 = "2d253937a83605fd947a0d68d86208f0801bef97bf45679c81528d6c4d4e5d1d";
libraryHaskellDepends = [
- aeson base bytestring either http-api-data http-client http-media
- http-types mime-types servant servant-client string-conversions
+ aeson base bytestring http-api-data http-client http-media
+ http-types mime-types mtl servant servant-client string-conversions
text transformers
];
testHaskellDepends = [
@@ -159791,6 +163379,27 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "telegram-bot" = callPackage
+ ({ mkDerivation, base, containers, http-client, http-client-tls
+ , pipes, telegram-api, text, transformers
+ }:
+ mkDerivation {
+ pname = "telegram-bot";
+ version = "0.5.1.0";
+ sha256 = "525fc12654179fa7c57ae062741bb236f5821dc1b5c0c8b9a5c62946d8817fd3";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base containers http-client http-client-tls pipes telegram-api text
+ transformers
+ ];
+ executableHaskellDepends = [ base text ];
+ testHaskellDepends = [ base ];
+ homepage = "https://github.com/akru/telegram-bot#readme";
+ description = "Telegram Bot microframework for Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"teleport" = callPackage
({ mkDerivation, aeson, ansi-terminal, base, bytestring
, configurator, optparse-applicative, system-filepath, text, turtle
@@ -159869,6 +163478,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "template-haskell-compat-v0208" = callPackage
+ ({ mkDerivation, base, base-prelude, template-haskell }:
+ mkDerivation {
+ pname = "template-haskell-compat-v0208";
+ version = "0.1.1";
+ sha256 = "e3d2ede7a0da70c6c477a56c61c92e5b43e684ac7fb05d421ea840643e73fdb5";
+ libraryHaskellDepends = [ base base-prelude template-haskell ];
+ homepage = "https://github.com/nikita-volkov/template-haskell-compat-v0208";
+ description = "A backwards compatibility layer for Template Haskell newer than 2.8";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"template-haskell-util" = callPackage
({ mkDerivation, base, GenericPretty, ghc-prim, template-haskell }:
mkDerivation {
@@ -160459,8 +164080,8 @@ self: {
pname = "test-framework-hunit";
version = "0.3.0.2";
sha256 = "95cb8ee02a850b164bfdabdf4dbc839d621361f3ac770ad21ea43a8bde360bf8";
- revision = "1";
- editedCabalFile = "50dfa482f626505b45ab433d0110f275e314f872a198b5fc24d1a640af755880";
+ revision = "2";
+ editedCabalFile = "f3b7d4b2bf246b88de781a03806e5c90a499c64b2b0c040be50dd980764fcc62";
libraryHaskellDepends = [
base extensible-exceptions HUnit test-framework
];
@@ -160922,8 +164543,8 @@ self: {
}:
mkDerivation {
pname = "texmath";
- version = "0.8.6.5";
- sha256 = "33f8c3d78f2f46246b64cecab47e27f1f4e587f05b2375e94a8a43dfce446c90";
+ version = "0.8.6.6";
+ sha256 = "9c78e53e685b4537a39a4d2bc785df1d0d0ee775085bd532d8ae88d10d4c58b4";
libraryHaskellDepends = [
base containers mtl pandoc-types parsec syb xml
];
@@ -161438,6 +165059,37 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "text-show_3_4_1" = callPackage
+ ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors
+ , bytestring, bytestring-builder, containers, contravariant
+ , deriving-compat, generic-deriving, ghc-boot-th, ghc-prim, hspec
+ , integer-gmp, nats, QuickCheck, quickcheck-instances, semigroups
+ , tagged, template-haskell, text, th-lift, transformers
+ , transformers-compat, void
+ }:
+ mkDerivation {
+ pname = "text-show";
+ version = "3.4.1";
+ sha256 = "1a1ac1c88004b3c060d09d011f645e6fbcf59147b109ee4192cbe7724732558b";
+ libraryHaskellDepends = [
+ array base base-compat bifunctors bytestring bytestring-builder
+ containers contravariant generic-deriving ghc-boot-th ghc-prim
+ integer-gmp nats semigroups tagged template-haskell text th-lift
+ transformers transformers-compat void
+ ];
+ testHaskellDepends = [
+ array base base-compat base-orphans bifunctors bytestring
+ bytestring-builder containers contravariant deriving-compat
+ generic-deriving ghc-boot-th ghc-prim hspec integer-gmp nats
+ QuickCheck quickcheck-instances semigroups tagged template-haskell
+ text th-lift transformers transformers-compat void
+ ];
+ homepage = "https://github.com/RyanGlScott/text-show";
+ description = "Efficient conversion of values into Text";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"text-show-instances" = callPackage
({ mkDerivation, base, base-compat, bifunctors, binary, bytestring
, containers, directory, generic-deriving, ghc-boot, ghc-prim
@@ -161790,24 +165442,23 @@ self: {
}) {};
"th-context" = callPackage
- ({ mkDerivation, array, base, bytestring, containers, data-default
- , deepseq, ghc-prim, haskell-src-exts, hspec, hspec-core, lens, mtl
- , mtl-unleashed, syb, template-haskell, text, th-desugar
- , th-orphans, th-reify-many, th-typegraph
+ ({ mkDerivation, array, atp-haskell, base, bytestring, containers
+ , data-default, deepseq, ghc-prim, haskell-src-exts, hspec
+ , hspec-core, lens, mtl, mtl-unleashed, pretty, syb
+ , template-haskell, text, th-desugar, th-orphans, th-reify-many
}:
mkDerivation {
pname = "th-context";
- version = "0.23";
- sha256 = "54b65f7692f211426c7f3fc1751d938d756fee64f2970ebe6db30476f95c219f";
+ version = "0.24";
+ sha256 = "a04e7033443836628ee2bccfe4d4aefd0a65576f3e8c30fdcbc4abd916373949";
libraryHaskellDepends = [
- base containers data-default haskell-src-exts lens mtl
- mtl-unleashed syb template-haskell th-desugar th-orphans
- th-typegraph
+ atp-haskell base containers data-default haskell-src-exts lens mtl
+ mtl-unleashed pretty syb template-haskell th-desugar th-orphans
];
testHaskellDepends = [
- array base bytestring containers deepseq ghc-prim hspec hspec-core
- lens mtl mtl-unleashed syb template-haskell text th-desugar
- th-orphans th-reify-many th-typegraph
+ array atp-haskell base bytestring containers data-default deepseq
+ ghc-prim hspec hspec-core lens mtl mtl-unleashed syb
+ template-haskell text th-desugar th-orphans th-reify-many
];
homepage = "https://github.com/seereason/th-context";
description = "Test instance context";
@@ -162097,16 +165748,17 @@ self: {
({ mkDerivation, array, base, base-compat, bytestring, containers
, data-default, deepseq, ghc-prim, haskell-src-exts, hspec
, hspec-core, lens, mtl, mtl-unleashed, pretty, set-extra, syb
- , template-haskell, text, th-desugar, th-orphans, th-reify-many
+ , template-haskell, text, th-context, th-desugar, th-lift-instances
+ , th-orphans, th-reify-many
}:
mkDerivation {
pname = "th-typegraph";
- version = "0.33.1";
- sha256 = "4b9ba6823398c2ce042728c0358e670533ba146bfd7c5e72019069da1c594080";
+ version = "0.35.1";
+ sha256 = "30995f3cf18b3752b353a4e178bc196647238c70d165134b975990f4f0c487df";
libraryHaskellDepends = [
base base-compat containers data-default haskell-src-exts lens mtl
- mtl-unleashed pretty set-extra syb template-haskell th-desugar
- th-orphans
+ mtl-unleashed pretty set-extra syb template-haskell th-context
+ th-desugar th-lift-instances th-orphans
];
testHaskellDepends = [
array base bytestring containers data-default deepseq ghc-prim
@@ -162652,8 +166304,8 @@ self: {
}:
mkDerivation {
pname = "tianbar";
- version = "1.1.0.1";
- sha256 = "cf58ba500aa8d68bce6e35b233f13b8d8d1a2efecef24e4fece628cfd171df73";
+ version = "1.1.1.1";
+ sha256 = "0cc35cd49ab80f083091dc085e942e1b3b0c5bf37aeab54e402b9dbc6aff9927";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -163680,16 +167332,17 @@ self: {
}:
mkDerivation {
pname = "titlecase";
- version = "0.1.0.2";
- sha256 = "4860625a5233a9cc923224e0d86f113200b6636a79bef209acf40f1dcb631ce1";
+ version = "0.1.0.3";
+ sha256 = "67bbc3f21d7e020afa4547aaacabf8927d53fd5e6dae41f3a0b92ab018172222";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base blaze-markup semigroups text ];
- executableHaskellDepends = [ base blaze-markup text ];
+ executableHaskellDepends = [ base blaze-markup semigroups text ];
testHaskellDepends = [
- base semigroups tasty tasty-hunit tasty-quickcheck text
+ base blaze-markup semigroups tasty tasty-hunit tasty-quickcheck
+ text
];
- homepage = "https://github.com/nkaretnikov/titlecase";
+ homepage = "https://github.com/peti/titlecase#readme";
description = "Convert English words to title case";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -164446,8 +168099,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "tracy";
- version = "0.1.3.0";
- sha256 = "9c298b7ff70dd4f5aaf839e7bccbc9810f0235833bb5b723babe0838eac5d301";
+ version = "0.1.4.0";
+ sha256 = "e778ebf70161ac37878629bf8857021969a71bea1b04140a0c306d0b9d0f430f";
libraryHaskellDepends = [ base ];
description = "Convenience wrappers for non-intrusive debug tracing";
license = stdenv.lib.licenses.mit;
@@ -166187,8 +169840,8 @@ self: {
}:
mkDerivation {
pname = "twitter-feed";
- version = "0.2.0.9";
- sha256 = "570e20335adce61cddbdefa8f3f01131e44f266fb1970ccbe65d3716fbe72960";
+ version = "0.2.0.11";
+ sha256 = "8b98b4ddfb88f4c14f8eb43bd74a4c4e7941a92d44b90717e9b8dbe4c454c889";
libraryHaskellDepends = [
aeson authenticate-oauth base bytestring http-conduit
];
@@ -166200,27 +169853,6 @@ 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
@@ -166685,8 +170317,8 @@ self: {
({ mkDerivation, base, ghc-prim }:
mkDerivation {
pname = "type-operators";
- version = "0.1.0.3";
- sha256 = "ea0b994df588b84679171878ebdc420d20dbfef975d263ff48622ab161057dc2";
+ version = "0.1.0.4";
+ sha256 = "dbbcedf368c23c46abac04f157cb4f2c812099a4f75d606b24f1ac1116d40b74";
libraryHaskellDepends = [ base ghc-prim ];
homepage = "https://github.com/Shou/type-operators#readme";
description = "Various type-level operators";
@@ -166875,6 +170507,28 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "typed-process" = callPackage
+ ({ mkDerivation, async, base, base64-bytestring, bytestring
+ , conduit, conduit-extra, exceptions, hspec, http-conduit, process
+ , stm, temporary, transformers
+ }:
+ mkDerivation {
+ pname = "typed-process";
+ version = "0.1.0.0";
+ sha256 = "de866bc6ccb3ae3ccce20701add8bd913f7d7b4e252a9133eac35d035d0a10f8";
+ libraryHaskellDepends = [
+ async base bytestring conduit conduit-extra exceptions process stm
+ transformers
+ ];
+ testHaskellDepends = [
+ async base base64-bytestring bytestring conduit conduit-extra hspec
+ http-conduit temporary
+ ];
+ homepage = "https://github.com/fpco/typed-process#readme";
+ description = "Run external processes, with strong typing of streams";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"typed-spreadsheet" = callPackage
({ mkDerivation, async, base, diagrams-cairo, diagrams-gtk
, diagrams-lib, foldl, gtk, microlens, stm, text, transformers
@@ -167175,13 +170829,13 @@ self: {
}:
mkDerivation {
pname = "u2f";
- version = "0.1.0.0";
- sha256 = "b7d123b1eee52751bc1310e2acca2129241bf5588a2587dcfe37691e1ff17205";
+ version = "0.1.0.1";
+ sha256 = "b5843d158a5356d4a75a09a30952cd886e16b52227d2080fe5959c4a7aeb57be";
libraryHaskellDepends = [
aeson asn1-encoding asn1-types base base64-bytestring binary
- bytestring cryptohash cryptonite either-unwrap text
+ bytestring cryptohash cryptonite text
];
- testHaskellDepends = [ base bytestring hspec text ];
+ testHaskellDepends = [ base bytestring either-unwrap hspec text ];
homepage = "https://github.com/EButlerIV/u2f";
description = "Haskell Universal Two Factor helper toolbox library thing";
license = stdenv.lib.licenses.bsd3;
@@ -167342,6 +170996,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) libudev;};
+ "udp-conduit" = callPackage
+ ({ mkDerivation, base, chunked-data, conduit-combinators
+ , mono-traversable, network
+ }:
+ mkDerivation {
+ pname = "udp-conduit";
+ version = "0.1.0.4";
+ sha256 = "52d3d29e9d2243014aea9af04e7243b512c1679ec04e54c1dc74d55e94a0178e";
+ libraryHaskellDepends = [
+ base chunked-data conduit-combinators mono-traversable network
+ ];
+ homepage = "https://github.com/kqr/udp-conduit#readme";
+ description = "Simple fire-and-forget conduit UDP wrappers";
+ license = stdenv.lib.licenses.isc;
+ }) {};
+
"uglymemo" = callPackage
({ mkDerivation, base, containers }:
mkDerivation {
@@ -167700,6 +171370,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "unfoldable_0_9" = callPackage
+ ({ mkDerivation, base, containers, ghc-prim, QuickCheck, random
+ , transformers
+ }:
+ mkDerivation {
+ pname = "unfoldable";
+ version = "0.9";
+ sha256 = "decb997909f9cd8c6ad618a46290c6df922e525361ec5d06e9db3b3822a40f77";
+ libraryHaskellDepends = [
+ base containers ghc-prim QuickCheck random transformers
+ ];
+ homepage = "https://github.com/sjoerdvisscher/unfoldable";
+ description = "Class of data structures that can be unfolded";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"unfoldable-restricted" = callPackage
({ mkDerivation, base, constraints, containers, hashable
, transformers, unfoldable, unit-constraint, unordered-containers
@@ -167943,6 +171630,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "unicode-transforms_0_2_0" = callPackage
+ ({ mkDerivation, base, bitarray, bytestring, deepseq
+ , getopt-generics, QuickCheck, split, text
+ }:
+ mkDerivation {
+ pname = "unicode-transforms";
+ version = "0.2.0";
+ sha256 = "3b27ca1ae8f0a906fbbefe1de819a80a01933610a4657ef6383db2590fdecb0e";
+ libraryHaskellDepends = [ base bitarray bytestring text ];
+ testHaskellDepends = [
+ base deepseq getopt-generics QuickCheck split text
+ ];
+ homepage = "http://github.com/harendra-kumar/unicode-transforms";
+ description = "Unicode normalization";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"unicoder" = callPackage
({ mkDerivation, attoparsec, base, directory, text }:
mkDerivation {
@@ -170223,6 +173928,43 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "vault-tool" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, http-client
+ , http-client-tls, http-types, text, unordered-containers
+ }:
+ mkDerivation {
+ pname = "vault-tool";
+ version = "0.0.0.1";
+ sha256 = "6be3b3e15e2e7dcd968f5ff3d6b72ba418ff60b70f1eb2669f10f8827537f8e8";
+ libraryHaskellDepends = [
+ aeson base bytestring http-client http-client-tls http-types text
+ unordered-containers
+ ];
+ homepage = "https://github.com/bitc/hs-vault-tool";
+ description = "Client library for HashiCorp's Vault tool (via HTTP API)";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
+ "vault-tool-server" = callPackage
+ ({ mkDerivation, aeson, async, base, bytestring, filepath
+ , http-client, process, tasty-hunit, temporary, text, vault-tool
+ }:
+ mkDerivation {
+ pname = "vault-tool-server";
+ version = "0.0.0.1";
+ sha256 = "cde6fc62398c4656f4a17e4f3db875acd927069b1b32a7a2c8316c819495f50d";
+ libraryHaskellDepends = [
+ aeson async base bytestring filepath http-client process temporary
+ text vault-tool
+ ];
+ testHaskellDepends = [
+ aeson base tasty-hunit temporary vault-tool
+ ];
+ homepage = "https://github.com/bitc/hs-vault-tool";
+ description = "Utility library for spawning a HashiCorp Vault process";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"vaultaire-common" = callPackage
({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring
, cereal, containers, hashable, hslogger, hspec, locators, mtl
@@ -170529,6 +174271,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "vector-builder" = callPackage
+ ({ mkDerivation, base, base-prelude, quickcheck-instances, rebase
+ , semigroups, tasty, tasty-hunit, tasty-quickcheck, vector
+ }:
+ mkDerivation {
+ pname = "vector-builder";
+ version = "0.3";
+ sha256 = "6041b4a9b05c8d39c67cb4bedcf1192a33babda444f2ec64b24598874db45ec0";
+ libraryHaskellDepends = [ base base-prelude semigroups vector ];
+ testHaskellDepends = [
+ quickcheck-instances rebase tasty tasty-hunit tasty-quickcheck
+ ];
+ homepage = "https://github.com/nikita-volkov/vector-builder";
+ description = "Vector builder";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"vector-bytes-instances" = callPackage
({ mkDerivation, base, bytes, tasty, tasty-quickcheck, vector }:
mkDerivation {
@@ -170943,6 +174702,34 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "vgrep" = callPackage
+ ({ mkDerivation, async, attoparsec, base, cabal-file-th, containers
+ , directory, doctest, fingertree, lens, lifted-base, mmorph, mtl
+ , pipes, pipes-concurrency, process, QuickCheck, stm, tasty
+ , tasty-quickcheck, template-haskell, text, transformers, unix, vty
+ }:
+ mkDerivation {
+ pname = "vgrep";
+ version = "0.1.4.0";
+ sha256 = "353bd92260e225c892d26d6926e9668016187d8ef50311b8f80ae55fc82ed29b";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ async attoparsec base containers fingertree lens lifted-base mmorph
+ mtl pipes pipes-concurrency process stm text transformers unix vty
+ ];
+ executableHaskellDepends = [
+ async base cabal-file-th containers directory lens mtl pipes
+ pipes-concurrency process template-haskell text unix vty
+ ];
+ testHaskellDepends = [
+ base containers doctest lens QuickCheck tasty tasty-quickcheck text
+ ];
+ homepage = "http://github.com/fmthoma/vgrep#readme";
+ description = "A pager for grep";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"vhd" = callPackage
({ mkDerivation, base, byteable, bytestring, cereal, cipher-aes
, cryptohash, directory, filepath, mmap, QuickCheck, random
@@ -171507,8 +175294,8 @@ self: {
}:
mkDerivation {
pname = "vty";
- version = "5.11";
- sha256 = "e6f21d7e62d1368637025eadb1b60d3bf9c58113b91b0510b9352bcc8aab0a32";
+ version = "5.11.1";
+ sha256 = "4d6fa0bd9ad3f53c87cca1d02dab246326a9d79737b4861674ba4ff68646d23a";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -171532,7 +175319,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "vty_5_11_1" = callPackage
+ "vty_5_11_3" = callPackage
({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
, data-default, deepseq, directory, filepath, hashable, HUnit
, microlens, microlens-mtl, microlens-th, mtl, parallel, parsec
@@ -171543,8 +175330,8 @@ self: {
}:
mkDerivation {
pname = "vty";
- version = "5.11.1";
- sha256 = "4d6fa0bd9ad3f53c87cca1d02dab246326a9d79737b4861674ba4ff68646d23a";
+ version = "5.11.3";
+ sha256 = "0ee3fc39e8e5219b551bfc26ee38e9342e38b028480dacc2e6ac87fab5380232";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -171953,8 +175740,8 @@ self: {
}:
mkDerivation {
pname = "wai-extra";
- version = "3.0.18";
- sha256 = "42fde2a6066c2de40b931a5379f3436899c96f7b31037ed27524ec86714d0764";
+ version = "3.0.19";
+ sha256 = "8002890c4aa4fc564a142982bc37f29c35caa76231697eb51c519a698482e3bf";
libraryHaskellDepends = [
aeson ansi-terminal base base64-bytestring blaze-builder bytestring
case-insensitive containers cookie data-default-class deepseq
@@ -172643,27 +176430,6 @@ self: {
}) {};
"wai-middleware-static" = callPackage
- ({ mkDerivation, base, base16-bytestring, bytestring, containers
- , cryptohash, directory, expiring-cache-map, filepath, http-types
- , mime-types, mtl, old-locale, text, time, wai
- }:
- mkDerivation {
- pname = "wai-middleware-static";
- version = "0.8.0";
- sha256 = "a37aaf452e3816928934d39b4eef3c1f7186c9db618d0b303e5136fc858e5e58";
- revision = "3";
- editedCabalFile = "819eb104224cefb36cb6d8db5c43a2103e0add6c5bb799fad8bde0762493bfa9";
- libraryHaskellDepends = [
- base base16-bytestring bytestring containers cryptohash directory
- expiring-cache-map filepath http-types mime-types mtl old-locale
- text time wai
- ];
- homepage = "https://github.com/scotty-web/wai-middleware-static";
- description = "WAI middleware that serves requests to static files";
- 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
@@ -172682,7 +176448,6 @@ self: {
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
@@ -173185,8 +176950,8 @@ self: {
}:
mkDerivation {
pname = "warc";
- version = "0.2.0";
- sha256 = "dc53a6f3442b659cf79a9bfd56195b83fe3dcdbc731b4a15ad5e9ee2ea02c03c";
+ version = "0.3.0";
+ sha256 = "f1a2d1f51ec16ccf21b5fd0a74a5e485d3bc207deda8ba0e6944971688b19dfc";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -173397,6 +177162,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "wavefront-obj" = callPackage
+ ({ mkDerivation, attoparsec, base, containers, hspec, linear, text
+ , transformers
+ }:
+ mkDerivation {
+ pname = "wavefront-obj";
+ version = "0.1.0.1";
+ sha256 = "f73744ebc9dd035686f089c368434bf6940bd0c9928258aa00b7258677c0e258";
+ libraryHaskellDepends = [
+ attoparsec base containers linear text transformers
+ ];
+ testHaskellDepends = [ base hspec linear ];
+ homepage = "https://github.com/sasinestro/wavefront-obj#readme";
+ description = "Wavefront .obj file loader";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"wavesurfer" = callPackage
({ mkDerivation, base, binary, bytestring, bytestring-lexing
, bytestring-show, delimited-text
@@ -174494,8 +178276,8 @@ self: {
}:
mkDerivation {
pname = "wikicfp-scraper";
- version = "0.1.0.4";
- sha256 = "57c916f27a4e4a7f2b6aad3d60d91aff9ea4a1981ad145bc4f1e2062e76e970f";
+ version = "0.1.0.5";
+ sha256 = "0a34feeaf03f5f98ebb4c43c9d711323814c0148e062f2eebacb524f489769ee";
libraryHaskellDepends = [
attoparsec base bytestring scalpel text time
];
@@ -174697,8 +178479,8 @@ self: {
}:
mkDerivation {
pname = "wiring";
- version = "0.4.2";
- sha256 = "f8b9cc8d1811d88ad1a19e67ae071f4bcdef17ae3ce1f63e9664f5255033e689";
+ version = "0.5.0";
+ sha256 = "c442bf4d5beff553c289e459ef31d823569207ffa7afc61ef6cda64793fa01a8";
libraryHaskellDepends = [ base mtl template-haskell transformers ];
testHaskellDepends = [
base hspec mtl QuickCheck template-haskell transformers
@@ -174735,6 +178517,24 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
+ "withdependencies_0_2_4" = callPackage
+ ({ mkDerivation, base, conduit, containers, hspec, HUnit, mtl
+ , profunctors
+ }:
+ mkDerivation {
+ pname = "withdependencies";
+ version = "0.2.4";
+ sha256 = "a13eddc8fce5061204abf7289bed49bceb5b86a7981ba6a1b3fe510727fe267f";
+ libraryHaskellDepends = [
+ base conduit containers mtl profunctors
+ ];
+ testHaskellDepends = [ base conduit hspec HUnit mtl ];
+ homepage = "https://github.com/bartavelle/withdependencies";
+ description = "Run computations that depend on one or more elements in a stream";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"witherable" = callPackage
({ mkDerivation, base, base-orphans, containers, hashable
, transformers, unordered-containers, vector
@@ -174803,8 +178603,8 @@ self: {
}:
mkDerivation {
pname = "wkt";
- version = "0.3.0";
- sha256 = "2154fdd2bfe62ebef45319896e2eedb7a3d386d144b686bd7f3b5169621c0e4f";
+ version = "0.3.1";
+ sha256 = "22ed4f892e845b4f660d40bd1b5edca7fcb5e1e05007154d72c093311d975ddd";
libraryHaskellDepends = [ base lens linear trifecta ];
testHaskellDepends = [
base filepath lens linear tasty tasty-golden trifecta
@@ -174991,8 +178791,8 @@ self: {
}:
mkDerivation {
pname = "wolf";
- version = "0.2.8";
- sha256 = "a76f54f9274e021787c59f2739a55a74f803576eaa624c506648839dd3b52a8c";
+ version = "0.2.12";
+ sha256 = "fabd09aa41a108a0d10fbb2611c3a7c0faf123103809428e235d2dbfa8080ade";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -175056,18 +178856,18 @@ self: {
}) {};
"word24" = callPackage
- ({ mkDerivation, base, QuickCheck, test-framework
+ ({ mkDerivation, base, deepseq, QuickCheck, test-framework
, test-framework-quickcheck2
}:
mkDerivation {
pname = "word24";
- version = "1.0.7";
- sha256 = "115ac84f16562a1b95649b70fafc1ff5f6e70576947672838781bb9aa53107e6";
- libraryHaskellDepends = [ base ];
+ version = "2.0.1";
+ sha256 = "c34ba17cc88df314151ef27dea192102ed73d5f0678f1359a5fe59799dc3a086";
+ libraryHaskellDepends = [ base deepseq ];
testHaskellDepends = [
- base QuickCheck test-framework test-framework-quickcheck2
+ base deepseq QuickCheck test-framework test-framework-quickcheck2
];
- homepage = "http://www.tiresiaspress.us/haskell/word24";
+ homepage = "https://github.com/winterland1989/word24";
description = "24-bit word and int types for GHC";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -175974,8 +179774,8 @@ self: {
}:
mkDerivation {
pname = "x86-64bit";
- version = "0.4.1";
- sha256 = "c980fccd28989467703dee57477d0b4c8916cc52a81e8aa8d3aa5c206726bbaf";
+ version = "0.4.4";
+ sha256 = "4deca451bb872b0ea29851e51c04d88af735dff454e9df38d3dc998c531bc9e2";
libraryHaskellDepends = [
base deepseq monads-tf QuickCheck tardis vector
];
@@ -176420,6 +180220,28 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "xls" = callPackage
+ ({ mkDerivation, base, conduit, filepath, getopt-generics
+ , resourcet, transformers
+ }:
+ mkDerivation {
+ pname = "xls";
+ version = "0.1.0";
+ sha256 = "c582a2ecd64986c3d254ddad20ad2411e45061d073caaaffdb6214f6336e43f0";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base conduit filepath resourcet transformers
+ ];
+ executableHaskellDepends = [
+ base conduit getopt-generics resourcet transformers
+ ];
+ testHaskellDepends = [ base ];
+ homepage = "http://github.com/harendra-kumar/xls";
+ description = "Parse Microsoft Excel xls files (BIFF/Excel 97-2004)";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"xlsior" = callPackage
({ mkDerivation, attoparsec, base, blaze-markup, bytestring
, conduit, conduit-extra, data-default, exceptions, mtl, resourcet
@@ -176518,14 +180340,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "xlsx-tabular_0_1_0_2" = callPackage
+ "xlsx-tabular_0_1_1" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, data-default
, lens, text, xlsx
}:
mkDerivation {
pname = "xlsx-tabular";
- version = "0.1.0.2";
- sha256 = "0650c6e22c4b1f2be1d91a62cdf6160a17f2a18cfe7918cc30523a923218689d";
+ version = "0.1.1";
+ sha256 = "b266fd453913fede59a1d27122b675035829de7e7037eaa92de8a1e40f942f7d";
libraryHaskellDepends = [
aeson base bytestring containers data-default lens text xlsx
];
@@ -177127,8 +180949,8 @@ self: {
pname = "xmlhtml";
version = "0.2.3.5";
sha256 = "e333a1c7afd5068b60b143457fea7325a34408cc65b3ac55f5b342eb0274b06d";
- revision = "1";
- editedCabalFile = "6a4d1fc061c4dd01628d762d947e63619a25714aa0dd36b6fe674a7ec62b9045";
+ revision = "2";
+ editedCabalFile = "7ef4b85552808a9169da9c650ece3b9994a6c6106185a92e73aad50c5e98e6f1";
libraryHaskellDepends = [
base blaze-builder blaze-html blaze-markup bytestring containers
parsec text unordered-containers
@@ -177785,22 +181607,23 @@ self: {
}) {};
"yackage" = callPackage
- ({ mkDerivation, base, blaze-builder, blaze-html, bytestring, Cabal
- , cmdargs, conduit, containers, directory, http-conduit, http-types
- , shakespeare, tar, text, transformers, unordered-containers
- , vector, wai, warp, yaml, yesod-core, yesod-form, zlib
+ ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring
+ , Cabal, cmdargs, conduit, containers, directory, http-conduit
+ , http-types, shakespeare, tar, text, transformers
+ , unordered-containers, vector, wai, warp, yaml, yesod-core
+ , yesod-form, zlib
}:
mkDerivation {
pname = "yackage";
- version = "0.8.0";
- sha256 = "b42c5fe3b93dbb4c900f462c60e5f6286aed679664e8a4ccdddae7f56f042015";
+ version = "0.8.1";
+ sha256 = "1d48064cbfd2c51f4fd33a6289c9efe1c8d49f063d850a9dd7ae3a226136cae5";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- base blaze-builder blaze-html bytestring Cabal cmdargs conduit
- containers directory http-conduit http-types shakespeare tar text
- transformers unordered-containers vector wai warp yaml yesod-core
- yesod-form zlib
+ aeson base blaze-builder blaze-html bytestring Cabal cmdargs
+ conduit containers directory http-conduit http-types shakespeare
+ tar text transformers unordered-containers vector wai warp yaml
+ yesod-core yesod-form zlib
];
homepage = "http://github.com/snoyberg/yackage";
description = "Personal Hackage replacement for testing new packages";
@@ -177937,20 +181760,20 @@ self: {
({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat
, bytestring, conduit, containers, directory, enclosed-exceptions
, filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific
- , semigroups, temporary, text, transformers, unordered-containers
- , vector
+ , semigroups, template-haskell, temporary, text, transformers
+ , unordered-containers, vector
}:
mkDerivation {
pname = "yaml";
- version = "0.8.18.7";
- sha256 = "b8cebafe9294b34258114b8ea5576d26c2d0070645ab9bfc84000b367931a944";
+ version = "0.8.20";
+ sha256 = "d5cda5b2849afb9f0d7572759c3e006798d7efaeeb0bf0d3825f12832a0a3b11";
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
+ enclosed-exceptions filepath resourcet scientific semigroups
+ template-haskell text transformers unordered-containers vector
];
libraryPkgconfigDepends = [ libyaml ];
executableHaskellDepends = [ aeson base bytestring ];
@@ -178364,8 +182187,8 @@ self: {
}:
mkDerivation {
pname = "yes-precure5-command";
- version = "5.5.2";
- sha256 = "19ed62fa3277ce1356005bd8715f41526057dd152c9a2c3ab18158431ff0c52a";
+ version = "5.5.3";
+ sha256 = "27f2f2dcd81923a18450cda21a31585d0d3887afde504190667cb7dbf0a0af7e";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -178639,6 +182462,33 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "yesod-auth-hashdb_1_6_0_1" = callPackage
+ ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
+ , hspec, http-conduit, http-types, monad-logger, network-uri
+ , persistent, persistent-sqlite, pwstore-fast, resourcet, text
+ , unordered-containers, wai-extra, yesod, yesod-auth, yesod-core
+ , yesod-form, yesod-persistent, yesod-test
+ }:
+ mkDerivation {
+ pname = "yesod-auth-hashdb";
+ version = "1.6.0.1";
+ sha256 = "8fe73fb7e4301e02e69cac312227078fd01927c8a006224f7e3fd8a93aa9cb75";
+ libraryHaskellDepends = [
+ aeson base bytestring persistent pwstore-fast text yesod-auth
+ yesod-core yesod-form yesod-persistent
+ ];
+ testHaskellDepends = [
+ aeson base basic-prelude bytestring containers hspec http-conduit
+ http-types monad-logger network-uri persistent-sqlite resourcet
+ text unordered-containers wai-extra yesod yesod-auth yesod-core
+ yesod-test
+ ];
+ 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
({ mkDerivation, authenticate-kerberos, base, bytestring
, shakespeare, text, transformers, yesod-auth, yesod-core
@@ -178855,6 +182705,18 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "yesod-colonnade" = callPackage
+ ({ mkDerivation, base, colonnade, text, yesod-core }:
+ mkDerivation {
+ pname = "yesod-colonnade";
+ version = "0.1";
+ sha256 = "5e98908136715fadc3f46153bcc99c559affef85ed64bcde4bd2314e962dca79";
+ libraryHaskellDepends = [ base colonnade text yesod-core ];
+ homepage = "https://github.com/andrewthad/colonnade#readme";
+ description = "Helper functions for using yesod with colonnade";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"yesod-comments" = callPackage
({ mkDerivation, base, bytestring, directory, friendly-time
, gravatar, old-locale, persistent, template-haskell, text, time
@@ -179186,6 +183048,31 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "yesod-form_1_4_8" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
+ , blaze-markup, byteable, bytestring, containers, data-default
+ , email-validate, hspec, network-uri, persistent, resourcet
+ , semigroups, shakespeare, template-haskell, text, time
+ , transformers, wai, xss-sanitize, yesod-core, yesod-persistent
+ }:
+ mkDerivation {
+ pname = "yesod-form";
+ version = "1.4.8";
+ sha256 = "c6f2f83dd361569f830c95671b70c7510b485840d20b9ade6c747de127088f0b";
+ libraryHaskellDepends = [
+ aeson attoparsec base blaze-builder blaze-html blaze-markup
+ byteable bytestring containers data-default email-validate
+ network-uri persistent resourcet semigroups shakespeare
+ template-haskell text time transformers wai xss-sanitize yesod-core
+ yesod-persistent
+ ];
+ testHaskellDepends = [ base hspec text time ];
+ homepage = "http://www.yesodweb.com/";
+ description = "Form handling support for Yesod Web Framework";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"yesod-form-json" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, text
, unordered-containers, yesod-core, yesod-form
@@ -179878,8 +183765,8 @@ self: {
}:
mkDerivation {
pname = "yesod-static";
- version = "1.5.0.4";
- sha256 = "55a91e85739fb3e06de50f34def5929c7bb8b74810b9fe621c4e2e3f3ebc82b0";
+ version = "1.5.0.5";
+ sha256 = "3cf3f0a1da82caf974343fe03c8efa7794f56d13c6747846fa746f16b029f459";
libraryHaskellDepends = [
async attoparsec base base64-bytestring blaze-builder byteable
bytestring conduit conduit-extra containers cryptohash
@@ -180211,7 +184098,7 @@ self: {
license = stdenv.lib.licenses.gpl2;
}) {};
- "yi_0_13_1" = callPackage
+ "yi_0_13_3" = 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
@@ -180219,8 +184106,8 @@ self: {
}:
mkDerivation {
pname = "yi";
- version = "0.13.1";
- sha256 = "78e1140fd9d4ca2f880bb621c18325845dfbc54a9a213cf1fb7715c6741c4c08";
+ version = "0.13.3";
+ sha256 = "e6caf353d17a18378a6a31a90f8b4130eab7ea51d548218d620e9037b0a01036";
configureFlags = [ "-fpango" "-fvty" ];
isLibrary = false;
isExecutable = true;
@@ -180267,8 +184154,8 @@ self: {
}:
mkDerivation {
pname = "yi-core";
- version = "0.13.1";
- sha256 = "df42e9b6bd3d2546ef972e088734a9d2394617cef4d63512c8a24cdb8396062e";
+ version = "0.13.3";
+ sha256 = "41f2ace2aa9cdbcc8392ac007c5c94a2785a659acd50d8fb5b3a87a9f296948c";
libraryHaskellDepends = [
array attoparsec base binary bytestring containers data-default
directory dlist dynamic-state dyre exceptions filepath hashable
@@ -180310,8 +184197,8 @@ self: {
}:
mkDerivation {
pname = "yi-frontend-pango";
- version = "0.13.1";
- sha256 = "897fae1674b6564ce54ad016a2e35e1cd771cc16f464933a6dc9fcc63ff3b279";
+ version = "0.13.3";
+ sha256 = "8da397739c5b448aa825f69bb2f0d085c68091540cc6e80fa09d384acc8a1cfd";
libraryHaskellDepends = [
base containers filepath glib gtk microlens-platform mtl
oo-prototypes pango pointedlist text transformers-base yi-core
@@ -180329,8 +184216,8 @@ self: {
}:
mkDerivation {
pname = "yi-frontend-vty";
- version = "0.13.1";
- sha256 = "38dc95447ea4baf8780ad21f6bdd8f1bfe6883e23baf2993d8c026782d51d06e";
+ version = "0.13.3";
+ sha256 = "3dd96a09085b7ad5375e9038af38fef7cb72c1c3dd9c7941fbe40d4ae43f5002";
libraryHaskellDepends = [
base containers data-default dlist microlens-platform pointedlist
stm text vty yi-core yi-language
@@ -180358,6 +184245,25 @@ self: {
license = stdenv.lib.licenses.gpl2;
}) {};
+ "yi-fuzzy-open_0_13_3" = callPackage
+ ({ mkDerivation, base, binary, containers, data-default, directory
+ , filepath, mtl, text, transformers-base, vector, yi-core
+ , yi-language, yi-rope
+ }:
+ mkDerivation {
+ pname = "yi-fuzzy-open";
+ version = "0.13.3";
+ sha256 = "51f827d2d9deec703a0450f90aed40d2084379fc3ab59d51d13b444f316e893c";
+ libraryHaskellDepends = [
+ base binary containers data-default directory filepath mtl text
+ transformers-base vector yi-core yi-language yi-rope
+ ];
+ homepage = "https://github.com/yi-editor/yi#readme";
+ description = "Fuzzy open plugin for yi";
+ license = stdenv.lib.licenses.gpl2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"yi-gtk" = callPackage
({ mkDerivation }:
mkDerivation {
@@ -180376,8 +184282,8 @@ self: {
}:
mkDerivation {
pname = "yi-ireader";
- version = "0.13.1";
- sha256 = "222212c92f7271f62dd297a4298ec51b326c08bcbe515e97ede3a9fd4cc23131";
+ version = "0.13.3";
+ sha256 = "7f8f3985386f3a64ad4de36c93b81183a08f9c0d5d9fbe4acfc47ac2a19cb2c7";
libraryHaskellDepends = [
base binary bytestring containers data-default microlens-platform
text yi-core yi-language yi-rope
@@ -180393,8 +184299,8 @@ self: {
}:
mkDerivation {
pname = "yi-keymap-cua";
- version = "0.13.1";
- sha256 = "2f35799c34970675b0f381db7d5ba77b32ad05f76ee21d30fe8233599f02c38a";
+ version = "0.13.3";
+ sha256 = "ba7836bd5192212baa9b3ae5c7a839953be08be67aa5199068f472f9a24f5a54";
libraryHaskellDepends = [
base microlens-platform text yi-core yi-keymap-emacs yi-rope
];
@@ -180411,8 +184317,8 @@ self: {
}:
mkDerivation {
pname = "yi-keymap-emacs";
- version = "0.13.1";
- sha256 = "dcb51f973325e9c7dfc6db781886ecd4b7f4761a8d1a88b1443ab457b4bf3f3d";
+ version = "0.13.3";
+ sha256 = "3b2ee411a67904f011c6f5f9ac7739d7c4571c4a0c8deaef82aaeb44176cd1b2";
libraryHaskellDepends = [
base containers filepath Hclip microlens-platform mtl oo-prototypes
semigroups text transformers-base yi-core yi-language yi-misc-modes
@@ -180433,8 +184339,8 @@ self: {
}:
mkDerivation {
pname = "yi-keymap-vim";
- version = "0.13.1";
- sha256 = "16913f6be574a6a4705dc3736fdfe7a3b3f4e3f4e1127d846fe510495410d85b";
+ version = "0.13.3";
+ sha256 = "e81caeb7866e485a88ede2b88cfe7f6fbbc6ea9cd21424502d11150df64211b4";
libraryHaskellDepends = [
attoparsec base binary containers data-default directory filepath
Hclip microlens-platform mtl oo-prototypes pointedlist safe
@@ -180479,7 +184385,7 @@ self: {
license = stdenv.lib.licenses.gpl2;
}) {};
- "yi-language_0_13_1" = callPackage
+ "yi-language_0_13_3" = callPackage
({ mkDerivation, alex, array, base, binary, containers
, data-default, hashable, microlens-platform, oo-prototypes
, pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec
@@ -180488,8 +184394,8 @@ self: {
}:
mkDerivation {
pname = "yi-language";
- version = "0.13.1";
- sha256 = "22ab333ec6bbeba4da562996a4783f20437b2383639e5f1fa144d98369a6c747";
+ version = "0.13.3";
+ sha256 = "06d3c328777bed0fb1c0ab8a7fabfed6603fa6cfc4d50f3195c85e9bae99cc5f";
libraryHaskellDepends = [
array base binary containers data-default hashable
microlens-platform oo-prototypes pointedlist regex-base regex-tdfa
@@ -180515,8 +184421,8 @@ self: {
}:
mkDerivation {
pname = "yi-misc-modes";
- version = "0.13.1";
- sha256 = "12ebcb20d106dcab4da2588f0d8ef357cecea52a35ff1b6e1eb197287c58d06e";
+ version = "0.13.3";
+ sha256 = "94993c405dccbc2aa4f5077096560c68219414a2d747f84a195b4fd556f7e63e";
libraryHaskellDepends = [
array base binary data-default filepath microlens-platform
semigroups text yi-core yi-language yi-rope
@@ -180536,8 +184442,8 @@ self: {
}:
mkDerivation {
pname = "yi-mode-haskell";
- version = "0.13.1";
- sha256 = "55e78a4323eec19aab49d473fa9b5a874cb56e8bbb137756b8048696b75bab9e";
+ version = "0.13.3";
+ sha256 = "438ff92a24aef5e3cb7a8aa0046014b8f40927f046a612f830a20fb2ef9a6fde";
libraryHaskellDepends = [
array base binary data-default microlens-platform text yi-core
yi-language yi-rope
@@ -180560,8 +184466,8 @@ self: {
}:
mkDerivation {
pname = "yi-mode-javascript";
- version = "0.13.1";
- sha256 = "fdbad8e3fc6de90aaade5cda3881d161284fcc97b6e88c493d0005eb3923b990";
+ version = "0.13.3";
+ sha256 = "1a24664cf2d65732b5575bd4ab3bc92d3897a3c6af4bc93296945429b5c974f3";
libraryHaskellDepends = [
array base binary data-default dlist filepath microlens-platform
mtl text yi-core yi-language yi-rope
@@ -180626,14 +184532,23 @@ self: {
}) {};
"yi-snippet" = callPackage
- ({ mkDerivation, base, containers, yi, yi-rope }:
+ ({ mkDerivation, base, binary, containers, data-default, free, lens
+ , mtl, tasty-hunit, tasty-th, text, vector, yi-core, yi-rope
+ }:
mkDerivation {
pname = "yi-snippet";
- version = "0.1.0.0";
- sha256 = "2d8d646ed19ab1f911d15a0095942abefce3fd6f743fdc9e8169ed454f2f7661";
- libraryHaskellDepends = [ base containers yi yi-rope ];
- homepage = "https://github.com/yi-editor/yi-snippet";
- description = "Snippet support for Yi";
+ version = "0.13.3";
+ sha256 = "0373adb2e93de479995cc64299106a3fb2ba2dbfb5abb87d811ef13f47a39077";
+ libraryHaskellDepends = [
+ base binary containers data-default free lens mtl text vector
+ yi-core yi-rope
+ ];
+ testHaskellDepends = [
+ base binary containers data-default free lens mtl tasty-hunit
+ tasty-th text vector yi-core yi-rope
+ ];
+ homepage = "https://github.com/yi-editor/yi#readme";
+ description = "Snippet support for yi";
license = stdenv.lib.licenses.gpl2;
}) {};
@@ -181291,20 +185206,20 @@ self: {
}) {};
"zim-parser" = callPackage
- ({ mkDerivation, array, base, binary, binary-conduit, bytestring
- , conduit, conduit-extra, hspec, lzma-conduit, resourcet
+ ({ mkDerivation, array, base, base-compat, binary, binary-conduit
+ , bytestring, conduit, conduit-extra, hspec, lzma
}:
mkDerivation {
pname = "zim-parser";
- version = "0.2.0.0";
- sha256 = "663e6604b20c67bfd3e0ba161c3f7c88f10230a28282990311133d8a9d962df6";
+ version = "0.2.1.0";
+ sha256 = "b27f6a395c54e0dac6926a5ea18b582aa21c5d91e31b53f8749f063947a15789";
libraryHaskellDepends = [
- array base binary binary-conduit bytestring conduit conduit-extra
- lzma-conduit resourcet
+ array base base-compat binary binary-conduit bytestring conduit
+ conduit-extra lzma
];
testHaskellDepends = [
- array base binary binary-conduit bytestring conduit conduit-extra
- hspec lzma-conduit resourcet
+ array base base-compat binary binary-conduit bytestring conduit
+ conduit-extra hspec lzma
];
homepage = "https://github.com/robbinch/zim-parser#readme";
description = "Read and parse ZIM files";
@@ -181486,6 +185401,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) zlib;};
+ "zlib_0_6_1_2" = callPackage
+ ({ mkDerivation, base, bytestring, QuickCheck, tasty, tasty-hunit
+ , tasty-quickcheck, zlib
+ }:
+ mkDerivation {
+ pname = "zlib";
+ version = "0.6.1.2";
+ sha256 = "e4eb4e636caf07a16a9730ce469a00b65d5748f259f43edd904dd457b198a2bb";
+ libraryHaskellDepends = [ base bytestring ];
+ librarySystemDepends = [ zlib ];
+ testHaskellDepends = [
+ base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
+ ];
+ description = "Compression and decompression in the gzip and zlib formats";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) zlib;};
+
"zlib-bindings" = callPackage
({ mkDerivation, base, bytestring, hspec, QuickCheck, zlib }:
mkDerivation {
diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix
index c3d289d2a8d..1a05f19bd82 100644
--- a/pkgs/development/interpreters/clisp/default.nix
+++ b/pkgs/development/interpreters/clisp/default.nix
@@ -5,18 +5,18 @@
# - full: contains base plus modules in withModules
{ stdenv, fetchurl, libsigsegv, gettext, ncurses, readline, libX11
, libXau, libXt, pcre, zlib, libXpm, xproto, libXext, xextproto
-, libffi, libffcall, coreutils
+, libffi
+, libffcall
+, coreutils
# build options
, threadSupport ? (stdenv.isi686 || stdenv.isx86_64)
, x11Support ? (stdenv.isi686 || stdenv.isx86_64)
, dllSupport ? true
, withModules ? [
- "bindings/glibc"
"pcre"
"rawsock"
- "wildcard"
- "zlib"
]
+ ++ stdenv.lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" "wildcard" ]
++ stdenv.lib.optional x11Support "clx/new-clx"
}:
@@ -33,15 +33,17 @@ stdenv.mkDerivation rec {
};
inherit libsigsegv gettext coreutils;
-
+
+ ffcallAvailable = stdenv.isLinux && (libffcall != null);
+
buildInputs = [libsigsegv]
++ stdenv.lib.optional (gettext != null) gettext
++ stdenv.lib.optional (ncurses != null) ncurses
++ stdenv.lib.optional (pcre != null) pcre
++ stdenv.lib.optional (zlib != null) zlib
++ stdenv.lib.optional (readline != null) readline
- ++ stdenv.lib.optional (libffi != null) libffi
- ++ stdenv.lib.optional (libffcall != null) libffcall
+ ++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) libffi
+ ++ stdenv.lib.optional ffcallAvailable libffcall
++ stdenv.lib.optionals x11Support [
libX11 libXau libXt libXpm xproto libXext xextproto
];
@@ -64,8 +66,10 @@ stdenv.mkDerivation rec {
configureFlags = "builddir"
+ stdenv.lib.optionalString (!dllSupport) " --without-dynamic-modules"
+ stdenv.lib.optionalString (readline != null) " --with-readline"
- + stdenv.lib.optionalString (libffi != null) " --with-dynamic-ffi"
- + stdenv.lib.optionalString (libffcall != null) " --with-ffcall"
+ # --with-dynamic-ffi can only exist with --with-ffcall - foreign.d does not compile otherwise
+ + stdenv.lib.optionalString (ffcallAvailable && (libffi != null)) " --with-dynamic-ffi"
+ + stdenv.lib.optionalString ffcallAvailable " --with-ffcall"
+ + stdenv.lib.optionalString (!ffcallAvailable) " --without-ffcall"
+ stdenv.lib.concatMapStrings (x: " --with-module=" + x) withModules
+ stdenv.lib.optionalString threadSupport " --with-threads=POSIX_THREADS";
@@ -88,6 +92,6 @@ stdenv.mkDerivation rec {
description = "ANSI Common Lisp Implementation";
homepage = http://clisp.cons.org;
maintainers = with stdenv.lib.maintainers; [raskin tohl];
- platforms = stdenv.lib.platforms.linux;
+ platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index 8679c7122c9..97f8f61a98e 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -7,11 +7,11 @@
else stdenv.mkDerivation)
(rec {
- name = "guile-2.0.12";
+ name = "guile-2.0.13";
src = fetchurl {
url = "mirror://gnu/guile/${name}.tar.xz";
- sha256 = "1sdpjq0jf1h65w29q0zprj4x6kdp5jskkvbnlwphy9lvdxrqg0fy";
+ sha256 = "12yqkr974y91ylgw6jnmci2v90i90s7h9vxa4zk0sai8vjnz4i1p";
};
nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index ae8256dfaea..96c85704f5e 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -19,7 +19,8 @@ let
enableParallelBuilding = true;
- buildInputs = [ flex bison pkgconfig systemd ];
+ buildInputs = [ flex bison pkgconfig ]
+ ++ lib.optional stdenv.isLinux systemd;
configureFlags = [
"EXTENSION_DIR=$(out)/lib/php/extensions"
@@ -301,12 +302,12 @@ let
in {
php56 = generic {
- version = "5.6.26";
- sha256 = "0dk2ifn50iv8jvw2jyw2pr9xqnkksxfv9qbpay84na54hf0anynl";
+ version = "5.6.27";
+ sha256 = "0g1adx231c738694gc4bh8x65c7fwsqdbm42n9xwrsdncyhd6xrv";
};
php70 = generic {
- version = "7.0.11";
- sha256 = "1wgpkfzpiap29nxjzqjjvpgirpg61n61xbqq9f25i60lq6fp56zr";
+ version = "7.0.12";
+ sha256 = "09va788b9zk5igzmsfxr593ly174qf9kmihd4fq3kclgzsa75i1q";
};
}
diff --git a/pkgs/development/interpreters/pyrex/0.9.5.nix b/pkgs/development/interpreters/pyrex/0.9.5.nix
index 3f6a3c1bfcb..b67ad3db2ef 100644
--- a/pkgs/development/interpreters/pyrex/0.9.5.nix
+++ b/pkgs/development/interpreters/pyrex/0.9.5.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, pythonPackages }:
+{ stdenv, fetchurl, python2Packages }:
let version = "0.9.5.1.1"; in
-pythonPackages.buildPythonPackage rec {
+python2Packages.buildPythonPackage rec {
name = "pyrex-${version}";
src = fetchurl {
diff --git a/pkgs/development/interpreters/pyrex/0.9.6.nix b/pkgs/development/interpreters/pyrex/0.9.6.nix
index 44e014322ff..7a0ac5a1e22 100644
--- a/pkgs/development/interpreters/pyrex/0.9.6.nix
+++ b/pkgs/development/interpreters/pyrex/0.9.6.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, pythonPackages }:
+{ stdenv, fetchurl, python2Packages }:
let version = "0.9.6.4"; in
-pythonPackages.buildPythonPackage rec {
+python2Packages.buildPythonPackage rec {
name = "pyrex-${version}";
src = fetchurl {
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index 4c28e977b49..a6eeee25be9 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -1,18 +1,23 @@
-{ stdenv, fetchurl, fetchpatch, self, callPackage, python27Packages
-, bzip2, openssl, gettext
-
-, includeModules ? false
-
-, db, gdbm, ncurses, sqlite, readline
-
-, tcl ? null, tk ? null, xlibsWrapper ? null, libX11 ? null, x11Support ? !stdenv.isCygwin
-, zlib ? null, zlibSupport ? true
-, expat, libffi
-
-, CF, configd
+{ stdenv, fetchurl
+, bzip2
+, gdbm
+, fetchpatch
+, ncurses
+, openssl
+, readline
+, sqlite
+, tcl ? null, tk ? null, xlibsWrapper ? null, libX11 ? null, x11Support ? false
+, zlib
+, callPackage
+, self
+, python27Packages
+, gettext
+, db
+, expat
+, libffi
+, CF, configd, coreutils
}:
-assert zlibSupport -> zlib != null;
assert x11Support -> tcl != null
&& tk != null
&& xlibsWrapper != null
@@ -27,12 +32,14 @@ let
pythonVersion = majorVersion;
version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
libPrefix = "python${majorVersion}";
+ sitePackages = "lib/${libPrefix}/site-packages";
src = fetchurl {
url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz";
sha256 = "0y7rl603vmwlxm6ilkhc51rx2mfj14ckcz40xxgs0ljnvlhp30yp";
};
+ hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false);
patches =
[ # Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff.
./search-path.patch
@@ -76,6 +83,15 @@ let
./2.7.3-dylib.patch
./2.7.3-getpath-exe-extension.patch
./2.7.3-no-libm.patch
+ ] ++ optionals hasDistutilsCxxPatch [
+
+ # Patch from http://bugs.python.org/issue1222585 adapted to work with
+ # `patch -p1' and with a last hunk removed
+ # Upstream distutils is calling C compiler to compile C++ code, which
+ # only works for GCC and Apple Clang. This makes distutils to call C++
+ # compiler when needed.
+ ./python-2.7-distutils-C++.patch
+
];
preConfigure = ''
@@ -90,7 +106,7 @@ let
'' + optionalString stdenv.isDarwin ''
substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
substituteInPlace Lib/multiprocessing/__init__.py \
- --replace 'os.popen(comm)' 'os.popen("nproc")'
+ --replace 'os.popen(comm)' 'os.popen("${coreutils}/bin/nproc")'
'';
configureFlags = [
@@ -111,16 +127,11 @@ let
buildInputs =
optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++
- [ bzip2 openssl ]
+ [ bzip2 openssl zlib ]
++ optionals stdenv.isCygwin [ expat libffi ]
- ++ optionals includeModules (
- [ db gdbm ncurses sqlite readline
- ] ++ optionals x11Support [ tcl tk xlibsWrapper libX11 ]
- )
- ++ optional zlibSupport zlib
- ++ optional stdenv.isDarwin CF;
-
- propagatedBuildInputs = optional stdenv.isDarwin configd;
+ ++ [ db gdbm ncurses sqlite readline ]
+ ++ optionals x11Support [ tcl tk xlibsWrapper libX11 ]
+ ++ optionals stdenv.isDarwin [ CF configd ];
mkPaths = paths: {
C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths;
@@ -129,11 +140,12 @@ let
# Build the basic Python interpreter without modules that have
# external dependencies.
- python = stdenv.mkDerivation {
+
+in stdenv.mkDerivation {
name = "python-${version}";
pythonVersion = majorVersion;
- inherit majorVersion version src patches buildInputs propagatedBuildInputs
+ inherit majorVersion version src patches buildInputs
preConfigure configureFlags;
LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
@@ -165,20 +177,16 @@ let
# 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;
+ inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch;
+ executable = libPrefix;
buildEnv = callPackage ../../wrapper.nix { python = self; };
withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python27Packages; };
- executable = libPrefix;
- sitePackages = "lib/${libPrefix}/site-packages";
+ isPy2 = true;
+ isPy27 = true;
interpreter = "${self}/bin/${executable}";
};
@@ -200,99 +208,4 @@ let
platforms = stdenv.lib.platforms.all;
maintainers = with stdenv.lib.maintainers; [ chaoflow domenkozar ];
};
- };
-
-
- # This function builds a Python module included in the main Python
- # distribution in a separate derivation.
- buildInternalPythonModule =
- { moduleName
- , internalName ? "_" + moduleName
- , deps
- }:
- if includeModules then null else stdenv.mkDerivation rec {
- name = "python-${moduleName}-${python.version}";
-
- inherit src patches preConfigure postConfigure configureFlags;
-
- buildInputs = [ python ] ++ deps;
-
- # We need to set this for python.buildEnv
- pythonPath = [];
-
- inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH;
-
- # non-python gdbm has a libintl dependency on i686-cygwin, not on x86_64-cygwin
- buildPhase = (if (stdenv.system == "i686-cygwin" && moduleName == "gdbm") then ''
- sed -i setup.py -e "s:libraries = \['gdbm'\]:libraries = ['gdbm', 'intl']:"
- '' else '''') + ''
- substituteInPlace setup.py --replace 'self.extensions = extensions' \
- 'self.extensions = [ext for ext in self.extensions if ext.name in ["${internalName}"]]'
-
- python ./setup.py build_ext
- [ -z "$(find build -name '*_failed.so' -print)" ]
- '';
-
- installPhase =
- ''
- dest=$out/lib/${python.libPrefix}/site-packages
- mkdir -p $dest
- cp -p $(find . -name "*.${if stdenv.isCygwin then "dll" else "so"}") $dest/
- '';
- };
-
-
- # The Python modules included in the main Python distribution, built
- # as separate derivations.
- modules = {
-
- bsddb = buildInternalPythonModule {
- moduleName = "bsddb";
- deps = [ db ];
- };
-
- curses = buildInternalPythonModule {
- moduleName = "curses";
- deps = [ ncurses ];
- };
-
- curses_panel = buildInternalPythonModule {
- moduleName = "curses_panel";
- deps = [ ncurses modules.curses ];
- };
-
- crypt = buildInternalPythonModule {
- moduleName = "crypt";
- internalName = "crypt";
- deps = optional (stdenv ? glibc) stdenv.glibc;
- };
-
- gdbm = buildInternalPythonModule {
- moduleName = "gdbm";
- internalName = "gdbm";
- deps = [ gdbm ] ++ stdenv.lib.optional stdenv.isCygwin gettext;
- };
-
- sqlite3 = buildInternalPythonModule {
- moduleName = "sqlite3";
- deps = [ sqlite ];
- };
-
- } // optionalAttrs x11Support {
-
- tkinter = if stdenv.isCygwin then null else (buildInternalPythonModule {
- moduleName = "tkinter";
- deps = [ tcl tk xlibsWrapper libX11 ];
- });
-
- } // {
-
- readline = buildInternalPythonModule {
- moduleName = "readline";
- internalName = "readline";
- deps = [ readline ];
- };
-
- };
-
-in python // { inherit modules; }
+ }
diff --git a/pkgs/development/interpreters/python/cpython/2.7/python-2.7-distutils-C++.patch b/pkgs/development/interpreters/python/cpython/2.7/python-2.7-distutils-C++.patch
new file mode 100644
index 00000000000..90c21d5e60c
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/2.7/python-2.7-distutils-C++.patch
@@ -0,0 +1,260 @@
+--- a/Lib/distutils/cygwinccompiler.py
++++ b/Lib/distutils/cygwinccompiler.py
+@@ -117,8 +117,10 @@
+ # dllwrap 2.10.90 is buggy
+ if self.ld_version >= "2.10.90":
+ self.linker_dll = "gcc"
++ self.linker_dll_cxx = "g++"
+ else:
+ self.linker_dll = "dllwrap"
++ self.linker_dll_cxx = "dllwrap"
+
+ # ld_version >= "2.13" support -shared so use it instead of
+ # -mdll -static
+@@ -132,9 +134,13 @@
+ self.set_executables(compiler='gcc -mcygwin -O -Wall',
+ compiler_so='gcc -mcygwin -mdll -O -Wall',
+ compiler_cxx='g++ -mcygwin -O -Wall',
++ compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
+ linker_exe='gcc -mcygwin',
+ linker_so=('%s -mcygwin %s' %
+- (self.linker_dll, shared_option)))
++ (self.linker_dll, shared_option)),
++ linker_exe_cxx='g++ -mcygwin',
++ linker_so_cxx=('%s -mcygwin %s' %
++ (self.linker_dll_cxx, shared_option)))
+
+ # cygwin and mingw32 need different sets of libraries
+ if self.gcc_version == "2.91.57":
+@@ -160,8 +166,12 @@
+ raise CompileError, msg
+ else: # for other files use the C-compiler
+ try:
+- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+- extra_postargs)
++ if self.detect_language(src) == 'c++':
++ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++ extra_postargs)
++ else:
++ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++ extra_postargs)
+ except DistutilsExecError, msg:
+ raise CompileError, msg
+
+@@ -327,9 +337,14 @@
+ self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin,
+ compiler_so='gcc%s -mdll -O -Wall' % no_cygwin,
+ compiler_cxx='g++%s -O -Wall' % no_cygwin,
++ compiler_so_cxx='g++%s -mdll -O -Wall' % no_cygwin,
+ linker_exe='gcc%s' % no_cygwin,
+ linker_so='%s%s %s %s'
+ % (self.linker_dll, no_cygwin,
++ shared_option, entry_point),
++ linker_exe_cxx='g++%s' % no_cygwin,
++ linker_so_cxx='%s%s %s %s'
++ % (self.linker_dll_cxx, no_cygwin,
+ shared_option, entry_point))
+ # Maybe we should also append -mthreads, but then the finished
+ # dlls need another dll (mingwm10.dll see Mingw32 docs)
+--- a/Lib/distutils/emxccompiler.py
++++ b/Lib/distutils/emxccompiler.py
+@@ -65,8 +65,12 @@
+ # XXX optimization, warnings etc. should be customizable.
+ self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+ compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++ compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++ compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+ linker_exe='gcc -Zomf -Zmt -Zcrtdll',
+- linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll')
++ linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll',
++ linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll',
++ linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll')
+
+ # want the gcc library statically linked (so that we don't have
+ # to distribute a version dependent on the compiler we have)
+@@ -83,8 +87,12 @@
+ raise CompileError, msg
+ else: # for other files use the C-compiler
+ try:
+- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+- extra_postargs)
++ if self.detect_language(src) == 'c++':
++ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++ extra_postargs)
++ else:
++ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++ extra_postargs)
+ except DistutilsExecError, msg:
+ raise CompileError, msg
+
+--- a/Lib/distutils/sysconfig.py
++++ b/Lib/distutils/sysconfig.py
+@@ -170,10 +170,12 @@
+ _osx_support.customize_compiler(_config_vars)
+ _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+
+- (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
+- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+- 'CCSHARED', 'LDSHARED', 'SO', 'AR',
+- 'ARFLAGS')
++ (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
++ get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++ 'SO', 'AR', 'ARFLAGS')
++
++ cflags = ''
++ cxxflags = ''
+
+ if 'CC' in os.environ:
+ newcc = os.environ['CC']
+@@ -188,19 +190,27 @@
+ cxx = os.environ['CXX']
+ if 'LDSHARED' in os.environ:
+ ldshared = os.environ['LDSHARED']
++ if 'LDCXXSHARED' in os.environ:
++ ldcxxshared = os.environ['LDCXXSHARED']
+ if 'CPP' in os.environ:
+ cpp = os.environ['CPP']
+ else:
+ cpp = cc + " -E" # not always
+ if 'LDFLAGS' in os.environ:
+ ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+ if 'CFLAGS' in os.environ:
+- cflags = opt + ' ' + os.environ['CFLAGS']
++ cflags = os.environ['CFLAGS']
+ ldshared = ldshared + ' ' + os.environ['CFLAGS']
++ if 'CXXFLAGS' in os.environ:
++ cxxflags = os.environ['CXXFLAGS']
++ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+ if 'CPPFLAGS' in os.environ:
+ cpp = cpp + ' ' + os.environ['CPPFLAGS']
+ cflags = cflags + ' ' + os.environ['CPPFLAGS']
++ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+ ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+ if 'AR' in os.environ:
+ ar = os.environ['AR']
+ if 'ARFLAGS' in os.environ:
+@@ -209,13 +219,17 @@
+ archiver = ar + ' ' + ar_flags
+
+ cc_cmd = cc + ' ' + cflags
++ cxx_cmd = cxx + ' ' + cxxflags
+ compiler.set_executables(
+ preprocessor=cpp,
+ compiler=cc_cmd,
+ compiler_so=cc_cmd + ' ' + ccshared,
+- compiler_cxx=cxx,
++ compiler_cxx=cxx_cmd,
++ compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+ linker_so=ldshared,
+ linker_exe=cc,
++ linker_so_cxx=ldcxxshared,
++ linker_exe_cxx=cxx,
+ archiver=archiver)
+
+ compiler.shared_lib_extension = so_ext
+--- a/Lib/distutils/unixccompiler.py
++++ b/Lib/distutils/unixccompiler.py
+@@ -55,14 +55,17 @@
+ # are pretty generic; they will probably have to be set by an outsider
+ # (eg. using information discovered by the sysconfig about building
+ # Python extensions).
+- executables = {'preprocessor' : None,
+- 'compiler' : ["cc"],
+- 'compiler_so' : ["cc"],
+- 'compiler_cxx' : ["cc"],
+- 'linker_so' : ["cc", "-shared"],
+- 'linker_exe' : ["cc"],
+- 'archiver' : ["ar", "-cr"],
+- 'ranlib' : None,
++ executables = {'preprocessor' : None,
++ 'compiler' : ["cc"],
++ 'compiler_so' : ["cc"],
++ 'compiler_cxx' : ["c++"],
++ 'compiler_so_cxx' : ["c++"],
++ 'linker_so' : ["cc", "-shared"],
++ 'linker_exe' : ["cc"],
++ 'linker_so_cxx' : ["c++", "-shared"],
++ 'linker_exe_cxx' : ["c++"],
++ 'archiver' : ["ar", "-cr"],
++ 'ranlib' : None,
+ }
+
+ if sys.platform[:6] == "darwin":
+@@ -112,12 +115,19 @@
+
+ def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+ compiler_so = self.compiler_so
++ compiler_so_cxx = self.compiler_so_cxx
+ if sys.platform == 'darwin':
+ compiler_so = _osx_support.compiler_fixup(compiler_so,
+ cc_args + extra_postargs)
++ compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
++ cc_args + extra_postargs)
+ try:
+- self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+- extra_postargs)
++ if self.detect_language(src) == 'c++':
++ self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
++ extra_postargs)
++ else:
++ self.spawn(compiler_so + cc_args + [src, '-o', obj] +
++ extra_postargs)
+ except DistutilsExecError, msg:
+ raise CompileError, msg
+
+@@ -174,23 +184,16 @@
+ ld_args.extend(extra_postargs)
+ self.mkpath(os.path.dirname(output_filename))
+ try:
+- if target_desc == CCompiler.EXECUTABLE:
+- linker = self.linker_exe[:]
++ if target_lang == "c++":
++ if target_desc == CCompiler.EXECUTABLE:
++ linker = self.linker_exe_cxx[:]
++ else:
++ linker = self.linker_so_cxx[:]
+ else:
+- linker = self.linker_so[:]
+- if target_lang == "c++" and self.compiler_cxx:
+- # skip over environment variable settings if /usr/bin/env
+- # is used to set up the linker's environment.
+- # This is needed on OSX. Note: this assumes that the
+- # normal and C++ compiler have the same environment
+- # settings.
+- i = 0
+- if os.path.basename(linker[0]) == "env":
+- i = 1
+- while '=' in linker[i]:
+- i = i + 1
+-
+- linker[i] = self.compiler_cxx[i]
++ if target_desc == CCompiler.EXECUTABLE:
++ linker = self.linker_exe[:]
++ else:
++ linker = self.linker_so[:]
+
+ if sys.platform == 'darwin':
+ linker = _osx_support.compiler_fixup(linker, ld_args)
+--- a/Lib/_osx_support.py
++++ b/Lib/_osx_support.py
+@@ -14,13 +14,13 @@
+ # configuration variables that may contain universal build flags,
+ # like "-arch" or "-isdkroot", that may need customization for
+ # the user environment
+-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
+- 'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
+- 'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
+- 'PY_CORE_CFLAGS')
++_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
++ 'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
++ 'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
++ 'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
+
+ # configuration variables that may contain compiler calls
+-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
++_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
+
+ # prefix added to original configuration variable names
+ _INITPRE = '_OSX_SUPPORT_INITIAL_'
\ No newline at end of file
diff --git a/pkgs/development/interpreters/python/cpython/3.3/default.nix b/pkgs/development/interpreters/python/cpython/3.3/default.nix
index 3be1209b636..b25e2ffd0cb 100644
--- a/pkgs/development/interpreters/python/cpython/3.3/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.3/default.nix
@@ -1,21 +1,23 @@
{ stdenv, fetchurl
, bzip2
-, db
, gdbm
-, libX11, xproto
, lzma
, ncurses
, openssl
, readline
, sqlite
-, tcl, tk
+, tcl ? null, tk ? null, libX11 ? null, xproto ? null, x11Support ? false
, zlib
, callPackage
, self
, python33Packages
+, CF, configd
}:
-assert readline != null -> ncurses != null;
+assert x11Support -> tcl != null
+ && tk != null
+ && xproto != null
+ && libX11 != null;
with stdenv.lib;
@@ -26,13 +28,14 @@ let
pythonVersion = majorVersion;
version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
libPrefix = "python${majorVersion}";
+ sitePackages = "lib/${libPrefix}/site-packages";
buildInputs = filter (p: p != null) [
- zlib bzip2 lzma gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto
- ];
+ zlib bzip2 lzma gdbm sqlite readline ncurses openssl ]
+ ++ optionals x11Support [ tcl tk libX11 xproto ]
+ ++ optionals stdenv.isDarwin [ CF configd ];
-in
-stdenv.mkDerivation {
+in stdenv.mkDerivation {
name = "python3-${version}";
pythonVersion = majorVersion;
inherit majorVersion version;
@@ -77,23 +80,36 @@ stdenv.mkDerivation {
# Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484
echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py
+
+ # Use Python3 as default python
+ ln -s "$out/bin/idle3" "$out/bin/idle"
+ ln -s "$out/bin/pip3" "$out/bin/pip"
+ ln -s "$out/bin/pydoc3" "$out/bin/pydoc"
+ ln -s "$out/bin/python3" "$out/bin/python"
+ ln -s "$out/bin/python3-config" "$out/bin/python-config"
+ ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc"
+ '';
+
+ postFixup = ''
+ # Get rid of retained dependencies on -dev packages, and remove
+ # some $TMPDIR references to improve binary reproducibility.
+ for i in $out/lib/python${majorVersion}/_sysconfigdata.py $out/lib/python${majorVersion}/config-${majorVersion}m/Makefile; do
+ sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g"
+ done
+
+ # FIXME: should regenerate this.
+ rm $out/lib/python${majorVersion}/__pycache__/_sysconfigdata.cpython*
+
'';
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);
+ inherit libPrefix sitePackages x11Support;
executable = "${libPrefix}m";
buildEnv = callPackage ../../wrapper.nix { python = self; };
withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python33Packages; };
isPy3 = true;
isPy33 = true;
is_py3k = true; # deprecated
- sitePackages = "lib/${libPrefix}/site-packages";
interpreter = "${self}/bin/${executable}";
};
diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
index 78f5972e10f..43edce8a44c 100644
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix
@@ -1,23 +1,23 @@
{ stdenv, fetchurl
, bzip2
-, db
, gdbm
-, libX11, xproto
, lzma
, ncurses
, openssl
, readline
, sqlite
-, tcl, tk
+, tcl ? null, tk ? null, libX11 ? null, xproto ? null, x11Support ? false
, zlib
, callPackage
, self
, python34Packages
-
, CF, configd
}:
-assert readline != null -> ncurses != null;
+assert x11Support -> tcl != null
+ && tk != null
+ && xproto != null
+ && libX11 != null;
with stdenv.lib;
@@ -28,25 +28,14 @@ let
pythonVersion = majorVersion;
version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
libPrefix = "python${majorVersion}";
+ sitePackages = "lib/${libPrefix}/site-packages";
buildInputs = filter (p: p != null) [
- zlib
- bzip2
- lzma
- gdbm
- sqlite
- db
- readline
- ncurses
- openssl
- tcl
- tk
- libX11
- xproto
- ] ++ optionals stdenv.isDarwin [ CF configd ];
+ zlib bzip2 lzma gdbm sqlite readline ncurses openssl ]
+ ++ optionals x11Support [ tcl tk libX11 xproto ]
+ ++ optionals stdenv.isDarwin [ CF configd ];
-in
-stdenv.mkDerivation {
+in stdenv.mkDerivation {
name = "python3-${version}";
pythonVersion = majorVersion;
inherit majorVersion version;
@@ -100,23 +89,36 @@ stdenv.mkDerivation {
# Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484
echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py
+
+ # Use Python3 as default python
+ ln -s "$out/bin/idle3" "$out/bin/idle"
+ ln -s "$out/bin/pip3" "$out/bin/pip"
+ ln -s "$out/bin/pydoc3" "$out/bin/pydoc"
+ ln -s "$out/bin/python3" "$out/bin/python"
+ ln -s "$out/bin/python3-config" "$out/bin/python-config"
+ ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc"
+ '';
+
+ postFixup = ''
+ # Get rid of retained dependencies on -dev packages, and remove
+ # some $TMPDIR references to improve binary reproducibility.
+ for i in $out/lib/python${majorVersion}/_sysconfigdata.py $out/lib/python${majorVersion}/config-${majorVersion}m/Makefile; do
+ sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g"
+ done
+
+ # FIXME: should regenerate this.
+ rm $out/lib/python${majorVersion}/__pycache__/_sysconfigdata.cpython*
+
'';
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);
+ inherit libPrefix sitePackages x11Support;
executable = "${libPrefix}m";
buildEnv = callPackage ../../wrapper.nix { python = self; };
withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python34Packages; };
isPy3 = true;
isPy34 = true;
is_py3k = true; # deprecated
- sitePackages = "lib/${libPrefix}/site-packages";
interpreter = "${self}/bin/${executable}";
};
diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix
index 84488e7e05c..dd2cce707ef 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix
@@ -1,22 +1,23 @@
{ stdenv, fetchurl
, bzip2
, gdbm
-, libX11, xproto
, lzma
, ncurses
, openssl
, readline
, sqlite
-, tcl, tk
+, tcl ? null, tk ? null, libX11 ? null, xproto ? null, x11Support ? false
, zlib
, callPackage
, self
, python35Packages
-
, CF, configd
}:
-assert readline != null -> ncurses != null;
+assert x11Support -> tcl != null
+ && tk != null
+ && xproto != null
+ && libX11 != null;
with stdenv.lib;
@@ -27,23 +28,14 @@ let
pythonVersion = majorVersion;
version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
libPrefix = "python${majorVersion}";
+ sitePackages = "lib/${libPrefix}/site-packages";
buildInputs = filter (p: p != null) [
- zlib
- bzip2
- lzma
- gdbm
- sqlite
- readline
- ncurses
- openssl
- tcl
- tk
- libX11
- xproto
- ] ++ optionals stdenv.isDarwin [ CF configd ];
-in
-stdenv.mkDerivation {
+ zlib bzip2 lzma gdbm sqlite readline ncurses openssl ]
+ ++ optionals x11Support [ tcl tk libX11 xproto ]
+ ++ optionals stdenv.isDarwin [ CF configd ];
+
+in stdenv.mkDerivation {
name = "python3-${version}";
pythonVersion = majorVersion;
inherit majorVersion version;
@@ -97,12 +89,20 @@ stdenv.mkDerivation {
# Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484
echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py
+
+ # Use Python3 as default python
+ ln -s "$out/bin/idle3" "$out/bin/idle"
+ ln -s "$out/bin/pip3" "$out/bin/pip"
+ ln -s "$out/bin/pydoc3" "$out/bin/pydoc"
+ ln -s "$out/bin/python3" "$out/bin/python"
+ ln -s "$out/bin/python3-config" "$out/bin/python-config"
+ ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc"
'';
postFixup = ''
# Get rid of retained dependencies on -dev packages, and remove
# some $TMPDIR references to improve binary reproducibility.
- for i in $out/lib//python${majorVersion}/_sysconfigdata.py $out/lib/python${majorVersion}/config-${majorVersion}m/Makefile; do
+ for i in $out/lib/python${majorVersion}/_sysconfigdata.py $out/lib/python${majorVersion}/config-${majorVersion}m/Makefile; do
sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g"
done
@@ -111,20 +111,12 @@ 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);
+ inherit libPrefix sitePackages x11Support;
executable = "${libPrefix}m";
buildEnv = callPackage ../../wrapper.nix { python = self; };
withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python35Packages; };
isPy3 = true;
isPy35 = true;
- is_py3k = true; # deprecated
- sitePackages = "lib/${libPrefix}/site-packages";
interpreter = "${self}/bin/${executable}";
};
diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index 1d2ee98bb85..d5960ccde99 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -1,25 +1,24 @@
{ stdenv, fetchurl
, glibc
, bzip2
-, db
, gdbm
-, libX11, xproto
, lzma
, ncurses
, openssl
, readline
, sqlite
-, tcl, tk
+, tcl ? null, tk ? null, libX11 ? null, xproto ? null, x11Support ? false
, zlib
, callPackage
, self
, python36Packages
-
, CF, configd
}:
-assert readline != null -> ncurses != null;
-
+assert x11Support -> tcl != null
+ && tk != null
+ && xproto != null
+ && libX11 != null;
with stdenv.lib;
let
@@ -29,25 +28,14 @@ let
pythonVersion = majorVersion;
version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
libPrefix = "python${majorVersion}";
+ sitePackages = "lib/${libPrefix}/site-packages";
buildInputs = filter (p: p != null) [
- glibc
- zlib
- bzip2
- lzma
- gdbm
- sqlite
- db
- readline
- ncurses
- openssl
- tcl
- tk
- libX11
- xproto
- ] ++ optionals stdenv.isDarwin [ CF configd ];
-in
-stdenv.mkDerivation {
+ zlib bzip2 lzma gdbm sqlite readline ncurses openssl ]
+ ++ optionals x11Support [ tcl tk libX11 xproto ]
+ ++ optionals stdenv.isDarwin [ CF configd ];
+
+in stdenv.mkDerivation {
name = "python3-${version}";
pythonVersion = majorVersion;
inherit majorVersion version;
@@ -101,23 +89,24 @@ stdenv.mkDerivation {
# Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484
echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py
+
+ # Use Python3 as default python
+ ln -s "$out/bin/idle3" "$out/bin/idle"
+ ln -s "$out/bin/pip3" "$out/bin/pip"
+ ln -s "$out/bin/pydoc3" "$out/bin/pydoc"
+ ln -s "$out/bin/python3" "$out/bin/python"
+ ln -s "$out/bin/python3-config" "$out/bin/python-config"
+ ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc"
'';
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);
+ inherit libPrefix sitePackages x11Support;
executable = "${libPrefix}m";
buildEnv = callPackage ../../wrapper.nix { python = self; };
withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python36Packages; };
isPy3 = true;
isPy35 = true;
is_py3k = true; # deprecated
- sitePackages = "lib/${libPrefix}/site-packages";
interpreter = "${self}/bin/${executable}";
};
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index 99af42cd7ad..0f798c63e8f 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -69,13 +69,13 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // {
doCheck = false;
doInstallCheck = doCheck;
- postFixup = attrs.postFixup or ''
+ postFixup = ''
wrapPythonPrograms
'' + lib.optionalString catchConflicts ''
# check if we have two packages with the same name in closure and fail
# this shouldn't happen, something went wrong with dependencies specs
${python.interpreter} ${./catch_conflicts.py}
- '';
+ '' + attrs.postFixup or '''';
passthru = {
inherit python; # The python interpreter
diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix
index 7e11ac89b16..bce6d19d58d 100644
--- a/pkgs/development/interpreters/python/pypy/2.7/default.nix
+++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi
-, sqlite, openssl, ncurses, pythonFull, expat, tcl, tk, xlibsWrapper, libX11
+, sqlite, openssl, ncurses, python, expat, tcl, tk, xlibsWrapper, libX11
, makeWrapper, callPackage, self, pypyPackages, gdbm, db }:
assert zlibSupport -> zlib != null;
@@ -34,7 +34,7 @@ let
patch lib-python/2.7/test/test_pyexpat.py < '${expatch}'
'';
- buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 makeWrapper gdbm db ]
+ buildInputs = [ bzip2 openssl pkgconfig python 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;
@@ -62,7 +62,7 @@ let
'';
buildPhase = ''
- ${pythonFull.interpreter} rpython/bin/rpython --make-jobs="$NIX_BUILD_CORES" -Ojit --batch pypy/goal/targetpypystandalone.py --withmod-_minimal_curses --withmod-unicodedata --withmod-thread --withmod-bz2 --withmod-_multiprocessing
+ ${python.interpreter} rpython/bin/rpython --make-jobs="$NIX_BUILD_CORES" -Ojit --batch pypy/goal/targetpypystandalone.py --withmod-_minimal_curses --withmod-unicodedata --withmod-thread --withmod-bz2 --withmod-_multiprocessing
'';
setupHook = ./setup-hook.sh;
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 7126a5140c3..336c861bbdc 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -129,6 +129,9 @@ let
$out/bin/ruby setup.rb
popd
+ # Remove unnecessary groff reference from runtime closure, since it's big
+ sed -i '/NROFF/d' $out/lib/ruby/*/*/rbconfig.rb
+
# Bundler tries to create this directory
mkdir -pv $out/${passthru.gemPath}
mkdir -p $out/nix-support
diff --git a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix
index 8279a4cd0df..582e7039d17 100644
--- a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix
+++ b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, autoconf213, fetchurl, pkgconfig, nspr, perl, python, zip }:
+{ stdenv, autoconf213, fetchurl, pkgconfig, nspr, perl, python2, zip }:
stdenv.mkDerivation rec {
version = "185-1.0.0";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ nspr ];
- buildInputs = [ pkgconfig perl python zip ];
+ buildInputs = [ pkgconfig perl python2 zip ];
nativeBuildInputs = if stdenv.isArm then [ autoconf213 ] else [];
postUnpack = "sourceRoot=\${sourceRoot}/js/src";
diff --git a/pkgs/development/interpreters/spidermonkey/24.2.nix b/pkgs/development/interpreters/spidermonkey/24.2.nix
index d207fbd1070..279528e9e83 100644
--- a/pkgs/development/interpreters/spidermonkey/24.2.nix
+++ b/pkgs/development/interpreters/spidermonkey/24.2.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 = "24.2.0";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ nspr ];
- buildInputs = [ pkgconfig perl python zip libffi readline ];
+ buildInputs = [ pkgconfig perl python2 zip libffi readline ];
postPatch = ''
# Fixes an issue with version detection under perl 5.22.x
diff --git a/pkgs/development/interpreters/spidermonkey/31.5.nix b/pkgs/development/interpreters/spidermonkey/31.5.nix
index 2334e1b6b7f..f52d526e3fa 100644
--- a/pkgs/development/interpreters/spidermonkey/31.5.nix
+++ b/pkgs/development/interpreters/spidermonkey/31.5.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, perl, python, zip, libffi, readline }:
+{ stdenv, fetchurl, pkgconfig, perl, python2, zip, libffi, readline }:
stdenv.mkDerivation rec {
version = "31.5.0";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "1q8icql5hh1g3gzg5fp4rl9rfagyhm9gilfn3dgi7qn4i1mrfqsd";
};
- 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/Xaw3d/builder.sh b/pkgs/development/libraries/Xaw3d/builder.sh
deleted file mode 100644
index ff42e47ea56..00000000000
--- a/pkgs/development/libraries/Xaw3d/builder.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-source $stdenv/setup
-
-configurePhase() {
- cd lib/Xaw3d
- (mkdir X11 && cd X11 && ln -fs .. Xaw3d)
- xmkmf
-}
-
-buildPhase() {
- make depend $makeFlags
- make $makeFlags
-}
-
-installPhase() {
- make install SHLIBDIR=$out/lib USRLIBDIR=$out/lib INCDIR=$out/include
- cd $out/include/X11 && ln -s Xaw3d Xaw
-
- mkdir -p "$out/nix-support"
- echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs"
-}
-
-makeFlags="CDEBUGFLAGS=" # !!! awful hack
-
-genericBuild
diff --git a/pkgs/development/libraries/Xaw3d/config.patch b/pkgs/development/libraries/Xaw3d/config.patch
deleted file mode 100644
index 4062f313368..00000000000
--- a/pkgs/development/libraries/Xaw3d/config.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -rc xc-orig/lib/Xaw3d/Imakefile xc/lib/Xaw3d/Imakefile
-*** xc-orig/lib/Xaw3d/Imakefile 2003-03-08 15:55:18.000000000 +0100
---- xc/lib/Xaw3d/Imakefile 2005-11-11 20:12:24.000000000 +0100
-***************
-*** 9,15 ****
- XCOMM For grayed stipple shadows, define GRAY_BLKWHT_STIPPLES:
- #define GRAY_BLKWHT_STIPPLES
- XCOMM For scrollbars with arrows, define ARROW_SCROLLBARS:
-! #undef ARROW_SCROLLBARS
-
- #define DoNormalLib NormalLibXaw
- #define DoSharedLib SharedLibXaw
---- 9,15 ----
- XCOMM For grayed stipple shadows, define GRAY_BLKWHT_STIPPLES:
- #define GRAY_BLKWHT_STIPPLES
- XCOMM For scrollbars with arrows, define ARROW_SCROLLBARS:
-! #define ARROW_SCROLLBARS
-
- #define DoNormalLib NormalLibXaw
- #define DoSharedLib SharedLibXaw
-***************
-*** 22,28 ****
- #define IncSubSubdir Xaw3d
-
- XCOMM When building outside an X11 source tree:
-! XCOMM EXTRA_INCLUDES = -I.
-
- #ifdef SharedXawReqs
- REQUIREDLIBS = SharedXawReqs
---- 22,28 ----
- #define IncSubSubdir Xaw3d
-
- XCOMM When building outside an X11 source tree:
-! EXTRA_INCLUDES = -I.
-
- #ifdef SharedXawReqs
- REQUIREDLIBS = SharedXawReqs
-diff -rc xc-orig/lib/Xaw3d/laylex.l xc/lib/Xaw3d/laylex.l
-*** xc-orig/lib/Xaw3d/laylex.l 1996-10-15 16:41:26.000000000 +0200
---- xc/lib/Xaw3d/laylex.l 2005-11-11 20:03:50.000000000 +0100
-***************
-*** 26,31 ****
---- 26,33 ----
- #ifdef __STDC__
- static int count ();
- #endif
-+
-+ static int LayYY_prev_more_offset = 0;
- %}
- %%
- vertical return VERTICAL;
diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix
index ca225b3381b..50399f62d0a 100644
--- a/pkgs/development/libraries/Xaw3d/default.nix
+++ b/pkgs/development/libraries/Xaw3d/default.nix
@@ -1,14 +1,14 @@
-{stdenv, fetchurl, xlibsWrapper, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex}:
+{stdenv, fetchurl, xlibsWrapper, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex, pkgconfig}:
stdenv.mkDerivation {
- name = "Xaw3d-1.5E";
- builder = ./builder.sh;
+ name = "Xaw3d-1.6.2";
src = fetchurl {
- url = http://freshmeat.net/redir/xaw3d/11835/url_tgz/Xaw3d-1.5E.tar.gz;
- md5 = "29ecfdcd6bcf47f62ecfd672d31269a1";
+ urls = [
+ ftp://ftp.x.org/pub/xorg/individual/lib/libXaw3d-1.6.tar.bz2
+ ];
+ sha256 = "099kx6ni5vkgr3kf40glif8m6r1m1hq6hxqlqrblaj1w5cphh8hi";
};
- patches = [./config.patch ./laylex.patch];
- buildInputs = [imake gccmakedep libXpm libXp bison flex];
+ buildInputs = [imake gccmakedep libXpm libXp bison flex pkgconfig];
propagatedBuildInputs = [xlibsWrapper libXmu];
meta = {
diff --git a/pkgs/development/libraries/Xaw3d/laylex.patch b/pkgs/development/libraries/Xaw3d/laylex.patch
deleted file mode 100644
index 911ea800ec6..00000000000
--- a/pkgs/development/libraries/Xaw3d/laylex.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -rc xc-orig/lib/Xaw3d/laylex.l xc/lib/Xaw3d/laylex.l
-*** xc-orig/lib/Xaw3d/laylex.l 2006-08-07 12:12:54.000000000 +0200
---- xc/lib/Xaw3d/laylex.l 2006-08-07 12:14:49.000000000 +0200
-***************
-*** 27,33 ****
- static int count ();
- #endif
-
-- static int LayYY_prev_more_offset = 0;
- %}
- %%
- vertical return VERTICAL;
---- 27,32 ----
diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix
new file mode 100644
index 00000000000..c4b37ddb78f
--- /dev/null
+++ b/pkgs/development/libraries/arb/default.nix
@@ -0,0 +1,21 @@
+{stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint}:
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "arb";
+ version = "2.8.1";
+ src = fetchFromGitHub {
+ owner = "fredrik-johansson";
+ repo = "${pname}";
+ rev = "${version}";
+ sha256 = "15phk71ci9rr32aqznpkd2b993wjahsgliilkg4mnxsr86nwdf6x";
+ };
+ buildInputs = [mpir gmp mpfr flint];
+ configureFlags = "--with-gmp=${gmp} --with-mpir=${mpir} --with-mpfr=${mpfr} --with-flint=${flint}";
+ meta = {
+ inherit version;
+ description = ''A library for arbitrary-precision interval arithmetic'';
+ license = stdenv.lib.licenses.lgpl21Plus;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/arb/git.nix b/pkgs/development/libraries/arb/git.nix
new file mode 100644
index 00000000000..87b884fece1
--- /dev/null
+++ b/pkgs/development/libraries/arb/git.nix
@@ -0,0 +1,21 @@
+{stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint}:
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "arb";
+ version = "2.9.0pre20161013";
+ src = fetchFromGitHub {
+ owner = "fredrik-johansson";
+ repo = "${pname}";
+ rev = "10bc615ce5999caf4723444b2b1219b74781d8a4";
+ sha256 = "1xb40x3hv9nh76aizhskj5gdhalgn7r95a7zji2nn4ih3lmh40hl";
+ };
+ buildInputs = [mpir gmp mpfr flint];
+ configureFlags = "--with-gmp=${gmp} --with-mpir=${mpir} --with-mpfr=${mpfr} --with-flint=${flint}";
+ meta = {
+ inherit version;
+ description = ''A library for arbitrary-precision interval arithmetic'';
+ license = stdenv.lib.licenses.lgpl21Plus;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix
index b8f86f1fa22..a6f2b1371e5 100644
--- a/pkgs/development/libraries/at-spi2-atk/default.nix
+++ b/pkgs/development/libraries/at-spi2-atk/default.nix
@@ -2,14 +2,14 @@
, intltool, dbus_glib, at_spi2_core, libSM }:
stdenv.mkDerivation rec {
- versionMajor = "2.20";
- versionMinor = "1";
+ versionMajor = "2.22";
+ versionMinor = "0";
moduleName = "at-spi2-atk";
name = "${moduleName}-${versionMajor}.${versionMinor}";
src = fetchurl {
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
- sha256 = "2358a794e918e8f47ce0c7370eee8fc8a6207ff1afe976ec9ff547a03277bf8e";
+ sha256 = "e8bdedbeb873eb229eb08c88e11d07713ec25ae175251648ad1a9da6c21113c1";
};
buildInputs = [ python pkgconfig popt atk libX11 libICE xorg.libXtst libXi
diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix
index 52459f85374..3562969f6c9 100644
--- a/pkgs/development/libraries/at-spi2-core/default.nix
+++ b/pkgs/development/libraries/at-spi2-core/default.nix
@@ -2,14 +2,14 @@
, libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }:
stdenv.mkDerivation rec {
- versionMajor = "2.20";
- versionMinor = "2";
+ versionMajor = "2.22";
+ versionMinor = "0";
moduleName = "at-spi2-core";
name = "${moduleName}-${versionMajor}.${versionMinor}";
src = fetchurl {
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
- sha256 = "88a4de9d43139f13cca531b47b901bc1b56e0ab06ba899126644abd4ac16a143";
+ sha256 = "415ea3af21318308798e098be8b3a17b2f0cf2fe16cecde5ad840cf4e0f2c80a";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix
index 472a2ad9807..a14de67d7f3 100644
--- a/pkgs/development/libraries/aubio/default.nix
+++ b/pkgs/development/libraries/aubio/default.nix
@@ -1,30 +1,30 @@
{ stdenv, fetchurl, alsaLib, fftw, libjack2, libsamplerate
-, libsndfile, pkgconfig, python
+, libsndfile, pkgconfig, python2
}:
stdenv.mkDerivation rec {
- name = "aubio-0.4.1";
+ name = "aubio-0.4.3";
src = fetchurl {
url = "http://aubio.org/pub/${name}.tar.bz2";
- sha256 = "15f6nf76y7iyl2kl4ny7ky0zpxfxr8j3902afvd6ydnnkh5dzmr5";
+ sha256 = "1azarklqggch8kkz3gbqwi2vlb6ld4lidyhp34qawr0c7h3xnb5n";
};
buildInputs = [
- alsaLib fftw libjack2 libsamplerate libsndfile pkgconfig python
+ alsaLib fftw libjack2 libsamplerate libsndfile pkgconfig python2
];
- configurePhase = "python waf configure --prefix=$out";
+ configurePhase = "${python2.interpreter} waf configure --prefix=$out";
- buildPhase = "python waf";
+ buildPhase = "${python2.interpreter} waf";
- installPhase = "python waf install";
+ installPhase = "${python2.interpreter} waf install";
- meta = with stdenv.lib; {
+ meta = with stdenv.lib; {
description = "Library for audio labelling";
homepage = http://aubio.org/;
license = licenses.gpl2;
- maintainers = [ maintainers.goibhniu maintainers.marcweber ];
+ maintainers = with maintainers; [ goibhniu marcweber fpletz ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/avro-c++/default.nix b/pkgs/development/libraries/avro-c++/default.nix
index 2cd03253e7e..eaf7b135eb5 100644
--- a/pkgs/development/libraries/avro-c++/default.nix
+++ b/pkgs/development/libraries/avro-c++/default.nix
@@ -1,22 +1,26 @@
-{ stdenv, fetchurl, cmake, boost155, pythonPackages
-}:
+{ stdenv, fetchurl, cmake, boost, python2}:
-let version = "1.7.5"; in
+let version = "1.8.1"; in
stdenv.mkDerivation {
name = "avro-c++-${version}";
src = fetchurl {
url = "mirror://apache/avro/avro-${version}/cpp/avro-cpp-${version}.tar.gz";
- sha256 = "064ssbbgrc3hyalzj8rn119bsrnyk1vlpkhl8gghv96jgqbpdyb3";
+ sha256 = "6559755ac525e908e42a2aa43444576cba91e522fe989088ee7f70c169bcc403";
};
buildInputs = [
cmake
- boost155
- pythonPackages.python
+ python2
+ boost
];
+ preConfigure = ''
+ substituteInPlace test/SchemaTests.cc --replace "BOOST_CHECKPOINT" "BOOST_TEST_CHECKPOINT"
+ substituteInPlace test/buffertest.cc --replace "BOOST_MESSAGE" "BOOST_TEST_MESSAGE"
+ '';
+
enableParallelBuilding = true;
meta = {
diff --git a/pkgs/development/libraries/bootil/default.nix b/pkgs/development/libraries/bootil/default.nix
new file mode 100644
index 00000000000..727c6bfc4f3
--- /dev/null
+++ b/pkgs/development/libraries/bootil/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, fetchpatch, premake4 }:
+
+stdenv.mkDerivation rec {
+ name = "bootil-unstable-2015-12-17";
+
+ meta = {
+ description = "Garry Newman's personal utility library";
+ homepage = https://github.com/garrynewman/bootil;
+ # License unsure - see https://github.com/garrynewman/bootil/issues/21
+ license = stdenv.lib.licenses.free;
+ maintainers = [ stdenv.lib.maintainers.abigailbuccaneer ];
+ platforms = stdenv.lib.platforms.all;
+ };
+
+ src = fetchFromGitHub {
+ owner = "garrynewman";
+ repo = "bootil";
+ rev = "1d3e321fc2be359e2350205b8c7f1cad2164ee0b";
+ sha256 = "03wq526r80l2px797hd0n5m224a6jibwipcbsvps6l9h740xabzg";
+ };
+
+ patches = [ (fetchpatch {
+ url = https://github.com/garrynewman/bootil/pull/22.patch;
+ name = "github-pull-request-22.patch";
+ sha256 = "1qf8wkv00pb9w1aa0dl89c8gm4rmzkxfl7hidj4gz0wpy7a24qa2";
+ })];
+
+ platform =
+ if stdenv.isLinux then "linux"
+ else if stdenv.isDarwin then "macosx"
+ else abort "unrecognized platform";
+
+ buildInputs = [ premake4 ];
+
+ configurePhase = "premake4 --file=projects/premake4.lua gmake";
+ makeFlags = "-C projects/${platform}/gmake";
+
+ installPhase = ''
+ mkdir -p $out/lib
+ cp lib/${platform}/gmake/libbootil_static.a $out/lib/
+ cp -r include $out/
+ '';
+}
diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/development/libraries/cddlib/default.nix
new file mode 100644
index 00000000000..550a660b966
--- /dev/null
+++ b/pkgs/development/libraries/cddlib/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, gmp}:
+stdenv.mkDerivation rec {
+ name = "cddlib-${version}";
+ fileVersion = "094h";
+ version = "0.94h";
+ src = fetchurl {
+ urls = [
+ "http://archive.ubuntu.com/ubuntu/pool/universe/c/cddlib/cddlib_${fileVersion}.orig.tar.gz"
+ "ftp://ftp.math.ethz.ch/users/fukudak/cdd/cddlib-${fileVersion}.tar.gz"
+ ];
+ name = "";
+ sha256 = "1dasasscwfg793q8fwzgwf64xwj7w62yfvszpr8x8g38jka08vgy";
+ };
+ buildInputs = [gmp];
+ meta = {
+ inherit version;
+ description = ''An implementation of the Double Description Method for generating all vertices of a convex polyhedron'';
+ license = stdenv.lib.licenses.gpl2Plus ;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ homepage = "https://www.inf.ethz.ch/personal/fukudak/cdd_home/index.html";
+ };
+}
diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix
index 88bb6707749..1ac34f7608b 100644
--- a/pkgs/development/libraries/cogl/default.nix
+++ b/pkgs/development/libraries/cogl/default.nix
@@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty
-, pangoSupport ? true, pango, cairo, gobjectIntrospection
+, pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland
, gstreamerSupport ? true, gst_all_1 }:
let
ver_maj = "1.22";
- ver_min = "0";
+ ver_min = "2";
in
stdenv.mkDerivation rec {
name = "cogl-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://gnome/sources/cogl/${ver_maj}/${name}.tar.xz";
- sha256 = "689dfb5d14fc1106e9d2ded0f7930dcf7265d0bc84fa846b4f03941633eeaa91";
+ sha256 = "03f0ha3qk7ca0nnkkcr1garrm1n1vvfqhkz9lwjm592fnv6ii9rr";
};
nativeBuildInputs = [ pkgconfig ];
@@ -19,11 +19,13 @@ stdenv.mkDerivation rec {
configureFlags = [
"--enable-introspection"
"--enable-kms-egl-platform"
+ "--enable-wayland-egl-platform"
+ "--enable-wayland-egl-server"
] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst"
++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ];
propagatedBuildInputs = with xorg; [
- glib gdk_pixbuf gobjectIntrospection
+ glib gdk_pixbuf gobjectIntrospection wayland
mesa_noglu libXrandr libXfixes libXcomposite libXdamage
]
++ libintlOrEmpty
diff --git a/pkgs/development/libraries/db/db-4.4.nix b/pkgs/development/libraries/db/db-4.4.nix
deleted file mode 100644
index 00875d73f41..00000000000
--- a/pkgs/development/libraries/db/db-4.4.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ stdenv, fetchurl, ... } @ args:
-
-import ./generic.nix (args // rec {
- version = "4.4.20";
- extraPatches = [ ./cygwin-4.4.patch ];
- sha256 = "0y9vsq8dkarx1mhhip1vaciz6imbbyv37c1dm8b20l7p064bg2i9";
- branch = "4.4";
- drvArgs = { hardeningDisable = [ "format" ]; };
-})
diff --git a/pkgs/development/libraries/db/db-4.5.nix b/pkgs/development/libraries/db/db-4.5.nix
deleted file mode 100644
index 84b5ea67420..00000000000
--- a/pkgs/development/libraries/db/db-4.5.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ stdenv, fetchurl, ... } @ args:
-
-import ./generic.nix (args // rec {
- version = "4.5.20";
- extraPatches = [ ./cygwin-4.5.patch ./register-race-fix.patch ];
- sha256 = "0bd81k0qv5i8w5gbddrvld45xi9k1gvmcrfm0393v0lrm37dab7m";
- branch = "4.5";
- drvArgs = { hardeningDisable = [ "format" ]; };
-})
diff --git a/pkgs/development/libraries/db/db-4.7.nix b/pkgs/development/libraries/db/db-4.7.nix
deleted file mode 100644
index 6016d112d51..00000000000
--- a/pkgs/development/libraries/db/db-4.7.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ stdenv, fetchurl, ... } @ args:
-
-import ./generic.nix (args // rec {
- version = "4.7.25";
- sha256 = "0gi667v9cw22c03hddd6xd6374l0pczsd56b7pba25c9sdnxjkzi";
- branch = "4.7";
- drvArgs = { hardeningDisable = [ "format" ]; };
-})
diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 361acf632fa..a2586b011de 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -6,8 +6,8 @@ assert x11Support -> libX11 != null
&& libSM != null;
let
- version = "1.10.10";
- sha256 = "0hwsfczhx2djmc9116vj5v230i7gpjihwh3vbljs1ldlk831v3wx";
+ version = "1.10.12";
+ sha256 = "0pa71vf5c0d7k3gni06iascmplj0j5g70wbc833ayvi71d1pj2i1";
self = stdenv.mkDerivation {
name = "dbus-${version}";
diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix
new file mode 100644
index 00000000000..3651b9e7660
--- /dev/null
+++ b/pkgs/development/libraries/eclib/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, autoreconfHook
+, pari, ntl, gmp}:
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "eclib";
+ version = "20160720";
+ # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
+ src = fetchFromGitHub {
+ owner = "JohnCremona";
+ repo = "${pname}";
+ rev = "${version}";
+ sha256 = "0qrcd5c8cqhw9f14my6k6013w8li5vdigrjvchkr19n2l8g75j0h";
+ };
+ buildInputs = [pari ntl gmp];
+ nativeBuildInputs = [autoconf automake libtool gettext autoreconfHook];
+ meta = {
+ inherit version;
+ description = ''Elliptic curve tools'';
+ license = stdenv.lib.licenses.gpl2Plus;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/fflas-ffpack/1.nix b/pkgs/development/libraries/fflas-ffpack/1.nix
new file mode 100644
index 00000000000..1222aef12f8
--- /dev/null
+++ b/pkgs/development/libraries/fflas-ffpack/1.nix
@@ -0,0 +1,21 @@
+{stdenv, fetchurl, autoreconfHook, givaro_3_7, pkgconfig, openblas, gmpxx}:
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "fflas-ffpack";
+ version = "1.6.0";
+ src = fetchurl {
+ url = "http://linalg.org/fflas-ffpack-${version}.tar.gz";
+ sha256 = "02fr675278c65hfiy1chb903j4ix9i8yni1xc2g5nmsjcaf9vra9";
+ };
+ buildInputs = [autoreconfHook givaro_3_7 openblas gmpxx];
+ nativeBuildInputs = [pkgconfig];
+ configureFlags = "--with-blas=-lopenblas --with-gmp=${gmpxx.dev} --with-givaro=${givaro_3_7}";
+ meta = {
+ inherit version;
+ description = ''Finite Field Linear Algebra Subroutines'';
+ license = stdenv.lib.licenses.lgpl21Plus;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ homepage = "https://linbox-team.github.io/fflas-ffpack/";
+ };
+}
diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix
new file mode 100644
index 00000000000..7d0cb339a43
--- /dev/null
+++ b/pkgs/development/libraries/fflas-ffpack/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, openblas, liblapack}:
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "fflas-ffpack";
+ version = "2.2.2";
+ src = fetchFromGitHub {
+ owner = "linbox-team";
+ repo = "${pname}";
+ rev = "v${version}";
+ sha256 = "0k1f4pb7azrm6ajncvg7vni7ixfmn6fssd5ld4xddbi6jqbsf9rd";
+ };
+ buildInputs = [autoreconfHook givaro (liblapack.override {shared = true;}) openblas];
+ nativeBuildInputs = [pkgconfig];
+ configureFlags = "--with-blas-libs=-lopenblas --with-lapack-libs=-llapack";
+ meta = {
+ inherit version;
+ description = ''Finite Field Linear Algebra Subroutines'';
+ license = stdenv.lib.licenses.lgpl21Plus;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ homepage = "https://linbox-team.github.io/fflas-ffpack/";
+ };
+}
diff --git a/pkgs/development/libraries/ffmpeg/3.1.nix b/pkgs/development/libraries/ffmpeg/3.1.nix
index fd5ce7c19d8..fb14ca47598 100644
--- a/pkgs/development/libraries/ffmpeg/3.1.nix
+++ b/pkgs/development/libraries/ffmpeg/3.1.nix
@@ -5,9 +5,9 @@
}@args:
callPackage ./generic.nix (args // rec {
- version = "${branch}.3";
+ version = "${branch}.4";
branch = "3.1";
- sha256 = "0f4ajs0c4088nkal4gqagx05wfyhd1izfxmzxxsdh56ibp38kg2q";
+ sha256 = "1ynb1f0py5jb6hs78ypynpwc3jlqrw51vl8y1wnd44nwlisxz6bw";
darwinFrameworks = [ Cocoa CoreMedia ];
patches = stdenv.lib.optional stdenv.isDarwin ./sdk_detection.patch;
})
diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix
new file mode 100644
index 00000000000..add520558ba
--- /dev/null
+++ b/pkgs/development/libraries/flatbuffers/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+ name = "flatbuffers-${version}";
+ version = "1.4.0";
+
+ src = fetchFromGitHub {
+ owner = "google";
+ repo = "flatbuffers";
+ rev = "v${version}";
+ sha256 = "0jsqk49h521d5h4c9gk39a8968g6rcd6520a8knbfc7ssc4028y0";
+ };
+
+ buildInputs = [ cmake ];
+ enableParallelBuilding = true;
+
+ # Not sure how tests are supposed to be run.
+ # "make: *** No rule to make target 'check'. Stop."
+ doCheck = false;
+
+ meta = {
+ description = "Memory Efficient Serialization Library.";
+ longDescription = ''
+ FlatBuffers is an efficient cross platform serialization library for
+ games and other memory constrained apps. It allows you to directly
+ access serialized data without unpacking/parsing it first, while still
+ having great forwards/backwards compatibility.
+ '';
+ maintainers = [ stdenv.lib.maintainers.teh ];
+ license = stdenv.lib.licenses.asl20;
+ platforms = stdenv.lib.platforms.unix;
+ homepage = http://google.github.io/flatbuffers;
+ };
+}
diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix
new file mode 100644
index 00000000000..be158684b5b
--- /dev/null
+++ b/pkgs/development/libraries/flint/default.nix
@@ -0,0 +1,22 @@
+{stdenv, fetchurl, gmp, mpir, mpfr, openblas, ntl}:
+stdenv.mkDerivation rec {
+ name = "flint-${version}";
+ version = "2.5.2";
+ # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
+ src = fetchurl {
+ url = "http://www.flintlib.org/flint-${version}.tar.gz";
+ sha256 = "11syazv1a8rrnac3wj3hnyhhflpqcmq02q8pqk2m6g2k6h0gxwfb";
+ };
+ buildInputs = [gmp mpir mpfr openblas ntl];
+ configureFlags = "--with-gmp=${gmp} --with-mpir=${mpir} --with-mpfr=${mpfr} --with-blas=${openblas} --with-ntl=${ntl}";
+ meta = {
+ inherit version;
+ description = ''Fast Library for Number Theory'';
+ license = stdenv.lib.licenses.gpl2Plus;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ homepage = "http://www.flintlib.org/";
+ downloadPage = "http://www.flintlib.org/downloads.html";
+ updateWalker = true;
+ };
+}
diff --git a/pkgs/development/libraries/fplll/20160331.nix b/pkgs/development/libraries/fplll/20160331.nix
new file mode 100644
index 00000000000..952ecb0eade
--- /dev/null
+++ b/pkgs/development/libraries/fplll/20160331.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, autoreconfHook
+, gmp, mpfr
+}:
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "fplll";
+ version = "20160331";
+ src = fetchFromGitHub {
+ owner = "${pname}";
+ repo = "${pname}";
+ rev = "11dea26c2f9396ffb7a7191aa371343f1f74c5c3";
+ sha256 = "1clxch9hbr30w6s84m2mprxv58adhg5qw6sa2p3jr1cy4r7r59ib";
+ };
+ nativeBuildInputs = [autoconf automake libtool gettext autoreconfHook];
+ buildInputs = [gmp mpfr];
+ meta = {
+ inherit version;
+ description = ''Lattice algorithms using floating-point arithmetic'';
+ license = stdenv.lib.licenses.lgpl21Plus;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix
new file mode 100644
index 00000000000..b377061fe97
--- /dev/null
+++ b/pkgs/development/libraries/fplll/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, autoreconfHook
+, gmp, mpfr
+}:
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "fplll";
+ version = "5.0.2";
+ src = fetchFromGitHub {
+ owner = "${pname}";
+ repo = "${pname}";
+ rev = "${version}";
+ sha256 = "0rl98rx284giyhj3pf6iydn1a06jis8c8mnsc7kqs4rcmiw4bjpx";
+ };
+ nativeBuildInputs = [autoconf automake libtool gettext autoreconfHook];
+ buildInputs = [gmp mpfr];
+ meta = {
+ inherit version;
+ description = ''Lattice algorithms using floating-point arithmetic'';
+ license = stdenv.lib.licenses.lgpl21Plus;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix
index 5a8b1f2fcbc..11308a93337 100644
--- a/pkgs/development/libraries/gcab/default.nix
+++ b/pkgs/development/libraries/gcab/default.nix
@@ -1,11 +1,12 @@
{ stdenv, fetchurl, intltool, gobjectIntrospection, pkgconfig }:
stdenv.mkDerivation rec {
- name = "gcab-0.6";
+ name = "gcab-${version}";
+ version = "0.7";
src = fetchurl {
- url = "mirror://gnome/sources/gcab/0.6/${name}.tar.xz";
- sha256 = "a0443b904bfa7227b5155bfcdf9ea9256b6e26930b8febe1c41f972f6f1334bb";
+ url = "mirror://gnome/sources/gcab/${version}/${name}.tar.xz";
+ sha256 = "1vxdsiky3492zlyrym02sdwf09y19rl2z5h5iin7qm0wizw5wvm1";
};
buildInputs = [ intltool gobjectIntrospection pkgconfig ];
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index d710c7357bc..ce3e0f61972 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -39,16 +39,9 @@ composableDerivation.composableDerivation {} (fixed: rec {
(if netcdfSupport then "--with-netcdf=${netcdf}" else "")
];
- # Prevent this:
- #
- # Checking .pth file support in /nix/store/xkrmb8xnvqxzjwsdmasqmsdh1a5y2y99-gdal-1.11.2/lib/python2.7/site-packages/
- # /nix/store/pbi1lgank10fy0xpjckbdpgacqw34dsz-python-2.7.9/bin/python -E -c pass
- # TEST FAILED: /nix/store/xkrmb8xnvqxzjwsdmasqmsdh1a5y2y99-gdal-1.11.2/lib/python2.7/site-packages/ does NOT support .pth files
- # error: bad install directory or PYTHONPATH
preBuild = ''
- pythonInstallDir=$out/lib/${pythonPackages.python.libPrefix}/site-packages
- mkdir -p $pythonInstallDir
- export PYTHONPATH=''${PYTHONPATH:+''${PYTHONPATH}:}$pythonInstallDir
+ substituteInPlace swig/python/GNUmakefile \
+ --replace "ifeq (\$(STD_UNIX_LAYOUT),\"TRUE\")" "ifeq (1,1)"
'';
postInstall = ''
diff --git a/pkgs/development/libraries/gf2x/default.nix b/pkgs/development/libraries/gf2x/default.nix
new file mode 100644
index 00000000000..feba97f4da4
--- /dev/null
+++ b/pkgs/development/libraries/gf2x/default.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl}:
+stdenv.mkDerivation rec {
+ name = "gf2x-${version}";
+ version = "1.1";
+ # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
+ src = fetchurl {
+ url = "http://gforge.inria.fr/frs/download.php/file/30873/gf2x-1.1.tar.gz";
+ sha256 = "17w4b39j9dvri5s278pxi8ha7mf47j87kq1lr802l4408rh02gqd";
+ };
+ buildInputs = [];
+ meta = {
+ inherit version;
+ description = ''Routines for fast arithmetic in GF(2)[x]'';
+ license = stdenv.lib.licenses.gpl2Plus;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix
index 0a0c5858917..c4487dca597 100644
--- a/pkgs/development/libraries/git2/default.nix
+++ b/pkgs/development/libraries/git2/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, curl, http-parser, libiconv }:
stdenv.mkDerivation (rec {
- version = "0.24.1";
+ version = "0.24.2";
name = "libgit2-${version}";
src = fetchurl {
name = "${name}.tar.gz";
url = "https://github.com/libgit2/libgit2/tarball/v${version}";
- sha256 = "0rw80480dx2f6a2wbb1bwixygg1iwq3r7vwhxdmkkf4lpxd35jhd";
+ sha256 = "0avijw83vfx64cn23vx2j1h14zmkx8silgjnq6q2qw2z3sh73hs1";
};
# TODO: `cargo` (rust's package manager) surfaced a serious bug in
diff --git a/pkgs/development/libraries/givaro/3.7.nix b/pkgs/development/libraries/givaro/3.7.nix
new file mode 100644
index 00000000000..9907ae24f2c
--- /dev/null
+++ b/pkgs/development/libraries/givaro/3.7.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl, automake, autoconf, libtool, autoreconfHook, gmpxx}:
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "givaro";
+ version = "3.7.2";
+ src = fetchurl {
+ url = "https://forge.imag.fr/frs/download.php/370/givaro-${version}.tar.gz";
+ sha256 = "0lf5cnbyr27fw7klc3zabkb1979dn67jmrjz6pa3jzw2ng74x9b3";
+ };
+ buildInputs = [autoconf automake libtool autoreconfHook gmpxx];
+ meta = {
+ inherit version;
+ description = ''A C++ library for arithmetic and algebraic computations'';
+ license = stdenv.lib.licenses.cecill-b;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/givaro/3.nix b/pkgs/development/libraries/givaro/3.nix
new file mode 100644
index 00000000000..bb0fd0e0898
--- /dev/null
+++ b/pkgs/development/libraries/givaro/3.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl, automake, autoconf, libtool, autoreconfHook, gmpxx}:
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "givaro";
+ version = "3.8.0";
+ src = fetchurl {
+ url = "https://forge.imag.fr/frs/download.php/592/givaro-${version}.tar.gz";
+ sha256 = "1822ksv8653a84hvcz0vxl3nk8dqz7d41ys8rplq0zjjmvb2i5yq";
+ };
+ buildInputs = [autoconf automake libtool autoreconfHook gmpxx];
+ meta = {
+ inherit version;
+ description = ''A C++ library for arithmetic and algebraic computations'';
+ license = stdenv.lib.licenses.cecill-b;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix
new file mode 100644
index 00000000000..d9a8624b2ea
--- /dev/null
+++ b/pkgs/development/libraries/givaro/default.nix
@@ -0,0 +1,20 @@
+{stdenv, fetchFromGitHub, automake, autoconf, libtool, autoreconfHook, gmpxx}:
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "givaro";
+ version = "4.0.2";
+ src = fetchFromGitHub {
+ owner = "linbox-team";
+ repo = "${pname}";
+ rev = "v${version}";
+ sha256 = "04n1lyc823z3l1d7mnmqpc9z1pkn646szjchasbfkn74m7cb0qz7";
+ };
+ buildInputs = [autoconf automake libtool autoreconfHook gmpxx];
+ meta = {
+ inherit version;
+ description = ''A C++ library for arithmetic and algebraic computations'';
+ license = stdenv.lib.licenses.cecill-b;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/gnutls/3.3.nix b/pkgs/development/libraries/gnutls/3.3.nix
index 86262d4aef2..87b46dc26a0 100644
--- a/pkgs/development/libraries/gnutls/3.3.nix
+++ b/pkgs/development/libraries/gnutls/3.3.nix
@@ -1,10 +1,10 @@
{ callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec {
- version = "3.3.24";
+ version = "3.3.25";
src = fetchurl {
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-${version}.tar.xz";
- sha256 = "5b65fe2a91c8dfa32bedc78acffcb152e5426cd3349e2afc43cccc9bdaf18aa5";
+ sha256 = "0bhzkzpzwg3lhbhpas7m4rcj4mrnyq76zmic9z42wpa68d76r78q";
};
})
diff --git a/pkgs/development/libraries/gnutls/3.4.nix b/pkgs/development/libraries/gnutls/3.4.nix
index 4ca991b9667..fc3ac0ec421 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.15";
+ version = "3.4.16";
src = fetchurl {
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-${version}.tar.xz";
- sha256 = "161lbs0ijkkc94xx6yz87q36a055hl6d5hdwyz5s1wpm0lwh2apb";
+ sha256 = "09rrjaflgp5p0hi5gqljklz1xpalnvj8bawvjj6baw8768dvp6nr";
};
})
diff --git a/pkgs/development/libraries/gnutls/3.5.nix b/pkgs/development/libraries/gnutls/3.5.nix
index b85859f0e62..602df9f44a3 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.4";
+ version = "3.5.5";
src = fetchurl {
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz";
- sha256 = "1sx8p7v452s9m854r2c5pvcd1k15a3caiv5h35fhrxz0691h2f2f";
+ sha256 = "0ag5q3dfxzv0dmqy7q0a8y74yc3m5yzvjrp324l6vqafh3klz6c6";
};
})
diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index f031cb93c98..9425bd7c6a6 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -34,11 +34,7 @@ stdenv.mkDerivation {
] ++ lib.optional guileBindings
[ "--enable-guile" "--with-guile-site-dir=\${out}/share/guile/site" ];
- # Build of the Guile bindings is not parallel-safe. See
- #
- # for the actual fix. Also an apparent race in the generation of
- # systemkey-args.h.
- enableParallelBuilding = false;
+ enableParallelBuilding = true;
buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp autogen ]
++ lib.optional doCheck nettools
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix
index 2d588e5d231..d78b50a7821 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix
@@ -1,8 +1,8 @@
-{ fetchurl, stdenv, pkgconfig, pythonPackages, gstreamer, gst_plugins_base
+{ fetchurl, stdenv, pkgconfig, python2Packages, gstreamer, gst_plugins_base
}:
let
- inherit (pythonPackages) python pygobject2;
+ inherit (python2Packages) python pygobject2;
in stdenv.mkDerivation rec {
name = "gst-python-0.10.22";
diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix
index 37b1f816923..8b2383f33cc 100644
--- a/pkgs/development/libraries/gtkmm/3.x.nix
+++ b/pkgs/development/libraries/gtkmm/3.x.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy }:
let
- ver_maj = "3.20";
+ ver_maj = "3.22";
ver_min = "0";
in
stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gtkmm/${ver_maj}/${name}.tar.xz";
- sha256 = "12h2kd22iayvjfhmgjccm33igrbvqdj7hym31fsa1y0dhwzmf8gh";
+ sha256 = "05da4d4b628fb20c8384630ddf478a3b5562952b2d6181fe28d58f6cbc0514f5";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix
index df3f68b1249..60a1435462b 100644
--- a/pkgs/development/libraries/http-parser/default.nix
+++ b/pkgs/development/libraries/http-parser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gyp, utillinux, python, fixDarwinDylibNames }:
+{ stdenv, fetchurl, python2Packages, utillinux, fixDarwinDylibNames }:
let
version = "2.7.0";
@@ -17,9 +17,9 @@ in stdenv.mkDerivation {
buildFlags = [ "BUILDTYPE=Release" ];
buildInputs =
- [ gyp ]
+ [ python2Packages.gyp ]
++ stdenv.lib.optional stdenv.isLinux utillinux
- ++ stdenv.lib.optionals stdenv.isDarwin [ python fixDarwinDylibNames ];
+ ++ stdenv.lib.optionals stdenv.isDarwin [ python2Packages.python fixDarwinDylibNames ];
doCheck = !stdenv.isDarwin;
@@ -42,6 +42,6 @@ in stdenv.mkDerivation {
homepage = https://github.com/joyent/http-parser;
license = stdenv.lib.licenses.mit;
- platforms = stdenv.lib.platforms.linux; # Broken on pure-darwin, wants xcode
+ platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/development/libraries/ijs/default.nix b/pkgs/development/libraries/ijs/default.nix
index a08a653dc71..4506d3c4104 100644
--- a/pkgs/development/libraries/ijs/default.nix
+++ b/pkgs/development/libraries/ijs/default.nix
@@ -5,15 +5,6 @@ stdenv.mkDerivation {
inherit (ghostscript) src;
- patches = [
- # http://bugs.ghostscript.com/show_bug.cgi?id=696246
- (fetchpatch {
- name = "devijs-account-for-device-subclassing.patch";
- url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=b68e05c3";
- sha256 = "1c3fzfjzvf15z533vpw3l3da8wcxw98qi3p1lc6lf13940a57c7n";
- })
- ];
-
postPatch = "cd ijs";
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/iml/default.nix b/pkgs/development/libraries/iml/default.nix
new file mode 100644
index 00000000000..2ae8aad5ffc
--- /dev/null
+++ b/pkgs/development/libraries/iml/default.nix
@@ -0,0 +1,20 @@
+{stdenv, fetchurl, gmp, atlas}:
+stdenv.mkDerivation rec {
+ name = "iml-${version}";
+ version = "1.0.5";
+ src = fetchurl {
+ url = "http://www.cs.uwaterloo.ca/~astorjoh/iml-${version}.tar.bz2";
+ sha256 = "0akwhhz9b40bz6lrfxpamp7r7wkk48p455qbn04mfnl9a1l6db8x";
+ };
+ buildInputs = [gmp atlas];
+ configureFlags = "--with-gmp-include=${gmp.dev}/include --with-gmp-lib=${gmp}/lib";
+ meta = {
+ inherit version;
+ description = ''Algorithms for computing exact solutions to dense systems of linear equations over the integers'';
+ license = stdenv.lib.licenses.gpl2Plus;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ homepage = "https://cs.uwaterloo.ca/~astorjoh/iml.html";
+ updateWalker = true;
+ };
+}
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index cb48738dc10..4b214c37a69 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -36,11 +36,12 @@ let
});
- kdeFramework = args:
+ kdeFramework = let
+ broken = builtins.compareVersions self.qtbase.version "5.6.0" < 0;
+ in args:
let
inherit (args) name;
inherit (srcs."${name}") src version;
- qtVersion = (builtins.parseDrvName self.qtbase.name).version;
in kdeDerivation (args // {
name = "${name}-${version}";
inherit src;
@@ -51,7 +52,7 @@ let
];
platforms = lib.platforms.linux;
homepage = "http://www.kde.org";
- broken = builtins.compareVersions qtVersion "5.6.0" < 0;
+ inherit broken;
} // (args.meta or {});
});
diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index 2ccc172c074..365d44c5e39 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.26/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/frameworks/5.27/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
index 91bfd28df4e..ca8c521894b 100644
--- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
@@ -3,13 +3,6 @@
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/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index ec1602d5aa2..4891c1bc07b 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -3,579 +3,579 @@
{
attica = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/attica-5.26.0.tar.xz";
- sha256 = "1z7718vzknp25lzx4kh0k7xw7jgx5q8afwhfcdqhfrbydbch5ilc";
- name = "attica-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/attica-5.27.0.tar.xz";
+ sha256 = "0w6dwq83vj70m8rf52x60a64f6s6h0y7c948j3hddfql7s3ghha7";
+ name = "attica-5.27.0.tar.xz";
};
};
baloo = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/baloo-5.26.0.tar.xz";
- sha256 = "0cgk2fmm1hivzjajih3f09x901cncl2rxxp4qq7wz6g7d2s59pfy";
- name = "baloo-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/baloo-5.27.0.tar.xz";
+ sha256 = "0dqa5sxz2z440h6zry7s1x0r1d919qky69i5fv2nir7y844xx2cc";
+ name = "baloo-5.27.0.tar.xz";
};
};
bluez-qt = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/bluez-qt-5.26.0.tar.xz";
- sha256 = "0n235jsx6vw4v13y3hkbiz5fh4453avgvrwd1zzs4yc5mkz5w837";
- name = "bluez-qt-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/bluez-qt-5.27.0.tar.xz";
+ sha256 = "111gqxw1bvazdhxk5rcfhi438i6bd92r3wvlkxsdqrp7ypcqdpig";
+ name = "bluez-qt-5.27.0.tar.xz";
};
};
breeze-icons = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/breeze-icons-5.26.0.tar.xz";
- sha256 = "1kbbiid89inb7dpn0z612gb7v4p2msbvp9g5varb7wvyld1dgh59";
- name = "breeze-icons-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/breeze-icons-5.27.0.tar.xz";
+ sha256 = "12awfvka9sgdgh7dyg7cw7myw7fxrx1w93s1gyhdq2drjsdbghgz";
+ name = "breeze-icons-5.27.0.tar.xz";
};
};
extra-cmake-modules = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/frameworks/5.27/extra-cmake-modules-5.27.0.tar.xz";
+ sha256 = "0n7vw2a4kxdgpsc1wn9f1d0y01p6qfk8ac360rq329bvdpigxmnj";
+ name = "extra-cmake-modules-5.27.0.tar.xz";
};
};
frameworkintegration = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/frameworkintegration-5.26.0.tar.xz";
- sha256 = "0lqnwgsd6ads17qzdbd75azpk1h5ky3924ygzhbam1llnvcvfk9p";
- name = "frameworkintegration-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/frameworkintegration-5.27.0.tar.xz";
+ sha256 = "0zpv7wj2006f039wr1gp5bc4md8yq9ig5g3v5mx46sdjip5423p1";
+ name = "frameworkintegration-5.27.0.tar.xz";
};
};
kactivities = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kactivities-5.26.0.tar.xz";
- sha256 = "0cnciipmflnn1dxz69iqc2xy6g27sw4yr17yq3hp0r6kkycmpf71";
- name = "kactivities-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kactivities-5.27.0.tar.xz";
+ sha256 = "08x07rlf2gff1j9jahznz2838919vab1ay8jppz3bp5kywx104yk";
+ name = "kactivities-5.27.0.tar.xz";
};
};
kactivities-stats = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kactivities-stats-5.26.0.tar.xz";
- sha256 = "0vpbsg6jswaw3ax4ypp6ak823iymh9jqdf7ssn9kqljynnjhnfv8";
- name = "kactivities-stats-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kactivities-stats-5.27.0.tar.xz";
+ sha256 = "134a3zgasza9wghp1lkiaar3sakag7vn82pm2kcrmr420a0jigsw";
+ name = "kactivities-stats-5.27.0.tar.xz";
};
};
kapidox = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kapidox-5.26.0.tar.xz";
- sha256 = "1snz4szrgbdzy03jc0sax9r7b1jynj2npil1ngpr40xchs70vnb8";
- name = "kapidox-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kapidox-5.27.0.tar.xz";
+ sha256 = "193m0qpcqdkspdcwc8cwabjjcqyd9d0m5kl53mycyiv1m220x11l";
+ name = "kapidox-5.27.0.tar.xz";
};
};
karchive = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/karchive-5.26.0.tar.xz";
- sha256 = "1sysk9zznnahrdjfxxp3aaw6qy9c5l7agh1nbhnk0j5xm31js25g";
- name = "karchive-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/karchive-5.27.0.tar.xz";
+ sha256 = "1c7bifmzyr398p1qx9qfxp893wbr44sjn3sda9q0hdpmw2i7yf3z";
+ name = "karchive-5.27.0.tar.xz";
};
};
kauth = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kauth-5.26.0.tar.xz";
- sha256 = "08k1x943z7a044ihv79lm1c0vas5x9wc9wr4qirhllkrxd87nsc1";
- name = "kauth-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kauth-5.27.0.tar.xz";
+ sha256 = "17z6dh1qdpd490z84g6ynl8bcrr9naalvh34ybnpipvx3qs50kwl";
+ name = "kauth-5.27.0.tar.xz";
};
};
kbookmarks = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kbookmarks-5.26.0.tar.xz";
- sha256 = "0phhf5xv11iyf5vi8x6xwx7rqlxc27451bwmm2sr0c65bnnkj57j";
- name = "kbookmarks-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kbookmarks-5.27.0.tar.xz";
+ sha256 = "1lb20yn8s27h0965yf6w4v4wwlm80bl24mpsksp01z9f0711j8vm";
+ name = "kbookmarks-5.27.0.tar.xz";
};
};
kcmutils = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kcmutils-5.26.0.tar.xz";
- sha256 = "1pymbf50idnrz8vyy9lm9535h6s7ssd3p70fdg8dicx7lx6s5grd";
- name = "kcmutils-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kcmutils-5.27.0.tar.xz";
+ sha256 = "04nbd0836azs2i0pq8hq8ljnmfc45mqs022zdn84xd2q3npl3hfx";
+ name = "kcmutils-5.27.0.tar.xz";
};
};
kcodecs = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kcodecs-5.26.0.tar.xz";
- sha256 = "18xzxi5y47rn3wlxz3m98ix7sd20vmxnqsm3lksgakk08qcv47wk";
- name = "kcodecs-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kcodecs-5.27.0.tar.xz";
+ sha256 = "0f4k276sm0svh5y8yyq8hfc5vy60cpsrwany7kswyh22m57v5j8a";
+ name = "kcodecs-5.27.0.tar.xz";
};
};
kcompletion = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kcompletion-5.26.0.tar.xz";
- sha256 = "1f3h6qrpqsdds5zf99qkzxan2lh1y83d67pdswqvbfvwhr3bnl7s";
- name = "kcompletion-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kcompletion-5.27.0.tar.xz";
+ sha256 = "1mb64ii4ilhqhy9p6cl3phs17bg3lr4b60jkkm71yn2wnd4wl47s";
+ name = "kcompletion-5.27.0.tar.xz";
};
};
kconfig = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kconfig-5.26.0.tar.xz";
- sha256 = "0rsym5196agxzxzfxzywvsqlgvarnvw91zx04xvlsy70fnj70c4d";
- name = "kconfig-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kconfig-5.27.0.tar.xz";
+ sha256 = "18dpm0r4nnvmxrask6rv5dkniwna9hh72ffdnvjgrh8p5djs9szi";
+ name = "kconfig-5.27.0.tar.xz";
};
};
kconfigwidgets = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kconfigwidgets-5.26.0.tar.xz";
- sha256 = "08jr6rhh8fi85827bqxh8v4pavq63i2kzwbvqcfpvrrncj5aj4ci";
- name = "kconfigwidgets-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kconfigwidgets-5.27.0.tar.xz";
+ sha256 = "0sbhirfsjmsxiwaqqh5jh85bhwmij93gj5knnb0bs0al4hy29918";
+ name = "kconfigwidgets-5.27.0.tar.xz";
};
};
kcoreaddons = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kcoreaddons-5.26.0.tar.xz";
- sha256 = "10krqzrmbzzkj0xg5rxgs6i4ngg57ydqn3fkmpyz0x6g4yl3raqz";
- name = "kcoreaddons-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kcoreaddons-5.27.0.tar.xz";
+ sha256 = "0rzpxajv041kdbk92rwxq1qnvzyrxfjy154d8257yj2fj76w1gnw";
+ name = "kcoreaddons-5.27.0.tar.xz";
};
};
kcrash = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kcrash-5.26.0.tar.xz";
- sha256 = "0x60rw2zy37s38fpa8agggl9mm4kgvdabbcgr673p7b6k6vj46j8";
- name = "kcrash-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kcrash-5.27.0.tar.xz";
+ sha256 = "09wf4dzckc9l8dyl8qs1wc54h4rm38i2blzyyicm4iazi420lysk";
+ name = "kcrash-5.27.0.tar.xz";
};
};
kdbusaddons = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kdbusaddons-5.26.0.tar.xz";
- sha256 = "0wl5lpqqcckn003kqfz1wapi40wkn4xjk878zwykg3lplxfdlsqw";
- name = "kdbusaddons-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kdbusaddons-5.27.0.tar.xz";
+ sha256 = "1vgdl9z5xyfr2b5z7n2vdh0s6zab6ccxp30p1cy8hhhrsf04663m";
+ name = "kdbusaddons-5.27.0.tar.xz";
};
};
kdeclarative = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kdeclarative-5.26.0.tar.xz";
- sha256 = "0hmj0aj559i9flsw72zzwb2s95ajnzqh11rrs6wmcraywd4xywk8";
- name = "kdeclarative-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kdeclarative-5.27.0.tar.xz";
+ sha256 = "1a8pqwrwgmzarinhr9xxviqh9417p8icj8lwqg9ly0q0j3yv20dh";
+ name = "kdeclarative-5.27.0.tar.xz";
};
};
kded = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kded-5.26.0.tar.xz";
- sha256 = "0rk8jh0bg6wqfpjcg0g1i2frmhprc8pmnj6bwdifx119kh894n0l";
- name = "kded-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kded-5.27.0.tar.xz";
+ sha256 = "14f4qxia9p3vynv2ch9rs67zaxn9kpbas0fn0vwag1ikxb8qz0c2";
+ name = "kded-5.27.0.tar.xz";
};
};
kdelibs4support = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/portingAids/kdelibs4support-5.26.0.tar.xz";
- sha256 = "0jc05qzpcn72rvfyink7x56hvc7g21dcmgkfdx9w84brvqjnscz8";
- name = "kdelibs4support-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/portingAids/kdelibs4support-5.27.0.tar.xz";
+ sha256 = "17b8d5b9w27251k4r5xc17115nc3k1agv7j7gkmdiybjyilj1n91";
+ name = "kdelibs4support-5.27.0.tar.xz";
};
};
kdesignerplugin = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kdesignerplugin-5.26.0.tar.xz";
- sha256 = "10c8d83zl8qlg785rxn4d5ps18p0zplf5l00jnq8ikpa4ijnyn2j";
- name = "kdesignerplugin-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kdesignerplugin-5.27.0.tar.xz";
+ sha256 = "157lny5v8js63nvw2iyc9j4cinqmyj75a389s46n8wqyygrz5v0v";
+ name = "kdesignerplugin-5.27.0.tar.xz";
};
};
kdesu = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kdesu-5.26.0.tar.xz";
- sha256 = "0kxqrzbhjahp0cx3n828q2gh1bdxsp7gmhahbhfzasknkvp1nqqs";
- name = "kdesu-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kdesu-5.27.0.tar.xz";
+ sha256 = "1l501z102ygibz4000jnngm0cggh2kaf6hzra1ngv5nxqxzkh31a";
+ name = "kdesu-5.27.0.tar.xz";
};
};
kdewebkit = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kdewebkit-5.26.0.tar.xz";
- sha256 = "1z66jm8zpmksbdk7yzvcps712wd8d85r0dxw8zj3vw0z5yd68cmm";
- name = "kdewebkit-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kdewebkit-5.27.0.tar.xz";
+ sha256 = "0ff6xnfc5airadk32s2d3jmmmzilgnwc9r6bvmvnai0f7c4db48f";
+ name = "kdewebkit-5.27.0.tar.xz";
};
};
kdnssd = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kdnssd-5.26.0.tar.xz";
- sha256 = "0jamzv7wxp50awjzk1vwhmj8pldnm6hjxx5zvsjfif26va30w0q3";
- name = "kdnssd-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kdnssd-5.27.0.tar.xz";
+ sha256 = "0dq2i4f4ny5cwgd41mjw5i7cf23ns55s2m13cjvxvy90nwhlymqp";
+ name = "kdnssd-5.27.0.tar.xz";
};
};
kdoctools = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kdoctools-5.26.0.tar.xz";
- sha256 = "1306ag1waw0cxkvwbb0n9gb9yc9nw6zzjssjrn19z366yp1z9ja8";
- name = "kdoctools-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kdoctools-5.27.0.tar.xz";
+ sha256 = "1hgg19da0918mx8z2614qljvj9j8bny78mwlyljf42814f3ycpam";
+ name = "kdoctools-5.27.0.tar.xz";
};
};
kemoticons = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kemoticons-5.26.0.tar.xz";
- sha256 = "09qpw3vr4l80hp4j6v73nsncmsrsxww2hab9c24i3167ygsvca5s";
- name = "kemoticons-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kemoticons-5.27.0.tar.xz";
+ sha256 = "0rjw2g3lfdxiy56x61d0sdcmcs8rml6h29a05fp6xww2bqcvr9wq";
+ name = "kemoticons-5.27.0.tar.xz";
};
};
kfilemetadata = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kfilemetadata-5.26.0.tar.xz";
- sha256 = "1y80llazn66f7vndyzspz7w0n1g2xhi8g13qwakws278wsi04p1l";
- name = "kfilemetadata-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kfilemetadata-5.27.0.tar.xz";
+ sha256 = "1la6h05izgnps10py2gcn4xnwz3fm7dyswib57flc8phzipxbg5q";
+ name = "kfilemetadata-5.27.0.tar.xz";
};
};
kglobalaccel = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kglobalaccel-5.26.0.tar.xz";
- sha256 = "0a1q9pif4n8fmp9kw8sbiaia2znc657fm1mi9gyvp5amphjjkzdd";
- name = "kglobalaccel-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kglobalaccel-5.27.0.tar.xz";
+ sha256 = "1z2knfxcla1f191cifij1fzw88b076yx6qjxraqfsmkc6g6i2bmj";
+ name = "kglobalaccel-5.27.0.tar.xz";
};
};
kguiaddons = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kguiaddons-5.26.0.tar.xz";
- sha256 = "0gaaxkzjpdqk8534dpbn6dxb83nckh1g7w62nssv4a2jwfkyrmgp";
- name = "kguiaddons-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kguiaddons-5.27.0.tar.xz";
+ sha256 = "1skvlcj0fgb4am02vlm4fyd52f9yn4y0aj5arcfz3qps5cjzr6xg";
+ name = "kguiaddons-5.27.0.tar.xz";
};
};
khtml = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/portingAids/khtml-5.26.0.tar.xz";
- sha256 = "1h1dacbwix1j9r0hgnpxhgjfbffh545852n2yn8kl25bf2ppx3m8";
- name = "khtml-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/portingAids/khtml-5.27.0.tar.xz";
+ sha256 = "05ssmgk2gr5v1x1lsvyyspvnlknmkxivgx1g210i9ayl08v8v3c0";
+ name = "khtml-5.27.0.tar.xz";
};
};
ki18n = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/ki18n-5.26.0.tar.xz";
- sha256 = "1f5xr2zskmi9x0xp6drg4mx41hs3ssyskpkd5x01b6s51av0i247";
- name = "ki18n-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/ki18n-5.27.0.tar.xz";
+ sha256 = "0a66z325bvdv7g6ysml2bf8559nkjhv2fxwj1ja6vsxkn95d54ff";
+ name = "ki18n-5.27.0.tar.xz";
};
};
kiconthemes = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kiconthemes-5.26.0.tar.xz";
- sha256 = "0zccfdwy12zssbca4szwypykzvz3yiqwi69sz1ndpiwsvvp575b7";
- name = "kiconthemes-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kiconthemes-5.27.0.tar.xz";
+ sha256 = "0m70vcrxp0vvqw5grlsn19d2hgdhky8iv2pr0xwzw8v5yrnl1hh2";
+ name = "kiconthemes-5.27.0.tar.xz";
};
};
kidletime = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kidletime-5.26.0.tar.xz";
- sha256 = "13wpfkr3jsj3p16c67jfiy60pi0j1b85wrkc9bqx91wl8a22xy02";
- name = "kidletime-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kidletime-5.27.0.tar.xz";
+ sha256 = "1cv6d2vylz7vymn4v0brv2jp1kzscvm9wh1ylp3wyi1jqyblgjfw";
+ name = "kidletime-5.27.0.tar.xz";
};
};
kimageformats = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kimageformats-5.26.0.tar.xz";
- sha256 = "13ibvrfjxm799sis1cilyaqc6cnb9wr464z605skn7qd2gqz7xfx";
- name = "kimageformats-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kimageformats-5.27.0.tar.xz";
+ sha256 = "0ijy7di9p37l6fjrmsday402vq4zibq1m37jghkvdymawxcrd22h";
+ name = "kimageformats-5.27.0.tar.xz";
};
};
kinit = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kinit-5.26.0.tar.xz";
- sha256 = "031wjnniqmvix70da4x019r21zcv99xa4njzk0nccfihpn6i2nx9";
- name = "kinit-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kinit-5.27.0.tar.xz";
+ sha256 = "0sbpl1sp1ajarjmnvx2l3dr09afsay28kp2sf4yacrm4lrmhwzip";
+ name = "kinit-5.27.0.tar.xz";
};
};
kio = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kio-5.26.0.tar.xz";
- sha256 = "1kvn570gcpzvm4fc8jygvf3w5jbgsjm4sr2bysbvw4zk983ldma0";
- name = "kio-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kio-5.27.0.tar.xz";
+ sha256 = "129sglaw1480v3i1xdyv6k1w3spbj8s00rkdr5mzlcdaqiig69rn";
+ name = "kio-5.27.0.tar.xz";
};
};
kitemmodels = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kitemmodels-5.26.0.tar.xz";
- sha256 = "1qizknavlgnhc5dqrq5ins6k4s43s815v7inzwhs4qrgv175qcjv";
- name = "kitemmodels-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kitemmodels-5.27.0.tar.xz";
+ sha256 = "00qgp5i35r7k9gy43wypn9fa7zxiqqip89dzbw8r6rabinihqzy2";
+ name = "kitemmodels-5.27.0.tar.xz";
};
};
kitemviews = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kitemviews-5.26.0.tar.xz";
- sha256 = "1z4j1h0bykb3544iy48halb9mrjmkrd40x2c09qsm2r1kc7n3312";
- name = "kitemviews-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kitemviews-5.27.0.tar.xz";
+ sha256 = "1469i10y2c3i1pdhzl9nk177y4n1mlc7p5w7kivdcrvf9ilxvbkx";
+ name = "kitemviews-5.27.0.tar.xz";
};
};
kjobwidgets = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kjobwidgets-5.26.0.tar.xz";
- sha256 = "0l2h7ghnrs3w8md5yajnbfl6na5ldg17sh9ifvhcwg6n9s57mibb";
- name = "kjobwidgets-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kjobwidgets-5.27.0.tar.xz";
+ sha256 = "05c6jzl2a37bfz5i7hzsjmrhh8ajx1gbz7j05wgal811m5m4ww8l";
+ name = "kjobwidgets-5.27.0.tar.xz";
};
};
kjs = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/portingAids/kjs-5.26.0.tar.xz";
- sha256 = "1f8mhhzq5k3ifpa1b0yspy886j9b82isz0vw16zl611fr564jln2";
- name = "kjs-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/portingAids/kjs-5.27.0.tar.xz";
+ sha256 = "18x4az3v4pbg77sxhmrdrfwrc9d9fw7l40m6p18k1khxn86hsp9j";
+ name = "kjs-5.27.0.tar.xz";
};
};
kjsembed = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/portingAids/kjsembed-5.26.0.tar.xz";
- sha256 = "030wrrxsdfkyalydi39s85hm0rgfx7647c4a4c1cck2v67k8iq3d";
- name = "kjsembed-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/portingAids/kjsembed-5.27.0.tar.xz";
+ sha256 = "1j42v2l41mwn0ms29b94py21dh7kiipkgdnigpbn89v7nkhwlq2b";
+ name = "kjsembed-5.27.0.tar.xz";
};
};
kmediaplayer = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/portingAids/kmediaplayer-5.26.0.tar.xz";
- sha256 = "0zq9xx6g0lfdyxrkrjqyrq6hnygpd7n0grrm6a75hdmyh3lklrvv";
- name = "kmediaplayer-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/portingAids/kmediaplayer-5.27.0.tar.xz";
+ sha256 = "003jvd2lzp70ywhnkpzgalzqkjpy3d9flkl144z2hfdwm011d58x";
+ name = "kmediaplayer-5.27.0.tar.xz";
};
};
knewstuff = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/knewstuff-5.26.0.tar.xz";
- sha256 = "0jd80wmdz241ddk4wdqwrb655r5lzxbxbp0mjyljgi1mwlrhkry4";
- name = "knewstuff-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/knewstuff-5.27.0.tar.xz";
+ sha256 = "05ikb7cvyx3cmrrjh2ss6439a49vmzbi3chjj23ffdz2nd2k7r2f";
+ name = "knewstuff-5.27.0.tar.xz";
};
};
knotifications = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/knotifications-5.26.0.tar.xz";
- sha256 = "01fvbi4dlqhia5iqj0iddbvkzjafw698pmh2ii9ynb071sqyb2pq";
- name = "knotifications-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/knotifications-5.27.0.tar.xz";
+ sha256 = "09v122nxfgqjzr2azfn2nh4q9l22i5wnsz9prs0i7s3m7y0d7pxn";
+ name = "knotifications-5.27.0.tar.xz";
};
};
knotifyconfig = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/knotifyconfig-5.26.0.tar.xz";
- sha256 = "14ri2zkzc1b3wqvfb3v6rv0ri5srm7zjk06v9j5bwz778vdh436z";
- name = "knotifyconfig-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/knotifyconfig-5.27.0.tar.xz";
+ sha256 = "088p19ynjs79zf7mq3gkds93dg72jj8pfya53xyhzdg8s6vyns9n";
+ name = "knotifyconfig-5.27.0.tar.xz";
};
};
kpackage = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kpackage-5.26.0.tar.xz";
- sha256 = "1laq92gi67gn6gjz9nw51idq0wwyfwy6syfch0mssw3nbv7araqg";
- name = "kpackage-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kpackage-5.27.0.tar.xz";
+ sha256 = "0y07zh8ryibm69ljp9f169qfal6r4lngz1ljxgrr6qw15cjkjygk";
+ name = "kpackage-5.27.0.tar.xz";
};
};
kparts = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kparts-5.26.0.tar.xz";
- sha256 = "1ni17k02152axvkx666lx77zwpbsfahknrhgy8y8sy2dbn47jvya";
- name = "kparts-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kparts-5.27.0.tar.xz";
+ sha256 = "0rfsyr96s59ljp3jgmcwlvwzbgmlx7fvr62xswwmsnb8ah14k5rh";
+ name = "kparts-5.27.0.tar.xz";
};
};
kpeople = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kpeople-5.26.0.tar.xz";
- sha256 = "1zx9mvy1j2ynbj7gg4hnvxrjr5akmrh0l82xh73l4b12l0b775ap";
- name = "kpeople-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kpeople-5.27.0.tar.xz";
+ sha256 = "1w6sbd6djcpv36m9my4drqkrs1l3cryshpz1dx9z8p7afr296n8j";
+ name = "kpeople-5.27.0.tar.xz";
};
};
kplotting = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kplotting-5.26.0.tar.xz";
- sha256 = "1f695bb5n46mn362wwvwf636xjy87s63w5ac97lm1c9ndiins394";
- name = "kplotting-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kplotting-5.27.0.tar.xz";
+ sha256 = "1qp9q8g9yxy359bylyqyqxjq9wjismajrg4xhxx5xn4s6znyrxny";
+ name = "kplotting-5.27.0.tar.xz";
};
};
kpty = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kpty-5.26.0.tar.xz";
- sha256 = "1f1z4z73l4xb5vymg5hsqxcgv7jm81jnjgwn0v85alfcx94dax3m";
- name = "kpty-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kpty-5.27.0.tar.xz";
+ sha256 = "06pka8cbw6a9rk2j5pkz34rfy10bv6il3wqyf7ala32ynv5rcgc3";
+ name = "kpty-5.27.0.tar.xz";
};
};
kross = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/portingAids/kross-5.26.0.tar.xz";
- sha256 = "05ilcgq74l5m3jjr047zwz7ij60yw5xxp5cpd12892mi054ijb31";
- name = "kross-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/portingAids/kross-5.27.0.tar.xz";
+ sha256 = "13karf890afk3dplxgsjx48vjz1ka12pgsi8qw369xbff5nqy2vj";
+ name = "kross-5.27.0.tar.xz";
};
};
krunner = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/krunner-5.26.0.tar.xz";
- sha256 = "050qq146g9wj51615m22l9jjxmgh3gsah3v7iflbdda5nrnzhz3v";
- name = "krunner-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/krunner-5.27.0.tar.xz";
+ sha256 = "1yyxyippmn0d9ycj1hdjvhl1zd31yxwg89a9zwmj8v8gdfr9flj9";
+ name = "krunner-5.27.0.tar.xz";
};
};
kservice = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kservice-5.26.0.tar.xz";
- sha256 = "103hjnwh4zwpf8vz3si27jb34j6dm0ff445nc9xafnl1nkwisvgr";
- name = "kservice-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kservice-5.27.0.tar.xz";
+ sha256 = "129bjdr272qkz2inmagy8jnxasifrl4d82x8rp9akfar29qsj6x6";
+ name = "kservice-5.27.0.tar.xz";
};
};
ktexteditor = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/ktexteditor-5.26.0.tar.xz";
- sha256 = "0q84vbdkhg1sjhyrcv9y8cdv5qx09f1pz5wiw7dzdw06q9xgi3v4";
- name = "ktexteditor-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/ktexteditor-5.27.0.tar.xz";
+ sha256 = "127wp4dg72skd6abn2vqffxg91bn59z8yxwy6lxyzvck2pc5v1ss";
+ name = "ktexteditor-5.27.0.tar.xz";
};
};
ktextwidgets = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/ktextwidgets-5.26.0.tar.xz";
- sha256 = "0qafnlzkdqbp1par1s6mish46arbqwbl4xclvql168dlwxgd6b42";
- name = "ktextwidgets-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/ktextwidgets-5.27.0.tar.xz";
+ sha256 = "0aq2qx64wylxj5q5sr0dxv9h8bmn725llxyi7iwz31dg2ngfr7m4";
+ name = "ktextwidgets-5.27.0.tar.xz";
};
};
kunitconversion = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kunitconversion-5.26.0.tar.xz";
- sha256 = "08nd2i76l4mvgav69qcsq0rwc0r9rkmqy0d4d3b4bc9957yfhk4i";
- name = "kunitconversion-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kunitconversion-5.27.0.tar.xz";
+ sha256 = "11rn6813jz7clb6fjp9nbdg1c350zh0yiprbr053wkdjrb3aca7c";
+ name = "kunitconversion-5.27.0.tar.xz";
};
};
kwallet = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kwallet-5.26.0.tar.xz";
- sha256 = "0a3l079zry8bmwkd2lx0cvmkj8p3pvrvpffikca6z4qdw4mnnxjs";
- name = "kwallet-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kwallet-5.27.0.tar.xz";
+ sha256 = "1mlrkzvbqk6r43yqrvv6jsc66brzjd321fp7mg7g3ny47va7hbc2";
+ name = "kwallet-5.27.0.tar.xz";
};
};
kwayland = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kwayland-5.26.0.tar.xz";
- sha256 = "1ca2f0k1qsra3c014c3lrn2qxsdq1whk5lqrxqc9dqbpvpyjy939";
- name = "kwayland-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kwayland-5.27.0.tar.xz";
+ sha256 = "0va1kmki2xr4mx2918h333mfkqs5v1mhbzyf71hq190izdz0jdss";
+ name = "kwayland-5.27.0.tar.xz";
};
};
kwidgetsaddons = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kwidgetsaddons-5.26.0.tar.xz";
- sha256 = "1jam478939cibyhnwg6n3fwyqg8lx1njjbqmlqq4cmp9j62100cn";
- name = "kwidgetsaddons-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kwidgetsaddons-5.27.0.tar.xz";
+ sha256 = "0p9gxna7y7nigpi0ri7k45g4pf1svq0kxrhk4wf7rj58rilhcfrl";
+ name = "kwidgetsaddons-5.27.0.tar.xz";
};
};
kwindowsystem = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kwindowsystem-5.26.0.tar.xz";
- sha256 = "1jmacixr2il5wpw7wzaqswslvmxam3qf7mih271qzbx6k6ngdyk3";
- name = "kwindowsystem-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kwindowsystem-5.27.0.tar.xz";
+ sha256 = "0w49lpwicl71gyyf2aisvmfjpvjl3w1rqpx4a42ph0aywjihjmhx";
+ name = "kwindowsystem-5.27.0.tar.xz";
};
};
kxmlgui = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kxmlgui-5.26.0.tar.xz";
- sha256 = "18w41iyfg2iphav2g7qikg4ccv2cr0wl5a6r9h460f45vq9aph4z";
- name = "kxmlgui-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kxmlgui-5.27.0.tar.xz";
+ sha256 = "0hf55ip2irbsbg59r36njgb0h5ygpaspa4x6jfyi4bxj852c3hw1";
+ name = "kxmlgui-5.27.0.tar.xz";
};
};
kxmlrpcclient = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/kxmlrpcclient-5.26.0.tar.xz";
- sha256 = "001rvsmxi1mnbrs1kplsb8vx1wfpjp9g4kwm7714w3yh6vmr9j7p";
- name = "kxmlrpcclient-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/kxmlrpcclient-5.27.0.tar.xz";
+ sha256 = "17bavm8qj4r1kc67x5g20v1pl8arjqpn69hg7icp2b1b0vnfvav1";
+ name = "kxmlrpcclient-5.27.0.tar.xz";
};
};
modemmanager-qt = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/modemmanager-qt-5.26.0.tar.xz";
- sha256 = "1x4h334fcyqnclc9sxff73b79fsgg7a0r98c9palr787qvaafjv2";
- name = "modemmanager-qt-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/modemmanager-qt-5.27.0.tar.xz";
+ sha256 = "1zw5frscvbsp0jpb071ssqgvm097ylw3zy69y7f0dybhps6lv2jv";
+ name = "modemmanager-qt-5.27.0.tar.xz";
};
};
networkmanager-qt = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/networkmanager-qt-5.26.0.tar.xz";
- sha256 = "0yqhchkava6jsyl0gpa62x4856qszdiglwjxsba9dgl5lasfyrg0";
- name = "networkmanager-qt-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/networkmanager-qt-5.27.0.tar.xz";
+ sha256 = "0fnj0b2j4v51f12b3v59psdza2krdkidj22b9a9jwn224lg4852y";
+ name = "networkmanager-qt-5.27.0.tar.xz";
};
};
oxygen-icons5 = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/oxygen-icons5-5.26.0.tar.xz";
- sha256 = "0lwwl26xiya7fr5ga5kf45zvj40lm10jpd7p523v2dm0xmqbkf8n";
- name = "oxygen-icons5-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/oxygen-icons5-5.27.0.tar.xz";
+ sha256 = "1lb09ykj5ayj5lv7w2k2pqis7z61clr3gkinf6n7jghnlc96222g";
+ name = "oxygen-icons5-5.27.0.tar.xz";
};
};
plasma-framework = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/plasma-framework-5.26.0.tar.xz";
- sha256 = "0mjmzca0n51vwy9gxxanxfi2dvvzzdpwfjw0zdwmjm69znc870ja";
- name = "plasma-framework-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/plasma-framework-5.27.0.tar.xz";
+ sha256 = "11apg7h636dshswikjpz0qkapv8izqjjz47k7vs49x0byp802s5i";
+ name = "plasma-framework-5.27.0.tar.xz";
};
};
solid = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/solid-5.26.0.tar.xz";
- sha256 = "1dlln9dqyf7md32s6a7pd23dbs6jrvv59ylldxcxgkyjyyb2g0j3";
- name = "solid-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/solid-5.27.0.tar.xz";
+ sha256 = "01qlfj30n8sr8xd8l8fimg7hs7h70ynhalk2m9l8dz2qay2pdl27";
+ name = "solid-5.27.0.tar.xz";
};
};
sonnet = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/sonnet-5.26.0.tar.xz";
- sha256 = "0akvlrbbk0nbyh12rmcjch122xqa3926gz3l31bvhqgm50b683z2";
- name = "sonnet-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/sonnet-5.27.0.tar.xz";
+ sha256 = "07i3gng309vsf5kp5dlwca0lpi3iqc0lp0ixdvx75q832gk8ivrv";
+ name = "sonnet-5.27.0.tar.xz";
};
};
threadweaver = {
- version = "5.26.0";
+ version = "5.27.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.26/threadweaver-5.26.0.tar.xz";
- sha256 = "1bzlw3m1f207967pjmzlx1k0v38fwjvga9jg88iqh43zb60ks03a";
- name = "threadweaver-5.26.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.27/threadweaver-5.27.0.tar.xz";
+ sha256 = "0mg5i125b008x6162a5h2q14fg81m17md00017n09xljw3099kqy";
+ name = "threadweaver-5.27.0.tar.xz";
};
};
}
diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index 3740cf18b1e..f791f3a8d6e 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python, perl, yacc, flex
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python2, perl, yacc, flex
, texinfo, perlPackages
, openldap, libcap_ng, sqlite, openssl, db, libedit, pam
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
sha256 = "1r60i4v6y5lpll0l2qpn0ycp6q6f1xjg7k1csi547zls8k96yk9s";
};
- nativeBuildInputs = [ autoreconfHook pkgconfig python perl yacc flex ]
+ nativeBuildInputs = [ autoreconfHook pkgconfig python2 perl yacc flex ]
++ (with perlPackages; [ JSON ])
++ optional (!libOnly) texinfo;
buildInputs = optionals (!stdenv.isFreeBSD) [ libcap_ng db ]
diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix
index 63ab7144c47..838affca77a 100644
--- a/pkgs/development/libraries/keybinder/default.nix
+++ b/pkgs/development/libraries/keybinder/default.nix
@@ -1,9 +1,9 @@
{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, gnome3
-, gtk_doc, gtk2, pythonPackages, lua, libX11, libXext, libXrender, gobjectIntrospection
+, gtk_doc, gtk2, python2Packages, lua, libX11, libXext, libXrender, gobjectIntrospection
}:
let
- inherit (pythonPackages) python pygobject3 pygtk;
+ inherit (python2Packages) python pygobject3 pygtk;
in stdenv.mkDerivation rec {
name = "keybinder-${version}";
version = "0.3.0";
diff --git a/pkgs/development/libraries/kirigami/default.nix b/pkgs/development/libraries/kirigami/default.nix
new file mode 100644
index 00000000000..0fd80d7fa53
--- /dev/null
+++ b/pkgs/development/libraries/kirigami/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, cmake, ecm, pkgconfig, plasma-framework, qtbase, qtquickcontrols }:
+
+stdenv.mkDerivation rec {
+ pname = "kirigami";
+ version = "1.1.0";
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "mirror://kde/stable/${pname}/${name}.tar.xz";
+ sha256 = "1p9ydggwbyfdgwmvyc8004sk9mfshlg9b83lzvz9qk3a906ayxv6";
+ };
+
+ buildInputs = [ qtbase qtquickcontrols plasma-framework ];
+
+ nativeBuildInputs = [ cmake pkgconfig ecm ];
+
+ meta = with stdenv.lib; {
+ license = licenses.lgpl2;
+ homepage = http://www.kde.org;
+ maintainers = with maintainers; [ ttuegel peterhoeg ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix
index 9989990e35d..a064769ec84 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-20161001";
+ name = "libdwarf-20161021";
src = fetchurl {
url = "http://www.prevanders.net/${name}.tar.gz";
- sha512 = "2c522ae0b6e2afffd09e2e79562987fd819b197c9bce4900b6a4fd176b5ff229e88c6b755cfbae7831e7160ddeb3bfe2afbf39d756d7e75ec31ace0668554048";
+ sha512 = "733523fd5c58f878d65949c1812b2f46b40c4cc3177bc780c703ec71f83675d4b84e81bc1bcca42adf69b5e122562e4ce8e9a8743af29cc6fafe78ed9f8213fd";
};
configureFlags = " --enable-shared --disable-nonshared";
diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix
index eb2b46629ad..2158f26f285 100644
--- a/pkgs/development/libraries/libfilezilla/default.nix
+++ b/pkgs/development/libraries/libfilezilla/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libfilezilla-${version}";
- version = "0.6.1";
+ version = "0.7.1";
src = fetchurl {
url = "mirror://sourceforge/project/filezilla/libfilezilla/${version}/${name}.tar.bz2";
- sha256 = "73c3ada6f9c5649abd93e6a3e7ecc6682d4f43248660b5506918eab76a7b901b";
+ sha256 = "1lyxlras357p17vbwfhwny69izjx74xncaxpyk1n4d2jbsvjspfr";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libgap/default.nix b/pkgs/development/libraries/libgap/default.nix
new file mode 100644
index 00000000000..9e0510debd0
--- /dev/null
+++ b/pkgs/development/libraries/libgap/default.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl, gmp}:
+stdenv.mkDerivation rec {
+ name = "libgap-${version}";
+ version = "4.8.3";
+ # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
+ src = fetchurl {
+ url = "http://mirrors.mit.edu/sage/spkg/upstream/libgap/libgap-${version}.tar.gz";
+ sha256 = "0ng4wlw7bj63spf4vkdp43v3ja1fp782lxzdsyf51x26z21idrsq";
+ };
+ buildInputs = [gmp];
+ meta = {
+ inherit version;
+ description = ''A library-packaged fork of the GAP kernel'';
+ license = stdenv.lib.licenses.gpl3Plus;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix
index ac5b4dec07b..ee4f9401bbb 100644
--- a/pkgs/development/libraries/libgtop/default.nix
+++ b/pkgs/development/libraries/libgtop/default.nix
@@ -1,10 +1,12 @@
{ stdenv, fetchurl, glib, pkgconfig, perl, intltool, gobjectIntrospection }:
-stdenv.mkDerivation {
- name = "libgtop-2.32.0";
+stdenv.mkDerivation rec {
+ name = "libgtop-${version}";
+ major = "2.34";
+ version = "${major}.1";
src = fetchurl {
- url = mirror://gnome/sources/libgtop/2.32/libgtop-2.32.0.tar.xz;
- sha256 = "13hpml2vfm23816qggr5fvxj75ndb1dq4rgmi7ik6azj69ij8hw4";
+ url = "mirror://gnome/sources/libgtop/${major}/${name}.tar.xz";
+ sha256 = "c89978a76662b18d392edbe0d1b794f5a9a399a5ccf22a02d5b9e28b5ed609e2";
};
propagatedBuildInputs = [ glib ];
diff --git a/pkgs/development/libraries/libgumbo/default.nix b/pkgs/development/libraries/libgumbo/default.nix
new file mode 100644
index 00000000000..210a66e654a
--- /dev/null
+++ b/pkgs/development/libraries/libgumbo/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool }:
+
+stdenv.mkDerivation rec {
+ name = "libgumbo-${version}";
+ version = "0.10.1";
+
+ src = fetchFromGitHub {
+ owner = "google";
+ repo = "gumbo-parser";
+ rev = "v${version}";
+ sha256 = "0xslckwdh2i0g2qjsb6rnm8mjmbagvziz0hjlf7d1lbljfms1iw1";
+ };
+
+ buildInputs = [ autoconf automake libtool ];
+
+ preConfigure = "./autogen.sh";
+
+ meta = with stdenv.lib; {
+ description = "C99 HTML parsing algorithm";
+ homepage = https://github.com/google/gumbo-parser;
+ maintainers = [ maintainers.nico202 ];
+ platforms = platforms.linux;
+ license = licenses.asl20;
+ };
+}
diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix
index 27891fc4e4a..cf38f117bb8 100644
--- a/pkgs/development/libraries/libhttpseverywhere/default.nix
+++ b/pkgs/development/libraries/libhttpseverywhere/default.nix
@@ -1,21 +1,20 @@
-{stdenv, fetchFromGitHub, gnome3, glib, json_glib, libxml2, libarchive, libsoup, gobjectIntrospection, meson, ninja, pkgconfig, valadoc}:
+{stdenv, fetchurl, gnome3, glib, json_glib, libxml2, libarchive, libsoup, gobjectIntrospection, meson, ninja, pkgconfig, valadoc}:
stdenv.mkDerivation rec {
- name = "libhttpseverywhere-${version}";
- version = "0.1.0";
+ major = "0.2";
+ minor = "3";
+ version = "${major}.${minor}";
- src = fetchFromGitHub {
- owner = "grindhold";
- repo = "libhttpseverywhere";
- rev = "${version}";
- sha256 = "1b8bcg4jp2h3nwk1g7jgswsipqzkjq2gb017v07wb7nvl6kdi0rc";
+ name = "libhttpseverywhere-${version}";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/libhttpseverywhere/${major}/libhttpseverywhere-${version}.tar.xz";
+ sha256 = "0ndk6yyfcd7iwwkv4rkivhd08k0x8v03gnp9dk1ms4bxb1l2i8l1";
};
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
@@ -29,9 +28,13 @@ stdenv.mkDerivation rec {
installPhase = "ninja install";
+ doCheck = true;
+
+ checkPhase = "./httpseverywhere_test";
+
meta = {
description = "library to use HTTPSEverywhere in desktop applications";
- homepage = https://github.com/grindhold/libhttpseverywhere;
+ homepage = https://git.gnome.org/browse/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
deleted file mode 100644
index 3a86bf6b836..00000000000
--- a/pkgs/development/libraries/libhttpseverywhere/meson.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/libmusicbrainz/5.x.nix b/pkgs/development/libraries/libmusicbrainz/5.x.nix
index 7cdb8fb4691..5ec8f80f7e0 100644
--- a/pkgs/development/libraries/libmusicbrainz/5.x.nix
+++ b/pkgs/development/libraries/libmusicbrainz/5.x.nix
@@ -1,13 +1,16 @@
-{ stdenv, fetchurl, cmake, neon, libdiscid }:
+{ stdenv, fetchFromGitHub, cmake, neon, libdiscid, libxml2, pkgconfig }:
stdenv.mkDerivation rec {
- name = "libmusicbrainz-5.0.1";
+ version = "5.1.0";
+ name = "libmusicbrainz-${version}";
- buildInputs = [ cmake neon libdiscid ];
+ buildInputs = [ cmake neon libdiscid libxml2 pkgconfig ];
- src = fetchurl {
- url = "https://github.com/downloads/metabrainz/libmusicbrainz/${name}.tar.gz";
- md5 = "a0406b94c341c2b52ec0fe98f57cadf3";
+ src = fetchFromGitHub {
+ owner = "metabrainz";
+ repo = "libmusicbrainz";
+ sha256 = "0ah9kaf3g3iv1cps2vs1hs33nfbjfx1xscpjgxr1cg28p4ri6jhq";
+ rev = "release-${version}";
};
dontUseCmakeBuildDir=true;
diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix
index 5b02cfec7e3..e8a80497de3 100644
--- a/pkgs/development/libraries/libpqxx/default.nix
+++ b/pkgs/development/libraries/libpqxx/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, postgresql, python }:
+{ lib, stdenv, fetchurl, postgresql, python2 }:
stdenv.mkDerivation rec {
name = "libpqxx-4.0.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0f6wxspp6rx12fkasanb0z2g2gc8dhcfwnxagx8wwqbpg6ifsz09";
};
- buildInputs = [ postgresql python ];
+ buildInputs = [ postgresql python2 ];
preConfigure = ''
patchShebangs .
diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/development/libraries/libpst/default.nix
index a67395182e1..0a7eb618b18 100644
--- a/pkgs/development/libraries/libpst/default.nix
+++ b/pkgs/development/libraries/libpst/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, fetchurl, autoreconfHook, boost, python, libgsf,
+{ stdenv, fetchurl, autoreconfHook, boost, python2, libgsf,
pkgconfig, bzip2, xmlto, gettext, imagemagick, doxygen }:
stdenv.mkDerivation rec {
- name = "libpst-0-6-63";
+ name = "libpst-0.6.68";
src = fetchurl {
- url = http://www.five-ten-sg.com/libpst/packages/libpst-0.6.63.tar.gz;
- sha256 = "0qih919zk40japs4mpiaw5vyr2bvwz60sjf23gixd5vvzc32cljz";
+ url = "http://www.five-ten-sg.com/libpst/packages/${name}.tar.gz";
+ sha256 = "06mcaga36i65n1ifr5pw6ghcb1cjfqwrmm1xmaw1sckqf2iqx2by";
};
- buildInputs = [ autoreconfHook boost python libgsf pkgconfig bzip2
- xmlto gettext imagemagick doxygen ];
+ buildInputs = [ autoreconfHook boost python2 libgsf pkgconfig bzip2
+ xmlto gettext imagemagick doxygen
+ ];
doCheck = true;
diff --git a/pkgs/development/libraries/librep/default.nix b/pkgs/development/libraries/librep/default.nix
index 314508cc5c2..cb61982da09 100644
--- a/pkgs/development/libraries/librep/default.nix
+++ b/pkgs/development/libraries/librep/default.nix
@@ -7,11 +7,12 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "librep-${version}";
- version = "0.92.5";
+ version = "0.92.6";
+ sourceName = "librep_${version}";
src = fetchurl {
- url = "https://github.com/SawfishWM/librep/archive/${name}.tar.gz";
- sha256 = "1ly425cgs0yi3lb5l84v3bacljw7m2nmzgky3acy1anp709iwi76";
+ url = "http://download.tuxfamily.org/librep/${sourceName}.tar.xz";
+ sha256 = "1k6c0hmyzxh8459r790slh9vv9vwy9d7w3nlmrqypbx9mk855hgy";
};
buildInputs = [ pkgconfig autoreconfHook readline texinfo ];
@@ -30,9 +31,10 @@ stdenv.mkDerivation rec {
interpreter, a byte-code compiler, and a virtual
machine. It can serve as an application extension language
but is also suitable for standalone scripts.
- '';
+ '';
homepage = http://sawfish.wikia.com;
license = licenses.gpl2;
maintainers = [ maintainers.AndersonTorres ];
};
}
+# TODO: investigate fetchFromGithub
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 1489ab62774..030d800f4a5 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, glib, libxml2, pkgconfig
-, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking, gobjectIntrospection
+, gnomeSupport ? true, libgnome_keyring3, sqlite, glib_networking, gobjectIntrospection
, valaSupport ? true, vala_0_32
, libintlOrEmpty
, intltool, python }:
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
++ stdenv.lib.optionals valaSupport [ vala_0_32 ];
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ]
- ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring ];
+ ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring3 ];
passthru.propagatedUserEnvPackages = [ glib_networking.out ];
# glib_networking is a runtime dependency, not a compile-time dependency
diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix
index faa0b988be2..d5e72cae5fc 100644
--- a/pkgs/development/libraries/libspatialite/default.nix
+++ b/pkgs/development/libraries/libspatialite/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, sqlite, zlib, proj, geos, libiconv }:
+{ stdenv, lib, fetchurl, pkgconfig, libxml2, sqlite, zlib, proj, geos, libiconv }:
+
+with lib;
stdenv.mkDerivation rec {
name = "libspatialite-4.2.0";
@@ -14,7 +16,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- meta = with stdenv.lib; {
+ postInstall = "" + optionalString stdenv.isDarwin ''
+ ln -s $out/lib/mod_spatialite.{so,dylib}
+ '';
+
+ meta = {
description = "Extensible spatial index library in C++";
homepage = https://www.gaia-gis.it/fossil/libspatialite;
# They allow any of these
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index bb6907c7b04..b632b910f01 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, xz }:
+{ stdenv, fetchurl, fetchpatch, pkgconfig, zlib, libjpeg, xz }:
let
version = "4.0.6";
@@ -19,6 +19,38 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ patches = [
+ (fetchpatch {
+ url = "https://sources.debian.net/data/main/t/tiff/4.0.6-2/debian/patches/01-CVE-2015-8665_and_CVE-2015-8683.patch";
+ sha256 = "1c4zmvxj124873al8fvkiv8zq7wx5mv2vd4f1y9w8liv92cm7hkc";
+ })
+ (fetchpatch {
+ url = "https://sources.debian.net/data/main/t/tiff/4.0.6-2/debian/patches/02-fix_potential_out-of-bound_writes_in_decode_functions.patch";
+ sha256 = "0rsc7zh7cdhgcmx2vbjfaqrb0g93a3924ngqkrzb14w5j2fqfbxv";
+ })
+ (fetchpatch {
+ url = "https://sources.debian.net/data/main/t/tiff/4.0.6-2/debian/patches/03-fix_potential_out-of-bound_write_in_NeXTDecode.patch";
+ sha256 = "1s01xhp4sl04yhqhqwp50gh43ykcqk230mmbv62vhy2jh7v0ky3a";
+ })
+ (fetchpatch {
+ url = "https://sources.debian.net/data/main/t/tiff/4.0.6-2/debian/patches/04-CVE-2016-5314_CVE-2016-5316_CVE-2016-5320_CVE-2016-5875.patch";
+ sha256 = "0by35qxpzv9ib3mnh980gd30jf3qmsfp2kl730rq4pq66wpzg9m8";
+ })
+ (fetchpatch {
+ url = "https://sources.debian.net/data/main/t/tiff/4.0.6-2/debian/patches/05-CVE-2016-6223.patch";
+ sha256 = "0rh8ia0wsf5yskzwdjrlbiilc9m0lq0igs42k6922pl3sa1lxzv1";
+ })
+ (fetchpatch {
+ url = "https://sources.debian.net/data/main/t/tiff/4.0.6-2/debian/patches/06-CVE-2016-5321.patch";
+ sha256 = "0n0igfxbd3kqvvj2k2xgysrp63l4v2gd110fwkk4apfpm0hvzwh0";
+ })
+ (fetchpatch {
+ url = "https://sources.debian.net/data/main/t/tiff/4.0.6-2/debian/patches/07-CVE-2016-5323.patch";
+ sha256 = "1j6w8g6qizkx5h4aq95kxzx6bgkn4jhc8l22swwhvlkichsh4910";
+ })
+
+ ];
+
doCheck = true;
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index ab3654cb626..577006f9014 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -1,7 +1,9 @@
-{ stdenv, lib, fetchurl, zlib, xz, python, findXMLCatalogs, libiconv, fetchpatch
+{ stdenv, lib, fetchurl, zlib, xz, python2, findXMLCatalogs, libiconv, fetchpatch
, supportPython ? (! stdenv ? cross) }:
-stdenv.mkDerivation rec {
+let
+ python = python2;
+in stdenv.mkDerivation rec {
name = "libxml2-${version}";
version = "2.9.4";
diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix
index 8621a573190..80019d52f4f 100644
--- a/pkgs/development/libraries/lmdb/default.nix
+++ b/pkgs/development/libraries/lmdb/default.nix
@@ -3,11 +3,11 @@
let optional = stdenv.lib.optional;
in stdenv.mkDerivation rec {
name = "lmdb-${version}";
- version = "0.9.16";
+ version = "0.9.18";
src = fetchzip {
url = "https://github.com/LMDB/lmdb/archive/LMDB_${version}.tar.gz";
- sha256 = "1lkmngscijwiz09gdkqygdp87x55vp8gb4fh4vq7s34k4jv0327l";
+ sha256 = "01j384kxg36kym060pybr5p6mjw0xv33bqbb8arncdkdq57xk8wg";
};
postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb";
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 4e464907c6b..5ff884fd3c1 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, fetchpatch
, pkgconfig, intltool, autoreconfHook, substituteAll
-, file, expat, libdrm, xorg, wayland, systemd
+, file, expat, libdrm, xorg, wayland, systemd, openssl
, llvmPackages, libffi, libomxil-bellagio, libva
-, libelf, libvdpau, python
+, libelf, libvdpau, python2
, grsecEnabled ? false
, enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt
}:
@@ -71,11 +71,13 @@ stdenv.mkDerivation {
"--with-dri-driverdir=$(drivers)/lib/dri"
"--with-dri-searchpath=${driverLink}/lib/dri"
"--with-egl-platforms=x11,wayland,drm"
- (optionalString (stdenv.system != "armv7l-linux")
- "--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,freedreno,swrast")
- (optionalString (stdenv.system != "armv7l-linux")
- "--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast")
-
+ ]
+ ++ optionals (stdenv.system != "armv7l-linux") [
+ "--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,freedreno,swrast"
+ "--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast"
+ "--with-vulkan-drivers=intel"
+ ]
+ ++ [
(enableFeature enableTextureFloats "texture-float")
(enableFeature grsecEnabled "glx-rts")
(enableFeature stdenv.isLinux "dri3")
@@ -112,8 +114,8 @@ stdenv.mkDerivation {
glproto dri2proto dri3proto presentproto
libX11 libXext libxcb libXt libXfixes libxshmfence
libffi wayland libvdpau libelf libXvMC
- libomxil-bellagio libva libpthreadstubs
- (python.withPackages (ps: [ ps.Mako ]))
+ libomxil-bellagio libva libpthreadstubs openssl/*or another sha1 provider*/
+ (python2.withPackages (ps: [ ps.Mako ]))
] ++ optional stdenv.isLinux systemd;
@@ -134,8 +136,13 @@ stdenv.mkDerivation {
$out/lib/vdpau \
$out/lib/bellagio \
$out/lib/libxatracker* \
+ $out/lib/libvulkan_* \
+
+ # move share/vulkan/icd.d/
+ mv $out/share/ $drivers/
mv $out/lib/dri/* $drivers/lib/dri
+ rmdir "$out/lib/dri"
# move libOSMesa to $osmesa, as it's relatively big
mkdir -p {$osmesa,$drivers}/lib/
diff --git a/pkgs/development/libraries/mpfi/default.nix b/pkgs/development/libraries/mpfi/default.nix
new file mode 100644
index 00000000000..c88c8da6378
--- /dev/null
+++ b/pkgs/development/libraries/mpfi/default.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, mpfr}:
+stdenv.mkDerivation rec {
+ name = "mpfi-${version}";
+ version = "1.5.1";
+ src = fetchurl {
+ url = "https://gforge.inria.fr/frs/download.php/file/30129/mpfi-${version}.tar.bz2";
+ sha256 = "0vk9jfcfiqda0zksg1ffy36pdznpng9b4nl7pfzpz9hps4v6bk1z";
+ };
+ buildInputs = [mpfr];
+ meta = {
+ inherit version;
+ description = ''A multiple precision interval arithmetic library based on MPFR'';
+ license = stdenv.lib.licenses.lgpl21Plus;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git "a/pkgs/development/libraries/mpir/\\" "b/pkgs/development/libraries/mpir/\\"
new file mode 100644
index 00000000000..b7872ece6ae
--- /dev/null
+++ "b/pkgs/development/libraries/mpir/\\"
@@ -0,0 +1,20 @@
+{stdenv, fetchurl}:
+stdenv.mkDerivation rec {
+ name = "mpir-${version}";
+ version = "1";
+ inherit buildInputs;
+ src = fetchurl {
+ url = "http://mpir.org/mpir-${version}.tar.bz2";
+ sha256 = "0000000000000000000000000000000000000000000000000000000000000000";
+ };
+ meta = {
+ inherit version;
+ description = ''A highly optimised library for bignum arithmetic forked from GMP'';
+ license = stdenv.lib.licenses. ;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ downloadPage = "http://mpir.org/downloads.html";
+ homepage = "http://mpir.org/";
+ updateWalker = true;
+ };
+}
diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix
new file mode 100644
index 00000000000..c3a254c6bdc
--- /dev/null
+++ b/pkgs/development/libraries/mpir/default.nix
@@ -0,0 +1,20 @@
+{stdenv, fetchurl, m4}:
+stdenv.mkDerivation rec {
+ name = "mpir-${version}";
+ version = "2.7.2";
+ buildInputs = [m4];
+ src = fetchurl {
+ url = "http://mpir.org/mpir-${version}.tar.bz2";
+ sha256 = "1v25dx7cah2vxwzgq78hpzqkryrfxhwx3mcj3jjq3xxljlsw7m57";
+ };
+ meta = {
+ inherit version;
+ description = ''A highly optimised library for bignum arithmetic forked from GMP'';
+ license = stdenv.lib.licenses.lgpl3Plus;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ downloadPage = "http://mpir.org/downloads.html";
+ homepage = "http://mpir.org/";
+ updateWalker = true;
+ };
+}
diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index 30339cfdae9..71a15b7e477 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl
, CoreServices ? null }:
-let version = "4.12"; in
+let version = "4.13.1"; in
stdenv.mkDerivation {
name = "nspr-${version}";
src = fetchurl {
url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
- sha256 = "1pk98bmc5xzbl62q5wf2d6mryf0v95z6rsmxz27nclwiaqg0mcg0";
+ sha256 = "5e4c1751339a76e7c772c0c04747488d7f8c98980b434dc846977e43117833ab";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index 6a89a672b2c..0167011ed49 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
sha256 = "1l0w12czavgs0wzw1c594g358ilvfg2fn32cn8z7pv84zxj4g429";
};
- postPatch =
+ preConfigure =
let ippicvVersion = "20151201";
ippicvPlatform = if stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux" then "linux"
else throw "ICV is not available for this platform (or not yet supported by this package)";
diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index fd66d5bd41e..7ea32745ba0 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -68,6 +68,12 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "bindnow" "relro" ];
+ # Fix pkgconfig file that gets broken with multiple outputs
+ postFixup = ''
+ sed -i $dev/lib/pkgconfig/opencv.pc -e "s|includedir_old=.*|includedir_old=$dev/include/opencv|"
+ sed -i $dev/lib/pkgconfig/opencv.pc -e "s|includedir_new=.*|includedir_new=$dev/include|"
+ '';
+
passthru = lib.optionalAttrs enablePython { pythonPath = []; };
meta = {
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index a99cc51de4a..cdef4d9a49f 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, cyrus_sasl, db, groff }:
+{ stdenv, fetchurl, openssl, cyrus_sasl, db, groff, libtool }:
stdenv.mkDerivation rec {
name = "openldap-2.4.44";
@@ -13,11 +13,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- buildInputs = [ openssl cyrus_sasl db groff ];
+ buildInputs = [ openssl cyrus_sasl db groff libtool ];
configureFlags =
[ "--enable-overlays"
"--disable-dependency-tracking" # speeds up one-time build
+ "--enable-modules"
] ++ stdenv.lib.optional (openssl == null) "--without-tls"
++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl"
++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
@@ -36,6 +37,10 @@ stdenv.mkDerivation rec {
rm -r libraries/*/.libs
'';
+ postInstall = ''
+ chmod +x "$out"/lib/*.{so,dylib}
+ '';
+
meta = with stdenv.lib; {
homepage = http://www.openldap.org/;
description = "An open source implementation of the Lightweight Directory Access Protocol";
diff --git a/pkgs/development/libraries/openslp/default.nix b/pkgs/development/libraries/openslp/default.nix
index a77296b4895..80a77e72275 100644
--- a/pkgs/development/libraries/openslp/default.nix
+++ b/pkgs/development/libraries/openslp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, fetchpatch }:
stdenv.mkDerivation {
name = "openslp-2.0.0";
@@ -8,6 +8,19 @@ stdenv.mkDerivation {
sha256 = "16splwmqp0400w56297fkipaq9vlbhv7hapap8z09gp5m2i3fhwj";
};
+ patches = [
+ (fetchpatch {
+ name = "openslp-2.0.0-null-pointer-deref.patch";
+ url = "https://svnweb.mageia.org/packages/cauldron/openslp/current/SOURCES/openslp-2.0.0-null-pointer-deref.patch?revision=1019712&view=co";
+ sha256 = "186f3rj3z2lf5h1lpbhqk0szj2a9far1p3mjqg6422f29yjfnz6a";
+ })
+ (fetchpatch {
+ name = "openslp-2.0.0-CVE-2016-7567.patch";
+ url = "https://svnweb.mageia.org/packages/cauldron/openslp/current/SOURCES/openslp-2.0.0-CVE-2016-7567.patch?revision=1057233&view=co";
+ sha256 = "1zrgql91vjjl2v7brlibc8jqndnjz9fclqbdn0b6fklkpwznprny";
+ })
+ ];
+
meta = with stdenv.lib; {
homepage = "http://openslp.org/";
description = "An open-source implementation of the IETF Service Location Protocol";
diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix
new file mode 100644
index 00000000000..93c4320e78a
--- /dev/null
+++ b/pkgs/development/libraries/physics/fastjet/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "fastjet-${version}";
+ version = "3.2.0";
+
+ src = fetchurl {
+ url = "http://fastjet.fr/repo/fastjet-${version}.tar.gz";
+ sha256 = "1qvmab7l4ps5xd1wvmblgpzyhkbs2gff41qgyg7r7b9nlgqjgacn";
+ };
+
+ configureFlags = "--enable-allcxxplugins";
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "A software package for jet finding in pp and e+e− collisions";
+ license = stdenv.lib.licenses.gpl2;
+ homepage = http://fastjet.fr/;
+ platforms = stdenv.lib.platforms.unix;
+ };
+}
diff --git a/pkgs/development/libraries/physics/hepmc/default.nix b/pkgs/development/libraries/physics/hepmc/default.nix
new file mode 100644
index 00000000000..b935a3d56ea
--- /dev/null
+++ b/pkgs/development/libraries/physics/hepmc/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, cmake }:
+
+stdenv.mkDerivation rec {
+ name = "hepmc-${version}";
+ version = "2.06.09";
+
+ src = fetchurl {
+ url = "http://lcgapp.cern.ch/project/simu/HepMC/download/HepMC-${version}.tar.gz";
+ sha256 = "020sc7hzy7d6d1i6bs352hdzy5zy5zxkc33cw0jhh8s0jz5281y6";
+ };
+
+ patches = [ ./in_source.patch ];
+ buildInputs = [ cmake ];
+
+ cmakeFlags = [
+ "-Dmomentum:STRING=GEV"
+ "-Dlength:STRING=MM"
+ ];
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "The HepMC package is an object oriented event record written in C++ for High Energy Physics Monte Carlo Generators";
+ license = stdenv.lib.licenses.gpl2;
+ homepage = http://lcgapp.cern.ch/project/simu/HepMC/;
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = with stdenv.lib.maintainers; [ veprbl ];
+ };
+}
diff --git a/pkgs/development/libraries/physics/hepmc/in_source.patch b/pkgs/development/libraries/physics/hepmc/in_source.patch
new file mode 100644
index 00000000000..836a5655869
--- /dev/null
+++ b/pkgs/development/libraries/physics/hepmc/in_source.patch
@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -37,21 +37,6 @@ message(STATUS "default momentum and length are ${HEPMC_DEFAULT_MOM_UNIT} ${HEPM
+ # find the HepMC cmake modules
+ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules ${CMAKE_MODULE_PATH})
+
+-# make sure we are not building from within the source code directory
+-string(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" in_source)
+-string( REGEX MATCH "${CMAKE_SOURCE_DIR}/" in_source_subdir
+-"${CMAKE_BINARY_DIR}")
+-if (in_source OR in_source_subdir)
+- message(FATAL_ERROR "
+-ERROR: In source builds of this project are not allowed.
+-A separate build directory is required.
+-Please create one and run cmake from the build directory.
+-Also note that cmake has just added files to your source code directory.
+-We suggest getting a new copy of the source code.
+-Otherwise, delete `CMakeCache.txt' and the directory `CMakeFiles'.
+- ")
+-endif ()
+-
+ # build_docs is OFF (false) by default
+ if ( build_docs )
+ message(STATUS "documents WILL be built and installed" )
diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix
new file mode 100644
index 00000000000..cb765f761d7
--- /dev/null
+++ b/pkgs/development/libraries/physics/herwig/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchpatch, fetchurl, boost, fastjet, gfortran, gsl, lhapdf, thepeg, zlib, autoconf, automake, libtool }:
+
+stdenv.mkDerivation rec {
+ name = "herwig-${version}";
+ version = "7.0.3";
+
+ src = fetchurl {
+ url = "http://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2";
+ sha256 = "0v7b84n0v3dhjpx0vfk5p8g87kivgg9svfivnih1yrfm749269m2";
+ };
+
+ patches = [
+ # Otherwise it causes an error
+ # lib/Herwig/HwMatchboxScales.so: undefined symbol: _Z8renScaleSt6vectorIN6ThePEG14Lorentz5VectorIdEESaIS2_EES4_S4_
+ (fetchpatch {
+ url = "https://herwig.hepforge.org/hg/herwig/rev/fe543583fa02?style=raw";
+ sha256 = "1y6a9q93wicw3c73xni74w5k25vidgcr60ffi2b2ymhb390jas83";
+ })
+ ];
+
+ nativeBuildInputs = [ autoconf automake libtool ];
+
+ buildInputs = [ boost fastjet gfortran gsl thepeg zlib ]
+ # There is a bug that requires for MMHT PDF's to be presend during the build
+ ++ (with lhapdf.pdf_sets; [ MMHT2014lo68cl MMHT2014nlo68cl ]);
+
+ preConfigure = ''
+ # needed for the patch above
+ autoreconf -i
+ '';
+
+ configureFlags = [
+ "--with-thepeg=${thepeg}"
+ ];
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "A multi-purpose particle physics event generator";
+ license = stdenv.lib.licenses.gpl2;
+ homepage = https://herwig.hepforge.org/;
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = with stdenv.lib.maintainers; [ veprbl ];
+ };
+}
diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix
new file mode 100644
index 00000000000..90a6d17f09a
--- /dev/null
+++ b/pkgs/development/libraries/physics/lhapdf/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, boost, python2 }:
+
+stdenv.mkDerivation rec {
+ name = "lhapdf-${version}";
+ version = "6.1.6";
+
+ src = fetchurl {
+ url = "http://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz";
+ sha256 = "1sgbaxv8clcfy4d96fkwfyqcd4b29i0hwv32ry4vy69j5qiki0f2";
+ };
+
+ buildInputs = [ boost python2 ];
+
+ patches = [ ./distutils-c++.patch ];
+
+ configureFlags = "--with-boost=${boost.dev}";
+
+ enableParallelBuilding = true;
+
+ passthru = {
+ pdf_sets = import ./pdf_sets.nix { inherit stdenv fetchurl; };
+ };
+
+ meta = {
+ description = "A general purpose interpolator, used for evaluating Parton Distribution Functions from discretised data files";
+ license = stdenv.lib.licenses.gpl2;
+ homepage = http://lhapdf.hepforge.org;
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = with stdenv.lib.maintainers; [ veprbl ];
+ };
+}
diff --git a/pkgs/development/libraries/physics/lhapdf/distutils-c++.patch b/pkgs/development/libraries/physics/lhapdf/distutils-c++.patch
new file mode 100644
index 00000000000..822c3e38272
--- /dev/null
+++ b/pkgs/development/libraries/physics/lhapdf/distutils-c++.patch
@@ -0,0 +1,24 @@
+--- a/wrappers/python/Makefile.am
++++ b/wrappers/python/Makefile.am
+@@ -25,7 +25,7 @@ fix-out-of-source: $(FIXSOURCES)
+
+ if WITH_PYTHON
+
+-PYEXT_ENV = CC=$(CC) CXX=$(CXX)
++PYEXT_ENV = CC=$(CXX) CXX=$(CXX)
+
+ ## Always force setup.py, it's not good at guessing what needs to rebuild
+ all-local: fix-out-of-source
+diff --git a/wrappers/python/Makefile.in b/wrappers/python/Makefile.in
+index 925460c..fdc8888 100644
+--- a/wrappers/python/Makefile.in
++++ b/wrappers/python/Makefile.in
+@@ -266,7 +266,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ EXTRA_DIST = lhapdf.cpp lhapdf.pyx clhapdf.pxd
+ FIXSOURCES = $(EXTRA_DIST)
+-@WITH_PYTHON_TRUE@PYEXT_ENV = CC=$(CC) CXX=$(CXX)
++@WITH_PYTHON_TRUE@PYEXT_ENV = CC=$(CXX) CXX=$(CXX)
+ all: all-am
+
+ .SUFFIXES:
diff --git a/pkgs/development/libraries/physics/lhapdf/maintainer.sh b/pkgs/development/libraries/physics/lhapdf/maintainer.sh
new file mode 100755
index 00000000000..b0ced3b24e0
--- /dev/null
+++ b/pkgs/development/libraries/physics/lhapdf/maintainer.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+BASE_URL="https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/"
+
+for pdf_set in `curl $BASE_URL 2>/dev/null | gsed -e "s/.*/dev/null | tr -d '\n'
+ echo "\";"
+done
diff --git a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
new file mode 100644
index 00000000000..c2a0babb4d5
--- /dev/null
+++ b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
@@ -0,0 +1,668 @@
+{ stdenv, fetchurl }:
+
+let
+ mkPdfSet = name: sha256:
+ stdenv.mkDerivation {
+ inherit name;
+
+ src = fetchurl {
+ url = "https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/${name}.tar.gz";
+ inherit sha256;
+ };
+
+ preferLocalBuild = true;
+
+ installPhase = ''
+ mkdir -p $out/${name}/
+ cp * $out/${name}/
+ '';
+
+ setupHook = ./pdfset-hook.sh;
+ };
+in
+ stdenv.lib.mapAttrs mkPdfSet {
+ "ATLAS-epWZ12-EIG" = "01nj0zn19sk2ir4fk1202jsz457yrpqrsm99gn60a6rbamjybk73";
+ "ATLAS-epWZ12-VAR" = "13kra15c5ahjldprdvp343c7gd875g8hca7r1bx9ccz6nffxram6";
+ "CJ12max" = "1vk2zkaiqbl6fixaxy7mrggmmxv7lvnw736lxm5sh25dapg6s8ag";
+ "CJ12mid" = "0s2558ihypn0l9qqx25qwnawbc7fkbi2wwwhbyb108rjk2klaf8v";
+ "CJ12min" = "1kdla638m3axr65ndid9irmqhby4gl084r297xw3jxxlrb0b7hj9";
+ "CJ15lo" = "0hww26wbcb3i61z41s518gj41mn5gcikb08pdzyb5vyrl63b39bf";
+ "CJ15nlo" = "0acmyr5zpb7yzs2pikhgf8nx8l7csmai4sv361l7x3miqir56ss4";
+ "CT09MC1" = "18ap08vh1f4ivibq5z57wv7lwvw1pzwl865xznzzcr0jy4f59103";
+ "CT09MC2" = "04yxg4bl0dcgh6hb9g223wm084w0q1y2lbd4z7w8vmvvvn579ij8";
+ "CT09MCS" = "01vjpdgy79gvk3w4blwjgfqpf50mjdi5kmfcgnlnwxp5q0804pgf";
+ "CT10" = "17glhnqj4yknqy70zs7m097n1qq9fqljj3mna6qxchmgql04dvxw";
+ "CT10as" = "1709bb3ky4mpn4cgx9lda8swmvb2pl70ly1gzk4ahgsflkb8iaj3";
+ "CT10f3" = "0ijrx0wm03r0yg6f0n4vwp1c3kypdjpmmnv12gk79y193bfk362l";
+ "CT10f4" = "14icbh8lg9290wfalr1bsx0zff1df19x0qrjqh8n0y9ckqmkbh6l";
+ "CT10nlo" = "14ib003sxpxc8awywjckbw124aqhmi70wg4hlwc2nvdh46sqk11b";
+ "CT10nlo_as_0112" = "0n2abywijgjys56kz5qm30arh3v5k685l0gayl4mdablbw0ccaca";
+ "CT10nlo_as_0113" = "123kbzzfjlparffgmqpimygzjcn0wi1vnyrkjfjn2kwcdjazz8dp";
+ "CT10nlo_as_0114" = "17lgcbf7914dfb89d4v8fal69zq7gmadvha8gpz0wfw4p0pq765b";
+ "CT10nlo_as_0115" = "0rgpc3mcsd18yg4j41k9hhvbjbi3d1zrd9fq1314m4qvviq6d9j7";
+ "CT10nlo_as_0116" = "15xyhmipv9xbiz3jaqdj59nyczn35nq14183xz4py68l2v20smqi";
+ "CT10nlo_as_0117" = "1qf9azafrwqpyp5flc912g2frfpi899vb032yrrgqj2l1flg474x";
+ "CT10nlo_as_0118" = "1jra85s6df6vvmljkf8gg2jkj3r6b1yl6aidzlm3j59di0fk9xp8";
+ "CT10nlo_as_0119" = "0y7k0w592j777jpbrh8v2zh1l6n38xbxjvyiv5x4pvwi6zrp9ppf";
+ "CT10nlo_as_0120" = "0mh1hdmic5c3krlb1xypy0n6r86r7da0ay9183xwb68d1kh4j630";
+ "CT10nlo_as_0121" = "1gwvgj3bwv8fz8mbmgnfsy0bvsm4h9d898mf1kcaaivh56sfial8";
+ "CT10nlo_as_0122" = "1jkkqcmjynd30paxc9z9gpmxkfhs6ad3x5sms5980jx291rc8hgd";
+ "CT10nlo_as_0123" = "0gppcp49275pg3yv37mzkx7az6298wwy7gqla3gzxfzlas0ybg0b";
+ "CT10nlo_as_0124" = "1irl19q4wyw36dwhln1m4y7y40by5xgdjqpgj7sqaix8jvijc9bz";
+ "CT10nlo_as_0125" = "17c6n2prdsry2phqmaykrf1yc02mvhacb87r7yl0nhkhx80kysk2";
+ "CT10nlo_as_0126" = "183p4fd85zs2c1j0zwfsa08wq6v780xvwbg44bpm52m4ih1dgqy3";
+ "CT10nlo_as_0127" = "1vcpadkf90x9qiqaplc25hld7qljk5d3lzs1dssqi5fh1kci8qd1";
+ "CT10nlo_nf3" = "1dfzas3z075riwx26bkmvjck42pjgbm32d1flg5rccsxjn4pmmm0";
+ "CT10nlo_nf4" = "0npv1h5gi2vhgxzcbcsl740z2p7j9p8pg3jwfb0yz88wlbj5bkah";
+ "CT10nnlo" = "1la35l1b3hxdkihh9vkibfh68rghcfgq48q27x2b05dfhcvcz9lz";
+ "CT10nnlo_as_0110" = "0j1f6lbjhwcpgfb8kwzsij0hfmzb3dggi6zwwv9f2w39ax2rfb8i";
+ "CT10nnlo_as_0111" = "1519hvpi1zrjk8p31ksna39n9l8v02ggj5q775q243p9qyfayxlf";
+ "CT10nnlo_as_0112" = "0asnbr0va5p1j81kmv8ar267aciap638kcb48cs5ghz9fvhxp197";
+ "CT10nnlo_as_0113" = "1j5cfbv1d5q2hscyrvig6xkk7gfv4x5cxn1142qmd8pdm9ky2fdb";
+ "CT10nnlo_as_0114" = "03rkvf4ljv7bnzp0fyyrypbbx4rxd1y6id3dfvg4w22s65kp0csm";
+ "CT10nnlo_as_0115" = "1d8rkwvnymx4pi0v1s2vbc880mggdmfnzjppd7fghjqj4lkkanyi";
+ "CT10nnlo_as_0116" = "039i2bq4xr6hlvg0syzmyfv4lm7lrwr59myrhd609dybiky4aqd8";
+ "CT10nnlo_as_0117" = "0q3a5lbpxh24zv7ypbc680kqrkwy5m7xbgx5v44b6cdzlib6lvsn";
+ "CT10nnlo_as_0118" = "0b11mpgrkqn2n37asg8qg3qmhdhbr8lmj8qjixxpca0h1j7m71a5";
+ "CT10nnlo_as_0119" = "1j411yqrlbhqmby8mplgghmb4zxclf1h3pdsffx9iv8sq1q6dy2i";
+ "CT10nnlo_as_0120" = "1djf9qfqrywpsyv0w6igidg9a4ca739dvqgc7qz7qg2bpclbaly9";
+ "CT10nnlo_as_0121" = "0nlm5iwcvb02fd7kan4yp60qbc0fgir4dii3xg03n42xzqixy2qm";
+ "CT10nnlo_as_0122" = "1kwq04i5ln8wv32vf4akjnzid3jdq67zccfg7xriqrwd9367x5kv";
+ "CT10nnlo_as_0123" = "0w4fmsmyci09v0cxnmhdbqxv3xq3wa9ma7m4g39sg2gdsxqz1rgd";
+ "CT10nnlo_as_0124" = "0yzrj1pdigssi39z21k9jxbiahhc1785rjxhq7xl8zx38paspbg7";
+ "CT10nnlo_as_0125" = "0qvdvj3wkbkw0b0zv79ybds2pk5z9kbriwsm5ffpnycrfkzrm2kd";
+ "CT10nnlo_as_0126" = "1cf8bqi1g4c3xqg5k9m4fa8v8bcnwkzblmfn7zc396pgbzhhz610";
+ "CT10nnlo_as_0127" = "0zknrx60h8jdf2pfg2zq6xk73hn86gcv69ml78ik5ms0y5gp21av";
+ "CT10nnlo_as_0128" = "09yn8l3nv29frj3xn9pafiz2iamccp8ii8j7hmp63iaji6c7m5fg";
+ "CT10nnlo_as_0129" = "1ypq63r5myz2phn4y5sbb5dbxvycwis8jixjl0n95xmqlx5zhixi";
+ "CT10nnlo_as_0130" = "0ilr6ijbbh1zki66ma006h1qhdq7wmzm0ipki78bk01jnr5yl5sg";
+ "CT10w" = "1qkwz1drbkxcb4gskkfn0r7fsa6g9hjlc8716m633x35kha1v52j";
+ "CT10was" = "00s4n3nkngwyhh82l132v88c4jgkg03ff4x7m7nna21lvkv4wkb3";
+ "CT10wf3" = "1r43pzb1291bjcmahgfh0f86pvb3nhdpxw7gikqmypdmck0n2mqf";
+ "CT10wf4" = "18bf9k0jp95y9yz0m896sdzy9q1fyp0r4f5hrv4jq4d1z84zdis5";
+ "CT10wnlo" = "17wsw6p0h618q68swn9mjsahfyqikjgsiykiby7y27ryairv709n";
+ "CT10wnlo_as_0112" = "0p7mh56zyqh9i72llbmjchwm50ifa358snd8i1nqr3r6lr5265hb";
+ "CT10wnlo_as_0113" = "0nl4lk3cscsn6p50b3qqaabqfnkn5xgjmcxvfrr1n4njh411kmln";
+ "CT10wnlo_as_0114" = "1vck1i34dspbzskzpbqxbq11gp79drlrik52waklvsl5110xawnv";
+ "CT10wnlo_as_0115" = "070cl0prprqqkkzwxnvyw7r4ivvs8slb98v5yza0gvpwck0blnzn";
+ "CT10wnlo_as_0116" = "0v50pyjqpcrarbx886la0hr6vwvnavsldm9amcdp1vlck5w8mmg9";
+ "CT10wnlo_as_0117" = "108sb5h79mpgkvdzqlx830dykba5kw9zqgxa60i7bcyjnv0277si";
+ "CT10wnlo_as_0118" = "0zf335291hwfmdbhgl5v2y5pbc9slm7dmjfkijdv0jm33drpkcg2";
+ "CT10wnlo_as_0119" = "0kvwc0k5y51p4qvlb6hhxvn9c2n8x0xn0xyp5zkz75ad3vaz9yvn";
+ "CT10wnlo_as_0120" = "0yvbcni3xf718xild7s9g6cxw7dwa38f4iqdm5z7dd9ahxyw9rxv";
+ "CT10wnlo_as_0121" = "1z0mlrbdn8a9n6h0jpha3p1lqz4iamrwa80svqn9y4qii9h5pjkn";
+ "CT10wnlo_as_0122" = "1dh5czjvyjnwlzc14vz91693pr3nyls5g926g347rdrkqkjq8dcz";
+ "CT10wnlo_as_0123" = "0nf7qpgb83ahm5dkzr10xafhcx4lvb3zlxnz70jczl1jd4v2cld9";
+ "CT10wnlo_as_0124" = "14h07z06csxb6v6ai1w5ba0kygnsrzdwxr2nx1kcn93axcsqqbhv";
+ "CT10wnlo_as_0125" = "0g0w6mwy5y4l36cn4z8gfmigzharyn5xqk5ricasracrnf7ydix2";
+ "CT10wnlo_as_0126" = "0dbkkyimpll9r3979vbk4xqi5cfhzr6b28x6j73fbxxxi1xfavl5";
+ "CT10wnlo_as_0127" = "1svmgs55kg74rifjyns38lggv1c18mzmpmvsv116rrllklb19pfp";
+ "CT10wnlo_nf3" = "1m13if0d9xijq695x41snpwwrsgs5a0jvil6j2ww8cspc33d7vr3";
+ "CT10wnlo_nf4" = "1b9lz23rn2w7fqwxxgf6fcg620ac58dnb1ssj3ml3vfn7z88yx43";
+ "CT14llo" = "0sz2ni8xcjjg8034qjrhb77ak1akzlf5fwq00qs9c196lk5b2x7s";
+ "CT14llo_NF3" = "07zzs3jprh0haqx5bcsii213m99m2nh9vki76d9cbhicyzx23pc1";
+ "CT14llo_NF4" = "0bxkw5qms6dpab0zf1hhd8dllrjip2izbv23aqpg72d5rqxb6ny4";
+ "CT14llo_NF6" = "060fx2xrc90id3nb7rlmrvkxlyafx3g7nhdb5jmbr3hxwrzrq674";
+ "CT14lo" = "0y36qkjqd75zf1w1hs1q51qxgin7sm3bhmcbwczwrb17c3vb4m2m";
+ "CT14lo_NF3" = "06iad9lrpxsy0d365vrjv6gjlgggakylrmj1px17y6s796jq6c6g";
+ "CT14lo_NF4" = "18c03j26mbapjidq01s4yrfdh0i7j75gbswdhwcllwdvcg3gnki1";
+ "CT14lo_NF6" = "09ncggqnqcdpzakm16dzxd6ikay9gd5k8si80k52hrr9m2gf36ci";
+ "CT14nlo" = "137i0n7g9rgfsf5rx65d50njwsqawprazp5an513kmz1cwq0cqmd";
+ "CT14nlo_NF3" = "0pmamazh9i8pahalasr7mwx67ixbgrbsh8004grg0cimr2y4iwjj";
+ "CT14nlo_NF4" = "1k7sy8lpzkwy0dc4ig9i9134k854fk0r0lann6pj3jsxs0l6h5km";
+ "CT14nlo_NF6" = "1gfwr0sjbq41gx3057hqy8v6ysivjf1xrh6fp3qqn6m13gy2kbas";
+ "CT14nlo_as_0111" = "0kgg9r635grdwp152ylzklawzy8nf2ywlp75bjc1yyagg765k6jv";
+ "CT14nlo_as_0112" = "0j0bxx0gjdnj41gjasgd153gd811wyhsza56fvzrpka820bkk6rg";
+ "CT14nlo_as_0113" = "06if5wk1asazvff57ah944mnzkh5460yqkkwcs8zhnwx2kbq9v85";
+ "CT14nlo_as_0114" = "1szy7jwjvdvqqpjvcra1f0wn8qgrja6wx4kwcq9vf60pns7mzk7v";
+ "CT14nlo_as_0115" = "1kkahzmrbdr7s06v093arnss0xpxv7byqqx2f5aqh4fzimwp9n7v";
+ "CT14nlo_as_0116" = "0qpkmmpq1b33grf85jzkanwpa02j1cam39pkxchql95hv2jlgw4l";
+ "CT14nlo_as_0117" = "0381620r6h9s2qby52jvys4z8m6jfafa5qnia2fq3q1pc0xp1q2p";
+ "CT14nlo_as_0118" = "13hgxmjx6bv7njb6jdlypy1z61nqf5m5bavxsbrmwwfxlsl4jdzn";
+ "CT14nlo_as_0119" = "06pjl10js0xq7p14ifjn7xhndxyb39sxyc9ksd6wx55i6zyqf08l";
+ "CT14nlo_as_0120" = "1wyygxxjlcsh1qg6npk5szfbf59k4j80hnxnxhah9x9wrg5kg9j2";
+ "CT14nlo_as_0121" = "064afbxxqx4rsa3l73rki8wxa08a1rb53qyf3nwwjb4zb426jfgg";
+ "CT14nlo_as_0122" = "172xvndzcm8s4hzjgrq3szg6j7z4s2f4pgr07vr178zvn9986ham";
+ "CT14nlo_as_0123" = "0q2dansvna4p04ilb1sajz3s5mi89jgd8badqh6r72g26s96dman";
+ "CT14nnlo" = "1y3gd5wzpwv024xcrn70bz6h62n96mgqqwyl5r7q6czw0is52dzq";
+ "CT14nnloIC" = "05k55h97yc8iz9inzggy2yk6vbqiy0915m9c0dfxgr8m2iycndbh";
+ "CT14nnlo_NF3" = "0ijns9bjkw8zcinba7rflc7ic03mn5701lqfrxqjyq4q6kh8fia7";
+ "CT14nnlo_NF4" = "0fhyzaxnm17pi7wfh5hwaic9q4y0hb05ripd6r648wnnhhi353xy";
+ "CT14nnlo_NF6" = "1rnacbsh0y9qjd2x7ggs87zi9msrxrp2l6lidg92i2la4pri27zk";
+ "CT14nnlo_as_0111" = "1hl88j40czr73h9fbz0zbliawlqwng7ikrmq01hsfns190axm8w9";
+ "CT14nnlo_as_0112" = "1w9344v9ihr0w8vrfhhxn81gcnr0qm6ihwwijvcdds09jpdlp6vr";
+ "CT14nnlo_as_0113" = "11symfb1ljislbksrars1k766fa2n1inbarzbw3kp01vxpw8gxf5";
+ "CT14nnlo_as_0114" = "1s1zz0ibr72jvx9c7w3kcryiywnmg264gprn020yxl9sqfzm0kzz";
+ "CT14nnlo_as_0115" = "19c4c4s7djav1zai2nlxbvy8fzg8hqlynri1y4hyhc8hhl00lwb4";
+ "CT14nnlo_as_0116" = "1shjwky7jjwcci0frra2lfc0wycvza7na89c4bsqiksnk413v2z3";
+ "CT14nnlo_as_0117" = "1mp5xxv810khs59zg4kfsdj5qp6ny0878fbz7jf101mpyhdawf0m";
+ "CT14nnlo_as_0118" = "1mvyv13agnmc2c47i9yl8ki5d0qac3l6ipn3nf5rwxjgah495rv6";
+ "CT14nnlo_as_0119" = "02b14lrx3zpbl5s4nj1rvh30i9xdji37yvvg2xwjiw3i56vl8b2l";
+ "CT14nnlo_as_0120" = "0wf29wz9k2v39pbzh91bxwifbs4cn0gsnjdzm24cpgq7bnhyszn3";
+ "CT14nnlo_as_0121" = "1w12xmxqclrrwvfb2g3zvivkq858n0lpp0bzfibvh4wamdyyx3an";
+ "CT14nnlo_as_0122" = "1hgghn4ad7fj3ya17qnka3xcwz7sp4fl0vpcbqkrs9mbbz570fjc";
+ "CT14nnlo_as_0123" = "0m66gwhw2n668sg4srq683qbavwabrk4f4vfcsbppzbcgm7i4yz7";
+ "CT14qed_inc_neutron" = "0ph835nfx98i74nncmspj7qb5798yciq76hqvc505n5zd0hwp87x";
+ "CT14qed_inc_proton" = "0gv0rlr6l62gidqp02ifn75d1ribvbihgpaqc92fww73zwilr7l0";
+ "CT14qed_neutron" = "0ck1vmqk17i7rq42hra79cz2rm8ngxv4da6dvz62l6m2nrga3l2k";
+ "CT14qed_proton" = "1gijxkq5gpsljijblzd13kgr7xjjvnjv18v02jivylf73igsakd7";
+ "GRVPI0" = "0i5icsw9hf4jm25d0szxqc3r1131n417lv8b4gslg93xqj4ry1hf";
+ "GRVPI1" = "05j3mcrb0sq4nzv7y0k68f2m3v8vnd13mzbhq43gjq712cbj126p";
+ "HERAPDF15LO_EIG" = "12cqj3vqwi86sfgxkiwbd7rnpw1awnbqbc852b0x32d9j18nz9c2";
+ "HERAPDF15NLO_ALPHAS" = "06yiid611zi5i9snqrkjr3g4z2n1gwkvqjs606ha0b4nrwlpnkhc";
+ "HERAPDF15NLO_EIG" = "0h5brmk7w70dgbwhjikfpprni924c2f3kxsmxzcm2qlrlgj0nswd";
+ "HERAPDF15NLO_VAR" = "049bfsgkcfnz4z7vzkl4vr6ivp9kvak2f07nmarm8q2wwd6pjjqy";
+ "HERAPDF15NNLO_ALPHAS" = "09qf93b336yak3aqnfqlvz5j6xvvrsqkc4ag41xh4prpswj8fmrc";
+ "HERAPDF15NNLO_EIG" = "1yf48sr7nak6lph2s1vd3s91mrw0da9kjxlvqzcg3n9j48l3f3r0";
+ "HERAPDF15NNLO_VAR" = "0di4b75ag82iysyrv5wfvn8728jdi8mkq96ycpq534078ps2n3bd";
+ "HERAPDF20_AG_NLO_EIG" = "0jr2s4dj5w9xwidrqbqi8af2dqycm4vr36qy3x5javllp4dn04cr";
+ "HERAPDF20_AG_NNLO_EIG" = "11cdhjwz4qm2hxf8i5kl38ny4nbsrd2vf3jkwz17lrgls716wh00";
+ "HERAPDF20_HiQ2_NLO_EIG" = "09wwkv8lk7gy14avvamk3sqdsvig2bvnzha5d4v5s2ln7g6g7vhq";
+ "HERAPDF20_HiQ2_NLO_VAR" = "1cgprisw1bksi8nryqqsy6ac097ywxdgj5yg796izari7j72p4bh";
+ "HERAPDF20_HiQ2_NNLO_EIG" = "05670fr76fx14gp4ywywz71scr6f25jk14i4k84gpcb2l6rnbv9g";
+ "HERAPDF20_HiQ2_NNLO_VAR" = "15nxgq5hy6ncvqma6ai8k7601bfw97p0h9db2gqbbyyvxf2ldnc7";
+ "HERAPDF20_Jets_NLO_EIG" = "1c2n2cn9l8x9jc8c4dh2whgz3378nnnvb3448cgpv0qfm589ygxy";
+ "HERAPDF20_Jets_NLO_VAR_Duv" = "0z2pkmlpffy29x2bh0086m1ybbb94x507fkr4khmdb4d0h33ppdw";
+ "HERAPDF20_Jets_NLO_VAR_fsdn" = "1ya4hbr3shjggpqi6h3g9j3jnbmmgrva2djbsaxgp7icii39yf1a";
+ "HERAPDF20_Jets_NLO_VAR_fshdn" = "1sl2sq27xx40mj4zn00vc44k3vf1yxb7fwpqp0p3lqlp9gcwlycp";
+ "HERAPDF20_Jets_NLO_VAR_fshup" = "0qs8g45s70d0l3g7xh0bqhk65ac9g003bjpacd9v97gzpm6jvr45";
+ "HERAPDF20_Jets_NLO_VAR_fsup" = "17ix21qwjkp9gy9gvn3143d8ganzg9r78n6q47wdfxh12jzvgc7k";
+ "HERAPDF20_Jets_NLO_VAR_haddn" = "15rbsdddm5ayg5r0gljxxcmrrvzhfdr44ky2d6a70wjr2g6lc5yc";
+ "HERAPDF20_Jets_NLO_VAR_hadup" = "1x3rnr2hkcfglpmv732blziygzvdlw2rkks1ap9majnayh01vvfk";
+ "HERAPDF20_Jets_NLO_VAR_mbdn" = "1fi0rp4gpqj7yjmv6b68ac7m8v4f9m4q9kd6nq4ndk2gp11i6799";
+ "HERAPDF20_Jets_NLO_VAR_mbup" = "062dfx73lihlhndn5xjlsimfxalxbfhn1xyqzbk7bsqj9mffmwli";
+ "HERAPDF20_Jets_NLO_VAR_mcdn" = "092hwkx9kliib8lf405sy9bvxg6xgydnsxl92yjqwyicajihhij4";
+ "HERAPDF20_Jets_NLO_VAR_mcup" = "0qcirk0sqnkfyb3pdxlpkl51pbj2gybw7kgw9xzmj4j3jdg2zjqg";
+ "HERAPDF20_Jets_NLO_VAR_q0dn" = "1xv319ai4pwy1mcy6i3wk3mp4nkdpjb2zcnz17gxvdx2l6z1bz5m";
+ "HERAPDF20_Jets_NLO_VAR_q0up" = "0bfsqx23jsrjjsczl5j90hp3njvlwaw8mypj1si83mr1z0s9q4rx";
+ "HERAPDF20_Jets_NLO_VAR_q2mdn" = "16qfw118c3lh91zsg2nb49xjynbd9w1rh4y5ybr35v38i4acpdab";
+ "HERAPDF20_Jets_NLO_VAR_q2mup" = "1q80h7r0cklpz1jam3nzxs7h3i8jpgpc03l7c3g4mkz61ynh0ida";
+ "HERAPDF20_LO_EIG" = "1r6ylwi2yszsk5dmw27734s0ghkvdawmqa6fik1k3j82d9s22mkl";
+ "HERAPDF20_NLO_ALPHAS_110" = "0zmmg0k33bf52skbz42cgxdjw0ap33fyf0h1kfd9ciw4gra2rakn";
+ "HERAPDF20_NLO_ALPHAS_111" = "1mlc33kfs4zlmn305hifjh2d85byvym1mzdj9bc3nlypv4zcszlf";
+ "HERAPDF20_NLO_ALPHAS_112" = "0wswbdmkyv0a6fw531s1s7jnskzxsvwh9bydvgiav53pfpibsyx6";
+ "HERAPDF20_NLO_ALPHAS_113" = "0qx7kh3cmqz59sm6vjcvi2hj5c7d816mc7jfhqr03hvavqcsla14";
+ "HERAPDF20_NLO_ALPHAS_114" = "1n2434j9gvdz24h30sng8z5jmc9hhnm9nbr3hi82n6ssnwabsl97";
+ "HERAPDF20_NLO_ALPHAS_115" = "05wk9glb6xpg5n689slihcfkdvm3kgwpxw8dxp4rp8zyvrsh6l6f";
+ "HERAPDF20_NLO_ALPHAS_116" = "133vvg5bh1lx6zcacnaphkj11608wafim4rb6lcqx4mkpxabmzxa";
+ "HERAPDF20_NLO_ALPHAS_117" = "18n1s7qqzf67lg8gphpm606dvz802i6xmlz5if5jdhjz8r3qklzf";
+ "HERAPDF20_NLO_ALPHAS_118" = "07xj5j7k54bwi9xq51cf8zanqlkjcbdrvw9k8ch3h40bk961c5pz";
+ "HERAPDF20_NLO_ALPHAS_119" = "0njyfp84kf51m9rw9z3d3figp23043p5ml7cdb45dvh9hbpssh40";
+ "HERAPDF20_NLO_ALPHAS_120" = "02paa7bng9nycd8dd2zf2099592mbaz8c4a5hamcmvzqfz0sdy7d";
+ "HERAPDF20_NLO_ALPHAS_121" = "07hmbvpm96pm5yp9bsx9aksznksh6k4qrw0k28bns0wjn75khxsl";
+ "HERAPDF20_NLO_ALPHAS_122" = "1pjn3h1wr6l6sy7kjvk72qc409dr939z787q2qbaph7xh5rf7k2s";
+ "HERAPDF20_NLO_ALPHAS_123" = "09hz6pw4nklwf94krna7g80659v9c2c0f5rf99mnx900xyhk7pxa";
+ "HERAPDF20_NLO_ALPHAS_124" = "1d9gmc3g0j32kgwyfddmx9f3gxwrgnq3xcbrabdx9cw554ysd6sg";
+ "HERAPDF20_NLO_ALPHAS_125" = "0mi2q9yhkcdpj7336kbs1vw4zvm8c9fryz0c7hdj246kj26rb0mv";
+ "HERAPDF20_NLO_ALPHAS_126" = "067rng6gv24qf1j8lz37115mc42k8wjpzrfcw4jw2d1yg22ci0lb";
+ "HERAPDF20_NLO_ALPHAS_127" = "0v3xcdr8wsradqf3bzayvvlsdjzr54qa2kbqb5pyvfi3rafrwrmi";
+ "HERAPDF20_NLO_ALPHAS_128" = "0ywnd9c6bq5bp02s3b3pql8a74wm472p11alqi4b4pmlzphzk1ix";
+ "HERAPDF20_NLO_ALPHAS_129" = "055ya2wxscbzp2w3zx2a5xgs94wl60bm6c2vxrs2rgnab72382j9";
+ "HERAPDF20_NLO_ALPHAS_130" = "0k91azhwxrfni5yfasn83f67ma9w8fax2k1k9xc8pvgmbh3c14wi";
+ "HERAPDF20_NLO_EIG" = "1ryamdwblj1ysbha672q2z9qai62h6cibb0laizfq2nq4j4ml3vz";
+ "HERAPDF20_NLO_FF3A_EIG" = "1fs6ldnwflmn5ysqkq9aky2xskd0dvq372h48x89h4vmsvd302wn";
+ "HERAPDF20_NLO_FF3A_VAR" = "0jd9wgrhchqjcjrkh5hjx7x8agm43jq5p8dmyvk0rniz9zybx64d";
+ "HERAPDF20_NLO_FF3B_EIG" = "0r04zjfaaq686g3bd6c753vkcwsbgdcfzr67ngm7vsz27zscbjbz";
+ "HERAPDF20_NLO_FF3B_VAR" = "12qrfld8958gvk9c2q8l0mvccx6wkrgnsiapgzl37s6s6zcgid10";
+ "HERAPDF20_NLO_VAR" = "0q5ih9ac3z6n158h6q149h0ggkfjrdn5rqwf7nzi3j50fhs63swj";
+ "HERAPDF20_NNLO_ALPHAS_110" = "1828i4ybdzs7zj62lzsifgshxdas81vjvhfg86ixry4xqkfprlfg";
+ "HERAPDF20_NNLO_ALPHAS_111" = "011d1a900jjpa78ph05sdy353gfmrr8azpngcf0cjigcn4fwdna6";
+ "HERAPDF20_NNLO_ALPHAS_112" = "0xb2bnigwlhs0vs3fwzsz66zidchwgs97kn6vjfhxnik8xdfkyb8";
+ "HERAPDF20_NNLO_ALPHAS_113" = "13b8gh0qwpy574ra6184vgff3wba0blr44lxj56xrkaql9zi1jx1";
+ "HERAPDF20_NNLO_ALPHAS_114" = "09n30p5pbw2wyjss2jjz1h4nl9scin42s91sxdcrwinnc3y5n1in";
+ "HERAPDF20_NNLO_ALPHAS_115" = "0nlimqmfhx2ijx48ylciih5diwlsb5zzkli82rgnnxci3r4ycjq4";
+ "HERAPDF20_NNLO_ALPHAS_116" = "0nr8svx60zrf42nxg74v0h759y9lwg54892xpdmswg7mw0nwcrm9";
+ "HERAPDF20_NNLO_ALPHAS_117" = "0xiqdr2r5dyyp5q56b3w04wy3raqrh1mjsv1fm05xswxn2xwyhlq";
+ "HERAPDF20_NNLO_ALPHAS_118" = "";
+ "HERAPDF20_NNLO_ALPHAS_119" = "1w9nl0pnfc1cii4knmqdq4cnh6shhhgj8pg4a42bx20lvqc3aqgb";
+ "HERAPDF20_NNLO_ALPHAS_120" = "1lksn0rcxq2scwpnps8dawlzijhvwbg0pn2is4r29igbqck2jvb3";
+ "HERAPDF20_NNLO_ALPHAS_121" = "03d58rbibvgcvmsw86q3030qnw5nnvq8p6diqscd9srb8br06p8m";
+ "HERAPDF20_NNLO_ALPHAS_122" = "0541yx5fcadw7rggpypd8kg393m5hwzsw5jangsmsrsby1rc2m4a";
+ "HERAPDF20_NNLO_ALPHAS_123" = "1ckc8s04jf7x19xpwwb8g60likrlz3dp91qzaafljvbd9b27aa61";
+ "HERAPDF20_NNLO_ALPHAS_124" = "13dx2wh0dhxsjjk6ak7wy1gr8g297dpc9xvkxvb5ayd0rzmhjlwb";
+ "HERAPDF20_NNLO_ALPHAS_125" = "0yh6jakycsqhh4h6jqrilw1afmk1jkcq2px978z4qcz4y0m6bx4a";
+ "HERAPDF20_NNLO_ALPHAS_126" = "0045sa1kl4w75ja6an38i2a3fi78q6xg22av536l9h1c8j82ql13";
+ "HERAPDF20_NNLO_ALPHAS_127" = "1f5l9cy59dc3rc9xqrsq85g0mbhyaqkbpzi40f3gjg6bxjlgb4rx";
+ "HERAPDF20_NNLO_ALPHAS_128" = "1c2pbd4zam5av582r777197638l6i5a0chmw9ci7l05lzm19nzmi";
+ "HERAPDF20_NNLO_ALPHAS_129" = "1aipmxxn7s1r66m6gmrjgr2yca7sxvpf8r86s4a5j768akkgmlld";
+ "HERAPDF20_NNLO_ALPHAS_130" = "1g2q3438bivd20i685jmx565cq108yv72vhxmpmhysh4qwvwpqqw";
+ "HERAPDF20_NNLO_EIG" = "12zn49jx7qjr8apgpbhknzll4vwlz3x9y1ai908ix2h86pgap2ml";
+ "HERAPDF20_NNLO_VAR" = "152h21khvkhxwx87c5lqwzpakmahcpj1ixw6kgl0wrrwjknvfgxn";
+ "JR14NLO08FF" = "16azkqxf1yw1j32ay6j01gf8n9n7qm56jh4yzgjag0zdhm01lbip";
+ "JR14NLO08VF" = "1ilw38pp4vy8c8v1glfi4ixca73wjkdg3di1wh9p8xqrifdb096p";
+ "JR14NNLO08FF" = "1w0pywmjb4xi7bsvv1mdd4q2adf1g7khspfbkphmlh8zipx29nxx";
+ "JR14NNLO08VF" = "0kzszj1r141fcg9vbf53480224nxcc5wfk9zmpmzbmrxzi0w127r";
+ "JR14NNLO20FF" = "0wc3qib90dpd1wgiymrn5lzwhqmh58ji2s92vpj2v9v4spws7pdq";
+ "JR14NNLO20VF" = "18l4ipn80gmh9kdw7a1k49fwgbl7b1frgc0hsa04vbwnv6hm73hn";
+ "LUXqed_plus_PDF4LHC15_nnlo_100" = "009wb1ibh4yfbqh5fsznc2g9g50rl6g0pq0x9qf7iiq2vd40rzsz";
+ "METAv10LHC" = "1vn4wnx1blz6wylbzirswdqqf0knmyh1pcfh62wvj695mh7i0w16";
+ "METAv10LHCH" = "1p4wy7m1ksz0r1fylwz3cbq7jl8s58v817n3d898l83ic2ghp4vj";
+ "METAv10LHCHfull" = "1w623939fjdyx1316rxyaavf6kmxff19himr00br57jrw3v49nfg";
+ "METAv10LHCas0116" = "0y1l6djkmx8zcsii9j9krwhvgh071a9y5d4m1rkqpbqf6dnq9kll";
+ "METAv10LHCas0120" = "1g1izkf3j0vdrjskbjzh8lzsdn1bqssidr0gsapyzlx0dzc2ixdp";
+ "MMHT2014lo68cl" = "03wrjv448zdqblv4zx5b2p4m0nj8h4igabh8pzskj0327w7g91lm";
+ "MMHT2014lo_asmzsmallrange" = "07c2n0ddjh5183h4srskvh1d4fvzi4xrjgpkk7ap28j7r0q0maig";
+ "MMHT2014nlo68cl" = "039zw5zrzm661bgjv7d0imzhfv3j3ixnrssi13ynfpin9v2izy6g";
+ "MMHT2014nlo68cl_nf3" = "0bjmng4ifdswi88kf59zzxpdq8ka80m01208nb2ij3dkpw0n5hnf";
+ "MMHT2014nlo68cl_nf4" = "01g0bbfwxaqhgpv0yz17fvwa4q1a1vh9867kp9fyavn600kd91ds";
+ "MMHT2014nlo68cl_nf4as5" = "1wdrk7b1hs6s8f2gxp7b3c1qrxvncs41h4aph1dhf8zffn3653yy";
+ "MMHT2014nlo68clas118" = "1nv7h2j31z061mgph5154qgxn8rl5sdgwzzs3d3clxfshh5gcccn";
+ "MMHT2014nlo68clas118_nf3" = "1d7k0vablssy1vfimsvxdiklaachw44lg37fgj1im52k81qxzd3n";
+ "MMHT2014nlo68clas118_nf4" = "1s8gv434b4mz6y5rv4kms69ghliafcmih09icj4qwk66hj7pn5lj";
+ "MMHT2014nlo68clas118_nf4as5" = "00zvf9zkrp9lk9psqvzsn04l1rw1xmq37bd2c8mqc2px3zdq9q0f";
+ "MMHT2014nlo_asmzlargerange" = "186jz5r74qas28x04daqkxhs5p31i68hhy8a7q6lzd5nh42x6kk0";
+ "MMHT2014nlo_asmzsmallrange" = "0qvz3cri83i09xh6vm2wilc76cc3gri331f1vrrs8x71xinisv49";
+ "MMHT2014nlo_asmzsmallrange_nf3" = "0ckw5971pwvvix8idw2m6j7w6bjivqpa1ynm6ml0bhc75cmm6l4i";
+ "MMHT2014nlo_asmzsmallrange_nf4" = "1asnk3pl3dw1sh76k0s95jb57cv5k90zjgpbkr3nnrbhvnkizl5a";
+ "MMHT2014nlo_mbrange_nf3" = "0bghvriw01jxmzcm9isz7in43ph7vz6zzr0rmmi81snrwvg8918h";
+ "MMHT2014nlo_mbrange_nf4" = "1gad7269hz4jj3946yyqzmcx3zyxx2p4r0h88x3lfrm0rd0fg00d";
+ "MMHT2014nlo_mbrange_nf5" = "03id7bfds16kbnd0nwjla8sn4pl3q3qa5v0a3pykdwj14k9igi3n";
+ "MMHT2014nlo_mcrange_nf3" = "1zfmdclsgwf6517v88zg34wby40606sspcghh4yahc2bbznd6a63";
+ "MMHT2014nlo_mcrange_nf4" = "0hzhkv81a0z3ichj5kfhwnhc720xw48h63llijl0pcfv8qqpvl19";
+ "MMHT2014nlo_mcrange_nf5" = "148hg5dc60yhfmwsm0svasxc7l1py6ggj7lzv0mrshl07rwfh62a";
+ "MMHT2014nloas118_mbrange_nf3" = "03w1wish6ig3mw9j195rakxsjr7gr46qz8dh009sigqcgp3s9fad";
+ "MMHT2014nloas118_mbrange_nf4" = "1lbj3r1bbxx2y1ybnxpd0cw7jzkdz0rb1grn1pmwmrl0l13s7j59";
+ "MMHT2014nloas118_mbrange_nf5" = "12q0gkqzhxqwrvy8lpg66ldsxnwr8id6jv6k4dj6f0p93qif5wr8";
+ "MMHT2014nloas118_mcrange_nf3" = "093yh7wa3p4028x5zxw15pwkrkjxzfl7kcdm7jqlf08zwm52clyx";
+ "MMHT2014nloas118_mcrange_nf4" = "0q0y77i0fgdvjk9y76kqzxpn22jbzsh64qbx8186ri9fqzfi868i";
+ "MMHT2014nloas118_mcrange_nf5" = "187wsfm49ack0jh9rwy5h29b1511b17myqn28bm6nbn7r4rfvnkz";
+ "MMHT2014nnlo68cl" = "0sss77zwv94vcy4ghv6493vbw08xwm264dk081w34jc4ifa0vg90";
+ "MMHT2014nnlo68cl_nf3" = "06paq3nzs87babpksabnkqi38gvvyfvpqlh8p18140zrdpdffaj2";
+ "MMHT2014nnlo68cl_nf4" = "0lbqpdy66v3ns6ax9vj1ix4wjn2pwlw5y1z26hlbrxz3l8hbizg1";
+ "MMHT2014nnlo68cl_nf4as5" = "1bh5nsral3lrlqq6afvq9ahkfmhfw3mq0m0qcvsx4ma5jx5rv7dv";
+ "MMHT2014nnlo_asmzlargerange" = "00l2jqccsl3jfwdj7lndr4b5cpx44krjvnm3h0hjw6hkv4irxb5s";
+ "MMHT2014nnlo_asmzsmallrange" = "1x36pv9nhj74whibb16bc414ypcks6nd1s7q1jc0fb7ndf5rijy6";
+ "MMHT2014nnlo_asmzsmallrange_nf3" = "0svpc51n25cbz2b43zbd60bfckrlz3q2jn3x668xnha9qsd3c2vq";
+ "MMHT2014nnlo_asmzsmallrange_nf4" = "15jggp2nbm828nprxyyinmp7kfxngpm0apg446hvwd8hg7blb1a4";
+ "MMHT2014nnlo_mbrange_nf3" = "0r9gi5cw76zn0lq3fcs7s2xxh6jl9y5vdv31bhv6mac9jmhjb458";
+ "MMHT2014nnlo_mbrange_nf4" = "190wva3k49mymflbm1v5xd449j38jm7ylfcdiflym8pgkdvwcgyl";
+ "MMHT2014nnlo_mbrange_nf5" = "19mnv9nz01lmbiv01qmflhg24kldhqpmcc8mgp7bnkhicgivb5ib";
+ "MMHT2014nnlo_mcrange_nf3" = "0zskxladqr40v6wqafbl1pl04vq43babqf437c4xxg4sz9435l3l";
+ "MMHT2014nnlo_mcrange_nf4" = "0sny8r9zap8gnjh9id1klr59d9hs0bb40pf8hpy8q5pg6052vx3q";
+ "MMHT2014nnlo_mcrange_nf5" = "1l340c1x4fz647bhybrvbb6z00mla81b78jfqpnwd4vwfxnqmq9y";
+ "MRST2004qed" = "1kdrzk2arvs36lnpkbc94w06hx3nh8nixh2qjhb271c2blwgahzh";
+ "MRST2004qed_neutron" = "12vna0ic6gh313k22b44b0k9kd939v7zjl2hj65k1075j23mq425";
+ "MRST2004qed_proton" = "10z0cr8pnr0lfxxi916naiz381a2cqn461jblfzvvddwqmqbllbc";
+ "MRST2007lomod" = "13ar6hzw9al20zlm8lg0hvwmgrmv0dbam820gm36rj8p7i33qlr6";
+ "MRSTMCal" = "0kbyp4rypw8jm28zfpvf0grvfvxmsrp3grwsmfxpa2c38x6la3rq";
+ "MSTW2008CPdeutnlo68cl" = "1x2y7hl8ckplx175bp3wi04xafm44dd7vzfgnmvvai1x0072xi51";
+ "MSTW2008CPdeutnnlo68cl" = "1szsdqjkmny30mpw4pdzi97vj7i55agxm285dvnkzp06ycgp1ld3";
+ "MSTW2008lo68cl" = "0j12mv286r4ds9v7piqh4n44yjnc51hm74lqa4vv5xznxhibng7l";
+ "MSTW2008lo68cl_nf3" = "1s5z55b2aj37bx0p305lcgrdclgvyl99xgfrl0rhmdgr2byg33wi";
+ "MSTW2008lo68cl_nf4" = "0m539ihcz3dxy4gpfbam5badhhsimywlbgnczbybph8yn1118j9r";
+ "MSTW2008lo68cl_nf4as5" = "0vl1q7xnr425sscbk4djqi56jbpzpi8l3z2nknfqiy3l7ykg23ng";
+ "MSTW2008lo90cl" = "0af5j0s1i8yn0mjs4nb77migihw643lhd7dfl184v6wik3031yg3";
+ "MSTW2008lo90cl_nf3" = "1a6kc1lgswjk800jzcqlbpwzz4rs3g6agckhnlr8cizmp9p7risk";
+ "MSTW2008lo90cl_nf4" = "1bdjl58gslhw539650qwi7vbvsr22hpxpca17rkbqz9szh0ljhym";
+ "MSTW2008lo90cl_nf4as5" = "1crsm7dfcs0fn1i2ng18wy23z2ap01xr2rsnafqlra0q135m6hfp";
+ "MSTW2008nlo68cl" = "0pdvb5nshjjw7ddmdmj1v88m3jlk3vwfnab0pf2kf8hfx10hbv4q";
+ "MSTW2008nlo68cl_asmz+68cl" = "0gwmxs0f7raxvmpn12zavzqsrp3x0a82y1vq2kf9p9fq17in55yn";
+ "MSTW2008nlo68cl_asmz+68clhalf" = "1rmda4zpm6cs9kyxkhwpz38iv6g259156bmka4dc4zyfg1lcw85d";
+ "MSTW2008nlo68cl_asmz-68cl" = "15mmdnd3wwlrs5pwwhfa9f88vjpgza8vwxwxpyadxsmhx9jk79hy";
+ "MSTW2008nlo68cl_asmz-68clhalf" = "0dd7llc6ip6myy2yvf16riqs334f20l8wkmkksq53xngmz9qf263";
+ "MSTW2008nlo68cl_nf3" = "1j82imyylvnf3x39x1mb19hhp2nbcq2lk82hf7sj72c557l3qpjk";
+ "MSTW2008nlo68cl_nf4" = "08f008by768c8v3cmrsbgxpglqdj58nwwf22dmk2mbf2jq449s0n";
+ "MSTW2008nlo68cl_nf4as5" = "0hrqmmnp20vpj6dpz3bvm531i0pvl06als8irqz91cknv6zsvxf9";
+ "MSTW2008nlo90cl" = "1d3p4cialrngci9kn7225zcmyrr547dskzi74dfgdhbqc0256a2r";
+ "MSTW2008nlo90cl_asmz+90cl" = "19cd358yqklc8bxv0mg69cq3sf6zah7di0q9ilfqbiddmw1flw3p";
+ "MSTW2008nlo90cl_asmz+90clhalf" = "0ngn8f149agvmc54nrxjxqa0rifbd8a1hbcgpa443l75bmd9sqcp";
+ "MSTW2008nlo90cl_asmz-90cl" = "0fnqj7ywnp9nz5733ggjwmhxpy15zs2xgxjz7ixmql5mmaz3sxb6";
+ "MSTW2008nlo90cl_asmz-90clhalf" = "1jrp9q8li7a4bwhgh7q9h9zc0sdhck957zn14q9ca9kjsflyb9f5";
+ "MSTW2008nlo90cl_nf3" = "02ihabrcgp474wkq4w2fshpiqdznjaxyg5vawv52yj6hxifyy5a9";
+ "MSTW2008nlo90cl_nf4" = "1wrdl79qy8mimqk48705f3sd651zy130k1dmvvzwvdsjd9y8q58w";
+ "MSTW2008nlo90cl_nf4as5" = "18d1pvijcyfxkipmd2v2zrkxdbhxygkcyn3p8vz0vzq5q7s1s7r2";
+ "MSTW2008nlo_asmzrange" = "161364fvc8w8ggad58r1c58b0kngqa1bjpabaqi5cigmzazj3rl8";
+ "MSTW2008nlo_mbrange" = "1b7z4mm3f8wjjbxb8hs8l7kclh1yfz5yffzdsch2i09c7wh79616";
+ "MSTW2008nlo_mbrange_nf4" = "02s7ljzwamsha87i6nsd4kdfb9ky4k6m8xpqa1iz9wgrcy4pmw5p";
+ "MSTW2008nlo_mcrange" = "1bndxfi27r8k0m4r26bfsflbbrjc4s2vp5ixy7qidkw33g6mqh96";
+ "MSTW2008nlo_mcrange_fixasmz" = "10s2sfhdx5668cffwb0sbh5m54zq0inmpfnhkj0zk9ij4f5y815f";
+ "MSTW2008nlo_mcrange_fixasmz_nf3" = "0zwnicbmmqbak5sw92njpmvxpjnnhwl1ggvlj8q39hn5w5kdy1kq";
+ "MSTW2008nlo_mcrange_nf3" = "01mlzqwk30glr95g7n2y3yvvy7s6mkbdb5cqwl1m7k8d6m18n49g";
+ "MSTW2008nnlo68cl" = "0y6lv1wkhydfnlakjrrrjapxaapa0bcbmfx0w9c4psgy156kv1fv";
+ "MSTW2008nnlo68cl_asmz+68cl" = "0fhkbkshrc29kz0fc9vi2dqsg6irjm4sfw4sp0s4wkj766wg19nz";
+ "MSTW2008nnlo68cl_asmz+68clhalf" = "1z0fplsv1fij4fgrz7npr34hcmc2qkf7g398bq1smvb6b2qy5jb8";
+ "MSTW2008nnlo68cl_asmz-68cl" = "1qhjhdzpy67665ccwv0n3g7jlyb2vfk60cphjr0jb1adgv9fxa7q";
+ "MSTW2008nnlo68cl_asmz-68clhalf" = "0rlsis3r7l32jdiq2yhx1mz7q6qlzlsrarljvrmxf0g0g2d8nr4c";
+ "MSTW2008nnlo68cl_nf3" = "07nrz7afd1mcsqc3lqv9vk2phs1nfxdl63qh1bc0g7nznxwmmn97";
+ "MSTW2008nnlo68cl_nf4" = "1kd62hzk2p3q56kj79bs101arp55ajlyhwwa3vq3yp37i3ynz9ds";
+ "MSTW2008nnlo68cl_nf4as5" = "0x19rq5k9c97vzskqppf4k0fjahwiw2c1nb6iy5c2fq8mj1pz2gj";
+ "MSTW2008nnlo90cl" = "13xqlfys37b8chinah2yqmzd0clzli06p7vjk30ha22wgwm02dq3";
+ "MSTW2008nnlo90cl_asmz+90cl" = "0pd6imc3hvq7vgyv1db9y8rvpgz4ffwqv6rqzp27c7ipxg0wjyz0";
+ "MSTW2008nnlo90cl_asmz+90clhalf" = "1xn52ppixjg22ybd8ggf0azb3zg5zyilqjss033g0k9crq4a6y2v";
+ "MSTW2008nnlo90cl_asmz-90cl" = "10wxgh52zs0fp0bwd0b6csnz9x6mvp45gvjhk0y1dhgfwbcvw9y9";
+ "MSTW2008nnlo90cl_asmz-90clhalf" = "1kmvp1yfgsx4jhsjc4drg82cq4xs6as4grwrymfkrqnvhcg86vap";
+ "MSTW2008nnlo90cl_nf3" = "0vw0cmszwp49fsskacccl921za88cl5cfy0sqckgxzs4hx21x43n";
+ "MSTW2008nnlo90cl_nf4" = "1b3fy8mfclgsmvpyzfs34fjry6djmkjcjppdxni1ipjyp1bcaia3";
+ "MSTW2008nnlo90cl_nf4as5" = "05phi752spikwq74i0hfid7lsqi51hdvwxm520kdmbdz2pblbz4f";
+ "MSTW2008nnlo_asmzrange" = "1nj68qhvlsqi7299d9rrsmq7pr6bdil4gzr6yla2cgn4wwiggdwn";
+ "MSTW2008nnlo_mbrange" = "0jnmy4i593wz80lbm0r0cwdj9xw496p3in0lq8ksr4yjwz0agpbk";
+ "MSTW2008nnlo_mbrange_nf4" = "0lw3p4q0ixj7plcmwqh43lfgv1i7ljar3f3k1v6f0imyvz8swfgr";
+ "MSTW2008nnlo_mcrange" = "17v549iq2wn5zvxfdvq8pf5f7zvgnpa72i6gxvxzfqwkji7mv522";
+ "MSTW2008nnlo_mcrange_fixasmz" = "05c8z2q2866550clx2mwb1jvhpn0agkyg82vvrswi3h4hgkvlfjx";
+ "MSTW2008nnlo_mcrange_fixasmz_nf3" = "0r86xsl1wfphwdj2hhlilkwc2949m7bcn42dms14g7w45i24g6id";
+ "MSTW2008nnlo_mcrange_nf3" = "1c9lsggncwghvw9mgd18h50ljrnlpp1p5r2zlzf8z3g8i4f3aaih";
+ "NNPDF21_lo_as_0119_100" = "19qw2hp1yk82qgcrpx8wp2fg8wklaj6rr653m6mndhhr0aa0w80v";
+ "NNPDF21_lo_as_0130_100" = "0p5cw77dg5pkhl3d0y6r3k8vhw4m467wf3gd8kp2l5vcbdwb4izv";
+ "NNPDF21_lostar_as_0119_100" = "0i23axf0xl11nb2dn6p34bnm1xfisnn3a82db9dz863n60gqb5x4";
+ "NNPDF21_lostar_as_0130_100" = "1aka01747071l53jx4v7rgmfj5danzjillbwincgi1b28mw78yhq";
+ "NNPDF23_lo_as_0119_qed" = "02d85an11mr66yg3vi5fq4919ymbrh9h8b8qzzzm9dvfarzmbwxi";
+ "NNPDF23_lo_as_0130_qed" = "0qsxxw3nds42924xqnhs56wmd8ihmrip28glj47q9r9i3kgw3lv0";
+ "NNPDF23_nlo_FFN_NF4_as_0116" = "1d5wccg8l5xmdr8pvks6851zxrlgq1rk2y5dgp10k6r108059rgn";
+ "NNPDF23_nlo_FFN_NF4_as_0116_mc" = "1sc13cqah6di97fmlnb6qw454jyrp0i9jv2pfxvi8ix2vzd6km00";
+ "NNPDF23_nlo_FFN_NF4_as_0117" = "1gkzb46fnf9k97fgbbxljdnklffwnxmg58z01x55iklq4sn2aww3";
+ "NNPDF23_nlo_FFN_NF4_as_0117_mc" = "0nc3fx9ggqybymw5kglwq3kmznc9hm28sp58gs1l4gwx3xiy0bj6";
+ "NNPDF23_nlo_FFN_NF4_as_0118" = "1zlcqh0nfy8yf2cnzs0iy615nbmhpa2zh4carvifcqd4lv4azkp6";
+ "NNPDF23_nlo_FFN_NF4_as_0118_mc" = "0518z8jakc9r74kzanraf2n8haminfipp2rvr1288ymhsl5bxyp0";
+ "NNPDF23_nlo_FFN_NF4_as_0119" = "1k5mcql2411020m6vq26ck8ig3q01j79ndjgci2biq743m8nlvm2";
+ "NNPDF23_nlo_FFN_NF4_as_0119_mc" = "06yv9mwgvhag5442581r7by3nsxcy7c76llgaalphbzszqr2vy0p";
+ "NNPDF23_nlo_FFN_NF4_as_0120" = "1m97g47p44vq3izjji6agwmj2fwdvgddzy8w40mqqbr9fk19lbyi";
+ "NNPDF23_nlo_FFN_NF4_as_0120_mc" = "0bjllckv61jc1y6f8c1gqdh36r15glqn8fqp99q0kckaxyszy5vw";
+ "NNPDF23_nlo_FFN_NF5_as_0116" = "0x4kjj791hkwng4l5dvch8z0ig1nkliirlz9mkv02g54qrilnkmy";
+ "NNPDF23_nlo_FFN_NF5_as_0116_mc" = "055clf0m8l8gnby2lgwh4wkyqciskwp54y34vb1kwfbhdf71zmnj";
+ "NNPDF23_nlo_FFN_NF5_as_0117" = "1cplvrizlsjcixsjzlm2drssbjsrzj9bvq0k5mnv79r3p1xdp997";
+ "NNPDF23_nlo_FFN_NF5_as_0117_mc" = "17nic3kw991dbrhyjyxpk0zzv8rjh0r0whd6nl8v6wsf5q5h0ny2";
+ "NNPDF23_nlo_FFN_NF5_as_0118" = "07fgr71x2zk2ywcbnw0ikv0p9kzsmd83kdidfs49vm7azcbm0qfw";
+ "NNPDF23_nlo_FFN_NF5_as_0118_mc" = "0s365gsidichyj9x5926q1gm0x1bp52chv7fkpirflrrsywf0lc3";
+ "NNPDF23_nlo_FFN_NF5_as_0119" = "1qspxbwswz7ssqj2rx2jdg0bkj8prawwshvjd26ifz9i0l9qnqc0";
+ "NNPDF23_nlo_FFN_NF5_as_0119_mc" = "0aqyhrcrzs3kqhj1hndilpibvdwfw9qhg1x0cypx97h16n37j46x";
+ "NNPDF23_nlo_FFN_NF5_as_0120" = "1k9savpyg2iqr1ab4i5y7q1qhd8zxq413040h2v46jl8mp7x6bjn";
+ "NNPDF23_nlo_FFN_NF5_as_0120_mc" = "01g7mh7v62s47cwdf6ws6j37gxl4mrb26ivdzzwmhy6ydiw8ka53";
+ "NNPDF23_nlo_as_0114" = "0mmq32kddspgpacx2qj086das9z2bxh3l37qvp9yf84gqzjj7mml";
+ "NNPDF23_nlo_as_0115" = "0jn1gv137d2x3vxq7ny0qc0hnfmcd4hs3cxkyn7j26w7p59q81x7";
+ "NNPDF23_nlo_as_0116" = "1mnq360acd5vfwz9z8fzynldchkqrfiqhsxvi3s9a263h3p44bsa";
+ "NNPDF23_nlo_as_0116_mc" = "0ngw2hls52bax6dmis3nfa2ix8q8nh2d9mwjax4cjdkmmf7rdn2g";
+ "NNPDF23_nlo_as_0117" = "01wkq68b8zl3mznzvc4p7p9b4ik2bnqgjq97mw2287i448mnj9jn";
+ "NNPDF23_nlo_as_0117_mc" = "1s2g55240gh9j32ach9rban0iw4hjmw5haj1c21wgyh4nqiqlfwr";
+ "NNPDF23_nlo_as_0117_qed" = "1l2rbxn9fw72nmhqazfkh568q4df0q2jp0pn0fj368wdpf36fk0b";
+ "NNPDF23_nlo_as_0117_qed_neutron" = "17rpz4bdp3fxvafiz32aawxw64prkhqwqpnfnbqsigcslm18bwnc";
+ "NNPDF23_nlo_as_0118" = "01kax3g4d8nd6n1gip70d02kl3kvbqib93b99xgwc1f0np85p3r0";
+ "NNPDF23_nlo_as_0118_mc" = "0qhs7r4zzw68grrmfh7qdad49w4y4mvf55qnp86piri5vi8lklwk";
+ "NNPDF23_nlo_as_0118_qed" = "10xfv8nkg2jjy3yg9m9gakz6lixdvmahdy1z12znqyr1br57bdhy";
+ "NNPDF23_nlo_as_0118_qed_neutron" = "1zffxfykx2v3dniypsvyyqbz5pb4dcww653amaxv96hplw3fvr0h";
+ "NNPDF23_nlo_as_0119" = "1v24iwddahxy6sd43bxv6ywf8n7302qkwl9hv7d074q1d932kgr1";
+ "NNPDF23_nlo_as_0119_mc" = "0l95fgr5bwhsh0h3qqlnx9czkgmrf5y084zlzk3qhix3ldh8zbp4";
+ "NNPDF23_nlo_as_0119_qed" = "0rayscazcacy89lzg0ynpwrl9g4pnjwwp0l0vwc3gjz9cwznmwsk";
+ "NNPDF23_nlo_as_0119_qed_mc" = "1cc3candpavcfbv681zpg8gmwbh3g14vqkhs2s6v7rr9xhx6zqv1";
+ "NNPDF23_nlo_as_0119_qed_neutron" = "12h4x97yglcklrvwh937xa5bgqahq949a5wm3nyjbvrfsw9n330i";
+ "NNPDF23_nlo_as_0120" = "0f8lwydw45vy7c0mqmz60hpc0b40czx0gx35liyrhcbjvj9129m7";
+ "NNPDF23_nlo_as_0120_mc" = "0kqiizf0c0mbdavnv7ivk89kga84j7p7xprqi10589ggplchx8ag";
+ "NNPDF23_nlo_as_0121" = "17603srm35158sdwrqijyxm614splx7k6bjyzphgvznnkwpgi0i3";
+ "NNPDF23_nlo_as_0122" = "0c16498ngx436k9mb8fwkhhvcbdyjd4m0jh54v2n1dl354jz60sm";
+ "NNPDF23_nlo_as_0123" = "1j6d7k8d04gfx532iipd4vzm0nldbvy86pg8asgv4xrh80c1zslc";
+ "NNPDF23_nlo_as_0124" = "0dwv41kc9qsvvp22gvxi56gj13dnklgfp4ndrm0475q6gvfz25ak";
+ "NNPDF23_nlo_collider_as_0116" = "1hl7xw8jz0gijxh9cjkxv1rb1xncb1622ghf6wnsaarlqr4947ky";
+ "NNPDF23_nlo_collider_as_0117" = "08krhmjbgza9f4mbq7cdj9g7hh260aaniqqi5awbgp7idbn3nccj";
+ "NNPDF23_nlo_collider_as_0118" = "17645h9l8z8nk7pdaxdhvcfmcvi8ib8yylhiijkkw9yrywb5pakm";
+ "NNPDF23_nlo_collider_as_0119" = "0csf74lpxgzg48v6962falxd8n2nc9xdrqnxxwadqqyrnrfs06dw";
+ "NNPDF23_nlo_collider_as_0120" = "17xqx8hnwy7a67ah0ds8m3nv3cbq20vri83nlwahwfsbig7w505x";
+ "NNPDF23_nlo_noLHC_as_0116" = "02nhh7n2qzx3ak7ih2d3vw3a4dffxbbpv9wrh2yhz30zbrqqlzv2";
+ "NNPDF23_nlo_noLHC_as_0117" = "14j8hx346krwbi2fyyk77k60d7dlk2xlsc6zd543y03jdpk4ahlx";
+ "NNPDF23_nlo_noLHC_as_0118" = "0vwi6h1fkwjg28p2f3br1g601i8ca4dpfjs9vxg80kjzkif6k310";
+ "NNPDF23_nlo_noLHC_as_0119" = "02l15h62gn0njnj459pkp3k1nhiaivlknmbxb3giqpg6wmm2m9y1";
+ "NNPDF23_nlo_noLHC_as_0120" = "13lxmwmywg7wrwhgp0cb41b42479fgfa1bz3aqkbrnf6gi6pviln";
+ "NNPDF23_nnlo_FFN_NF4_as_0116" = "0j4ng2vl955vnq40zv5v9sb0wk8qari61v7995p2l0sxz268sz50";
+ "NNPDF23_nnlo_FFN_NF4_as_0117" = "1wjqlv6mbl2lgvwr5av47amrs8gnqkpkxzq91jvpaxkya3bmglc3";
+ "NNPDF23_nnlo_FFN_NF4_as_0118" = "113s8lxrmif79c6f11pnk5jz7q4lq7108gcfx84nanpksr9dmi6m";
+ "NNPDF23_nnlo_FFN_NF4_as_0119" = "1688qacmp9kl50q1vzffcprf9ydbi2bb2brc68jvid5f7bjkyfmw";
+ "NNPDF23_nnlo_FFN_NF4_as_0120" = "1i3cjnz5zgk8jw5jcrqy6kxx1i5v2a2lgy2fdck3j19cvn0iqqr9";
+ "NNPDF23_nnlo_FFN_NF5_as_0116" = "0v6ap405v9zapbi5sqldvs5lyhz5wsh4cxl8ssxj0l4789qm24hb";
+ "NNPDF23_nnlo_FFN_NF5_as_0117" = "153f95cqd0hkxfy9p81mf2dfdp13h3fhhp0qyxmiknhqm10ykdxq";
+ "NNPDF23_nnlo_FFN_NF5_as_0118" = "0fch9i9qj1k8h3sdwfdcd75idi0bv2q7a338dvj4697xqpxf2mj4";
+ "NNPDF23_nnlo_FFN_NF5_as_0119" = "03r72mrbvy9jkkbmgvp2776xxgjx0jyxsv4bvpxmhscpym9mjvq7";
+ "NNPDF23_nnlo_FFN_NF5_as_0120" = "0rsflim77kdp849pg6f87rq6j0wirj4gayvrnvi4xvfjlk1mxkll";
+ "NNPDF23_nnlo_as_0114" = "1p32hw48zwmvj9i5iyg9pqhf11zwf7m7g5q8prfj8825dvsgql94";
+ "NNPDF23_nnlo_as_0115" = "0smmwd7xla73sb3bci46grj1kfd751pybkf7fz3w3qdkp5jjglqp";
+ "NNPDF23_nnlo_as_0116" = "14blxcfb2jbdgwh73f2spvqxy5dhn5v6ygwi346dzwswipwbixir";
+ "NNPDF23_nnlo_as_0117" = "0di0a5dkskalllnh90ngfb046z5hm9ihjra1r1ck06v9ryam2w9c";
+ "NNPDF23_nnlo_as_0117_qed" = "0dvzz7ac45j4m655k0i3ycy6xwfm6y6801qsb5bgp1kdv7g2pj3z";
+ "NNPDF23_nnlo_as_0117_qed_neutron" = "0v05yw5nc1r7vh8sjag4fmdklkn4jmcdpsmgvwm7sblgfc6gnssm";
+ "NNPDF23_nnlo_as_0118" = "14p9y1ryc1j26gl01sn60pmrfpnkm81bhark2g98xz8dmfmjp7iq";
+ "NNPDF23_nnlo_as_0118_qed" = "15mcq4q20ijmf06pcc626jlk22fm8c473p4i80bmi27h5x2pl56i";
+ "NNPDF23_nnlo_as_0118_qed_neutron" = "15vsjjc1i2x6lb0603h6knj68si8cvxml2xk97pw343qn3p8h4ka";
+ "NNPDF23_nnlo_as_0119" = "1qzap9zlpwyyshh8hc0gm82y9rl9hpy232j03gd6vwmcw5pgm2d2";
+ "NNPDF23_nnlo_as_0119_qed" = "1cqvdmq0hm9rh6749bn08i6c94gshpjafmwv8siizdlm8v9af442";
+ "NNPDF23_nnlo_as_0119_qed_mc" = "0a77i8grscxwnybgikik94ldiddrif3yy6d4bqb6x1aj4hr9i5ag";
+ "NNPDF23_nnlo_as_0119_qed_neutron" = "182jqm5019n94givs4rwblpz02hp90mbizp0b5svrxf21zdyrmbx";
+ "NNPDF23_nnlo_as_0120" = "1v8ykgxnqbvfra57xpamhgbcjvj89dndhk62pmji004gvqpmwi61";
+ "NNPDF23_nnlo_as_0121" = "1fv1m86ya7zi77ajd8r1nls2zcr7n6s3wqrdiwq5ikxidqxc6cgy";
+ "NNPDF23_nnlo_as_0122" = "0bn6bmvs8w9qsqcpq8y8a7w64xbkvrqwiikm5shjprwqy9xbspyf";
+ "NNPDF23_nnlo_as_0123" = "0w7sqyyf98ymxpgqfh8gr9g1pdwr2pw12zc8gqykn5nkjbbmijgy";
+ "NNPDF23_nnlo_as_0124" = "1hilgda0gqyj81a5h0mxrl5g9ahlm1n6mhd3ajkicxz2fvxm2n1l";
+ "NNPDF23_nnlo_collider_as_0116" = "07m2jwjwzjc4bdsx9dkrp41qn04f9z3k2m6n4q308hwdq9lmcm99";
+ "NNPDF23_nnlo_collider_as_0117" = "0i4kggkkkp407r33a2nsdy329zxpx8h6dq0h0wwpvq1kmyrjk6i4";
+ "NNPDF23_nnlo_collider_as_0118" = "027wlw7lk04grz5qavyymj21ik4zr9fy9yk2kwjc9gx2ycp3sj2z";
+ "NNPDF23_nnlo_collider_as_0119" = "0jq3q3sh1p8rn1qap77794v9hh3j0b7pmfl24wxvpc4dly4al0vs";
+ "NNPDF23_nnlo_collider_as_0120" = "1s0jic8amasmxczdflbbhn6071nx8cxr3ynfrinllp36d92pmgsx";
+ "NNPDF23_nnlo_noLHC_as_0116" = "0jzn78p2gygsqip50jfnnrmwl7issbp4vzpf71cbvj39ihsmavy0";
+ "NNPDF23_nnlo_noLHC_as_0117" = "0zns2yy50c0bm91y8xaafmzhgx1wafvmv39cykw7xwsnkgclh487";
+ "NNPDF23_nnlo_noLHC_as_0118" = "0v5bdc8d9w5g606h42rpn6zw31y1a5nk9akgfd1lyrhilvh7ayck";
+ "NNPDF23_nnlo_noLHC_as_0119" = "1zacfd5jc5wvcig0g8g4jkr77zcxvzcvppa4ci81c1n8d0whnr5s";
+ "NNPDF23_nnlo_noLHC_as_0120" = "1lx7m8ajwvhkzxck2ngxng1g90fpay5r5iwdnk2w7xgp1hb1ayc3";
+ "NNPDF30_lo_as_0118" = "12adhizxskpjzdr6inc2hi6bxrs8ns3bnyihz09hfh9q53d5ayik";
+ "NNPDF30_lo_as_0118_nf_3" = "1gjaiwqdhlswf1qmw39xr6g0w4bnnbinfpwl9c37jnggk6dxwdjz";
+ "NNPDF30_lo_as_0118_nf_4" = "121xn280f5xx04q0rr4ina9iqzbc1v8cay78km836kqvgb3pcpyx";
+ "NNPDF30_lo_as_0118_nf_6" = "1s77g0bf1qjb9rn1svnpfx10laxx87lw660ark9fhhx14zgybs3i";
+ "NNPDF30_lo_as_0130" = "0nvpwbmdzm8fn4wlb2rhzar71kk4myfddpqsqhd7wb1fqxkj5b7y";
+ "NNPDF30_lo_as_0130_nf_3" = "10diiahiy3yk6y7m1r4bd6nr1kf4mnccgj5qyq2lw49highn4s8k";
+ "NNPDF30_lo_as_0130_nf_4" = "0j3b3rj5pr2ws3yaq6h74hhsjy7lv3d2x5nryc55q22xfkgf451i";
+ "NNPDF30_lo_as_0130_nf_6" = "0w7k4a9ir4xvfh3v6dba70rhwkkq7qk16z178wld26zl6a7gw1hk";
+ "NNPDF30_nlo_as_0115" = "15g9alyc317qydqy3g7sqlh6pc4pxn3xmhmzv9lcw2ghg3gn35fi";
+ "NNPDF30_nlo_as_0115_nf_3" = "05b5xl89jvk6bgp86yl5hwdh3x8211czdsbianqkfix35rqrvlx3";
+ "NNPDF30_nlo_as_0115_nf_4" = "02p9lhvricjl5r79pkcm2fv14p9gw1d2qizka4w254ang3i1hcm0";
+ "NNPDF30_nlo_as_0115_nf_6" = "1iabf2qszv1270ac2sr2bqs7rb3gm58fj388saqbhnra4p2kv9fw";
+ "NNPDF30_nlo_as_0117" = "01my1m7vx7yax8ldnjp7s1mz1w3x3m0h1gdd8mamfrvphaghwp4x";
+ "NNPDF30_nlo_as_0117_atlas" = "0vjfh6kihsypvkpg3fwqf96kd2ldq0azcl72ia6w1nr52rsqc27l";
+ "NNPDF30_nlo_as_0117_cms" = "1sbaq99731ihrkp9a2fj6lxj9dr2c9j4vp2335249nrkinfpf4mq";
+ "NNPDF30_nlo_as_0117_cons" = "14qwjsa633v3h0sbizmhifrwdm7fmglyk608lq4ims8y7nn491nq";
+ "NNPDF30_nlo_as_0117_hera" = "05gs9ril5vkm7xrnz5pvjd6pk8ivgk0bl4bh45gx658fgg2snhiy";
+ "NNPDF30_nlo_as_0117_nf_3" = "0jc8p8h9pny0l7j3hv55iwaw684ymj0hl62d6bxlvw8sqvhxcqyl";
+ "NNPDF30_nlo_as_0117_nf_4" = "0a37b46ach3m0gqniwk79qk963w0m96dknda2rhp1glpg5xdxl0z";
+ "NNPDF30_nlo_as_0117_nf_6" = "1hjj6k5g2fia7xq5piy0dhsqs9lwriasmppjwil9wxnwklnwmr2m";
+ "NNPDF30_nlo_as_0117_nojet" = "0z3s8ixmq2l4znv2dn0dcz9rq5f9b3jgnlwmvjzcab3wvj1za687";
+ "NNPDF30_nlo_as_0117_nolhc" = "1x9nbnxm72wzaky4rvlrq1kmqs86ypphqwvsng33n0zdd9yr82pr";
+ "NNPDF30_nlo_as_0118" = "0b51qb2i3h9d7hrviarfszwljsy88m8ibzgz7dd5gn88k9kardrm";
+ "NNPDF30_nlo_as_0118_1000" = "17yla3w0rqy1a5hxq3bfq94ddda2qv6zzj76lfrm4zahl6m02kdy";
+ "NNPDF30_nlo_as_0118_atlas" = "034h2wgakbm3mx70034nwb44ii38rca7xv3az3fhcnjbpg9vnf0p";
+ "NNPDF30_nlo_as_0118_cms" = "08g9315fpc4khwfjf76vvyqa9nannvwq0bpc42f9f7yc0pck71qa";
+ "NNPDF30_nlo_as_0118_cons" = "1lw0fhy9gwk3zr7vq7qh9p6zprbyd4faln3npnxs2snncic1mnz6";
+ "NNPDF30_nlo_as_0118_hera" = "0ndgfpxl9mrf1fk6w5q9ag3qm9rr4q3jkymfnr4frkmzcdxjnvzn";
+ "NNPDF30_nlo_as_0118_hera_1000" = "0lljb96d3q25yw3fz3cbk2in90q6srpc4alkz95nyrvgp25xgbgy";
+ "NNPDF30_nlo_as_0118_hessian" = "0h8d2zc02ccr1rmlsf4xd5a41irbs9q9wx68caj2xy0i7qr8rsmp";
+ "NNPDF30_nlo_as_0118_mc" = "12nnyzh2f6mv4gq4x4b8nlqx34lbj5y2y60zivfdbcpyg2spj5y8";
+ "NNPDF30_nlo_as_0118_nf_3" = "10f5md8bhf44n5x6r7ln8c58a9ylm4mfgxg30vd0d8mvjc3zpsng";
+ "NNPDF30_nlo_as_0118_nf_4" = "0q14zqkzqy2hgh8wli5db7dsqgsljgbc717da661wj8kqa23w4r4";
+ "NNPDF30_nlo_as_0118_nf_6" = "08ajfn1r27hdarff464j2gpi7ffjjxs6pwzh3vil8lpjij5y7d4l";
+ "NNPDF30_nlo_as_0118_nojet" = "0zzzk72n7nq1mcaalbv7mpfpb9kh095j0zazbzfjf2k6r3p0v082";
+ "NNPDF30_nlo_as_0118_nolhc" = "1p7iac75znr1li8qg9xf1my37i70flhvjkfjmrb5b0h3hk9agb1r";
+ "NNPDF30_nlo_as_0118_nolhc_1000" = "04mgjfq1ncy90gqljfdzw1iwzav5infkfv7zj2rid088n3qfs91p";
+ "NNPDF30_nlo_as_0119" = "0p0kgw17c97p99zy3ffr6g7pphhc8ccdhcq4iip5drqm4hc6nb58";
+ "NNPDF30_nlo_as_0119_atlas" = "1hpx2jm4y6kz9b4j42ags98j115hd2s41km670979z9zxmj2qm5q";
+ "NNPDF30_nlo_as_0119_cms" = "1j0135mxdiyn22iqrmg0d44w2w7ql1cdacprxgdz4jfb0ppn68rx";
+ "NNPDF30_nlo_as_0119_cons" = "00qvhq9ypqv62zvlg32k3x5gibl5jh0b78hyrpvxf1l3y2b77nw1";
+ "NNPDF30_nlo_as_0119_hera" = "008f4m8p9gi4w61mgjiqqpw346rgqxaayc1rncy2fggl4gs64yi1";
+ "NNPDF30_nlo_as_0119_nf_3" = "1bh0sl8pjy5n90j5dz9c80n3vy21hdsv8vxwbqkq0b2lkv8gzw5g";
+ "NNPDF30_nlo_as_0119_nf_4" = "0swgnmbxz0g3ziib1992s0454jfsdi7l0x3lrvs5qzzjk6rg6qgd";
+ "NNPDF30_nlo_as_0119_nf_6" = "001awj8h76wybmxj9vvkxgqixzak4zbhsvjmj2lscb2v5qq3y68r";
+ "NNPDF30_nlo_as_0119_nojet" = "1x961nmad1rxmf4yzbz2drpi5hfac2ag1bs1jbvvlw3p04xr2c38";
+ "NNPDF30_nlo_as_0119_nolhc" = "1yx6f4n577zqwhp0i440r6zk06702jg4kkib9nmgws3jl5f28big";
+ "NNPDF30_nlo_as_0121" = "10k01z1amzp3jmfvfb2snrm8d04vr31kly1m30pw4fv0qn78idlw";
+ "NNPDF30_nlo_as_0121_nf_3" = "1gb40ycnf42fkrbdwfhb8wp56nmzxyi7fzbqgvlkby7pn86m2f7m";
+ "NNPDF30_nlo_as_0121_nf_4" = "18ywp6b9f83rxmh7gfn648wslvvf5g4ffm83rradp308smr1sv6p";
+ "NNPDF30_nlo_as_0121_nf_6" = "12dps7n3glrzwb8vsfghwbvnh1yyxvjnvqfilbrrcy0dm3sams7b";
+ "NNPDF30_nlo_nf_4_pdfas" = "0hrx872m52bb894c32jrvlvm9lcpy3yllj5ps52nmywqd8n1simj";
+ "NNPDF30_nlo_nf_5_pdfas" = "0q25jxvwpz8inkax0j2zq9pj8swqfn4jmkhs4ibkl6xs78bhjfb8";
+ "NNPDF30_nnlo_as_0115" = "03apmzw7krj77zdyl6sxwqg5fyv3vicp8iax445qdx8ld9kv225w";
+ "NNPDF30_nnlo_as_0115_nf_3" = "08y1gjzkpnjn6mn247n7a9ya8z6pml3602p08rjha4ljggxhyffq";
+ "NNPDF30_nnlo_as_0115_nf_4" = "19mjfk1rib9dxbsn0473ggi6akwv1zs9y3q9nzjg47mdjqlspb2q";
+ "NNPDF30_nnlo_as_0115_nf_6" = "1zcjjbjwjgbkrhgh0kira7wzwmy5vvi1n15wycg33yk09m06db6b";
+ "NNPDF30_nnlo_as_0117" = "1225gj4ihmphnfav2h38rz17lj1dyi9j1lazqlwww8vizl8933bz";
+ "NNPDF30_nnlo_as_0117_atlas" = "0i9nc7q1cwl8cxxaj1xaz28wmj09q5bjmh19p1fcbcln7hklvj5x";
+ "NNPDF30_nnlo_as_0117_cms" = "01ffhsw191nrr58x6wnjizx7bbijkknicvgk73pjbwyr67gfj581";
+ "NNPDF30_nnlo_as_0117_cons" = "1blfi0p231r5j34wspk192fmbv34gbvx3bkisjh7wxpiab80qdws";
+ "NNPDF30_nnlo_as_0117_hera" = "0ds02aj1q6y4dndfk9l9fyxci0dhpwr7jx1jq1qb9g5bb7bbhzz1";
+ "NNPDF30_nnlo_as_0117_nf_3" = "087rz8bz3j2h7yk7rknlqz3rpbczgx2r2zdag8pjccdqi9jnk9pg";
+ "NNPDF30_nnlo_as_0117_nf_4" = "1w44bwx6m6g8r990vl6f505bgf3v583mi19r0nfh2pahx2k2djaw";
+ "NNPDF30_nnlo_as_0117_nf_6" = "1l7gwbsl2haqaj6hqsnnqwrnxrkdv1h63qbs7iwfdq6474ndzwsf";
+ "NNPDF30_nnlo_as_0117_nojet" = "1nmv44arab9gfhs02jf4zijdb0644pvdmi6k809bxbfhir9sry8v";
+ "NNPDF30_nnlo_as_0117_nolhc" = "0zn2b05jv9da7394in14mswvma48y26lvpw7rwh7wmyw323rxpfv";
+ "NNPDF30_nnlo_as_0118" = "09xxi0vq90n9vfzq72c0mbf4yz4zif3kl6xwcjdb8r620ihwrnfw";
+ "NNPDF30_nnlo_as_0118_1000" = "1iy5inrsfpn70w65hy42pmz0630pbrgg4l48qgsamcjgqdhd3n84";
+ "NNPDF30_nnlo_as_0118_atlas" = "013jm6f2hnmzc2di7spf6zp31fwhm6c9sddwql36hww63w8sys71";
+ "NNPDF30_nnlo_as_0118_cms" = "1w0ax68rg5877s35zlg13c451fcz2rij4adzwhz4yf4skkbgflng";
+ "NNPDF30_nnlo_as_0118_cons" = "1qniswwj6cmcs7bm4n11jx2disqcwszl08cb7im824nvrcjka2pg";
+ "NNPDF30_nnlo_as_0118_hera" = "07k4wlfd63zmhnxq06avdpfrgfnc2ziqhsgyy3w4lvara9i27il0";
+ "NNPDF30_nnlo_as_0118_hera_1000" = "0ssiw9fk5fqwg77rbycrxrclldws35n6gj4a4sj6d9yc87vz1g7z";
+ "NNPDF30_nnlo_as_0118_hessian" = "1hb32bamwlx5il8g2sf5gy6xjr7r4rky7xgvdhf5ndq7v3n1ncx1";
+ "NNPDF30_nnlo_as_0118_mc" = "1gxl4c5z2vh382y8l2kpr8vy4fqvbxvrw6xjc6dp229ak89cd6c2";
+ "NNPDF30_nnlo_as_0118_nf_3" = "0iccjcds9j9pp8s3mwrshhzl5anklax4rgcwm5im90hipj450rgj";
+ "NNPDF30_nnlo_as_0118_nf_4" = "002r0179jsl0l43psvw3hd1drg9fcrlzw57sbyndlswvq4zkyzyc";
+ "NNPDF30_nnlo_as_0118_nf_6" = "1mwh2dxymayxa2khxjfxqmbhaj85jdnz548wmq6fyrxr63cfmw07";
+ "NNPDF30_nnlo_as_0118_nojet" = "0nly14fxfww78qihrd8b6wk3da24x5sxkb13h8l2cgdxkq90fxbd";
+ "NNPDF30_nnlo_as_0118_nolhc" = "11yvr5h66v37376d5p2m2g8fajdycv9baqq6mjfphf4a2abrl7m5";
+ "NNPDF30_nnlo_as_0118_nolhc_1000" = "1bi0mxs6v1izlbvich55vi7qab72v1sizd4wj13787w47ffqm89p";
+ "NNPDF30_nnlo_as_0119" = "11bvbqqjbyz0vjd4kh5qyd0a4rb62l103n10d1cyffgdfxxsk8f9";
+ "NNPDF30_nnlo_as_0119_atlas" = "1fm46crfparx2swpxnyscpwqgicxb4skhclnc5xaijcpzraflzp7";
+ "NNPDF30_nnlo_as_0119_cms" = "0i2d4wq7bsbfp8hqdr88nbii980zhfmpg6758czz7swd5yv8076a";
+ "NNPDF30_nnlo_as_0119_cons" = "0v54zyz410rg3wcdw44japzynzvvrbjrspk91d0129rdv2xz51cg";
+ "NNPDF30_nnlo_as_0119_hera" = "09w3krirq117cnhfkxlb8pld3xb5g2r3nhgc11v3ksavq746jhvk";
+ "NNPDF30_nnlo_as_0119_nf_3" = "1k00h1c0lv6884lb02qmqki7sfmxkqpj88fkvf057frk120f59ah";
+ "NNPDF30_nnlo_as_0119_nf_4" = "0pqjvaw2ad3g9zzjdyhh72580jrj4p8hxlvy9h6q9hhpwdihnnmh";
+ "NNPDF30_nnlo_as_0119_nf_6" = "096fc9958s3z559knxqccwj3vylxviq2g58rwirj3qdjvy96y2cc";
+ "NNPDF30_nnlo_as_0119_nojet" = "0l5crj00jm2vxgyr5nhs6h1n64xnxwpanrsjk8f8qfis37s68ar7";
+ "NNPDF30_nnlo_as_0119_nolhc" = "1nl4gkjjz3kpq1sbzqk2d0d50vmb3ks7j5z14hqf9dib2xr39jl1";
+ "NNPDF30_nnlo_as_0121" = "1c0ddbjskxw4rq1p8sp63vayxkvcnls062qp16wvrrbw7zkj1jaa";
+ "NNPDF30_nnlo_as_0121_nf_3" = "1sj9g0wg6x2cvwp45i726dcs44hpqjiqa011xzindnjh8cq7m6xn";
+ "NNPDF30_nnlo_as_0121_nf_4" = "1j4khzpw52vc26n7a95xg1wyqz720fnz2kbb8l9a5bsbmxmaa7xv";
+ "NNPDF30_nnlo_as_0121_nf_6" = "1kln7zjgl0hwl621wnhhsih0m8f9ir2i8ligfg2s0qp8s3787lrg";
+ "NNPDF30_nnlo_nf_4_pdfas" = "0s460v9712ahz09fhzhlnsnkl9arsy3l82g1z6xjz4la8fwkr9wq";
+ "NNPDF30_nnlo_nf_5_pdfas" = "1vjfm9j39m4389b0r51axlbzdbkpk2vbs3vks3yqcr3hr09g9myk";
+ "NNPDFpol10_100" = "0r5qfa8cyanalphgjdsh57s3viqv9i10v51p1pyamj1f90gb9pr8";
+ "NNPDFpol11_100" = "0nny1lpw37jcillpfxjx82hq7wlzp4yksxialmc2ivr192qqdda8";
+ "PDF4LHC15_nlo_30" = "05n0i1mr7v7ssvxvdmv9fn621rinl08frz71apjj7wfdm7s7bk72";
+ "PDF4LHC15_nlo_30_pdfas" = "0xi4xydx0x4ina0wmqv9jf4978xhd8x0l91dwfxh5vy39r5x4lm4";
+ "PDF4LHC15_nlo_100" = "0m9d4zy7608iryqy1ypgkr1d3yhw2wv1nrrc70zrfih7x0fp7lz7";
+ "PDF4LHC15_nlo_100_pdfas" = "05wyqyh9y32sxflq69igcnnsl0ifnkyw3vnnnjn6kscl8h8hs7lp";
+ "PDF4LHC15_nlo_asvar" = "14hdgj5g8ia7y6hi40zbh925dacrk7hd6cli6lkhlqzxl755nbs3";
+ "PDF4LHC15_nlo_mc" = "09p7y0z04r6wdkf8gi3yj85qk5hmp0mmhab8c7a7lly4731fyf42";
+ "PDF4LHC15_nlo_mc_pdfas" = "0sds9rkvbjkk7pardwq959qqbrvgwswxmsqcfppky2p0qmdsjs0s";
+ "PDF4LHC15_nlo_nf4_30" = "1ysy6dqlacg4bwb2f16p1aza5gwm9qnhmc0g0mhsdw4d2i4ml5yg";
+ "PDF4LHC15_nnlo_30" = "10cm4wa0mk34rnvsr5q8g9w7fs9cblsryms2nl370wdvcrhzsxph";
+ "PDF4LHC15_nnlo_30_pdfas" = "13xln0y8l0qcj9951glj4f1kqfaagj8gwkxzlvdkgjnj1scdy6yj";
+ "PDF4LHC15_nnlo_100" = "1gcq3qrf39dhq2pmpjrj3z0i0ycrk76mjdwmgfvzdxysp530ax54";
+ "PDF4LHC15_nnlo_100_pdfas" = "16r8far43ymsd64a4bbqlj56qvbjmcyxbawv4lkfxysjvbydxj4w";
+ "PDF4LHC15_nnlo_asvar" = "03fh1jcbmvla7n2jj3zq4ibwvq66h0rniply7h93d94zawcgsy4v";
+ "PDF4LHC15_nnlo_mc" = "0c6nfkv3x1p5iw514knjvqcs1dcaryf74qqg1za8x234yr5ndi3p";
+ "PDF4LHC15_nnlo_mc_pdfas" = "0l8hlcz69cdii7mpgargi9nsx7iy746nad5pnn7pvycrc40marij";
+ "abkm09_3_nlo" = "0h268l7j1zkxm2nacari10f86lpha511xhgrg0q9r8hc47sw2vxs";
+ "abkm09_3_nnlo" = "1gzhvblckskscql53pfxp79qclhhhhm45sqjhc9jrm1bp3x52w8i";
+ "abkm09_4_nlo" = "0yq3gy0qgnk5dh0hh3ldrf5bqzx5wpkhw509nvz5arlh0bfwhyg4";
+ "abkm09_4_nnlo" = "1b8470v2n5v87mmhp2dhmfh7iv3280ad67z2vyl0sfv87iic409j";
+ "abkm09_5_nlo" = "1nhck955mw94h3pyhm2vd3q60qxwsmclkfqdscp06fc3avyvrzfv";
+ "abkm09_5_nnlo" = "0wklkcjknn7ys1akg56zxdrkd7ardlc5qnbjq51mva1nf2bxk0np";
+ "abm11_3n_nlo" = "06r54q3ph851a0hyn4di1ifwjmdkdklf3wlsdpz7qn0w4w3xcg29";
+ "abm11_3n_nnlo" = "03rgkj2hyn3zmj8yxllfnc2iqr12j8shjcpdjka33v270lim3gq2";
+ "abm11_4n_nlo" = "02r9ba7rz8f5438rfckzny5amnq9qjgl164x8il6xqh5crxn4vb3";
+ "abm11_4n_nnlo" = "0z6a9wxy6018qm9nyyip9wdq46j7rh2if5xch19h4qx20gx6m48a";
+ "abm11_5n_as_nlo" = "0x2w81w9cz955k9dd45872k98my57w83cjdsv4gvjb64d1hsygzq";
+ "abm11_5n_as_nnlo" = "0091vwjkc686d1dnfn2dpa7jb56p8gli2z687fpx5f8yhjzpbh80";
+ "abm11_5n_nlo" = "1bpf37mg5wgcf1id2am98l5mj162xrnb8k16ppfx3qxlakp0iabl";
+ "abm11_5n_nnlo" = "1mpk322mqs078pk2nxxk8fa29ka6cxzsf65ffiny38678djmfqd2";
+ "abm12lhc_3_nnlo" = "0hwgspbp6dpw5lz211i0vjgg45hag7zr3djfdk16gkr86sra7ba6";
+ "abm12lhc_4_nnlo" = "161qdm0axsqhg6lizx0h4kdg714kl2d6mb8y7wrvanr0v0db9zkl";
+ "abm12lhc_5_nnlo" = "0vshq0fx5nigzdf0vryr2v4kggc37byalzfjswm70l3nnjhxp6xs";
+ "cteq6" = "0wk6fmajvbdh8wmx1wmyd9n53m82vvh2gj4iric4b4ig9ssmbjx9";
+ "cteq6l1" = "1b5m7g7wawk72h76l9yr3gx3n67jggna1004lwffvj43gffwkjap";
+ "cteq66" = "09i69ac3gkrai5jmazjyjvi5sl8k2vm48m90ijn6pl24p31qf68y";
+ "nCTEQ15FullNuc_1_1" = "0nx1n814mkikd01pxmpndk2qxpwqwd55cbn6z1kgxm8qlhhhd2zw";
+ "nCTEQ15FullNuc_3_2" = "1l2js36nh4jawwkpiq386blgwbmgi9ccvvzbwq92jb5kpd2fvh7z";
+ "nCTEQ15FullNuc_4_2" = "0fip3n3pjd94rz3f4gcv2szrx5k72m5b8xcmsgjfd1671r5kmlkd";
+ "nCTEQ15FullNuc_6_3" = "0v5yabjw3xkjq5c1zjqmj3wwb7yz1blkprxnrpvai54v17w3sk3r";
+ "nCTEQ15FullNuc_7_3" = "1ncarbncfkqk6l3rx3zg34a3sj7mpm2diqsafyldpn92cw66bcs2";
+ "nCTEQ15FullNuc_9_4" = "180ipb4m2zy54h7n4s0jwqk9k6562bygvnv7mg9dp2f7vf5317a1";
+ "nCTEQ15FullNuc_12_6" = "14z11wyzclx5k6dl46zr0jp6mja178bvd547cqqfy811nbzmmri3";
+ "nCTEQ15FullNuc_14_7" = "11i2xcd6ncp2aqw3y8pgcp63zkaj383ciwvqpzmjnqraiqqqa77i";
+ "nCTEQ15FullNuc_20_10" = "19vhxi7ch9vxa1vyjpxknk69hnnm2n5wpz4qybg1cznk59dvpi28";
+ "nCTEQ15FullNuc_27_13" = "09pflgyxl2ydzrmys7rv0mmvl32z3dmdx63wpilrw592aa70bc2i";
+ "nCTEQ15FullNuc_40_18" = "11pw23fbrz97i9278cxrvc0a4wbdyhz788axq8jn7yka9mg9kch6";
+ "nCTEQ15FullNuc_40_20" = "0raiqn6w90n17irf4l197my77999ygqwhim9lnjqgbn68yjqfqf3";
+ "nCTEQ15FullNuc_56_26" = "13msj49c1lfisgcigvc4wr32w597jwir8cggrcdq74b0d0ab85ch";
+ "nCTEQ15FullNuc_64_32" = "1spgcb340nz8by8051hngnh6pa1wjf19vi5a40xr8gyprdzhwb4a";
+ "nCTEQ15FullNuc_84_42" = "1z719mcx5lnx2ciwlnxxhgc4s00jrr9sfrxcimh69sj14hmzgx0d";
+ "nCTEQ15FullNuc_108_54" = "107klcpsr9d4dwavcqqs3849k90mdb3bdjam3pd79cmsy7ncr2hf";
+ "nCTEQ15FullNuc_119_59" = "14az155s3xfl8nscwpajzwj0dy94dadc4qdc64njlg3xlnxsgxy7";
+ "nCTEQ15FullNuc_131_54" = "1984nphc6sqizaq1c1laphw3hdvkp5k7sy7g563wq18578fifbmk";
+ "nCTEQ15FullNuc_184_74" = "1m311m5bkzq00qf117dli9xrmcmx8qqh716wff1yj8ri4c4h9m8x";
+ "nCTEQ15FullNuc_197_79" = "0vi29fdxaj7fnpc01k3y2ylb7ngpdnmbnzgxdnr6p9bj5wfa69z5";
+ "nCTEQ15FullNuc_197_98" = "0qjkdfgpbcmwc39wzyfb07wrqnkkwn7v8235y1m25x4wy5bbpjbg";
+ "nCTEQ15FullNuc_207_103" = "09py38s7shcyy07p5mxfiil5wlxijzbv9k4l3x0g1v191k0vi3m6";
+ "nCTEQ15FullNuc_208_82" = "1c9r5wr43291rw965axdzpshzjhnynsrlf28kfr17v7vpd9dykl4";
+ "nCTEQ15_1_1" = "14dlybcc038ssv2xbyhing27b9zx07nkqvgf66ysbb83ym5dvibs";
+ "nCTEQ15_3_2" = "0nq1aj4hxjih4z4xlhjfbza2dp2fyhwbccjgmgh2za5y7rzgz9fk";
+ "nCTEQ15_4_2" = "0c8r4vq3phi40v5h4p3nm7by72pz27zqwd67z9slmf1jy1yilnly";
+ "nCTEQ15_6_3" = "14ars149pssaiyhaln9zm7vz3wzj2597cy2xasyhlrfqhlgrq056";
+ "nCTEQ15_7_3" = "13b9wbm2hqx4lixq3dad1y3cr6didcch8kg7mqm9lgbism7dwaqw";
+ "nCTEQ15_9_4" = "1rkxhxwp0v9dm6f71c5635ihlspfx0sj666maif4iaw1sf4hazln";
+ "nCTEQ15_12_6" = "1xnnqp38zz3b61jb38hz54wv09w06fwwnb66sf93r1agcajvv1vi";
+ "nCTEQ15_14_7" = "164p2fhlsmkcc6fibi28lysbfn8q5vds4f0k0kppi96absgrfa70";
+ "nCTEQ15_20_10" = "1vhk2lmpf5kci9173v5qh2gsz7zghvjb11x1mln8yqcdxaq4az8x";
+ "nCTEQ15_27_13" = "1md9xv99m6jcdqldhbbypdix581nmhpyanvr049l5c1a2ab5nbpa";
+ "nCTEQ15_40_18" = "1gb4kfs207izq4dij9pqbmwm10vx6f1h7pdnf749jysmf6nayndh";
+ "nCTEQ15_40_20" = "0b44nkk315a9zaq3280wmsj67rkxw4jyk9v37s859fikr5v7s0sv";
+ "nCTEQ15_56_26" = "0ndyjjh7sxnhkamx182rpax0kcc2iqzwnmh391m5wh629zk0av8i";
+ "nCTEQ15_64_32" = "0ixbr2d30v6slqvp6gpry1159rx5m4hd1msymgli1w9k7pp7xjz5";
+ "nCTEQ15_84_42" = "12vkqpvjjyh0x0hbn7r4gx5za01yqs9a7lqirdxd15k04fp5rnjr";
+ "nCTEQ15_108_54" = "1bjx2d61qjhabfx28pfi64hf8br4gl67nzir3ygdpwdcah4k6lz8";
+ "nCTEQ15_119_59" = "0g7wffsyjh84r2wv8w67skx8gwdb3clv9c1dlpijwqmpkcm3b8q5";
+ "nCTEQ15_131_54" = "062sg81yrrdsc376gpq01xzsb6114sp6814ah9jbrd08qqxh04p2";
+ "nCTEQ15_184_74" = "1zqyvla6dj93cgfjw5z97b6wh6qy8pkrvcbwirjva769210rax75";
+ "nCTEQ15_197_79" = "0mp1gddlwxk2vdyhra5lafvblc82g6n2p19lmjwkmnrmjqdqsz12";
+ "nCTEQ15_197_98" = "0z2ymk9y0syzqj88mnr2kjn104602ajg17s31d9vi29lggy4cn44";
+ "nCTEQ15_207_103" = "1zpxky925n9jssdr036dyax8wxa0d478l4mjl50bjmzqhr8wl7hv";
+ "nCTEQ15_208_82" = "01jf2mrknx5igs0cvhm7xr25gr6z93bvj12cbq53k15fk5niyglv";
+ "nCTEQ15npFullNuc_1_1" = "1fq80hzfy16gs00knvl0g0yqrys27vzyk8h5jzs1ra981zgcw1zp";
+ "nCTEQ15npFullNuc_3_2" = "0rqjxc8q53jndxjrxd293r1m8gin3vif33jzr35y2ail9bhkjyzp";
+ "nCTEQ15npFullNuc_4_2" = "12gx03drv7hnmsgk6sni7mc7c4rbpag5gn2czyha1n19v13rry93";
+ "nCTEQ15npFullNuc_6_3" = "1gcxs7vcjcdyniczd1rprvzlc1p9yf08sy1fcrny2jfbxkfndqwx";
+ "nCTEQ15npFullNuc_7_3" = "09kwf5kbshw4pwh6iilqy1mzgvlg83jhakmvvgz27f569f20ci68";
+ "nCTEQ15npFullNuc_9_4" = "0gsh5jmyn7jlasp9ixx7imvkbp5rxmvfa480vy0bnxwjwz0924ia";
+ "nCTEQ15npFullNuc_12_6" = "0mb3zixcikagsqzpxb7jzrcg05dln37d7anz5359ssjyd6p1mqyi";
+ "nCTEQ15npFullNuc_14_7" = "1k2554rg82msxzkarjx85p6di3kmfqxmbfxpasi1x74laz38663n";
+ "nCTEQ15npFullNuc_20_10" = "03dv3z7j69l97xacd38wbp7iyyi36g0bbc2xmxhm3l64rjs21bmz";
+ "nCTEQ15npFullNuc_27_13" = "03lb2dznl5dpv0cwsl08dlrh7x26yi9acx3n70imr13gspfxp8ag";
+ "nCTEQ15npFullNuc_40_18" = "1827gpzdrxdkg9ikk7pjgv9h983mwzk21p60635l1zhwby5p4mn6";
+ "nCTEQ15npFullNuc_40_20" = "11mjdibgypwpphm1wmf4z311wg4lp37010vwyys8q6d927jzikn2";
+ "nCTEQ15npFullNuc_56_26" = "1hq6qv19gqzjv57msdajb9kc0lv5jvl3b6x2fc905lg0dc7h2ab5";
+ "nCTEQ15npFullNuc_64_32" = "15gq3l91p69dba5gfxvh7j4npwl7rwkakjnsv9lx84hvys7hgba9";
+ "nCTEQ15npFullNuc_84_42" = "0ah349jih2ia0x14mnrygzzw38prfgcmbxyw1hdvzqvgk73wazwa";
+ "nCTEQ15npFullNuc_108_54" = "1g8id10rpys9566r8h92diqrr43mww6q8nhvlns0kfjkvkr22m9y";
+ "nCTEQ15npFullNuc_119_59" = "0df499pvfls1281zkvngrhicnc0ac0bfwamzs027k7f2y6ygkfb4";
+ "nCTEQ15npFullNuc_131_54" = "0i83f1wg81nr742jf9407w7fbknigz6pyx64h7p65x82s4wmj9gf";
+ "nCTEQ15npFullNuc_184_74" = "1pnl4y2arxf87b1pp95b9jajzlqdyzs7mv82xhmw9fcn9yliy5s0";
+ "nCTEQ15npFullNuc_197_79" = "0d5c6g4185k6pwm5bs5fqlwc97l0gvf6bhk9l8a5vc039dggsgkj";
+ "nCTEQ15npFullNuc_197_98" = "0ql9xnwggsqibld13yisvsdkkymzph8wnqffnxhlyp5digwhl64v";
+ "nCTEQ15npFullNuc_207_103" = "04bg7hnngfsckk92gdrxbrxhsbb1ac1s7dscj7ycdy64fxn4lq8x";
+ "nCTEQ15npFullNuc_208_82" = "0f9ddimq9av2jr3yr15n630bi30bxh5nxrsbrcfw9cx8dwnjscwb";
+ "nCTEQ15np_1_1" = "1fndfff1lialb2qy08qp44w4605j9c2acrwpdb16k3awj88kx7mf";
+ "nCTEQ15np_3_2" = "0jxg5f5n4yp4zbdkm9y7xd40m89pbw5687hz7mylpn9n3phsi58y";
+ "nCTEQ15np_4_2" = "04q9gq8163lhfjrrp0ysqyb5sx2nkw5mpz70daqnxvybavbkg7mm";
+ "nCTEQ15np_6_3" = "1rr7wr9wwsjfgnrnfvm7nrplhb38zym6qiyg2sagq7saw6kqpprz";
+ "nCTEQ15np_7_3" = "0ndqi05g88b769p1chfc6maz6wvs33rx45r4k8f68n79yy6kvrh1";
+ "nCTEQ15np_9_4" = "0akxbyrs4y8gmnjiwma8z8ryrzmaw6dj148iq7ihsllwar3hp3p0";
+ "nCTEQ15np_12_6" = "0zv9g7r648f1h1f9qifii0mk2afdvphbfib3hp2sf960zb0d0nsv";
+ "nCTEQ15np_14_7" = "07pyaik3h2yi05hn49fv3x191i4x6429bb6kywy999bzfrkjndcp";
+ "nCTEQ15np_20_10" = "1ka5hnq9cmr4l12ajmw4fpgdzcf0pjlw2pk4lkw6ai1h5h5absa5";
+ "nCTEQ15np_27_13" = "02dmzdqqh58h7232s2hcjnpd76rll8vxynq1bx059mvxak5lr5kw";
+ "nCTEQ15np_40_18" = "0yp65xq318qw6xh3wm0n4s4a3s4ahvl14kq3cmwq9b954c5a5vkl";
+ "nCTEQ15np_40_20" = "1c367xb361p5mdwyda5iwswg7wb6s6gjibdv27n2kq41p1qp41y0";
+ "nCTEQ15np_56_26" = "1qgh3g6xwk9jc6sd7kjj89w8mr89bhpdaiml5g7lvdqn39l95ng6";
+ "nCTEQ15np_64_32" = "02966xmh15i7kg9iif19p5c27rv369yikpm1xqclf8dz45a7xsry";
+ "nCTEQ15np_84_42" = "0v968jw1m9ky1mh82w1bjidvg7r7cx23bnpv0vr4c1kqz0n5hb5s";
+ "nCTEQ15np_108_54" = "16hsl5ihcbx7wvrabrff5h422zfhlfrpskn5dy8s1phhla4r4ff3";
+ "nCTEQ15np_119_59" = "1bwhbfhw5xyb1dm18vxm095l1d9l9v0yl072qdbb6z9l29pa71dp";
+ "nCTEQ15np_131_54" = "19sn6ig1c5smxi845qyflrrqaivm4pphwbxpz2zd9r0qhn032mlm";
+ "nCTEQ15np_184_74" = "1s2vmirmi1npw3pkxpzxjf9i69gmrl1dqrm2s0cfzl6286h87scb";
+ "nCTEQ15np_197_79" = "0p7lnffr4gy8qad8nsm6qfaw05s9pndkw0n9yb6v5i6mqg0j3cgd";
+ "nCTEQ15np_197_98" = "0vmjvjqkdn5cixsnvl9lvg07lrq17yw5pf2mdbzkrrfblqki6g0x";
+ "nCTEQ15np_207_103" = "1fcaw2hqxnzhs9glrh9lxvpfh0sn3mwahgd8d7hnfikrw93v0sbz";
+ "nCTEQ15np_208_82" = "0glf5nw1mr42icmbcjliz627nlsb7a5hyp591ng9y7dh41hxr01w";
+ }
diff --git a/pkgs/development/libraries/physics/lhapdf/pdfset-hook.sh b/pkgs/development/libraries/physics/lhapdf/pdfset-hook.sh
new file mode 100644
index 00000000000..c499d370d86
--- /dev/null
+++ b/pkgs/development/libraries/physics/lhapdf/pdfset-hook.sh
@@ -0,0 +1,5 @@
+@name@ () {
+ addToSearchPath LHAPDF_DATA_PATH "@out@"
+}
+
+postHooks+=(@name@)
diff --git a/pkgs/development/libraries/physics/nlojet/default.nix b/pkgs/development/libraries/physics/nlojet/default.nix
new file mode 100644
index 00000000000..974563c9037
--- /dev/null
+++ b/pkgs/development/libraries/physics/nlojet/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, fetchpatch }:
+
+stdenv.mkDerivation rec {
+ name = "nlojet++";
+ version = "4.1.3";
+
+ src = fetchurl {
+ url = "http://desy.de/~znagy/hep-programs/nlojet++/nlojet++-${version}.tar.gz";
+ sha256 = "18qfn5kjzvnyh29x40zm2maqzfmrnay9r58n8pfpq5lcphdhhv8p";
+ };
+
+ patches = [
+ ./nlojet_clang_fix.patch
+ ];
+
+ meta = {
+ homepage = "http://www.desy.de/~znagy/Site/NLOJet++.html";
+ license = stdenv.lib.licenses.gpl2;
+ description = "Implementation of calculation of the hadron jet cross sections";
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = with stdenv.lib.maintainers; [ veprbl ];
+ };
+}
diff --git a/pkgs/development/libraries/physics/nlojet/nlojet_clang_fix.patch b/pkgs/development/libraries/physics/nlojet/nlojet_clang_fix.patch
new file mode 100644
index 00000000000..917c57e8cb4
--- /dev/null
+++ b/pkgs/development/libraries/physics/nlojet/nlojet_clang_fix.patch
@@ -0,0 +1,30 @@
+diff -rupN nlojet++-4.1.3-orig/nlo-hep/hep-lorentz/bits/hep-lorentzvector_complex.h nlojet++-4.1.3/nlo-hep/hep-lorentz/bits/hep-lorentzvector_complex.h
+--- nlojet++-4.1.3-orig/nlo-hep/hep-lorentz/bits/hep-lorentzvector_complex.h 2010-05-11 11:06:00.000000000 -0400
++++ nlojet++-4.1.3/nlo-hep/hep-lorentz/bits/hep-lorentzvector_complex.h 2014-08-23 03:22:51.000000000 -0400
+@@ -26,8 +26,11 @@
+ namespace nlo {
+
+ // Spacializations
++ template<>
+ class lorentzvector >;
++ template<>
+ class lorentzvector >;
++ template<>
+ class lorentzvector >;
+
+ template<>
+diff -rupN nlojet++-4.1.3-orig/nlo-hep/hep-lorentz/bits/hep-threevector_complex.h nlojet++-4.1.3/nlo-hep/hep-lorentz/bits/hep-threevector_complex.h
+--- nlojet++-4.1.3-orig/nlo-hep/hep-lorentz/bits/hep-threevector_complex.h 2010-05-11 11:06:00.000000000 -0400
++++ nlojet++-4.1.3/nlo-hep/hep-lorentz/bits/hep-threevector_complex.h 2014-08-23 03:23:09.000000000 -0400
+@@ -26,8 +26,11 @@
+ namespace nlo {
+
+ // Specializations
++ template<>
+ class threevector >;
++ template<>
+ class threevector >;
++ template<>
+ class threevector >;
+
+ template<>
diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix
new file mode 100644
index 00000000000..94074f6dcb4
--- /dev/null
+++ b/pkgs/development/libraries/physics/pythia/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, boost, fastjet, hepmc, lhapdf, rsync, zlib }:
+
+stdenv.mkDerivation rec {
+ name = "pythia-${version}";
+ version = "8.219";
+
+ src = fetchurl {
+ url = "http://home.thep.lu.se/~torbjorn/pythia8/pythia${builtins.replaceStrings ["."] [""] version}.tgz";
+ sha256 = "13fhphddl0jir8jyjvj6a9qz14wiv02q9lby8mcdyv8gsw0ir8hy";
+ };
+
+ buildInputs = [ boost fastjet hepmc zlib rsync lhapdf ];
+
+ preConfigure = ''
+ patchShebangs ./configure
+ '';
+
+ configureFlags = [
+ "--enable-shared"
+ "--with-hepmc2=${hepmc}"
+ ];
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "A program for the generation of high-energy physics events";
+ license = stdenv.lib.licenses.gpl2;
+ homepage = http://home.thep.lu.se/~torbjorn/Pythia.html;
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = with stdenv.lib.maintainers; [ veprbl ];
+ };
+}
diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix
new file mode 100644
index 00000000000..775ee75f61f
--- /dev/null
+++ b/pkgs/development/libraries/physics/rivet/default.nix
@@ -0,0 +1,74 @@
+{ stdenv, fetchurl, fastjet, ghostscript, gsl, hepmc, imagemagick, less, python2, texlive, yoda, which, makeWrapper }:
+
+stdenv.mkDerivation rec {
+ name = "rivet-${version}";
+ version = "2.5.2";
+
+ src = fetchurl {
+ url = "http://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
+ sha256 = "01agf0bswqvci8nwp67kvrlwc2k0sg1s0lxpq2a9q58l99v2gakh";
+ };
+
+ pythonPath = []; # python wrapper support
+
+ patches = [
+ ./key_val.patch
+ ./zaxis_fix.patch
+ ];
+
+ latex = texlive.combine { inherit (texlive)
+ scheme-basic
+ collection-pstricks
+ collection-fontsrecommended
+ mathastext
+ pgf
+ relsize
+ sfmath
+ xcolor
+ xkeyval
+ ;};
+ buildInputs = [ ghostscript hepmc imagemagick python2 latex makeWrapper ];
+ propagatedBuildInputs = [ fastjet gsl yoda ];
+
+ preInstall = ''
+ substituteInPlace bin/make-plots \
+ --replace '"which"' '"${which}/bin/which"' \
+ --replace '"latex"' '"${latex}/bin/latex"' \
+ --replace '"dvips"' '"${latex}/bin/dvips"' \
+ --replace '"ps2pdf"' '"${ghostscript}/bin/ps2pdf"' \
+ --replace '"ps2eps"' '"${ghostscript}/bin/ps2eps"' \
+ --replace '"kpsewhich"' '"${latex}/bin/kpsewhich"' \
+ --replace '"convert"' '"${imagemagick.out}/bin/convert"'
+ substituteInPlace bin/rivet \
+ --replace '"less"' '"${less}/bin/less"'
+ substituteInPlace bin/rivet-buildplugin \
+ --replace '"which"' '"${which}/bin/which"' \
+ --replace 'mycxx=' 'mycxx=${stdenv.cc}/bin/${if stdenv.cc.isClang or false then "clang++" else "g++"} #' \
+ --replace 'mycxxflags="' "mycxxflags=\"-std=c++11 $NIX_CFLAGS_COMPILE $NIX_CXXSTDLIB_COMPILE $NIX_CFLAGS_LINK "
+ substituteInPlace bin/rivet-mkhtml \
+ --replace '"make-plots"' \"$out/bin/make-plots\" \
+ --replace '"rivet-cmphistos"' \"$out/bin/rivet-cmphistos\"
+ '';
+
+ configureFlags = [
+ "--with-fastjet=${fastjet}"
+ "--with-hepmc=${hepmc}"
+ "--with-yoda=${yoda}"
+ ];
+
+ enableParallelBuilding = true;
+
+ postInstall = ''
+ for prog in "$out"/bin/*; do
+ wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out")
+ done
+ '';
+
+ meta = {
+ description = "A framework for comparison of experimental measurements from high-energy particle colliders to theory predictions";
+ license = stdenv.lib.licenses.gpl2;
+ homepage = https://rivet.hepforge.org;
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = with stdenv.lib.maintainers; [ veprbl ];
+ };
+}
diff --git a/pkgs/development/libraries/physics/rivet/key_val.patch b/pkgs/development/libraries/physics/rivet/key_val.patch
new file mode 100644
index 00000000000..0b24d703dac
--- /dev/null
+++ b/pkgs/development/libraries/physics/rivet/key_val.patch
@@ -0,0 +1,12 @@
+diff --git a/bin/rivet-cmphistos b/bin/rivet-cmphistos
+--- a/bin/rivet-cmphistos
++++ b/bin/rivet-cmphistos
+@@ -371,7 +371,7 @@ if __name__ == '__main__':
+ # plot[key] = val
+ if plotoptions.has_key("PLOT"):
+ for key_val in plotoptions["PLOT"]:
+- key, val = [s.strip() for s in key_val.split("=")]
++ key, val = [s.strip() for s in key_val.split("=", 1)]
+ plot[key] = val
+ if opts.LINEAR:
+ plot['LogY'] = '0'
diff --git a/pkgs/development/libraries/physics/rivet/zaxis_fix.patch b/pkgs/development/libraries/physics/rivet/zaxis_fix.patch
new file mode 100644
index 00000000000..c255db565e6
--- /dev/null
+++ b/pkgs/development/libraries/physics/rivet/zaxis_fix.patch
@@ -0,0 +1,42 @@
+diff --git a/bin/make-plots b/bin/make-plots
+index abb024d..f59293d 100755
+--- a/bin/make-plots
++++ b/bin/make-plots
+@@ -1152,8 +1152,8 @@ class ColorScale(Described):
+
+ zcustommajortickmarks = int(self.description.get('ZMajorTickMarks', -1))
+ zcustomminortickmarks = int(self.description.get('ZMinorTickMarks', -1))
+- zcustommajorticks=[]
+- zcustomminorticks=[]
++ zcustommajorticks=None
++ zcustomminorticks=None
+ if self.description.has_key('ZCustomMajorTicks') and self.description['ZCustomMajorTicks']!='':
+ # TODO: Would be nice to have less invisible separation of the custom ticks than split on tabs
+ ticks = self.description['ZCustomMajorTicks'].strip().split('\t')
+@@ -2214,7 +2214,7 @@ class Ticks(object):
+
+ class XTicks(Ticks):
+
+- def draw(self, custommajorticks=[], customminorticks=[], custommajortickmarks=-1, customminortickmarks=-1,drawlabels=True):
++ def draw(self, custommajorticks=None, customminorticks=None, custommajortickmarks=-1, customminortickmarks=-1,drawlabels=True):
+ twosided = bool(int(self.description.get('XTwosidedTicks', '0')))
+ out = ""
+ out += ('\n%\n% X-Ticks\n%\n')
+@@ -2265,7 +2265,7 @@ class XTicks(Ticks):
+
+ class YTicks(Ticks):
+
+- def draw(self, custommajorticks=[], customminorticks=[], custommajortickmarks=-1, customminortickmarks=-1, drawlabels=True):
++ def draw(self, custommajorticks=None, customminorticks=None, custommajortickmarks=-1, customminortickmarks=-1, drawlabels=True):
+ twosided = bool(int(self.description.get('YTwosidedTicks', '0')))
+ out = ""
+ out += ('\n%\n% Y-Ticks\n%\n')
+@@ -2320,7 +2320,7 @@ class ZTicks(Ticks):
+ self.description = description
+ self.coors = coors
+
+- def draw(self, custommajorticks=[], customminorticks=[],
++ def draw(self, custommajorticks=None, customminorticks=None,
+ custommajortickmarks=-1, customminortickmarks=-1,
+ drawlabels=True):
+ out = ""
diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix
new file mode 100644
index 00000000000..1216c34cdb8
--- /dev/null
+++ b/pkgs/development/libraries/physics/thepeg/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, boost, fastjet, gsl, hepmc, lhapdf, rivet, zlib }:
+
+stdenv.mkDerivation rec {
+ name = "thepeg-${version}";
+ version = "2.0.3";
+
+ src = fetchurl {
+ url = "http://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2";
+ sha256 = "0d26linwv92iq23n4gx154jvyd0lz5vg41kf4nxa01nspy7scyy5";
+ };
+
+ buildInputs = [ boost fastjet gsl hepmc lhapdf rivet zlib ];
+
+ configureFlags = [
+ "--with-hepmc=${hepmc}"
+ "--without-javagui"
+ ];
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "Toolkit for High Energy Physics Event Generation";
+ license = stdenv.lib.licenses.gpl2;
+ homepage = https://herwig.hepforge.org/;
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = with stdenv.lib.maintainers; [ veprbl ];
+ };
+}
diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix
new file mode 100644
index 00000000000..c1f0d3a2930
--- /dev/null
+++ b/pkgs/development/libraries/physics/yoda/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, python2Packages, makeWrapper }:
+
+stdenv.mkDerivation rec {
+ name = "yoda-${version}";
+ version = "1.6.5";
+
+ src = fetchurl {
+ url = "http://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";
+ sha256 = "1i8lmj63cd3qnxl9k2cb1abap2pirhx7ffinm834wbpy9iszwxql";
+ };
+
+ pythonPath = []; # python wrapper support
+
+ buildInputs = with python2Packages; [ python numpy matplotlib makeWrapper ];
+
+ enableParallelBuilding = true;
+
+ postInstall = ''
+ for prog in "$out"/bin/*; do
+ wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out")
+ done
+ '';
+
+ meta = {
+ description = "Provides small set of data analysis (specifically histogramming) classes";
+ license = stdenv.lib.licenses.gpl2;
+ homepage = https://yoda.hepforge.org;
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = with stdenv.lib.maintainers; [ veprbl ];
+ };
+}
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 138faf86506..04d06b0fcd4 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -8,7 +8,7 @@
, zlib, libjpeg, libpng, libtiff, sqlite, icu
, coreutils, bison, flex, gdb, gperf, lndir
-, patchelf, perl, pkgconfig, python
+, patchelf, perl, pkgconfig, python2
# optional dependencies
, cups ? null
@@ -213,7 +213,7 @@ stdenv.mkDerivation {
# FIXME: move to the main list on rebuild.
++ [gnome_vfs.out libgnomeui.out gtk2 GConf];
- nativeBuildInputs = [ lndir patchelf perl pkgconfig python ];
+ nativeBuildInputs = [ lndir patchelf perl pkgconfig python2 ];
# freetype-2.5.4 changed signedness of some struct fields
NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
diff --git a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix
index 328d8aee72b..9b6a6c46176 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix
@@ -1,8 +1,8 @@
-{ qtSubmodule, lib, copyPathsToStore, python, qtbase, qtsvg, qtxmlpatterns }:
+{ qtSubmodule, lib, copyPathsToStore, python2, qtbase, qtsvg, qtxmlpatterns }:
qtSubmodule {
name = "qtdeclarative";
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
qtInputs = [ qtbase qtsvg qtxmlpatterns ];
- nativeBuildInputs = [ python ];
+ nativeBuildInputs = [ python2 ];
}
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 3a2d026842a..35568c1eb2f 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix
@@ -1,7 +1,7 @@
{ qtSubmodule, stdenv, qtdeclarative, qtlocation, qtsensors
, fontconfig, gdk_pixbuf, gtk2, libwebp, libxml2, libxslt
, sqlite, systemd, glib, gst_all_1
-, bison2, flex, gdb, gperf, perl, pkgconfig, python, ruby
+, bison2, flex, gdb, gperf, perl, pkgconfig, python2, ruby
, substituteAll
, flashplayerFix ? false
}:
@@ -13,7 +13,7 @@ qtSubmodule {
qtInputs = [ qtdeclarative qtlocation qtsensors ];
buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ];
nativeBuildInputs = [
- bison2 flex gdb gperf perl pkgconfig python ruby
+ bison2 flex gdb gperf perl pkgconfig python2 ruby
];
patches =
let dlopen-webkit-nsplugin = substituteAll {
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 25e94c44ad2..bb245548d5b 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
@@ -8,7 +8,7 @@
, zlib, libjpeg, libpng, libtiff, sqlite, icu
, coreutils, bison, flex, gdb, gperf, lndir
-, patchelf, perl, pkgconfig, python
+, patchelf, perl, pkgconfig, python2
# optional dependencies
, cups ? null
@@ -186,7 +186,7 @@ stdenv.mkDerivation {
++ lib.optional (mysql != null) mysql.lib
++ lib.optional (postgresql != null) postgresql;
- nativeBuildInputs = [ lndir patchelf perl pkgconfig python ];
+ nativeBuildInputs = [ lndir patchelf perl pkgconfig python2 ];
# freetype-2.5.4 changed signedness of some struct fields
NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
diff --git a/pkgs/development/libraries/qt-5/5.6/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.6/qtdeclarative/default.nix
index 328d8aee72b..9b6a6c46176 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtdeclarative/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtdeclarative/default.nix
@@ -1,8 +1,8 @@
-{ qtSubmodule, lib, copyPathsToStore, python, qtbase, qtsvg, qtxmlpatterns }:
+{ qtSubmodule, lib, copyPathsToStore, python2, qtbase, qtsvg, qtxmlpatterns }:
qtSubmodule {
name = "qtdeclarative";
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
qtInputs = [ qtbase qtsvg qtxmlpatterns ];
- nativeBuildInputs = [ python ];
+ nativeBuildInputs = [ python2 ];
}
diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebengine.nix b/pkgs/development/libraries/qt-5/5.6/qtwebengine.nix
index a433976dad1..2a437e62eca 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtwebengine.nix
@@ -1,6 +1,62 @@
-{ qtSubmodule, qtquickcontrols, qtlocation, qtwebchannel }:
+{ qtSubmodule, qtquickcontrols, qtlocation, qtwebchannel
+
+, xlibs, libXcursor, libXScrnSaver, libXrandr, libXtst
+, fontconfig, freetype, harfbuzz, icu, dbus
+, zlib, libjpeg, libpng, libtiff
+, alsaLib
+, libcap
+, pciutils
+
+, bison, flex, git, which, gperf
+, coreutils
+, pkgconfig, python
+
+}:
qtSubmodule {
name = "qtwebengine";
qtInputs = [ qtquickcontrols qtlocation qtwebchannel ];
+ buildInputs = [ bison flex git which gperf ];
+ nativeBuildInputs = [ pkgconfig python coreutils ];
+ doCheck = true;
+
+ enableParallelBuilding = true;
+
+ preConfigure = ''
+ export MAKEFLAGS=-j$NIX_BUILD_CORES
+ substituteInPlace ./src/3rdparty/chromium/build/common.gypi \
+ --replace /bin/echo ${coreutils}/bin/echo
+ substituteInPlace ./src/3rdparty/chromium/v8/build/toolchain.gypi \
+ --replace /bin/echo ${coreutils}/bin/echo
+ substituteInPlace ./src/3rdparty/chromium/v8/build/standalone.gypi \
+ --replace /bin/echo ${coreutils}/bin/echo
+
+ configureFlags+="\
+ -plugindir $out/lib/qt5/plugins \
+ -importdir $out/lib/qt5/imports \
+ -qmldir $out/lib/qt5/qml \
+ -docdir $out/share/doc/qt5"
+ '';
+ propagatedBuildInputs = [
+ dbus zlib alsaLib
+
+ # Image formats
+ libjpeg libpng libtiff
+
+ # Text rendering
+ fontconfig freetype harfbuzz icu
+
+ # X11 libs
+ xlibs.xrandr libXScrnSaver libXcursor libXrandr xlibs.libpciaccess libXtst
+ xlibs.libXcomposite
+
+ libcap
+ pciutils
+ ];
+ postInstall = ''
+ cat > $out/libexec/qt.conf < $out/libexec/qt.conf < readline != null && ncurses != null;
stdenv.mkDerivation {
- name = "sqlite-3.14.1";
+ name = "sqlite-3.15.0";
src = fetchurl {
- url = "http://sqlite.org/2016/sqlite-autoconf-3140100.tar.gz";
- sha256 = "19j73j44akqgc6m82wm98yvnmm3mfzmfqr8mp3n7n080d53q4wdw";
+ url = "http://sqlite.org/2016/sqlite-autoconf-3150000.tar.gz";
+ sha256 = "09zdipkrvavlbw9dj4kwnii0z1b20rljn9fmfxz6scx0njljs5kp";
};
outputs = [ "bin" "dev" "out" ];
@@ -24,6 +24,7 @@ stdenv.mkDerivation {
"-DSQLITE_ENABLE_FTS3_PARENTHESIS"
"-DSQLITE_ENABLE_FTS3_TOKENIZER"
"-DSQLITE_ENABLE_FTS4"
+ "-DSQLITE_ENABLE_FTS5"
"-DSQLITE_ENABLE_RTREE"
"-DSQLITE_ENABLE_STMT_SCANSTATUS"
"-DSQLITE_ENABLE_UNLOCK_NOTIFY"
@@ -46,6 +47,9 @@ stdenv.mkDerivation {
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DUSE_PREAD64 -D_LARGEFILE64_SOURCE"
fi
+ # Necessary for FTS5 on Linux
+ export NIX_LDFLAGS="$NIX_LDFLAGS -lm"
+
echo ""
echo "NIX_CFLAGS_COMPILE = $NIX_CFLAGS_COMPILE"
echo ""
diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix
new file mode 100644
index 00000000000..838c30777fb
--- /dev/null
+++ b/pkgs/development/libraries/tachyon/default.nix
@@ -0,0 +1,32 @@
+{stdenv, fetchurl}:
+stdenv.mkDerivation rec {
+ name = "tachyon-${version}";
+ version = "0.98.9";
+ src = fetchurl {
+ url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${name}.tar.gz";
+ sha256 = "1ms0xr4ibrzz291ibm265lyjrdjrmhfrx0a70hwykhsdxn6jk8y6";
+ };
+ buildInputs = [];
+ preBuild = "cd unix";
+ arch = if stdenv.system == "x86_64-linux" then "linux-64-thr" else
+ if stdenv.system == "i686-linux" then "linux-thr" else
+ throw "Don't know what arch to select for tachyon build";
+ makeFlags = "${arch}";
+ installPhase = ''
+ cd ../compile/${arch}
+ mkdir -p "$out"/{bin,lib,include,share/doc/tachyon,share/tachyon}
+ cp tachyon "$out"/bin
+ cp libtachyon.* "$out/lib"
+ cd ../..
+ cp Changes Copyright README "$out/share/doc/tachyon"
+ cp -r scenes "$out/share/tachyon/scenes"
+ '';
+ meta = {
+ inherit version;
+ description = ''A Parallel / Multiprocessor Ray Tracing System'';
+ license = stdenv.lib.licenses.bsd3;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ homepage = "http://jedi.ks.uiuc.edu/~johns/tachyon/";
+ };
+}
diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix
index 024531a3027..125e6b389e3 100644
--- a/pkgs/development/libraries/talloc/default.nix
+++ b/pkgs/development/libraries/talloc/default.nix
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
"--builtin-libraries=replace"
];
- postInstall = ''
- ar qf $out/lib/libtalloc.a bin/default/talloc_[0-9]*.o
+ postInstall = ''
+ ar q $out/lib/libtalloc.a bin/default/talloc_[0-9]*.o
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix
index e9c9260d8d8..69f6f6d8971 100644
--- a/pkgs/development/libraries/telepathy/glib/default.nix
+++ b/pkgs/development/libraries/telepathy/glib/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, dbus_glib, glib, python, pkgconfig, libxslt
-, gobjectIntrospection, valaSupport ? true, vala_0_23 }:
+, gobjectIntrospection, valaSupport ? true, vala_0_23, glibcLocales }:
stdenv.mkDerivation rec {
name = "telepathy-glib-0.24.1";
@@ -10,10 +10,10 @@ stdenv.mkDerivation rec {
};
configureFlags = stdenv.lib.optional valaSupport "--enable-vala-bindings";
-
+ LC_ALL = "en_US.UTF-8";
propagatedBuildInputs = [dbus_glib glib python gobjectIntrospection];
- buildInputs = [pkgconfig libxslt] ++ stdenv.lib.optional valaSupport vala_0_23;
+ buildInputs = [pkgconfig libxslt glibcLocales ] ++ stdenv.lib.optional valaSupport vala_0_23;
preConfigure = ''
substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires
diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix
index 6c2713c1ebe..93d69d5a8d9 100644
--- a/pkgs/development/libraries/telepathy/qt/default.nix
+++ b/pkgs/development/libraries/telepathy/qt/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, cmake, qtbase, pkgconfig, pythonPackages, dbus_glib, dbus_daemon
+{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python2Packages, dbus_glib, dbus_daemon
, telepathy_farstream, telepathy_glib, fetchpatch }:
let
- inherit (pythonPackages) python dbus-python;
+ inherit (python2Packages) python dbus-python;
in stdenv.mkDerivation rec {
name = "telepathy-qt-0.9.6.1";
diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix
index 7fc403f0739..f885fc3f954 100644
--- a/pkgs/development/libraries/tinyxml/2.6.2.nix
+++ b/pkgs/development/libraries/tinyxml/2.6.2.nix
@@ -63,6 +63,8 @@ in stdenv.mkDerivation {
cp -v tinyxml.pc $out/lib/pkgconfig/
cp -v docs/* $out/share/doc/tinyxml/
+ '' + stdenv.lib.optionalString stdenv.isDarwin ''
+ install_name_tool -id $out/lib/libtinyxml.dylib $out/lib/libtinyxml.dylib
'';
meta = {
diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix
index 922aed61ed6..e3a7124720b 100644
--- a/pkgs/development/libraries/vaapi-intel/default.nix
+++ b/pkgs/development/libraries/vaapi-intel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gnum4, pkgconfig, python
+{ stdenv, fetchurl, gnum4, pkgconfig, python2
, intel-gpu-tools, libdrm, libva, libX11, mesa_noglu, wayland
}:
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
"--enable-wayland"
];
- nativeBuildInputs = [ gnum4 pkgconfig python ];
+ nativeBuildInputs = [ gnum4 pkgconfig python2 ];
buildInputs = [ intel-gpu-tools libdrm libva libX11 mesa_noglu wayland ];
diff --git a/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/pkgs/development/libraries/vapoursynth-mvtools/default.nix
index 0fb34e5953e..8ae95bc942e 100644
--- a/pkgs/development/libraries/vapoursynth-mvtools/default.nix
+++ b/pkgs/development/libraries/vapoursynth-mvtools/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "vapoursynth-mvtools-${version}";
- version = "16";
+ version = "17";
src = fetchFromGitHub {
owner = "dubhater";
repo = "vapoursynth-mvtools";
- rev = "48959b868c18fa8066502f957734cbd5fb9762a0";
- sha256 = "15xpqvfzhv0kcf3gyghni4flazi1mmj2iy6zw5834phqr52yg07z";
+ rev = "a2f5607420af8b8e76c0a6a06a517649bfa2c187";
+ sha256 = "06nq46jjyfpv74i27w2m6j64avs6shl99mk601m5h5mmdgm2mvcg";
};
buildInputs = [
diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix
index 12cba8decc7..cfa2c3fa1f2 100644
--- a/pkgs/development/libraries/vapoursynth/default.nix
+++ b/pkgs/development/libraries/vapoursynth/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "vapoursynth-${version}";
- version = "R33.1";
+ version = "R35";
src = fetchFromGitHub {
owner = "vapoursynth";
repo = "vapoursynth";
- rev = "0d69d29abb3c4ba9e806958bf9c539bd6eff6852";
- sha256 = "1dbz81vgqfsb306d7891p8y25y7632y32ii3l64shr0jsq64vgsm";
+ rev = "dcab1529d445776a5575859aea655e613c23c8bc";
+ sha256 = "0nhpqws91b19lql2alc5pxgzfgh1wjrws0kyvir41jhfxhhjaqpi";
};
buildInputs = [
diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix
index 1dc35db43f9..c122928eddd 100644
--- a/pkgs/development/libraries/vigra/default.nix
+++ b/pkgs/development/libraries/vigra/default.nix
@@ -1,7 +1,10 @@
{ stdenv, fetchurl, boost, cmake, doxygen, fftw, fftwSinglePrec, hdf5, ilmbase
-, libjpeg, libpng, libtiff, numpy, openexr, python }:
+, libjpeg, libpng, libtiff, openexr, python2Packages }:
-stdenv.mkDerivation rec {
+let
+ inherit (python2Packages) python numpy;
+ # Might want to use `python2.withPackages(ps: [ps.numpy]);` here...
+in stdenv.mkDerivation rec {
name = "vigra-${version}";
version = "1.10.0";
diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix
new file mode 100644
index 00000000000..4c00bb86142
--- /dev/null
+++ b/pkgs/development/libraries/vulkan-loader/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, fetchgit, fetchFromGitHub, cmake, pkgconfig, git, python3,
+ python3Packages, glslang, spirv-tools, x11, libxcb, wayland }:
+
+assert stdenv.system == "x86_64-linux";
+
+let
+ version = "1.0.26.0";
+ src = fetchFromGitHub {
+ owner = "KhronosGroup";
+ repo = "Vulkan-LoaderAndValidationLayers";
+ rev = "sdk-${version}";
+ sha256 = "157m746hc76xrxd3qq0f44f5dy7pjbz8cx74ykqrlbc7rmpjpk58";
+ };
+ getRev = name: builtins.substring 0 40 (builtins.readFile "${src}/${name}_revision");
+in
+
+stdenv.mkDerivation rec {
+ name = "vulkan-loader-${version}";
+ inherit version src;
+
+ prePatch = ''
+ if [ "$(cat '${src}/spirv-tools_revision')" != '${spirv-tools.src.rev}' ] \
+ || [ "$(cat '${src}/spirv-headers_revision')" != '${spirv-tools.headers.rev}' ] \
+ || [ "$(cat '${src}/glslang_revision')" != '${glslang.src.rev}' ]
+ then
+ echo "Version mismatch, aborting!"
+ false
+ fi
+ '';
+
+ buildInputs = [ cmake pkgconfig git python3 python3Packages.lxml
+ glslang spirv-tools x11 libxcb wayland
+ ];
+ enableParallelBuilding = true;
+
+ cmakeFlags = [
+ "-DBUILD_WSI_WAYLAND_SUPPORT=ON" # XLIB/XCB supported by default
+ ];
+
+ installPhase = ''
+ mkdir -p $out/lib
+ mkdir -p $out/bin
+ cp loader/libvulkan.so* $out/lib
+ cp demos/vulkaninfo $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ description = "LunarG Vulkan loader";
+ homepage = http://www.lunarg.com;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/webkitgtk/2.12.nix b/pkgs/development/libraries/webkitgtk/2.12.nix
index 38d8b7ac75a..04ab4d96773 100644
--- a/pkgs/development/libraries/webkitgtk/2.12.nix
+++ b/pkgs/development/libraries/webkitgtk/2.12.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, python, ruby, bison, gperf, cmake
+{ stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake
, pkgconfig, gettext, gobjectIntrospection, libnotify
, gtk2, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core
, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0";
nativeBuildInputs = [
- cmake perl python ruby bison gperf sqlite
+ cmake perl python2 ruby bison gperf sqlite
pkgconfig gettext gobjectIntrospection
];
diff --git a/pkgs/development/libraries/webkitgtk/2.14.nix b/pkgs/development/libraries/webkitgtk/2.14.nix
index 7439d72151d..ca74f384ec9 100644
--- a/pkgs/development/libraries/webkitgtk/2.14.nix
+++ b/pkgs/development/libraries/webkitgtk/2.14.nix
@@ -11,7 +11,7 @@ assert enableGeoLocation -> geoclue2 != null;
with stdenv.lib;
stdenv.mkDerivation rec {
name = "webkitgtk-${version}";
- version = "2.14.0";
+ version = "2.14.1";
meta = {
description = "Web content rendering engine, GTK+ port";
@@ -26,14 +26,14 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://webkitgtk.org/releases/${name}.tar.xz";
- sha256 = "02paj0anbnqn1z3hn5c4csmq9nga995rzagiplj3sjk2dj1ss4q5";
+ sha256 = "1dffnz20psgc604azhbzn9a6cdhafar9dw74w3bbwrfy531pcb9f";
};
# see if we can clean this up....
patches = [ ./finding-harfbuzz-icu.patch ];
- cmakeFlags = [
+ cmakeFlags = [
"-DPORT=GTK"
"-DUSE_LIBHYPHEN=0"
"-DENABLE_GLES2=ON"
diff --git a/pkgs/development/libraries/wxGTK-3.0/default.nix b/pkgs/development/libraries/wxGTK-3.0/default.nix
index 087e93b0e05..313e99f1087 100644
--- a/pkgs/development/libraries/wxGTK-3.0/default.nix
+++ b/pkgs/development/libraries/wxGTK-3.0/default.nix
@@ -1,9 +1,12 @@
{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
, gstreamer, gst_plugins_base, GConf, setfile
-, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true,
+, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true
+, withWebKit ? false, webkitgtk2 ? null
}:
+
assert withMesa -> mesa != null;
+assert withWebKit -> webkitgtk2 != null;
with stdenv.lib;
@@ -22,6 +25,7 @@ stdenv.mkDerivation {
[ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer
gst_plugins_base GConf ]
++ optional withMesa mesa
+ ++ optional withWebKit webkitgtk2
++ optional stdenv.isDarwin setfile;
nativeBuildInputs = [ pkgconfig ];
@@ -34,7 +38,9 @@ stdenv.mkDerivation {
++ optional withMesa "--with-opengl"
++ optionals stdenv.isDarwin
# allow building on 64-bit
- [ "--with-cocoa" "--enable-universal-binaries" ];
+ [ "--with-cocoa" "--enable-universal-binaries" ]
+ ++ optionals withWebKit
+ ["--enable-webview" "--enable-webview-webkit"];
SEARCH_LIB = optionalString withMesa "${mesa}/lib";
diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix
index 9e8de5a5aac..d1d0735e46d 100644
--- a/pkgs/development/libraries/zimg/default.nix
+++ b/pkgs/development/libraries/zimg/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec{
name = "zimg-${version}";
- version = "2.2.1";
+ version = "2.3";
src = fetchFromGitHub {
owner = "sekrit-twc";
repo = "zimg";
- rev = "e88b156fdd6d5ae647bfc68a30e86d14f214764d";
- sha256 = "1hb35pm9ykdyhg71drd59yy29d154m2r1mr8ikyzpi3knanjn23a";
+ rev = "9cbe9b0de66a690bdd142bae0e656e27c1f50ade";
+ sha256 = "1qj5fr8ghgnyfjzdvgkvplicqsgyp05g3pvsdrg9yivvx32291hp";
};
buildInputs = [ autoreconfHook ];
diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix
index 1e474e722ff..20070d8f717 100644
--- a/pkgs/development/libraries/zziplib/default.nix
+++ b/pkgs/development/libraries/zziplib/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, perl, python, zip, xmlto, zlib }:
+{ fetchurl, stdenv, perl, python2, zip, xmlto, zlib }:
stdenv.mkDerivation rec {
name = "zziplib-0.13.58";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sed -i -e s,--export-dynamic,, configure
'';
- buildInputs = [ perl python zip xmlto zlib ];
+ buildInputs = [ perl python2 zip xmlto zlib ];
doCheck = true;
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
homepage = http://zziplib.sourceforge.net/;
maintainers = [ ];
- platforms = python.meta.platforms;
+ platforms = python2.meta.platforms;
};
}
diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix
new file mode 100644
index 00000000000..9e928bdde6f
--- /dev/null
+++ b/pkgs/development/misc/loc/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper }:
+
+with rustPlatform;
+
+buildRustPackage rec {
+ version = "0.3.3";
+ name = "loc-${version}";
+
+ src = fetchFromGitHub {
+ owner = "cgag";
+ repo = "loc";
+ rev = "e2dfe2c1452f25f58974b545292b11dc450afd3d";
+ sha256 = "1kp5iawig6304gs1289aivgsq44zhnn0ykqv9ymwpvj0g12l4l8r";
+ };
+
+ depsSha256 = "01jww6d4dzb5pq6vcrp3xslhxic0vp0gicsddda4adzqg1lab8c2";
+
+ meta = {
+ homepage = "http://github.com/cgag/loc";
+ description = "Count lines of code quickly";
+ license = stdenv.lib.licenses.mit;
+ maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
+ platforms = with stdenv.lib.platforms; linux;
+ };
+}
+
diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix
index c5c69c7d05d..2a04b3dfba8 100644
--- a/pkgs/development/node-packages/node-env.nix
+++ b/pkgs/development/node-packages/node-env.nix
@@ -6,19 +6,19 @@ let
# Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
tarWrapper = runCommand "tarWrapper" {} ''
mkdir -p $out/bin
-
+
cat > $out/bin/tar < package.json < install.sh
+ sh install.sh
+ mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/
+ ln -s $out/lib/uchar $out/lib/ocaml/${ocaml.version}/site-lib/
+ '';
+
+
+ meta = {
+ description = "Compatibility library for OCaml’s Uchar module";
+ inherit (ocaml.meta) platforms license;
+ maintainers = [ stdenv.lib.maintainers.vbgl ];
+ };
+}
diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix
index 458ed1683e0..09cefdfbb69 100644
--- a/pkgs/development/ocaml-modules/zarith/default.nix
+++ b/pkgs/development/ocaml-modules/zarith/default.nix
@@ -2,14 +2,26 @@
assert stdenv.lib.versionAtLeast ocaml.version "3.12.1";
-stdenv.mkDerivation rec {
- name = "zarith-${version}";
- version = "1.3";
-
- src = fetchurl {
+let param =
+ if stdenv.lib.versionAtLeast ocaml.version "4.02"
+ then {
+ version = "1.4.1";
+ url = http://forge.ocamlcore.org/frs/download.php/1574/zarith-1.4.1.tgz;
+ sha256 = "0l36hzmfbvdai2kcgynh13vfdim5x2grnaw61fxqalyjm90c3di3";
+ } else {
+ version = "1.3";
url = http://forge.ocamlcore.org/frs/download.php/1471/zarith-1.3.tgz;
sha256 = "1mx3nxcn5h33qhx4gbg0hgvvydwlwdvdhqcnvfwnmf9jy3b8frll";
};
+in
+
+stdenv.mkDerivation rec {
+ name = "zarith-${version}";
+ inherit (param) version;
+
+ src = fetchurl {
+ inherit (param) url sha256;
+ };
buildInputs = [ ocaml findlib pkgconfig perl ];
propagatedBuildInputs = [ gmp ];
diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 31436d0ea38..0fd6c1873b5 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -14,7 +14,7 @@ let
sha256 = "0533cr5w14da8wdb2q4py6aizvbvsdbk3sj7m1jx9lwznvnlf5n3";
};
in stdenv.mkDerivation rec {
- name = "python-${python.version}-bootstrapped-pip-${version}";
+ name = "${python.libPrefix}-bootstrapped-pip-${version}";
version = "8.1.2";
src = fetchurl {
diff --git a/pkgs/development/python-modules/cython_test.patch b/pkgs/development/python-modules/cython_test.patch
new file mode 100644
index 00000000000..5b1cece3aa5
--- /dev/null
+++ b/pkgs/development/python-modules/cython_test.patch
@@ -0,0 +1,15 @@
+diff --git a/tests/run/numpy_math.pyx b/tests/run/numpy_math.pyx
+index eafd23a..4a15522 100644
+--- a/tests/run/numpy_math.pyx
++++ b/tests/run/numpy_math.pyx
+@@ -37,8 +37,8 @@ def test_fp_classif():
+ assert not npmath.isnan(d_zero)
+ assert not npmath.isnan(f_zero)
+
+- assert npmath.isinf(npmath.INFINITY) == 1
+- assert npmath.isinf(-npmath.INFINITY) == -1
++ assert npmath.isinf(npmath.INFINITY) != 0
++ assert npmath.isinf(-npmath.INFINITY) != 0
+ assert npmath.isnan(npmath.NAN)
+
+ assert npmath.signbit(npmath.copysign(1., -1.))
diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index 5ba813deba6..a9dced9b6c4 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
]
++ stdenv.lib.optional enableGtk2 pygtk
++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobjectIntrospection pygobject3 ]
- ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ];
+ ++ stdenv.lib.optionals enableTk [ python.tkinter tcl tk tkinter libX11 ];
patches =
[ ./basedirlist.patch ] ++
diff --git a/pkgs/development/python-modules/numpy-distutils-C++.patch b/pkgs/development/python-modules/numpy-distutils-C++.patch
new file mode 100644
index 00000000000..4b2d5c640e6
--- /dev/null
+++ b/pkgs/development/python-modules/numpy-distutils-C++.patch
@@ -0,0 +1,23 @@
+diff --git a/numpy/distutils/unixccompiler.py b/numpy/distutils/unixccompiler.py
+index a92ccd3..9630e91 100644
+--- a/numpy/distutils/unixccompiler.py
++++ b/numpy/distutils/unixccompiler.py
+@@ -43,10 +43,15 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts
+ if opt not in llink_s:
+ self.linker_so = llink_s.split() + opt.split()
+
+- display = '%s: %s' % (os.path.basename(self.compiler_so[0]), src)
+ try:
+- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+- extra_postargs, display = display)
++ if self.detect_language(src) == 'c++':
++ display = '%s: %s' % (os.path.basename(self.compiler_so_cxx[0]), src)
++ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++ extra_postargs, display = display)
++ else:
++ display = '%s: %s' % (os.path.basename(self.compiler_so[0]), src)
++ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++ extra_postargs, display = display)
+ except DistutilsExecError:
+ msg = str(get_exception())
+ raise CompileError(msg)
diff --git a/pkgs/development/python-modules/numpy.nix b/pkgs/development/python-modules/numpy.nix
index 141c8b14fa6..14504d92543 100644
--- a/pkgs/development/python-modules/numpy.nix
+++ b/pkgs/development/python-modules/numpy.nix
@@ -1,4 +1,4 @@
-{lib, python, buildPythonPackage, isPyPy, gfortran, nose, blas}:
+{lib, python, buildPythonPackage, isPy27, isPyPy, gfortran, nose, blas}:
args:
@@ -12,6 +12,12 @@ in buildPythonPackage (args // rec {
buildInputs = args.buildInputs or [ gfortran nose ];
propagatedBuildInputs = args.propagatedBuildInputs or [ passthru.blas ];
+ patches = lib.optionals (python.hasDistutilsCxxPatch or false) [
+ # See cpython 2.7 patches.
+ # numpy.distutils is used by cython during it's check phase
+ ./numpy-distutils-C++.patch
+ ];
+
preConfigure = ''
sed -i 's/-faltivec//' numpy/distutils/system_info.py
'';
diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix
index fb95a9fa468..23e06ff4cb4 100644
--- a/pkgs/development/python-modules/pycairo/default.nix
+++ b/pkgs/development/python-modules/pycairo/default.nix
@@ -1,9 +1,9 @@
-{ lib, fetchurl, fetchpatch, python, mkPythonDerivation, pkgconfig, cairo, xlibsWrapper, isPyPy, isPy35 }:
+{ lib, fetchurl, fetchpatch, python, mkPythonDerivation, pkgconfig, cairo, xlibsWrapper, isPyPy, isPy35, isPy3k }:
if (isPyPy) then throw "pycairo not supported for interpreter ${python.executable}" else mkPythonDerivation rec {
version = "1.10.0";
name = "${python.libPrefix}-pycairo-${version}";
- src = if python.is_py3k or false
+ src = if isPy3k
then fetchurl {
url = "http://cairographics.org/releases/pycairo-${version}.tar.bz2";
sha256 = "1gjkf8x6hyx1skq3hhwcbvwifxvrf9qxis5vx8x5igmmgs70g94s";
diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix
index 797d89fd482..dfddd7dddbd 100644
--- a/pkgs/development/python-modules/pygobject/3.nix
+++ b/pkgs/development/python-modules/pygobject/3.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, mkPythonDerivation, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo, which, ncurses}:
mkPythonDerivation rec {
- major = "3.20";
+ major = "3.22";
minor = "0";
name = "pygobject-${major}.${minor}";
src = fetchurl {
url = "mirror://gnome/sources/pygobject/${major}/${name}.tar.xz";
- sha256 = "0ikzh3l7g1gjh8jj8vg6mdvrb25svp63gxcam4m0i404yh0lgari";
+ sha256 = "08b29cfb08efc80f7a8630a2734dec65a99c1b59f1e5771c671d2e4ed8a5cbe7";
};
buildInputs = [ pkgconfig glib gobjectIntrospection ]
diff --git a/pkgs/development/python-modules/wxPython/3.0.nix b/pkgs/development/python-modules/wxPython/3.0.nix
index 5f224428fce..8dc99955af3 100644
--- a/pkgs/development/python-modules/wxPython/3.0.nix
+++ b/pkgs/development/python-modules/wxPython/3.0.nix
@@ -1,16 +1,18 @@
{ fetchurl
, lib
-, pythonPackages
, openglSupport ? true
, libX11
, wxGTK
, pkgconfig
+, buildPythonPackage
+, pyopengl
+, isPy3k
+, isPyPy
+, python
}:
assert wxGTK.unicode;
-with pythonPackages;
-
buildPythonPackage rec {
name = "wxPython-${version}";
version = "3.0.2.0";
diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix
index bc2d51f7f26..8f128001235 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.13.1";
- sha256 = "02gbjbv7wq33a17pzp83s36v4yg5r2l3rynkhrq1qlq6vc1n47yg";
+ version = "1.13.6";
+ sha256 = "1xyhy9cn8w9passp64p6hb3df2fpiqbds6rj7xha1335xpgj5zgs";
dontPatchShebangs = true;
postFixup = ''
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index a9b16f0db2c..742c9e49757 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -141,6 +141,13 @@ in
buildInputs = [ imagemagick pkgconfig which ];
};
+ ruby-terminfo = attrs: {
+ buildInputs = [ ncurses ];
+ buildFlags = [
+ "--with-cflags=-I${ncurses.dev}/include"
+ "--with-ldflags=-L${ncurses.out}/lib"
+ ];
+ };
rugged = attrs: {
buildInputs = [ cmake pkgconfig openssl libssh2 zlib ];
};
diff --git a/pkgs/development/tools/activator/default.nix b/pkgs/development/tools/activator/default.nix
index a992a90623e..394c60e0fdd 100644
--- a/pkgs/development/tools/activator/default.nix
+++ b/pkgs/development/tools/activator/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "activator";
- version = "1.3.10";
+ version = "1.3.12";
src = fetchurl {
url = "http://downloads.typesafe.com/typesafe-${pname}/${version}/typesafe-${name}.zip";
- sha256 = "43693f041c8422ee06a2a90a805fd7b0e258dc85da31f0a4dca340dfd119b4ce";
+ sha256 = "0c7mxznfgvywnyvr8l5jh4cp67ila5cdq14p6jwrkh6lwif3ah1p";
};
buildInputs = [ unzip jre ];
diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
new file mode 100644
index 00000000000..7cb4afbc12e
--- /dev/null
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, lib, fetchurl, makeWrapper, jre }:
+
+stdenv.mkDerivation rec {
+ name = "ammonite-repl-${version}";
+ version = "0.7.8";
+
+ src = fetchurl {
+ url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${version}";
+ sha256 = "0s34p168h5c7ij61rbmaygb95r654yj4j0wh6qya53k4ywl32vkp";
+ };
+
+ propagatedBuildInputs = [ jre ] ;
+ buildInputs = [ makeWrapper ] ;
+
+ phases = "installPhase";
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp ${src} $out/bin/amm
+ chmod +x $out/bin/amm
+ wrapProgram $out/bin/amm --prefix PATH ":" ${jre}/bin ;
+ '';
+
+ meta = {
+ description = "Improved Scala REPL";
+ longDescription = ''
+ The Ammonite-REPL is an improved Scala REPL, re-implemented from first principles.
+ It is much more featureful than the default REPL and comes
+ with a lot of ergonomic improvements and configurability
+ that may be familiar to people coming from IDEs or other REPLs such as IPython or Zsh.
+ '';
+ homepage = http://www.lihaoyi.com/Ammonite/;
+ license = lib.licenses.mit;
+ platforms = lib.platforms.all;
+ maintainer = [ lib.maintainers.nequissimus ];
+ };
+}
diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix
index 31d62bdae19..e25cb696a65 100644
--- a/pkgs/development/tools/analysis/cppcheck/default.nix
+++ b/pkgs/development/tools/analysis/cppcheck/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "cppcheck";
- version = "1.74";
+ version = "1.76.1";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${name}.tar.bz2";
- sha256 = "0m62byiprabm1m3mc4r2w54p7qyhgi8msipnpm66ychr8rz2yny0";
+ sha256 = "1l46bmzm5syfr9m5l0bqkj8lcyrynhw8gjf95s4fwhp2b7f0zisv";
};
nativeBuildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 ];
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
outputs = [ "out" "man" ];
+ enableParallelBuilding = true;
+
postInstall = ''
make DB2MAN=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl man
mkdir -p $man/share/man/man1
diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 723c6eb26bb..213222577d3 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.32.0";
+ version = "0.34.0";
name = "flow-${version}";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "v${version}";
- sha256 = "17v2qb9xsjv4lj62x553knnhb7z43y2frzvs0q1hvamw8wyp086h";
+ sha256 = "0fydrxp1aq4nmjkqya3j4z4zjbjvqx575qdgjzvkxq71akg56hqv";
};
installPhase = ''
diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index 0e0e44183f6..2ecb5eaa132 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -1,30 +1,20 @@
{ stdenv, fetchurl, fetchpatch, perl, gdb }:
stdenv.mkDerivation rec {
- name = "valgrind-3.11.0";
+ name = "valgrind-3.12.0";
src = fetchurl {
url = "http://valgrind.org/downloads/${name}.tar.bz2";
- sha256 = "0hiv871b9bk689mv42mkhp76za78l5773glszfkdbpf1m1qn4fbc";
+ sha256 = "18bnrw9b1d55wi1wnl68n25achsp9w48n51n1xw4fwjjnaal7jk7";
};
- patches =
- [ (fetchpatch {
- name = "glibc-2.21.patch";
- url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk"
- + "/valgrind-3.9.0-glibc-2.21.patch?h=packages/valgrind&id=41e87313b69";
- sha256 = "14sgsvjjalbcqpcayyv5cndc9hfm5bigkp684b6cr6virksmlk19";
- })
- ];
-
- outputs = [ "out" "doc" ];
+ outputs = [ "out" "dev" "man" "doc" ];
hardeningDisable = [ "stackprotector" ];
# Perl is needed for `cg_annotate'.
# GDB is needed to provide a sane default for `--db-command'.
- nativeBuildInputs = [ perl ];
- buildInputs = stdenv.lib.optional (!stdenv.isDarwin) gdb;
+ buildInputs = [ perl ] ++ stdenv.lib.optional (!stdenv.isDarwin) gdb;
enableParallelBuilding = true;
diff --git a/pkgs/development/tools/build-managers/gnumake/3.81/default.nix b/pkgs/development/tools/build-managers/gnumake/3.81/default.nix
deleted file mode 100644
index 333ff352927..00000000000
--- a/pkgs/development/tools/build-managers/gnumake/3.81/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{stdenv, fetchurl}:
-
-let version = "3.81"; in
-stdenv.mkDerivation {
- name = "gnumake-${version}";
-
- src = fetchurl {
- url = "mirror://gnu/make/make-${version}.tar.bz2";
- md5 = "354853e0b2da90c527e35aabb8d6f1e6";
- };
-
- doCheck = true;
-
- patches =
- [
- # Provide nested log output for subsequent pretty-printing by
- # nix-log2xml.
- ./log-3.81.patch
-
- # Purity: don't look for library dependencies (of the form
- # `-lfoo') in /lib and /usr/lib. It's a stupid feature anyway.
- # Likewise, when searching for included Makefiles, don't look in
- # /usr/include and friends.
- ./impure-dirs.patch
- ];
- patchFlags = "-p0";
-
- meta = {
- description = "GNU Make, a program controlling the generation of non-source files from sources";
-
- longDescription =
- '' Make is a tool which controls the generation of executables and
- other non-source files of a program from the program's source files.
-
- Make gets its knowledge of how to build your program from a file
- called the makefile, which lists each of the non-source files and
- how to compute it from other files. When you write a program, you
- should write a makefile for it, so that it is possible to use Make
- to build and install the program.
- '';
-
- homepage = http://www.gnu.org/software/make/;
-
- license = stdenv.lib.licenses.gpl2Plus;
- maintainers = [ ];
- platforms = stdenv.lib.platforms.unix;
- };
-}
diff --git a/pkgs/development/tools/build-managers/gnumake/3.81/impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/3.81/impure-dirs.patch
deleted file mode 100644
index f6646f1d012..00000000000
--- a/pkgs/development/tools/build-managers/gnumake/3.81/impure-dirs.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -rc read.c read.c
-*** read.c 2006-03-17 15:24:20.000000000 +0100
---- read.c 2007-05-24 17:16:31.000000000 +0200
-***************
-*** 99,107 ****
---- 99,109 ----
- #endif
- INCLUDEDIR,
- #ifndef _AMIGA
-+ #if 0
- "/usr/gnu/include",
- "/usr/local/include",
- "/usr/include",
-+ #endif
- #endif
- 0
- };
-diff -rc reremake.c
-*** remake.c 2006-03-20 03:36:37.000000000 +0100
---- remake.c 2007-05-24 17:06:54.000000000 +0200
-***************
-*** 1452,1460 ****
---- 1452,1462 ----
- static char *dirs[] =
- {
- #ifndef _AMIGA
-+ #if 0
- "/lib",
- "/usr/lib",
- #endif
-+ #endif
- #if defined(WINDOWS32) && !defined(LIBDIR)
- /*
- * This is completely up to the user at product install time. Just define
diff --git a/pkgs/development/tools/build-managers/gnumake/3.81/log-3.81.patch b/pkgs/development/tools/build-managers/gnumake/3.81/log-3.81.patch
deleted file mode 100644
index b98d85a0826..00000000000
--- a/pkgs/development/tools/build-managers/gnumake/3.81/log-3.81.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-diff -rc job.c job.c
-*** job.c 2006-03-20 04:03:04.000000000 +0100
---- job.c 2009-01-19 19:37:28.000000000 +0100
-***************
-*** 1083,1089 ****
- appear. */
-
- message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag))
-! ? "%s" : (char *) 0, p);
-
- /* Tell update_goal_chain that a command has been started on behalf of
- this target. It is important that this happens here and not in
---- 1083,1089 ----
- appear. */
-
- message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag))
-! ? (enable_nested_output ? "\e[3s\e[a%s\e[b" : "%s") : (char *) 0, p);
-
- /* Tell update_goal_chain that a command has been started on behalf of
- this target. It is important that this happens here and not in
-diff -rc main.c main.c
-*** main.c 2006-03-20 03:36:37.000000000 +0100
---- main.c 2009-01-19 19:41:41.000000000 +0100
-***************
-*** 886,891 ****
---- 886,900 ----
- }
-
-
-+ static void close_nesting()
-+ {
-+ while (stdout_nesting_level--)
-+ printf("\e[q");
-+ while (stderr_nesting_level--)
-+ fprintf(stderr, "\e[q");
-+ }
-+
-+
- #ifdef _AMIGA
- int
- main (int argc, char **argv)
-***************
-*** 931,936 ****
---- 940,950 ----
- atexit (close_stdout);
- #endif
-
-+ atexit(close_nesting);
-+
-+ if (getenv("NIX_INDENT_MAKE"))
-+ enable_nested_output = 1;
-+
- /* Needed for OS/2 */
- initialize_main(&argc, &argv);
-
-***************
-*** 3095,3100 ****
---- 3109,3120 ----
-
- /* Use entire sentences to give the translators a fighting chance. */
-
-+ if (entering && enable_nested_output)
-+ {
-+ printf("\e[p");
-+ stdout_nesting_level++;
-+ }
-+
- if (makelevel == 0)
- if (starting_directory == 0)
- if (entering)
-***************
-*** 3124,3129 ****
---- 3144,3159 ----
- printf (_("%s[%u]: Leaving directory `%s'\n"),
- program, makelevel, starting_directory);
-
-+ if (!entering && enable_nested_output)
-+ {
-+ printf("\e[q");
-+ stdout_nesting_level--;
-+ }
-+
- /* Flush stdout to be sure this comes before any stderr output. */
- fflush (stdout);
- }
-+
-+ int enable_nested_output = 0;
-+ int stdout_nesting_level = 0;
-+ int stderr_nesting_level = 0;
-diff -rc make.h
-*** make.h 2006-02-16 00:54:43.000000000 +0100
---- make.h 2009-01-19 19:32:03.000000000 +0100
-***************
-*** 609,611 ****
---- 609,614 ----
- #define ENULLLOOP(_v,_c) do{ errno = 0; \
- while (((_v)=_c)==0 && errno==EINTR); }while(0)
-
-+ extern int enable_nested_output;
-+ extern int stdout_nesting_level;
-+ extern int stderr_nesting_level;
-diff -rc reremake.c
-*** remake.c 2006-03-20 03:36:37.000000000 +0100
---- remake.c 2009-01-19 19:39:40.000000000 +0100
-***************
-*** 1120,1126 ****
---- 1120,1137 ----
- /* The normal case: start some commands. */
- if (!touch_flag || file->cmds->any_recurse)
- {
-+ if (enable_nested_output)
-+ {
-+ log_working_directory (1);
-+ fprintf(stderr, "\e[pbuilding %s\n", file->name);
-+ stderr_nesting_level++;
-+ }
- execute_file_commands (file);
-+ if (enable_nested_output)
-+ {
-+ fprintf(stderr, "\e[q");
-+ stderr_nesting_level--;
-+ }
- return;
- }
-
diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index 48ec100f593..e6006e94881 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "sbt-${version}";
- version = "0.13.12";
+ version = "0.13.13";
src = fetchurl {
url = "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz";
- sha256 = "1pq3c9nhxbdpx5csmpvjv93nz2z04n2gzzwyd7sllaplqgwk00i8";
+ sha256 = "0ygrz92qkzasj6fps1bjg7wlgl69867jjjc37yjadib0l8hkvl20";
};
patchPhase = ''
diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix
index 19dbdb76a36..550a59a887e 100644
--- a/pkgs/development/tools/build-managers/scons/default.nix
+++ b/pkgs/development/tools/build-managers/scons/default.nix
@@ -1,29 +1,17 @@
-{stdenv, fetchurl, python, makeWrapper}:
+{stdenv, fetchurl, python2Packages}:
let
name = "scons";
version = "2.5.0";
-in
-
-stdenv.mkDerivation {
+in python2Packages.buildPythonApplication {
name = "${name}-${version}";
src = fetchurl {
url = "mirror://sourceforge/scons/${name}-${version}.tar.gz";
sha256 = "1sdcj8iapfzmlq7098yas40qwl6khsiwydbxv33sw81wy93nnagb";
};
-
- buildInputs = [python makeWrapper];
-
- preConfigure = ''
- for i in "script/"*; do
- substituteInPlace $i --replace "/usr/bin/env python" "${python}/bin/python"
- done
- '';
- buildPhase = "python setup.py install --prefix=$out --install-data=$out/share --install-lib=$(toPythonPath $out) --symlink-scons -O1";
- installPhase = "for n in $out/bin/*-${version}; do wrapProgram $n --suffix PYTHONPATH ':' \"$(toPythonPath $out)\"; done";
-
- pythonPath = [];
+ # No tests
+ doCheck = false;
meta = {
homepage = "http://scons.org/";
diff --git a/pkgs/development/tools/cdecl/default.nix b/pkgs/development/tools/cdecl/default.nix
index 9e9fcfcc19d..c5bccf6ddae 100644
--- a/pkgs/development/tools/cdecl/default.nix
+++ b/pkgs/development/tools/cdecl/default.nix
@@ -3,8 +3,8 @@
stdenv.mkDerivation {
name = "cdecl-2.5";
src = fetchurl {
- url = "http://cdecl.org/files/cdecl-blocks-2.5.tar.gz";
- md5 = "c1927e146975b1c7524cbaf07a7c10f8";
+ url = "http://www.cdecl.org/files/cdecl-blocks-2.5.tar.gz";
+ sha256 = "1b7k0ra30hh8mg8fqv0f0yzkaac6lfg6n376drgbpxg4wwml1rly";
};
patches = [ ./cdecl-2.5-lex.patch ];
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
old mode 100644
new mode 100755
index 6bef2d7b548..c66c0fc93b7
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }:
let
- version = "1.6.0";
+ version = "1.7.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";
+ sha256 = "1qc0kmb6wxsy73vf0k2x95jlfb5dicgxw8c63mfn7ryxrh8a42z5";
};
docker_arm = fetchurl {
url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
- sha256 = "0aw6cfh92f7fywzry0yswa635hpmzh6fqcav0ljc5vqs26wdmjc1";
+ sha256 = "0jbgpv4y0fmvl1plri4ifj1vmk6rr82pncrccpz2k640nlniyhqi";
};
in
buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
owner = "gitlab-org";
repo = "gitlab-ci-multi-runner";
rev = "v${version}";
- sha256 = "10w222k4klxqyzk08c0j7nmhdbdnn70p6n1hfqy6h5mczlffqv61";
+ sha256 = "18wlab63fmmq9kgr0zmkgsr1kj6rjdqmyg87b7ryb9f40gmygcvj";
};
buildInputs = [ go-bindata ];
diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix
index 5c76fc69ac3..fe4ec06322f 100644
--- a/pkgs/development/tools/deis/default.nix
+++ b/pkgs/development/tools/deis/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "deis-${version}";
- version = "1.13.0";
+ version = "1.13.3";
rev = "v${version}";
-
+
goPackagePath = "github.com/deis/deis";
subPackages = [ "client" ];
@@ -18,8 +18,20 @@ buildGoPackage rec {
inherit rev;
owner = "deis";
repo = "deis";
- sha256 = "1qv9lxqx7m18029lj8cw3k7jngvxs4iciwrypdy0gd2nnghc68sw";
+ sha256 = "15q44jyjms8fdmly0z4sn4ymf1dx6cmdavgixjixdj2wbjw0yi2p";
};
- goDeps = ./deps.nix;
+ preBuild = ''
+ export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://deis.io;
+ description = "A command line utility used to interact with the Deis open source PaaS.";
+ license = licenses.asl20;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [
+ jgeerds
+ ];
+ };
}
diff --git a/pkgs/development/tools/deis/deps.nix b/pkgs/development/tools/deis/deps.nix
deleted file mode 100644
index 5a1b30a7e66..00000000000
--- a/pkgs/development/tools/deis/deps.nix
+++ /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/deisctl/default.nix b/pkgs/development/tools/deisctl/default.nix
new file mode 100644
index 00000000000..3f818ea7be6
--- /dev/null
+++ b/pkgs/development/tools/deisctl/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ name = "deis-${version}";
+ version = "1.13.3";
+ rev = "v${version}";
+
+ goPackagePath = "github.com/deis/deis";
+ subPackages = [ "deisctl" ];
+
+ src = fetchFromGitHub {
+ inherit rev;
+ owner = "deis";
+ repo = "deis";
+ sha256 = "15q44jyjms8fdmly0z4sn4ymf1dx6cmdavgixjixdj2wbjw0yi2p";
+ };
+
+ preBuild = ''
+ export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://deis.io;
+ description = "A command-line utility used to provision and operate a Deis cluster.";
+ license = licenses.asl20;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [
+ jgeerds
+ ];
+ };
+}
diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix
index 1e848e5d611..f724b65dd82 100644
--- a/pkgs/development/tools/devpi-client/default.nix
+++ b/pkgs/development/tools/devpi-client/default.nix
@@ -1,17 +1,20 @@
-{ stdenv, fetchurl, pythonPackages, python} :
+{ stdenv, fetchurl, pythonPackages, glibcLocales} :
pythonPackages.buildPythonApplication rec {
name = "devpi-client-${version}";
- version = "2.3.2";
+ version = "2.7.0";
src = fetchurl {
- url = "mirror://pypi/d/devpi-client/devpi-client-${version}.tar.gz";
- md5= "bfc8cd768f983fd0585c347bca00c8bb";
+ url = "mirror://pypi/d/devpi-client/${name}.tar.gz";
+ sha256 = "0z7vaf0a66n82mz0vx122pbynjvkhp2mjf9lskgyv09y3bxzzpj3";
};
- buildInputs = [ pythonPackages.tox pythonPackages.check-manifest pythonPackages.pkginfo ];
+ doCheck = false;
- propagatedBuildInputs = [ pythonPackages.py pythonPackages.devpi-common ];
+ LC_ALL = "en_US.UTF-8";
+ buildInputs = with pythonPackages; [ glibcLocales tox check-manifest pkginfo ];
+
+ propagatedBuildInputs = with pythonPackages; [ py devpi-common ];
meta = {
homepage = http://doc.devpi.net;
diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
index b653c705478..18933426db0 100644
--- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
+++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
@@ -1,7 +1,7 @@
-{stdenv, fetchurl, python, pkgconfig, libxml2Python, libxslt, intltool
-, makeWrapper, pythonPackages }:
+{stdenv, fetchurl, pkgconfig, libxml2Python, libxslt, intltool
+, makeWrapper, python2Packages }:
-stdenv.mkDerivation {
+python2Packages.mkPythonDerivation {
name = "gnome-doc-utils-0.20.10";
src = fetchurl {
@@ -10,9 +10,6 @@ stdenv.mkDerivation {
};
configureFlags = "--disable-scrollkeeper";
- buildInputs = [ python libxml2Python libxslt ];
- pythonPath = [ libxml2Python ];
- postInstall = "wrapPythonPrograms";
-
- nativeBuildInputs = [ pkgconfig intltool pythonPackages.wrapPython ];
+ buildInputs = [ libxslt pkgconfig intltool ];
+ propagatedBuildInputs = [ libxml2Python ];
}
diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index 7c831585956..e789370d585 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -1,38 +1,64 @@
{ stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv }:
-stdenv.mkDerivation rec {
- name = "electron-${version}";
+let
version = "1.2.2";
-
- src = fetchurl {
- url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
- sha256 = "0jqzs1297f6w7s4j9pd7wyyqbidb0c61yjz47raafslg6nljgp1c";
- name = "${name}.zip";
- };
-
- buildInputs = [ unzip makeWrapper ];
-
- buildCommand = ''
- mkdir -p $out/lib/electron $out/bin
- unzip -d $out/lib/electron $src
- ln -s $out/lib/electron/electron $out/bin
-
- fixupPhase
-
- patchelf \
- --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath "${atomEnv.libPath}:$out/lib/electron" \
- $out/lib/electron/electron
-
- wrapProgram $out/lib/electron/electron \
- --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1
- '';
+ name = "electron-${version}";
meta = with stdenv.lib; {
description = "Cross platform desktop application shell";
homepage = https://github.com/electron/electron;
license = licenses.mit;
maintainers = [ maintainers.travisbhartwell ];
- platforms = [ "x86_64-linux" ];
+ platforms = [ "x86_64-darwin" "x86_64-linux" ];
};
-}
+
+ linux = {
+ inherit name version meta;
+
+ src = fetchurl {
+ url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
+ sha256 = "0jqzs1297f6w7s4j9pd7wyyqbidb0c61yjz47raafslg6nljgp1c";
+ name = "${name}.zip";
+ };
+
+ buildInputs = [ unzip makeWrapper ];
+
+ buildCommand = ''
+ mkdir -p $out/lib/electron $out/bin
+ unzip -d $out/lib/electron $src
+ ln -s $out/lib/electron/electron $out/bin
+
+ fixupPhase
+
+ patchelf \
+ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath "${atomEnv.libPath}:$out/lib/electron" \
+ $out/lib/electron/electron
+
+ wrapProgram $out/lib/electron/electron \
+ --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1
+ '';
+ };
+
+ darwin = {
+ inherit name version meta;
+
+ src = fetchurl {
+ url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip";
+ sha256 = "0rqlpj3400qjsfj8k4lwajrwv5l6f8mhrpvsma7p36fw5qjbwp1z";
+ name = "${name}.zip";
+ };
+
+ buildInputs = [ unzip ];
+
+ buildCommand = ''
+ mkdir -p $out/Applications
+ unzip $src
+ mv Electron.app $out/Applications
+ mkdir -p $out/bin
+ ln -s $out/Applications/Electron.app/Contents/MacOs/Electron $out/bin/electron
+ '';
+ };
+in
+
+ stdenv.mkDerivation (if stdenv.isDarwin then darwin else linux)
diff --git a/pkgs/development/tools/grabserial/default.nix b/pkgs/development/tools/grabserial/default.nix
index 1020ed864df..c86c2e275ed 100644
--- a/pkgs/development/tools/grabserial/default.nix
+++ b/pkgs/development/tools/grabserial/default.nix
@@ -2,13 +2,13 @@
pythonPackages.buildPythonApplication rec {
- name = "grabserial-20141120";
+ name = "grabserial-1.9.3";
namePrefix = "";
src = fetchgit {
url = https://github.com/tbird20d/grabserial.git;
- rev = "8b9c98ea35d382bac2aafc7a8a9c02440369a792";
- sha256 = "ff27f5e5ab38c8450a4a0291e943e6c5a265e56d29d6a1caa849ae3238d71679";
+ rev = "7cbf104b61ffdf68e6782a8e885050565399a014";
+ sha256 = "043r2p5jw0ymx8ka1d39q1ap39i7sliq5f4w3yr1n53lzshjmc5g";
};
propagatedBuildInputs = [ pythonPackages.pyserial ];
diff --git a/pkgs/development/tools/misc/awf/default.nix b/pkgs/development/tools/misc/awf/default.nix
new file mode 100644
index 00000000000..b29dbcf79be
--- /dev/null
+++ b/pkgs/development/tools/misc/awf/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, gtk2, gtk3, pkgconfig
+, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+ name = "awf-${version}";
+ version = "1.3.1";
+
+ src = fetchFromGitHub {
+ owner = "valr";
+ repo = "awf";
+ rev = "v${version}";
+ sha256 = "18dqa2269cwr0hrn67vp0ifwbv8vc2xn6mg145pbnc038hicql8m";
+ };
+
+ nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ];
+
+ buildInputs = [ gtk2 gtk3 ];
+
+ autoreconfPhase = ''
+ patchShebangs ./autogen.sh
+ ./autogen.sh
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A Widget Factory";
+ longDescription = ''
+ A widget factory is a theme preview application for gtk2 and
+ gtk3. It displays the various widget types provided by gtk2/gtk3
+ in a single window allowing to see the visual effect of the
+ applied theme.
+ '';
+ homepage = https://github.com/valr/awf;
+ license = licenses.gpl3;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ michalrus ];
+ };
+}
diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix
new file mode 100644
index 00000000000..e9da64b112b
--- /dev/null
+++ b/pkgs/development/tools/misc/hound/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ name = "hound-unstable-${version}";
+ version = "20160919-${stdenv.lib.strings.substring 0 7 rev}";
+ rev = "f95e9a9224b8878b9cd8fac0afb6d31f83a65ca7";
+
+ goPackagePath = "github.com/etsy/hound";
+
+ src = fetchFromGitHub {
+ inherit rev;
+ owner = "etsy";
+ repo = "hound";
+ sha256 = "0d4mhka7f8x8xfjrjhl5l0v06ng8kc868jrajpv5bjkxsj71nwbg";
+ };
+
+ goDeps = ./deps.nix;
+
+ meta = {
+ inherit (src.meta) homepage;
+
+ description = "Lightning fast code searching made easy";
+ license = stdenv.lib.licenses.mit;
+ maintainers = with stdenv.lib.maintainers; [ grahamc ];
+ platforms = stdenv.lib.platforms.unix;
+ };
+}
diff --git a/pkgs/development/tools/misc/hound/deps.nix b/pkgs/development/tools/misc/hound/deps.nix
new file mode 100644
index 00000000000..fe51488c706
--- /dev/null
+++ b/pkgs/development/tools/misc/hound/deps.nix
@@ -0,0 +1 @@
+[]
diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix
index e59e4c23776..3c5dacb6f65 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=47258&view=co";
+ + "/debian/patches/perl5.22-regex-fixes.patch?revision=47258&view=co";
sha256 = "17clqczb9fky7hp8czxa0fy82b5478irvz4f3fnans3sqxl95hx3";
})];
diff --git a/pkgs/development/tools/misc/itstool/default.nix b/pkgs/development/tools/misc/itstool/default.nix
index fa8002d4f6c..8c2686d9a22 100644
--- a/pkgs/development/tools/misc/itstool/default.nix
+++ b/pkgs/development/tools/misc/itstool/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, python, libxml2Python }:
+{ stdenv, fetchurl, python2, libxml2Python }:
+# We need the same Python as is used to build libxml2Python
stdenv.mkDerivation rec {
name = "itstool-2.0.2";
@@ -8,12 +9,12 @@ stdenv.mkDerivation rec {
sha256 = "bf909fb59b11a646681a8534d5700fec99be83bb2c57badf8c1844512227033a";
};
- buildInputs = [ python libxml2Python ];
+ buildInputs = [ python2 libxml2Python ];
patchPhase =
''
sed -e '/import libxml2/i import sys\
- sys.path.append("${libxml2Python}/lib/${python.libPrefix}/site-packages")' \
+ sys.path.append("${libxml2Python}/lib/${python2.libPrefix}/site-packages")' \
-i itstool.in
'';
diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix
index 50e35928bba..86be86cb6d6 100644
--- a/pkgs/development/tools/misc/saleae-logic/default.nix
+++ b/pkgs/development/tools/misc/saleae-logic/default.nix
@@ -25,7 +25,7 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
stdenv.mkDerivation rec {
pname = "saleae-logic";
- version = "1.2.9";
+ version = "1.2.10";
name = "${pname}-${version}";
src =
@@ -33,13 +33,13 @@ stdenv.mkDerivation rec {
fetchurl {
name = "saleae-logic-${version}-32bit.zip";
url = "http://downloads.saleae.com/logic/${version}/Logic%20${version}%20(32-bit).zip";
- sha256 = "0000004xgv8v8l12shimhhn54nn0dldbxz1gpbx92ysd8q8x1q79";
+ sha256 = "1dyrj07cgj2fvwi1sk97vady9ri8f8n7mxy9zyzmw9isngs7bmll";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
name = "saleae-logic-${version}-64bit.zip";
url = "http://downloads.saleae.com/logic/${version}/Logic%20${version}%20(64-bit).zip";
- sha256 = "1d4hmp756ysfk5i1ys4mlkd1czbdw0zqznkzx08pyqk93zc7b16s";
+ sha256 = "1skx2pfnic7pyss7c69qb7kg2xvflpxf112xkf9awk516dw1w4h7";
}
else
abort "Saleae Logic software requires i686-linux or x86_64-linux";
diff --git a/pkgs/development/tools/mypy-lang/default.nix b/pkgs/development/tools/mypy-lang/default.nix
index ebce2b86c1f..6831c7f2b56 100644
--- a/pkgs/development/tools/mypy-lang/default.nix
+++ b/pkgs/development/tools/mypy-lang/default.nix
@@ -2,14 +2,14 @@
python35Packages.buildPythonApplication rec {
name = "mypy-lang-${version}";
- version = "0.4.3";
+ version = "0.4.5";
# Tests not included in pip package.
doCheck = false;
src = fetchurl {
url = "mirror://pypi/m/mypy-lang/${name}.tar.gz";
- sha256 = "11d8195xg8hksyh2qapbv66jvjgfpjwkc61nwljcfq9si144f2nb";
+ sha256 = "0x1n6r5in57zv4s75r22smpqxrz7xxp84fnrhkwzbpjnafa3y81f";
};
propagatedBuildInputs = with python35Packages; [ lxml ];
diff --git a/pkgs/development/tools/nimble/default.nix b/pkgs/development/tools/nimble/default.nix
index 1382883e5a3..d3248d6219e 100644
--- a/pkgs/development/tools/nimble/default.nix
+++ b/pkgs/development/tools/nimble/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "nimble-${version}";
- version = "0.7.8";
+ version = "0.7.10";
src = fetchFromGitHub {
owner = "nim-lang";
repo = "nimble";
rev = "v${version}";
- sha256 = "12znxzj1j5fflw2mkkrns9n7qg6sf207652zrdyf7h2jdyzzb73x";
+ sha256 = "1bcv8chir73nn6x7q8n3sw2scf3m0x2w9gkkzx162ryivza1nm1r";
};
buildInputs = [ nim openssl ];
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
index 3f5bd770dcf..b19f078d9a2 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, camlp4,
+{ stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, ppx_deriving, camlp4,
cmdliner, tyxml, reactivedata, cppo, which, base64}:
stdenv.mkDerivation {
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "1dali1akyd4zmkwav0d957ynxq2jj6cc94r4xiaql7ca89ajz4jj";
};
- buildInputs = [ocaml findlib menhir ocsigen_deriving
+ buildInputs = [ ocaml findlib menhir ocsigen_deriving ppx_deriving
cmdliner tyxml reactivedata cppo which base64];
propagatedBuildInputs = [ ocaml_lwt camlp4 ];
diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix
index ed441ea8c10..3c99c3b9580 100644
--- a/pkgs/development/tools/ocaml/merlin/default.nix
+++ b/pkgs/development/tools/ocaml/merlin/default.nix
@@ -8,10 +8,10 @@ let
then
"2.3.1"
else
- "2.5.0";
+ "2.5.1";
hashes = {
"2.3.1" = "192jamcc7rmvadlqqsjkzsl6hlgwhg9my1qc89fxh1lmd4qdsrpn";
- "2.5.0" = "1q09mnq4qmh6vfn45qxh2v81l364iazcpjs5dyczmlhln8b25bff";
+ "2.5.1" = "0p3hqxawp18q43ws6506cnndi49f3gxzmai0x2qch7h42dgh1cb8";
};
in
diff --git a/pkgs/development/tools/reno/default.nix b/pkgs/development/tools/reno/default.nix
new file mode 100644
index 00000000000..dbc2401970b
--- /dev/null
+++ b/pkgs/development/tools/reno/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pythonPackages }:
+
+pythonPackages.buildPythonApplication rec {
+ name = "reno-${version}";
+ version = "1.8.0";
+
+ src = fetchurl {
+ url = "mirror://pypi/r/reno/${name}.tar.gz";
+ sha256 = "1pqg0xzcilmyrrnpa87m11xwlvfc94a98s28z9cgddkhw27lg3ps";
+ };
+
+ # Don't know how to make tests pass
+ doCheck = false;
+
+ # Nothing to strip (python files)
+ dontStrip = true;
+
+ propagatedBuildInputs = with pythonPackages; [ pbr six pyyaml ];
+ buildInputs = with pythonPackages; [ Babel ];
+
+ meta = with stdenv.lib; {
+ description = "Release Notes Manager";
+ homepage = http://docs.openstack.org/developer/reno/;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ guillaumekoenig ];
+ };
+}
diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix
new file mode 100644
index 00000000000..b0c15a6df4b
--- /dev/null
+++ b/pkgs/development/tools/spirv-tools/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchFromGitHub, cmake, python }:
+
+let
+
+spirv_sources = {
+ # `vulkan-loader` requires a specific version of `spirv-tools` and `spirv-headers` as specified in
+ # `/spirv-tools_revision`.
+ tools = fetchFromGitHub {
+ owner = "KhronosGroup";
+ repo = "SPIRV-Tools";
+ rev = "923a4596b44831a07060df45caacb522613730c9";
+ sha256 = "0hmgng2sv34amfsag3ya09prnv1w535djwlzfn8h2vh430vgawxa";
+ };
+ headers = fetchFromGitHub {
+ owner = "KhronosGroup";
+ repo = "SPIRV-Headers";
+ rev = "33d41376d378761ed3a4c791fc4b647761897f26";
+ sha256 = "1s103bpi3g6hhq453qa4jbabfkyxxpf9vn213j8k4vm26lsi8hs2";
+ };
+};
+
+in
+
+stdenv.mkDerivation rec {
+ name = "spirv-tools-${version}";
+ version = "2016-07-18";
+
+ src = spirv_sources.tools;
+ patchPhase = ''ln -sv ${spirv_sources.headers} external/spirv-headers'';
+ enableParallelBuilding = true;
+
+ buildInputs = [ cmake python ];
+
+ passthru = {
+ headers = spirv_sources.headers;
+ };
+
+ meta = with stdenv.lib; {
+ inherit (src.meta) homepage;
+ description = "The SPIR-V Tools project provides an API and commands for processing SPIR-V modules.";
+ };
+}
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index cf4f34cbdfe..062873f0ccd 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -1,7 +1,5 @@
{ stdenv, fetchurl, fetchpatch, dpkg, curl, libarchive, openssl, ruby, buildRubyGem, libiconv
-, libxml2, libxslt, makeWrapper }:
-
-assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
+, libxml2, libxslt, makeWrapper, p7zip, xar, gzip, cpio }:
let
version = "1.8.6";
@@ -12,9 +10,16 @@ let
sha256 = "1rn03rqlf1iv6n87a78hkda2yqparhhaivfjpizblmxvlw2hk5r8";
};
+ url = if stdenv.isLinux
+ then "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}_${arch}.deb"
+ else if stdenv.isDarwin
+ then "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}.dmg"
+ else "system ${stdenv.system} not supported";
+
sha256 = {
- "x86_64-linux" = "1nkhf160hcl02yvafj6hq53j204qqxyvxjngnmf4f5md8dmkpn76";
- "i686-linux" = "0mr4pn7nggjdsqyxh1z2mflvvmpzhbxh5gax501d2hi8xr0y68df";
+ "x86_64-linux" = "1nkhf160hcl02yvafj6hq53j204qqxyvxjngnmf4f5md8dmkpn76";
+ "i686-linux" = "0mr4pn7nggjdsqyxh1z2mflvvmpzhbxh5gax501d2hi8xr0y68df";
+ "x86_64-darwin" = "1nd2adxwhs2vwmi5vw2z720ny4q9rpj8i4dlcdxzbyli7h8cs5mr";
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
arch = builtins.replaceStrings ["-linux"] [""] stdenv.system;
@@ -24,8 +29,7 @@ in stdenv.mkDerivation rec {
inherit version;
src = fetchurl {
- url = "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}_${arch}.deb";
- inherit sha256;
+ inherit url sha256;
};
meta = with stdenv.lib; {
@@ -33,14 +37,29 @@ in stdenv.mkDerivation rec {
homepage = http://vagrantup.com;
license = licenses.mit;
maintainers = with maintainers; [ lovek323 globin jgeerds kamilchm ];
- platforms = platforms.linux;
+ platforms = with platforms; linux ++ darwin;
};
- buildInputs = [ makeWrapper ];
+ buildInputs = [ makeWrapper ]
+ ++ stdenv.lib.optional stdenv.isDarwin [ p7zip xar gzip cpio ];
- unpackPhase = ''
- ${dpkg}/bin/dpkg-deb -x "$src" .
- '';
+ unpackPhase = if stdenv.isLinux
+ then ''
+ ${dpkg}/bin/dpkg-deb -x "$src" .
+ ''
+ else ''
+ 7z x $src
+ cd Vagrant/
+ xar -xf Vagrant.pkg
+ cd core.pkg/
+ cat Payload | gzip -d - | cpio -id
+
+ # move unpacked directories to match unpacked .deb from linux,
+ # so installPhase can be shared
+ mkdir -p opt/vagrant/ usr/
+ mv embedded opt/vagrant/embedded
+ mv bin usr/bin
+ '';
buildPhase = "";
@@ -110,5 +129,10 @@ in stdenv.mkDerivation rec {
postFixup = ''
chmod +x "$out/opt/vagrant/embedded/gems/gems/bundler-1.12.5/lib/bundler/templates/Executable"
chmod +x "$out/opt/vagrant/embedded/gems/gems/vagrant-$version/plugins/provisioners/salt/bootstrap-salt.sh"
- '';
+ '' +
+ (stdenv.lib.optionalString stdenv.isDarwin ''
+ # undo the directory movement done in unpackPhase
+ mv $out/opt/vagrant/embedded $out/
+ rm -r $out/opt
+ '');
}
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index 6cf73fd22b6..7c92df30311 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser
+{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser
, pkgconfig, runCommand, which, libtool
, version
, sha256 ? null
@@ -48,7 +48,7 @@ in stdenv.mkDerivation {
patches = patches ++ stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ];
buildInputs = extraBuildInputs
- ++ [ python which zlib libuv openssl ]
+ ++ [ python2 which zlib libuv openssl ]
++ optionals stdenv.isLinux [ utillinux http-parser ]
++ optionals stdenv.isDarwin [ pkgconfig libtool ];
setupHook = ./setup-hook.sh;
diff --git a/pkgs/development/web/nodejs/v0_10.nix b/pkgs/development/web/nodejs/v0_10.nix
deleted file mode 100644
index 9845aa3bf8c..00000000000
--- a/pkgs/development/web/nodejs/v0_10.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-{ stdenv, lib, fetchurl, openssl, python, zlib, v8, utillinux, http-parser, c-ares
-, pkgconfig, runCommand, which, libtool
-
-# apple frameworks
-, CoreServices, ApplicationServices, Carbon, Foundation
-}:
-
-let
- version = "0.10.42";
-
- # !!! Should we also do shared libuv?
- deps = {
- inherit openssl zlib;
-
- # disabled system v8 because v8 3.14 no longer receives security fixes
- # we fall back to nodejs' internal v8 copy which receives backports for now
- # inherit v8
- } // (stdenv.lib.optionalAttrs (!stdenv.isDarwin) {
- inherit http-parser;
- })
- // ({ cares = c-ares; });
-
- sharedConfigureFlags = name: let drv = builtins.getAttr name deps; in [
- "--shared-${name}"
- "--shared-${name}-includes=${lib.getDev drv}/include"
- "--shared-${name}-libpath=${lib.getLib drv}/lib"
- ];
-
- inherit (stdenv.lib) concatMap optional optionals maintainers licenses platforms;
-in stdenv.mkDerivation {
- name = "nodejs-${version}";
-
- src = fetchurl {
- url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
- sha256 = "01g19mq8b3b828f59x7bv79973w5sw4133ll1dxml37qk0vdbhgb";
- };
-
- configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++
- stdenv.lib.optional stdenv.isDarwin "--without-dtrace";
-
- prePatch = ''
- patchShebangs .
- sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
- sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py
- '';
-
- patches = stdenv.lib.optionals stdenv.isDarwin [ ./default-arch.patch ./no-xcode.patch ];
-
- postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
- (cd tools/gyp; patch -Np1 -i ${../../python-modules/gyp/no-darwin-cflags.patch})
- '';
-
- buildInputs = [ python which ]
- ++ (optional stdenv.isLinux utillinux)
- ++ optionals stdenv.isDarwin [ pkgconfig openssl libtool CoreServices ApplicationServices Foundation ];
- propagatedBuildInputs = optionals stdenv.isDarwin [ Carbon ];
- setupHook = ./setup-hook.sh;
-
- enableParallelBuilding = true;
-
- postFixup = ''
- pushd $out/lib/node_modules/npm/node_modules/node-gyp
- patch -p2 < ${./no-xcode.patch}
- popd
- '';
-
- passthru.interpreterName = "nodejs-0.10";
-
- meta = {
- description = "Event-driven I/O framework for the V8 JavaScript engine";
- homepage = http://nodejs.org;
- license = licenses.mit;
- platforms = platforms.linux ++ platforms.darwin;
- };
-}
diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix
index d0e2494cd30..f0a505a683a 100644
--- a/pkgs/development/web/nodejs/v4.nix
+++ b/pkgs/development/web/nodejs/v4.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser
+{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser
, pkgconfig, runCommand, which, libtool
, callPackage
}@args:
@@ -9,4 +9,9 @@ import ./nodejs.nix (args // rec {
url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz";
sha256 = "1566q1kkv8j30fgqx8sm2h8323f38wwpa1hfb10gr6z46jyhv4a2";
};
+
+ preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
+ substituteInPlace src/util.h \
+ --replace "tr1/type_traits" "type_traits"
+ '';
})
diff --git a/pkgs/development/web/nodejs/v5.nix b/pkgs/development/web/nodejs/v5.nix
index 2398ae4e739..7cd406abd2c 100644
--- a/pkgs/development/web/nodejs/v5.nix
+++ b/pkgs/development/web/nodejs/v5.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser
+{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser
, pkgconfig, runCommand, which, libtool
, callPackage
}@args:
diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix
index ac54f0f8d49..a2213546ec4 100644
--- a/pkgs/development/web/nodejs/v6.nix
+++ b/pkgs/development/web/nodejs/v6.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser
+{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser
, pkgconfig, runCommand, which, libtool, fetchpatch
, callPackage
, darwin ? null
diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index cb20bb516c9..17d80f2e298 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -1,13 +1,15 @@
{ stdenv, lib, fetchurl, substituteAll, lame, mplayer
-, libpulseaudio, python, pyqt4, qt4, wrapPython
-, pysqlite, sqlalchemy, pyaudio, beautifulsoup, httplib2, matplotlib
+, libpulseaudio
# This little flag adds a huge number of dependencies, but we assume that
# everyone wants Anki to draw plots with statistics by default.
, plotsSupport ? true
+, python2Packages
}:
let
version = "2.0.36";
+ inherit (python2Packages) python wrapPython sqlalchemy pyaudio beautifulsoup httplib2 matplotlib pyqt4;
+ qt4 = pyqt4.qt;
in
stdenv.mkDerivation rec {
name = "anki-${version}";
@@ -19,7 +21,7 @@ stdenv.mkDerivation rec {
sha256 = "070p0jmx6cy7kp9bfcgpgkzpyqkcj81wy8gmacns03n5rlq8487v";
};
- pythonPath = [ pyqt4 pysqlite sqlalchemy pyaudio beautifulsoup httplib2 ]
+ pythonPath = [ pyqt4 sqlalchemy pyaudio beautifulsoup httplib2 ]
++ lib.optional plotsSupport matplotlib;
buildInputs = [ python wrapPython lame mplayer libpulseaudio ];
diff --git a/pkgs/games/blobby/blobby.sh b/pkgs/games/blobby/blobby.sh
new file mode 100644
index 00000000000..4c4b32b1243
--- /dev/null
+++ b/pkgs/games/blobby/blobby.sh
@@ -0,0 +1,10 @@
+#! @shell@
+
+test -d ~/.blobby || {
+ mkdir ~/.blobby
+ cp -r "@out@/share/blobby"/* ~/.blobby
+ chmod u+w -R ~/.blobby
+ ( cd ~/.blobby; for i in *.zip; do @unzip@/bin/unzip "$i"; done )
+}
+
+@out@/bin/blobby.bin
diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix
index c577d65a559..03cd2e7ca26 100644
--- a/pkgs/games/blobby/default.nix
+++ b/pkgs/games/blobby/default.nix
@@ -1,5 +1,5 @@
{stdenv, fetchurl, SDL2, SDL2_image, mesa, cmake, physfs, boost, zip, zlib
-, pkgconfig}:
+, pkgconfig, unzip}:
stdenv.mkDerivation rec {
version = "1.0";
name = "blobby-volley-${version}";
@@ -9,12 +9,22 @@ stdenv.mkDerivation rec {
sha256 = "1qpmbdlyhfbrdsq4vkb6cb3b8mh27fpizb71q4a21ala56g08yms";
};
- buildInputs = [SDL2 SDL2_image mesa cmake physfs boost zip zlib pkgconfig];
+ buildInputs = [SDL2 SDL2_image mesa cmake physfs boost zip zlib pkgconfig
+ unzip];
preConfigure=''
sed -e '1i#include ' -i src/NetworkMessage.cpp
'';
+ inherit unzip;
+
+ postInstall = ''
+ cp ../data/Icon.bmp "$out/share/blobby/"
+ mv "$out/bin"/blobby{,.bin}
+ substituteAll "${./blobby.sh}" "$out/bin/blobby"
+ chmod a+x "$out/bin/blobby"
+ '';
+
meta = {
description = ''A blobby volleyball game'';
license = stdenv.lib.licenses.bsd3;
diff --git a/pkgs/games/frotz/default.nix b/pkgs/games/frotz/default.nix
new file mode 100644
index 00000000000..3b4fb6842db
--- /dev/null
+++ b/pkgs/games/frotz/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, ncurses }:
+
+stdenv.mkDerivation rec {
+ version = "2.44";
+ name = "frotz-${version}";
+
+ src = fetchFromGitHub {
+ owner = "DavidGriffith";
+ repo = "frotz";
+ rev = version;
+ sha256 = "0gjkk4gxzqmxfdirrz2lr0bms6l9fc31vkmlywigkbdlh8wxgypp";
+ };
+
+ makeFlags = ''CC=cc PREFIX=$(out) CURSES=-lncurses'';
+
+ buildInputs = [ ncurses ];
+
+ meta = with stdenv.lib; {
+ homepage = http://frotz.sourceforge.net/;
+ description = "A z-machine interpreter for Infocom games and other interactive fiction.";
+ platforms = platforms.unix;
+ maintainers = [ maintainers.nicknovitski ];
+ license = licenses.gpl2;
+ };
+}
diff --git a/pkgs/games/gmad/default.nix b/pkgs/games/gmad/default.nix
new file mode 100644
index 00000000000..a15914877cc
--- /dev/null
+++ b/pkgs/games/gmad/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, premake4, bootil }:
+
+stdenv.mkDerivation rec {
+ name = "gmad-unstable-2015-04-16";
+
+ meta = {
+ description = "Garry's Mod Addon Creator and Extractor";
+ homepage = https://github.com/garrynewman/gmad;
+ license = stdenv.lib.licenses.unfree;
+ maintainers = [ stdenv.lib.maintainers.abigailbuccaneer ];
+ platforms = stdenv.lib.platforms.all;
+ };
+
+ src = fetchFromGitHub {
+ owner = "garrynewman";
+ repo = "gmad";
+ rev = "377f3458bf1ecb8a1a2217c2194773e3c2a2dea0";
+ sha256="0myi9njr100gxhxk1vrzr2sbij5kxl959sq0riiqgg01div338g0";
+ };
+
+ buildInputs = [ premake4 bootil ];
+
+ targetName =
+ if stdenv.isLinux then "gmad_linux"
+ else if stdenv.isDarwin then "gmad_osx"
+ else "gmad";
+
+ configurePhase = "premake4 --bootil_lib=${bootil}/lib --bootil_inc=${bootil}/include gmake";
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp ${targetName} $out/bin/gmad
+ '';
+}
diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix
index 0d419c08b00..c1bde5fcbc3 100644
--- a/pkgs/games/mnemosyne/default.nix
+++ b/pkgs/games/mnemosyne/default.nix
@@ -14,7 +14,6 @@ in pythonPackages.buildPythonApplication rec {
pyqt4
matplotlib
cherrypy
- sqlite3
webob
];
preConfigure = ''
diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix
index 747bd26afcc..ee8e865a6f1 100644
--- a/pkgs/games/openra/default.nix
+++ b/pkgs/games/openra/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, mono, makeWrapper, lua
, SDL2, freetype, openal, systemd, pkgconfig,
- dotnetPackages, gnome3
+ dotnetPackages, gnome3, curl, unzip
}:
let
- version = "20160508";
+ version = "20161019";
in stdenv.mkDerivation rec {
name = "openra-${version}";
@@ -19,15 +19,15 @@ in stdenv.mkDerivation rec {
src = fetchurl {
name = "${name}.tar.gz";
url = "https://github.com/OpenRA/OpenRA/archive/release-${version}.tar.gz";
- sha256 = "1vr5bvdkh0n5569ga2h7ggj43vnzr37hfqkfnsis1sg4vgwrnzr7";
+ sha256 = "1psmq3kb2whkavh5pm0xc4m5b4bihvrl8pfrk851iqg1cs22bg0w";
};
dontStrip = true;
buildInputs = with dotnetPackages;
- [ NUnit3 NewtonsoftJson MonoNat FuzzyLogicLibrary SmartIrc4net SharpZipLib MaxMindGeoIP2 MaxMindDb SharpFont StyleCopMSBuild StyleCopPlusMSBuild RestSharp NUnitConsole ]
- ++ [ lua gnome3.zenity ];
- nativeBuildInputs = [ mono makeWrapper lua pkgconfig ];
+ [ NUnit3 NewtonsoftJson MonoNat FuzzyLogicLibrary SmartIrc4net SharpZipLib MaxMindGeoIP2 MaxMindDb SharpFont StyleCopMSBuild StyleCopPlusMSBuild RestSharp NUnitConsole OpenNAT ]
+ ++ [ curl unzip lua gnome3.zenity ];
+ nativeBuildInputs = [ curl unzip mono makeWrapper lua pkgconfig ];
patchPhase = ''
mkdir Support
@@ -42,6 +42,7 @@ in stdenv.mkDerivation rec {
'';
preBuild = let dotnetPackagesDlls = with dotnetPackages; [
+ "${OpenNAT}/lib/dotnet/Open.NAT/net45/Open.Nat.dll"
"${MonoNat}/lib/dotnet/Mono.Nat/net40/Mono.Nat.dll"
"${FuzzyLogicLibrary}/lib/dotnet/FuzzyLogicLibrary/Release/FuzzyLogicLibrary.dll"
"${SmartIrc4net}/lib/dotnet/SmartIrc4net/net40/SmarIrc4net*"
diff --git a/pkgs/games/privateer/default.nix b/pkgs/games/privateer/default.nix
index ca1721e8ed5..e3116ae6e9d 100644
--- a/pkgs/games/privateer/default.nix
+++ b/pkgs/games/privateer/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchsvn, boost, cmake, ffmpeg, freeglut, glib,
gtk2, libjpeg, libpng, libpthreadstubs, libvorbis, libXau, libXdmcp,
- libXmu, mesa, openal, pixman, pkgconfig, python27Full, SDL }:
+ libXmu, mesa, openal, pixman, pkgconfig, python27, SDL }:
stdenv.mkDerivation {
name = "privateer-1.03";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
buildInputs =
[ boost cmake ffmpeg freeglut glib gtk2 libjpeg libpng
libpthreadstubs libvorbis libXau libXdmcp libXmu mesa openal
- pixman pkgconfig python27Full SDL ];
+ pixman pkgconfig python27 SDL ];
patches = [ ./0001-fix-VSFile-constructor.patch ];
diff --git a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix
new file mode 100644
index 00000000000..fbb52340918
--- /dev/null
+++ b/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix
@@ -0,0 +1,65 @@
+{ stdenv, fetchurl, mfcj6510dwlpr, makeWrapper}:
+
+stdenv.mkDerivation rec {
+ name = "mfcj6510dw-cupswrapper-${version}";
+ version = "3.0.0-1";
+
+ src = fetchurl {
+ url = "http://download.brother.com/welcome/dlf006814/mfcj6510dw_cupswrapper_GPL_source_${version}.tar.gz";
+ sha256 = "0y5iffybxjin8injrdmc9n9hl4s6b8n6ck76m1z78bzi88vwmhai";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ mfcj6510dwlpr ];
+
+ buildPhase = ''
+ cd brcupsconfig
+ make all
+ cd ..
+ '';
+
+ installPhase = ''
+ TARGETFOLDER=$out/opt/brother/Printers/mfcj6510dw/cupswrapper
+ mkdir -p $TARGETFOLDER
+ cp PPD/brother_mfcj6510dw_printer_en.ppd $TARGETFOLDER
+ cp brcupsconfig/brcupsconfpt1 $TARGETFOLDER
+ cp scripts/cupswrappermfcj6510dw $TARGETFOLDER
+ sed -i -e '26,304d' $TARGETFOLDER/cupswrappermfcj6510dw
+ substituteInPlace $TARGETFOLDER/cupswrappermfcj6510dw \
+ --replace "\$ppd_file_name" "$TARGETFOLDER/brother_mfcj6510dw_printer_en.ppd"
+
+ CPUSFILTERFOLDER=$out/lib/cups/filter
+ mkdir -p $TARGETFOLDER $CPUSFILTERFOLDER
+ ln -s ${mfcj6510dwlpr}/lib/cups/filter/brother_lpdwrapper_mfcj6510dw $out/lib/cups/filter/brother_lpdwrapper_mfcj6510dw
+ ##TODO: Use the cups filter instead of the LPR one.
+ #cp scripts/cupswrappermfcj6510dw $CPUSFILTERFOLDER/brother_lpdwrapper_mfcj6510dw
+ #sed -i -e '110,258!d' $CPUSFILTERFOLDER/brother_lpdwrapper_mfcj6510dw
+ #sed -i -e '33,40d' $CPUSFILTERFOLDER/brother_lpdwrapper_mfcj6510dw
+ #sed -i -e '34,35d' $CPUSFILTERFOLDER/brother_lpdwrapper_mfcj6510dw
+ #substituteInPlace $CPUSFILTERFOLDER/brother_lpdwrapper_mfcj6510dw \
+ # --replace "/opt/brother/$``{device_model``}/$``{printer_model``}/lpd/filter$``{printer_model``}" \
+ # "${mfcj6510dwlpr}/opt/brother/Printers/mfcj6510dw/lpd/filtermfcj6510dw" \
+ # --replace "/opt/brother/Printers/$``{printer_model``}/inf/br$``{printer_model``}rc" \
+ # "${mfcj6510dwlpr}/opt/brother/Printers/mfcj6510dw/inf/brmfcj6510dwrc" \
+ # --replace "/opt/brother/$``{device_model``}/$``{printer_model``}/cupswrapper/brcupsconfpt1" \
+ # "$out/opt/brother/Printers/mfcj6510dw/cupswrapper/brcupsconfpt1" \
+ # --replace "/usr/share/cups/model/Brother/brother_" "$out/opt/brother/Printers/mfcj6510dw/cupswrapper/brother_"
+ #substituteInPlace $CPUSFILTERFOLDER/brother_lpdwrapper_mfcj6510dw \
+ # --replace "$``{printer_model``}" "mfcj6510dw" \
+ # --replace "$``{printer_name``}" "MFCJ6510DW"
+ '';
+
+ cleanPhase = ''
+ cd brcupsconfpt1
+ make clean
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://www.brother.com/;
+ description = "Brother MFC-J6510DW CUPS wrapper driver";
+ license = with licenses; gpl2;
+ platforms = with platforms; linux;
+ downloadPage = http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj6510dw_all&os=128;
+ maintainers = with maintainers; [ ramkromberg ];
+ };
+}
diff --git a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
new file mode 100644
index 00000000000..ee14e4a52db
--- /dev/null
+++ b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
@@ -0,0 +1,89 @@
+{ stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, patchelf, utillinux, vimNox
+, ghostscript, a2ps }:
+
+# Why:
+# The executable "brprintconf_mfcj6510dw" binary is looking for "/opt/brother/Printers/%s/inf/br%sfunc" and "/opt/brother/Printers/%s/inf/br%src".
+# Whereby, %s is printf(3) string substitution for stdin's arg0 (the command's own filename) from the 10th char forwards, as a runtime dependency.
+# e.g. Say the filename is "0123456789ABCDE", the runtime will be looking for /opt/brother/Printers/ABCDE/inf/brABCDEfunc.
+# Presumably, the binary was designed to be deployed under the filename "printconf_mfcj6510dw", whereby it will search for "/opt/brother/Printers/mfcj6510dw/inf/brmfcj6510dwfunc".
+# For NixOS, we want to change the string to the store path of brmfcj6510dwfunc and brmfcj6510dwrc but we're faced with two complications:
+# 1. Too little room to specify the nix store path. We can't even take advantage of %s by renaming the file to the store path hash since the variable is too short and can't contain the whole hash.
+# 2. The binary needs the directory it's running from to be r/w.
+# What:
+# As such, we strip the path and substitution altogether, leaving only "brmfcj6510dwfunc" and "brmfcj6510dwrc", while filling the leftovers with nulls.
+# Fully null terminating the cstrings is necessary to keep the array the same size and preventing overflows.
+# We then use a shell script to link and execute the binary, func and rc files in a temporary directory.
+# How:
+# In the package, we dump the raw binary as a string of search-able hex values using hexdump. We execute the substitution with sed. We then convert the hex values back to binary form using xxd.
+# We also write a shell script that invoked "mktemp -d" to produce a r/w temporary directory and link what we need in the temporary directory.
+# Result:
+# The user can run brprintconf_mfcj6510dw in the shell.
+
+stdenv.mkDerivation rec {
+ name = "mfcj6510dwlpr-${version}";
+ version = "3.0.0-1";
+
+ src = fetchurl {
+ url = "http://download.brother.com/welcome/dlf006614/mfcj6510dwlpr-${version}.i386.deb";
+ sha256 = "1ccvx393pqavsgzd8igrzlin5jrsf01d3acyvwqd1d0yz5jgqy6d";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ cups ghostscript dpkg a2ps ];
+
+ unpackPhase = "true";
+
+ brprintconf_mfcj6510dw_script = ''
+ #!/bin/sh
+ cd $(mktemp -d)
+ ln -s @out@/usr/bin/brprintconf_mfcj6510dw_patched brprintconf_mfcj6510dw_patched
+ ln -s @out@/opt/brother/Printers/mfcj6510dw/inf/brmfcj6510dwfunc brmfcj6510dwfunc
+ ln -s @out@/opt/brother/Printers/mfcj6510dw/inf/brmfcj6510dwrc brmfcj6510dwrc
+ ./brprintconf_mfcj6510dw_patched "$@"
+ '';
+
+ installPhase = ''
+ dpkg-deb -x $src $out
+ substituteInPlace $out/opt/brother/Printers/mfcj6510dw/lpd/filtermfcj6510dw \
+ --replace /opt "$out/opt"
+ substituteInPlace $out/opt/brother/Printers/mfcj6510dw/lpd/psconvertij2 \
+ --replace "GHOST_SCRIPT=`which gs`" "GHOST_SCRIPT=${ghostscript}/bin/gs"
+ substituteInPlace $out/opt/brother/Printers/mfcj6510dw/inf/setupPrintcapij \
+ --replace "/opt/brother/Printers" "$out/opt/brother/Printers" \
+ --replace "printcap.local" "printcap"
+
+ patchelf --set-interpreter ${pkgsi686Linux.stdenv.cc.libc.out}/lib/ld-linux.so.2 \
+ --set-rpath $out/opt/brother/Printers/mfcj6510dw/inf:$out/opt/brother/Printers/mfcj6510dw/lpd \
+ $out/opt/brother/Printers/mfcj6510dw/lpd/brmfcj6510dwfilter
+ patchelf --set-interpreter ${pkgsi686Linux.stdenv.cc.libc.out}/lib/ld-linux.so.2 $out/usr/bin/brprintconf_mfcj6510dw
+
+ #stripping the hardcoded path.
+ ${utillinux}/bin/hexdump -ve '1/1 "%.2X"' $out/usr/bin/brprintconf_mfcj6510dw | \
+ sed 's.2F6F70742F62726F746865722F5072696E746572732F25732F696E662F6272257366756E63.62726d66636a36353130647766756e63000000000000000000000000000000000000000000.' | \
+ sed 's.2F6F70742F62726F746865722F5072696E746572732F25732F696E662F627225737263.62726D66636A3635313064777263000000000000000000000000000000000000000000.' | \
+ ${vimNox}/bin/xxd -r -p > $out/usr/bin/brprintconf_mfcj6510dw_patched
+ chmod +x $out/usr/bin/brprintconf_mfcj6510dw_patched
+ #executing from current dir. segfaults if it's not r\w.
+ mkdir -p $out/bin
+ echo -n "$brprintconf_mfcj6510dw_script" > $out/bin/brprintconf_mfcj6510dw
+ chmod +x $out/bin/brprintconf_mfcj6510dw
+ substituteInPlace $out/bin/brprintconf_mfcj6510dw --replace @out@ $out
+
+ mkdir -p $out/lib/cups/filter/
+ ln -s $out/opt/brother/Printers/mfcj6510dw/lpd/filtermfcj6510dw $out/lib/cups/filter/brother_lpdwrapper_mfcj6510dw
+
+ wrapProgram $out/opt/brother/Printers/mfcj6510dw/lpd/psconvertij2 \
+ --prefix PATH ":" ${ stdenv.lib.makeBinPath [ coreutils gnused gawk ] }
+ wrapProgram $out/opt/brother/Printers/mfcj6510dw/lpd/filtermfcj6510dw \
+ --prefix PATH ":" ${ stdenv.lib.makeBinPath [ coreutils gnused file ghostscript a2ps ] }
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://www.brother.com/;
+ description = "Brother MFC-J6510DW LPR driver";
+ license = with licenses; unfree;
+ platforms = with platforms; linux;
+ downloadPage = http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj6510dw_all&os=128;
+ maintainers = with maintainers; [ ramkromberg ];
+ };
+}
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index bf0af6b806f..c0a6c0a9baa 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -3,7 +3,7 @@
, cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils
, net_snmp, openssl, polkit
, bash, coreutils, utillinux
-, qtSupport ? true, qt4
+, qtSupport ? true
, withPlugin ? false
}:
@@ -47,32 +47,27 @@ in
assert withPlugin -> builtins.elem hplipArch pluginArches
|| throw "HPLIP plugin not supported on ${stdenv.system}";
-stdenv.mkDerivation {
+pythonPackages.mkPythonDerivation {
inherit name src;
buildInputs = [
libjpeg
cups
libusb1
- pythonPackages.python
- pythonPackages.wrapPython
sane-backends
dbus
net_snmp
openssl
- ] ++ stdenv.lib.optionals qtSupport [
- qt4
];
nativeBuildInputs = [
pkgconfig
];
- pythonPath = with pythonPackages; [
+ propagatedBuildInputs = with pythonPackages; [
dbus
pillow
pygobject2
- recursivePthLoader
reportlab
usbutils
] ++ stdenv.lib.optionals qtSupport [
@@ -149,32 +144,7 @@ stdenv.mkDerivation {
rm $out/etc/udev/rules.d/56-hpmud.rules
'';
- fixupPhase = ''
- # Wrap the user-facing Python scripts in $out/bin without turning the
- # ones in $out /share into shell scripts (they need to be importable).
- # Note that $out/bin contains only symlinks to $out/share.
- for bin in $out/bin/*; do
- py=`readlink -m $bin`
- rm $bin
- cp $py $bin
- wrapPythonProgramsIn $bin "$out $pythonPath"
- sed -i "s@$(dirname $bin)/[^ ]*@$py@g" $bin
- done
-
- # Remove originals. Knows a little too much about wrapPythonProgramsIn.
- rm -f $out/bin/.*-wrapped
-
- # Merely patching shebangs in $out/share does not cause trouble.
- for i in $out/share/hplip{,/*}/*.py; do
- substituteInPlace $i \
- --replace /usr/bin/python \
- ${pythonPackages.python}/bin/${pythonPackages.python.executable} \
- --replace "/usr/bin/env python" \
- ${pythonPackages.python}/bin/${pythonPackages.python.executable}
- done
-
- wrapPythonProgramsIn $out/lib "$out $pythonPath"
-
+ postFixup = ''
substituteInPlace $out/etc/hp/hplip.conf --replace /usr $out
'' + stdenv.lib.optionalString (!withPlugin) ''
# A udev rule to notify users that they need the binary plugin.
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 1242d99398f..22a148398c5 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -8,8 +8,8 @@
assert x11Support -> xlibsWrapper != null;
assert cupsSupport -> cups != null;
let
- version = "9.18";
- sha256 = "18ad90za28dxybajqwf3y3dld87cgkx1ljllmcnc7ysspfxzbnl3";
+ version = "9.20";
+ sha256 = "1az0dnvgingqv78yvfhzmx1zavn5sv1xrrscz984hy3gvz2ks3rw";
fonts = stdenv.mkDerivation {
name = "ghostscript-fonts";
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
name = "ghostscript-${version}";
src = fetchurl {
- url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs918/${name}.tar.bz2";
+ url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs920/${name}.tar.xz";
inherit sha256;
};
@@ -57,34 +57,6 @@ stdenv.mkDerivation rec {
patches = [
./urw-font-files.patch
- # http://bugs.ghostscript.com/show_bug.cgi?id=696281
- (fetchpatch {
- name = "fix-check-for-using-shared-freetype-lib.patch";
- url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=8f5d285";
- sha256 = "1f0k043rng7f0rfl9hhb89qzvvksqmkrikmm38p61yfx51l325xr";
- })
- # http://bugs.ghostscript.com/show_bug.cgi?id=696301
- (fetchpatch {
- name = "add-gserrors.h-to-the-installed-files.patch";
- url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=feafe5e5";
- sha256 = "0s4ayzakjv809dkn7vilxwvs4dw35p3pw942ml91bk9z4kkaxyz7";
- })
- # http://bugs.ghostscript.com/show_bug.cgi?id=696246
- (fetchpatch {
- name = "guard-against-NULL-base-for-non-clist-devices.patch";
- url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=007bd77d08d800e6b07274d62e3c91be7c4a3f47";
- sha256 = "1la53273agl92lpy7qd0qhgzynx8b90hrk8g9jsj3055ssn6rqwh";
- })
- (fetchpatch {
- name = "ensure-plib-devices-always-use-the-clist.patch";
- url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=1bdbe4f87dc57648821e613ebcc591b84e8b35b3";
- sha256 = "1cq83fgyvrycapxm69v4r9f9qhzsr40ygrc3bkp8pk15wsmvq0k7";
- })
- (fetchpatch {
- name = "prevent-rinkj-device-crash-when-misconfigured.patch";
- url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=5571ddfa377c5d7d98f55af40e693814ac287ae4";
- sha256 = "08iqdlrngi6k0ml2b71dj5q136fyp1s9g0rr87ayyshn0k0lxwkv";
- })
];
preConfigure = ''
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index 06389c01ce0..a4e4e408fec 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, pythonPackages, makeWrapper
+{ stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper
, bash, libsamplerate, libsndfile, readline, gcc
# Optional Dependencies
@@ -11,7 +11,7 @@
with stdenv.lib;
let
- inherit (pythonPackages) python dbus-python;
+ inherit (python2Packages) python dbus-python;
shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
libOnly = prefix == "lib";
diff --git a/pkgs/misc/jackaudio/git.nix b/pkgs/misc/jackaudio/git.nix
index 7deeaadbb10..ac50b4c3d39 100644
--- a/pkgs/misc/jackaudio/git.nix
+++ b/pkgs/misc/jackaudio/git.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, pythonPackages, makeWrapper
+{ stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper
, bash, libsamplerate, libsndfile, readline
# Optional Dependencies
@@ -11,7 +11,7 @@
with stdenv.lib;
let
- inherit (pythonPackages) python dbus-python;
+ inherit (python2Packages) python dbus-python;
shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
libOnly = prefix == "lib";
diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix
index 731dc263a02..15481d74598 100644
--- a/pkgs/misc/lilypond/default.nix
+++ b/pkgs/misc/lilypond/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, ghostscript, texinfo, imagemagick, texi2html, guile
-, python, gettext, flex, perl, bison, pkgconfig, dblatex
+, python2, gettext, flex, perl, bison, pkgconfig, dblatex
, fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff
, fetchsvn, makeWrapper, t1utils
, texlive, tex ? texlive.combine {
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec{
buildInputs =
[ ghostscript texinfo imagemagick texi2html guile dblatex tex zip netpbm
- python gettext flex perl bison pkgconfig fontconfig freetype pango
+ python2 gettext flex perl bison pkgconfig fontconfig freetype pango
fontforge help2man groff makeWrapper t1utils
];
diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix
index 5e94f6f7771..ffdaf3949ae 100644
--- a/pkgs/misc/my-env/default.nix
+++ b/pkgs/misc/my-env/default.nix
@@ -41,7 +41,7 @@
# this is the example we will be using
nixEnv = complicatedMyEnv {
name = "nix";
- buildInputs = [ libtool stdenv perl curl bzip2 openssl db45 autoconf automake zlib ];
+ buildInputs = [ libtool stdenv perl curl bzip2 openssl db5 autoconf automake zlib ];
};
};
}
diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix
index 8e9083d9922..114e18dc93f 100644
--- a/pkgs/misc/solfege/default.nix
+++ b/pkgs/misc/solfege/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, pythonPackages, gettext, texinfo
-, ghostscript, pysqlite, librsvg, gdk_pixbuf, txt2man, timidity, mpg123
+, ghostscript, librsvg, gdk_pixbuf, txt2man, timidity, mpg123
, alsaUtils, vorbis-tools, csound, lilypond
, makeWrapper
}:
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
};
buildInputs = [ pkgconfig python pygtk gettext texinfo
- ghostscript pysqlite librsvg gdk_pixbuf txt2man makeWrapper
+ ghostscript librsvg gdk_pixbuf txt2man makeWrapper
];
preBuild = ''
diff --git a/pkgs/misc/themes/vertex/default.nix b/pkgs/misc/themes/vertex/default.nix
index bbacfa2f5e5..fe48bb14d40 100644
--- a/pkgs/misc/themes/vertex/default.nix
+++ b/pkgs/misc/themes/vertex/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
- pname = "vertex-theme";
+ pname = "theme-vertex";
version = "20161009";
src = fetchFromGitHub {
owner = "horst3180";
- repo = pname;
+ repo = "vertex-theme";
rev = "c861918a7fccf6d0768d45d790a19a13bb23485e";
sha256 = "13abgl18m04sj44gqipxbagpan4jqral65w59rgnhb6ldxgnhg33";
};
diff --git a/pkgs/misc/themes/zuki/default.nix b/pkgs/misc/themes/zuki/default.nix
index 73bc677854a..6da6d24902e 100644
--- a/pkgs/misc/themes/zuki/default.nix
+++ b/pkgs/misc/themes/zuki/default.nix
@@ -4,20 +4,20 @@ stdenv.mkDerivation rec {
name = "zuki-themes-${version}";
version = "${gnome3.version}.${date}";
date = {
- "3.18" = "2016-06-21";
"3.20" = "2016-07-01";
+ "3.22" = "2016-10-20";
}."${gnome3.version}";
src = fetchFromGitHub {
owner = "lassekongo83";
repo = "zuki-themes";
rev = {
- "3.18" = "5c83a847ad8fab0fe0b82ed2a7db429655ac9c10";
"3.20" = "dda1726ac7b556df2ef9696e530f8c2eaa0aed37";
+ "3.22" = "a48f0f12f81c49b480f82369ae45cfa49d78b143";
}."${gnome3.version}";
sha256 = {
- "3.18" = "1x9zrx5dqq8kivhqj5kjwhy4vwr899pri6jvwxbff5hibvyc7ipy";
"3.20" = "0p7db8a2ni494vwp3b7av7d214fnynf6gr976qma6h9x4ck3phiz";
+ "3.22" = "05sa5ighq01krbgfd4lddxvbhfqk5x5kgw6jnxwvx9rmmff713s1";
}."${gnome3.version}";
};
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index d2eee8c2cac..a8abd86e194 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -2038,4 +2038,26 @@ rec {
dependencies = [];
};
+
+ auto-pairs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+ name = "auto-pairs-2016-07-17";
+ src = fetchgit {
+ url = "git://github.com/jiangmiao/auto-pairs";
+ rev = "1b3a1efb078fdf74d4013308b63de57dfda0cc8e";
+ sha256 = "1g5gb9xvc9xw3rxg8p4w3qcsdl3xfpi5ax380916aq237kmrnzdk";
+ };
+ dependencies = [];
+
+ };
+
+ editorconfig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+ name = "editorconfig-vim-2016-07-16";
+ src = fetchgit {
+ url = "git://github.com/editorconfig/editorconfig-vim";
+ rev = "a459b8cfef00100da40fd69c8ae92c4d1e63e1d2";
+ sha256 = "03slzk7jgr348f59pxghmd9giwla63lxmwvripg99zrlgl0pvp5g";
+ };
+ dependencies = [];
+
+ };
}
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 1e04ab99221..bebfbd1b7c0 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -165,3 +165,5 @@
"vimwiki"
"vinegar"
"vundle"
+"github:jiangmiao/auto-pairs"
+"github:editorconfig/editorconfig-vim"
diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix
index 2ebb8868a2e..8625ac72c10 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix
@@ -22,6 +22,7 @@ let
ppp = "809.50.2";
libclosure = "65";
Libinfo = "477.50.4";
+ Libsystem = "1226.10.1";
removefile = "41";
libresolv = "60";
@@ -204,7 +205,7 @@ let
Libnotify = applePackage "Libnotify" "osx-10.11.6" "14rhhfzb75r9jf3kyj8fzd01n09n7km1fsdj3dzl3lkkp1sir78m" {};
libpthread = applePackage "libpthread" "osx-10.11.6" "1kbw738cmr9pa7pz1igmajs307clfq7gv2vm1sqdzhcnnjxbl28w" {};
libresolv = applePackage "libresolv" "osx-10.11.6" "09flfdi3dlzq0yap32sxidacpc4nn4va7z12a6viip21ix2xb2gf" {};
- Libsystem = applePackage "Libsystem" "osx-10.9.5" "1yfj2qdrf9vrzs7p9m4wlb7zzxcrim1gw43x4lvz4qydpp5kg2rh" {};
+ Libsystem = applePackage "Libsystem" "osx-10.11.6" "1nfkmbqml587v2s1d1y2s2v8nmr577jvk51y6vqrfvsrhdhc2w94" {};
libutil = applePackage "libutil" "osx-10.11.6" "1gmgmcyqdyc684ih7dimdmxdljnq7mzjy5iqbf589wc0pa8h5abm" {};
libunwind = applePackage "libunwind" "osx-10.11.6" "16nhx2pahh9d62mvszc88q226q5lwjankij276fxwrm8wb50zzlx" {};
mDNSResponder = applePackage "mDNSResponder" "osx-10.11.6" "069incq28a78yh1bnr17h9cd5if5mwqpq8ahnkyxxx25fkaxgzcf" {};
diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix
index af713bf61dd..2f13277d70c 100644
--- a/pkgs/os-specific/darwin/cctools/port.nix
+++ b/pkgs/os-specific/darwin/cctools/port.nix
@@ -22,6 +22,9 @@ let
patches = [
./ld-rpath-nonfinal.patch ./ld-ignore-rpath-link.patch
+ ] ++ stdenv.lib.optionals stdenv.isDarwin [
+ # See https://github.com/tpoechtrager/cctools-port/issues/24. Remove when that's fixed.
+ ./undo-unknown-triple.patch
];
enableParallelBuilding = true;
diff --git a/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch b/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch
new file mode 100644
index 00000000000..7df9bdd16da
--- /dev/null
+++ b/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch
@@ -0,0 +1,17 @@
+diff --git a/cctools/as/driver.c b/cctools/as/driver.c
+index b06d085..c03397a 100644
+--- a/cctools/as/driver.c
++++ b/cctools/as/driver.c
+@@ -363,12 +363,6 @@ char **envp)
+ /* Add -c or clang will run ld(1). */
+ new_argv[j] = "-c";
+ j++;
+- /* cctools-port start */
+- new_argv[j] = "-target";
+- j++;
+- new_argv[j] = "unknown-apple-darwin";
+- j++;
+- /* cctools-port end */
+ new_argv[j] = NULL;
+ if(execute(new_argv, verbose))
+ exit(0);
diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix
index cae5fe4329d..a779b53d3a5 100644
--- a/pkgs/os-specific/linux/android-udev-rules/default.nix
+++ b/pkgs/os-specific/linux/android-udev-rules/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
name = "android-udev-rules-${version}";
- version = "20160805";
+ version = "20161014";
src = fetchFromGitHub {
owner = "M0Rf30";
repo = "android-udev-rules";
rev = version;
- sha256 = "0sdf3insqs73cdzmwl3lqy7nj82f1lprxd3vm0jh3qpf0sd1k93c";
+ sha256 = "0xc7wslxf7xsvfbd83wsw4nikmpq1zfd607y2p2r3j1vkw1yak08";
};
installPhase = ''
diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix
index f58a7557ce3..b576ca71d58 100644
--- a/pkgs/os-specific/linux/apparmor/default.nix
+++ b/pkgs/os-specific/linux/apparmor/default.nix
@@ -82,7 +82,6 @@ let
buildInputs = [
perl
pythonPackages.python
- pythonPackages.readline
libapparmor
libapparmor.python
];
diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix
index 1fb1e1873d9..c3842959883 100644
--- a/pkgs/os-specific/linux/broadcom-sta/default.nix
+++ b/pkgs/os-specific/linux/broadcom-sta/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kernel }:
+{ stdenv, fetchurl, fetchpatch, kernel }:
let
version = "6.30.223.271";
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://www.broadcom.com/docs/linux_sta/${tarball}";
- sha256 = hashes.${stdenv.system};
+ sha256 = hashes."${stdenv.system}";
};
hardeningDisable = [ "pic" ];
@@ -27,6 +27,11 @@ stdenv.mkDerivation {
./linux-4.7.patch
./null-pointer-fix.patch
./gcc.patch
+ (fetchpatch {
+ name = "linux-4.8.patch";
+ url = "https://aur.archlinux.org/cgit/aur.git/plain/004-linux48.patch?h=broadcom-wl-dkms";
+ sha256 = "0s8apf6l3qm9kln451g4z0pr13f4jdgyval1vfl2abg0dqc5xfhs";
+ })
];
makeFlags = "KBASE=${kernel.dev}/lib/modules/${kernel.modDirVersion}";
diff --git a/pkgs/os-specific/linux/busybox/busybox-in-store.patch b/pkgs/os-specific/linux/busybox/busybox-in-store.patch
index ab072efd930..3500f167a14 100644
--- a/pkgs/os-specific/linux/busybox/busybox-in-store.patch
+++ b/pkgs/os-specific/linux/busybox/busybox-in-store.patch
@@ -1,15 +1,14 @@
Allow BusyBox to be invoked as "-busybox". This is
necessary when it's run from the Nix store as -busybox during
stdenv bootstrap.
-
---- 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);
+--- busybox-1.25.1-orig/libbb/appletlib.orig 2016-10-26 19:54:20.510957575 -0400
++++ busybox-1.25.1/libbb/appletlib.c 2016-10-26 19:48:31.590862853 -0400
+@@ -884,7 +884,7 @@
+ int applet;
+
+ # if ENABLE_BUSYBOX
- if (is_prefixed_with(name, "busybox"))
+ if (strstr(name, "busybox") != 0)
exit(busybox_main(argv));
- }
-
+ # endif
+ /* find_applet_by_name() search is more expensive, so goes second */
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index 2563c442822..6f86529a265 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.24.2";
+ name = "busybox-1.25.1";
src = fetchurl {
url = "http://busybox.net/downloads/${name}.tar.bz2";
- sha256 = "0mf8f6ly8yi1fbr15jkyv6hxwh2x800x661rcd11rwsnqqzga7p7";
+ sha256 = "0bm0l8xdjdz3kdyajp8wg27yamsw7r2y88nnrxwvvz984c7pwri7";
};
hardeningDisable = [ "format" ] ++ lib.optional enableStatic [ "fortify" ];
diff --git a/pkgs/os-specific/linux/cachefilesd/default.nix b/pkgs/os-specific/linux/cachefilesd/default.nix
new file mode 100644
index 00000000000..99cb7d264fe
--- /dev/null
+++ b/pkgs/os-specific/linux/cachefilesd/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "cachefilesd-${version}";
+ version = "0.10.9";
+
+ src = fetchurl {
+ url = "https://people.redhat.com/dhowells/fscache/${name}.tar.bz2";
+ sha256 = "1jkb3qd8rcmli3g2qgcpp1f9kklil4qgy86w7pg2cpv10ikyr5y8";
+ };
+
+ installFlags = [
+ "ETCDIR=$(out)/etc"
+ "SBINDIR=$(out)/sbin"
+ "MANDIR=$(out)/share/man"
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Local network file caching management daemon";
+ homepage = "https://people.redhat.com/dhowells/fscache/";
+ license = licenses.gpl2Plus;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ abbradar ];
+ };
+}
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index 66069f7c982..674f3caa765 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -62,13 +62,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "conky-${version}";
- version = "1.10.3";
+ version = "1.10.5";
src = fetchFromGitHub {
owner = "brndnmtthws";
repo = "conky";
rev = "v${version}";
- sha256 = "0sa2jl159jk5p2hr37adwq84m0ynva7v87qrwj1xv0kw8l4qzhjs";
+ sha256 = "1x1b7h4s8f8qbiyas7sw5v2nq5h2wy3q7hsp1ah4l7191jjidqix";
};
postPatch = ''
diff --git a/pkgs/os-specific/linux/crda/default.nix b/pkgs/os-specific/linux/crda/default.nix
index d28ae6f5098..ac6117cd599 100644
--- a/pkgs/os-specific/linux/crda/default.nix
+++ b/pkgs/os-specific/linux/crda/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libgcrypt, libnl, pkgconfig, pythonPackages, wireless-regdb }:
+{ stdenv, fetchurl, libgcrypt, libnl, pkgconfig, python2Packages, wireless-regdb }:
stdenv.mkDerivation rec {
name = "crda-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libgcrypt libnl ];
nativeBuildInputs = [
- pkgconfig pythonPackages.m2crypto pythonPackages.python
+ pkgconfig python2Packages.m2crypto python2Packages.python
];
postPatch = ''
diff --git a/pkgs/os-specific/linux/facetimehd/default.nix b/pkgs/os-specific/linux/facetimehd/default.nix
index de726d5b42c..a9cea506c97 100644
--- a/pkgs/os-specific/linux/facetimehd/default.nix
+++ b/pkgs/os-specific/linux/facetimehd/default.nix
@@ -3,25 +3,40 @@
# facetimehd is not supported for kernels older than 3.19";
assert stdenv.lib.versionAtLeast kernel.version "3.19";
+let
+ # Note: When updating this revision:
+ # 1. Also update pkgs/os-specific/linux/firmware/facetimehd-firmware/
+ # 2. Test the module and firmware change via:
+ # a. Give some applications a try (Skype, Hangouts, Cheese, etc.)
+ # b. Run: journalctl -f
+ # c. Then close the lid
+ # d. Then open the lid (and maybe press a key to wake it up)
+ # e. see if the module loads back (apps using the camera won't
+ # recover and will have to be restarted) and the camera
+ # still works.
+ srcParams = if (stdenv.lib.versionAtLeast kernel.version "4.8") then
+ { # Use mainline branch
+ version = "unstable-2016-10-09";
+ rev = "887d0f531ef7b91457be519474136c3355c5132b";
+ sha256 = "0bayahnxar1q6wvf9cb6p8gsfw98w0wqp715hs4r7apmddwk9v7n";
+ }
+ else
+ { # Use master branch (broken on 4.8)
+ version = "unstable-2016-05-02";
+ rev = "5a7083bd98b38ef3bd223f7ee531d58f4fb0fe7c";
+ sha256 = "0d455kajvn5xav9iilqy7s1qvsy4yb8vzjjxx7bvcgp7aj9ljvdp";
+ }
+ ;
+in
+
stdenv.mkDerivation rec {
name = "facetimehd-${version}-${kernel.version}";
- version = "git-20160503";
+ version = srcParams.version;
src = fetchFromGitHub {
owner = "patjak";
repo = "bcwc_pcie";
- # Note: When updating this revision:
- # 1. Also update pkgs/os-specific/linux/firmware/facetimehd-firmware/
- # 2. Test the module and firmware change via:
- # a. Give some applications a try (Skype, Hangouts, Cheese, etc.)
- # b. Run: journalctl -f
- # c. Then close the lid
- # d. Then open the lid (and maybe press a key to wake it up)
- # e. see if the module loads back (apps using the camera won't
- # recover and will have to be restarted) and the camera
- # still works.
- rev = "5a7083bd98b38ef3bd223f7ee531d58f4fb0fe7c";
- sha256 = "0d455kajvn5xav9iilqy7s1qvsy4yb8vzjjxx7bvcgp7aj9ljvdp";
+ inherit (srcParams) rev sha256;
};
preConfigure = ''
diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix
index 3402f7a7013..0e5f6208382 100644
--- a/pkgs/os-specific/linux/google-authenticator/default.nix
+++ b/pkgs/os-specific/linux/google-authenticator/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pam, qrencode }:
+{ stdenv, lib, fetchurl, pam, qrencode }:
stdenv.mkDerivation rec {
name = "google-authenticator-1.0";
@@ -20,10 +20,11 @@ stdenv.mkDerivation rec {
cp google-authenticator $out/bin
'';
- meta = {
+ meta = with lib; {
homepage = https://code.google.com/p/google-authenticator/;
description = "Two-step verification, with pam module";
- license = stdenv.lib.licenses.asl20;
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ aneeshusa ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/os-specific/linux/iotop/default.nix b/pkgs/os-specific/linux/iotop/default.nix
index 505468d849a..a19b3d4ec16 100644
--- a/pkgs/os-specific/linux/iotop/default.nix
+++ b/pkgs/os-specific/linux/iotop/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pythonPackages }:
+{ stdenv, fetchurl, python2Packages }:
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
name = "iotop-0.6";
src = fetchurl {
@@ -8,8 +8,6 @@ pythonPackages.buildPythonApplication rec {
sha256 = "0nzprs6zqax0cwq8h7hnszdl3d2m4c2d4vjfxfxbnjfs9sia5pis";
};
- propagatedBuildInputs = [ pythonPackages.curses ];
-
doCheck = false;
meta = {
diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix
index f6fcef11eb0..3e2eb93d213 100644
--- a/pkgs/os-specific/linux/iputils/default.nix
+++ b/pkgs/os-specific/linux/iputils/default.nix
@@ -34,7 +34,8 @@ stdenv.mkDerivation rec {
mkdir -p $out/share/man/man8
cp -p doc/clockdiff.8 doc/arping.8 doc/ping.8 doc/rdisc.8 \
- doc/tracepath.8 doc/ninfod.8 $out/share/man/man8
+ doc/tracepath.8 doc/ninfod.8 doc/traceroute6.8 \
+ $out/share/man/man8
ln -s $out/share/man/man8/{ping,ping6}.8
ln -s $out/share/man/man8/{tracepath,tracepath6}.8
'';
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index bdc243a149e..4d5fac82d93 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -180,7 +180,7 @@ with stdenv.lib;
VGA_SWITCHEROO y # Hybrid graphics support
DRM_GMA600 y
DRM_GMA3600 y
- ${optionalString (versionAtLeast version "4.5") ''
+ ${optionalString (versionAtLeast version "4.5" && (versionOlder version "4.9")) ''
DRM_AMD_POWERPLAY y # necessary for amdgpu polaris support
''}
@@ -210,6 +210,7 @@ with stdenv.lib;
# ACLs for all filesystems that support them.
FANOTIFY y
TMPFS y
+ FS_ENCRYPTION? m
EXT2_FS_XATTR y
EXT2_FS_POSIX_ACL y
EXT2_FS_SECURITY y
@@ -219,6 +220,7 @@ with stdenv.lib;
EXT3_FS_POSIX_ACL y
EXT3_FS_SECURITY y
EXT4_FS_POSIX_ACL y
+ EXT4_ENCRYPTION? ${if versionOlder version "4.8" then "m" else "y"}
EXT4_FS_SECURITY y
REISERFS_FS_XATTR? y
REISERFS_FS_POSIX_ACL? y
@@ -231,6 +233,10 @@ with stdenv.lib;
OCFS2_DEBUG_MASKLOG? n
BTRFS_FS_POSIX_ACL y
UBIFS_FS_ADVANCED_COMPR? y
+ F2FS_FS m
+ F2FS_FS_SECURITY? y
+ F2FS_FS_ENCRYPTION? y
+ UDF_FS m
${optionalString (versionAtLeast version "4.0" && versionOlder version "4.6") ''
NFSD_PNFS y
''}
diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index a46a75c01ca..3e6bd51cc47 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.103";
+ version = "3.10.104";
extraMeta.branch = "3.10";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
- sha256 = "008dz40zig0fhkm3hjmcn0kn5b1sfvpxb7dc4fbsddb6gifrh44v";
+ sha256 = "04kc64zdpg8h8655m825lbny3fwvqhmh3mg9h564i2irnll35lp3";
};
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 e14d722ad5d..48f12307bd1 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.63";
+ version = "3.12.66";
extraMeta.branch = "3.12";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
- sha256 = "0srg7xd68n10b28c3l5qa4dx5qr84ci7fdn48wcj79y7h2s0367x";
+ sha256 = "02nac7sr0c1h10mxp5azlsmz0gsr7qllsn2hibjknhk7jg8ry8cc";
};
kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix
index 75f5d6de631..4a18f2e498b 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.42";
+ version = "3.18.44";
extraMeta.branch = "3.18";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
- sha256 = "0ymimvy8kp2a2x0h31m3sipwx1h80576ws04k3cl49wgcgjwpwn4";
+ sha256 = "1cjdh9w2q164r53k06vv6nhxwjzm69nha5wndp8r1hjywjwcqqan";
};
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 43b69196b8c..67d8d267b54 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.33";
+ version = "4.1.35";
extraMeta.branch = "4.1";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "15ms5mvvf0wpmscv8l5irp4j7j3l6k61hcjx9ln41pz6si00zj3l";
+ sha256 = "0jn09hs91d5fi6615v9fnbpggyh1x192q6faggpbb90q110g0jjl";
};
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 246068f09ea..2930ebdfc7b 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.24";
+ version = "4.4.30";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0yhs1742wrl0ip9wsayparjpr7vccljnhfjimgy4fjp3w6aync1k";
+ sha256 = "0p4r779fyhjp9fxc00qqfanjxm1xlajabd2b8d7y1p8jplrr294x";
};
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
deleted file mode 100644
index 139ae20d8c9..00000000000
--- a/pkgs/os-specific/linux/kernel/linux-4.7.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
-
-import ./generic.nix (args // rec {
- version = "4.7.7";
- extraMeta.branch = "4.7";
-
- src = fetchurl {
- url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "079gvv91a0mymzxx1h9bbn4snk6xz0cyk1bf8pjkhdyyad90v17d";
- };
-
- 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-4.8.nix b/pkgs/os-specific/linux/kernel/linux-4.8.nix
index d7164d72940..0a2da165638 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.8.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.8.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
- version = "4.8.1";
+ version = "4.8.5";
extraMeta.branch = "4.8";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0rcqgi91jz5iyx1nrd4qjmvh0sgqjpqj94bwjh56c21nkxxiahg6";
+ sha256 = "0264h3b8h4bqgcif2jzbz4yzv290nrn444bhcqzb0lizj8a1f5s8";
};
kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
index 139ae20d8c9..eda2dd26163 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.7";
+ version = "4.7.10";
extraMeta.branch = "4.7";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "079gvv91a0mymzxx1h9bbn4snk6xz0cyk1bf8pjkhdyyad90v17d";
+ sha256 = "1p2r5d0jcrak9gxp0339g9z198x9laf09h08ck4jllhhaajrnicj";
};
kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 6b13b45d1ad..39bfbe76e6c 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-rc6";
- modDirVersion = "4.8.0-rc6";
- extraMeta.branch = "4.8";
+ version = "4.9-rc3";
+ modDirVersion = "4.9.0-rc3";
+ extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
- sha256 = "122qn2r3q85xqcb56lgpkiv06yrd5w742fcdjk1sribqcvl1xlqr";
+ sha256 = "16dvjxh1i0s18mzm2bcj1v1drv7n2id39jgy71n7i5pyvzc5ffhj";
};
features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 29d622cd3c3..11f07f13345 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -86,9 +86,9 @@ rec {
};
grsecurity_testing = grsecPatch
- { kver = "4.7.7";
- grrev = "201610101902";
- sha256 = "18x8grxj03bh9gqlm3sfgjl8vy5gpyrjr8nmdnrnas6ycmbvyjx4";
+ { kver = "4.7.10";
+ grrev = "201610262029";
+ sha256 = "0bczfyb0zazccl9d8sxm4p34nayamyiv7c1hp272glcjjmvlb7cv";
};
# This patch relaxes grsec constraints on the location of usermode helpers,
diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix
index 1327a349474..c7da0fcca2a 100644
--- a/pkgs/os-specific/linux/libselinux/default.nix
+++ b/pkgs/os-specific/linux/libselinux/default.nix
@@ -19,7 +19,13 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig libsepol pcre ]
++ optionals enablePython [ swig python ];
- NIX_CFLAGS_COMPILE = "-fstack-protector-all -std=gnu89";
+ # Avoid this false warning:
+ # avc_internal.c: In function 'avc_netlink_receive':
+ # avc_internal.c:105:25: error: cast increases required alignment of target type [-Werror=cast-align]
+ # struct nlmsghdr *nlh = (struct nlmsghdr *)buf;
+ # ^
+
+ NIX_CFLAGS_COMPILE = "-std=gnu89 -Wno-error=cast-align";
# Unreleased upstream patch that fixes Python package issue arising
# from recent SWIG changes.
diff --git a/pkgs/os-specific/linux/lksctp-tools/default.nix b/pkgs/os-specific/linux/lksctp-tools/default.nix
new file mode 100644
index 00000000000..f5f08a3e7c6
--- /dev/null
+++ b/pkgs/os-specific/linux/lksctp-tools/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "lksctp-tools-1.0.17";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/lksctp/${name}.tar.gz";
+ sha256 = "05da6c2v3acc18ndvmkrag6x5lf914b7s0xkkr6wkvrbvd621sqs";
+ };
+
+ meta = {
+ description = "Linux Kernel Stream Control Transmission Protocol Tools.";
+ homepage = http://lksctp.sourceforge.net/;
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index ae05e583061..229865b49a3 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -29,12 +29,12 @@ stdenv.mkDerivation {
src =
if stdenv.system == "i686-linux" then
fetchurl {
- url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
+ url = "http://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://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}.run";
+ url = "http://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}";
diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index 76858ab5e48..1088e0befdf 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -1,26 +1,19 @@
-{stdenv, fetchurl, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl}:
+{stdenv, fetchurl, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc}:
let
inherit (stdenv.lib) optional optionalString;
baseName = "sysdig";
- version = "0.10.0";
- # sysdig-0.11.0 depends on some headers from jq which are not
- # installed by default.
- # Relevant sysdig issue: https://github.com/draios/sysdig/issues/626
- jq-prefix = fetchurl {
- url="https://github.com/stedolan/jq/releases/download/jq-1.5/jq-1.5.tar.gz";
- sha256="0g29kyz4ykasdcrb0zmbrp2jqs9kv1wz9swx849i2d1ncknbzln4";
- };
+ version = "0.12.0";
in
stdenv.mkDerivation {
name = "${baseName}-${version}";
src = fetchurl {
url = "https://github.com/draios/sysdig/archive/${version}.tar.gz";
- sha256 = "0hs0r9z9j7padqdcj69bwx52iw6gvdl0w322qwivpv12j3prcpsj";
+ sha256 = "17nf2h5ajy333rwh91hzaw8zq2mnkb3lxy8fmbbs8qazgsvwz6c3";
};
buildInputs = [
- cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl
+ cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl jq gcc
];
hardeningDisable = [ "pic" ];
@@ -31,7 +24,6 @@ stdenv.mkDerivation {
cmakeFlags = [
"-DUSE_BUNDLED_DEPS=OFF"
- "-DUSE_BUNDLED_JQ=ON"
"-DSYSDIG_VERSION=${version}"
] ++ optional (kernel == null) "-DBUILD_DRIVER=OFF";
@@ -41,12 +33,23 @@ stdenv.mkDerivation {
export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
'';
- preBuild = ''
- mkdir -p jq-prefix/src
- cp ${jq-prefix} jq-prefix/src/jq-1.5.tar.gz
- '';
+ libPath = stdenv.lib.makeLibraryPath [
+ zlib
+ luajit
+ ncurses
+ jsoncpp
+ curl
+ jq
+ openssl
+ libb64
+ gcc
+ stdenv.cc.cc
+ ];
- postInstall = optionalString (kernel != null) ''
+ postInstall = ''
+ patchelf --set-rpath "$libPath" "$out/bin/sysdig"
+ patchelf --set-rpath "$libPath" "$out/bin/csysdig"
+ '' + optionalString (kernel != null) ''
make install_driver
kernel_dev=${kernel.dev}
kernel_dev=''${kernel_dev#/nix/store/}
diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index a8556fdbe07..14974f6d43f 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-10-01";
+ version = "2016-10-25";
src = fetchurl {
- url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-experimental-0.0.20161001.tar.xz";
- sha256 = "1j1s276lgp17yrlc46bgsbpwp635cvvv6b3ap49aq5h7jixvnfmc";
+ url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-experimental-0.0.20161025.tar.xz";
+ sha256 = "09rhap3dzb8rcq1a1af9inf1qz7161yghafbgpbnd9dg016vhgs3";
};
meta = with stdenv.lib; {
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index a3e9e930f5e..fe0d2ca28f9 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -4,13 +4,13 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- version = "2.5";
+ version = "2.6";
name = "wpa_supplicant-${version}";
src = fetchurl {
url = "http://hostap.epitest.fi/releases/${name}.tar.gz";
- sha256 = "05mkp5bx1c3z7h5biddsv0p49gkrq9ksany3anp4wdiv92p5prfc";
+ sha256 = "0l0l5gz3d5j9bqjsbjlfcv4w4jwndllp9fmyai4x9kg6qhs6v4xl";
};
# TODO: Patch epoll so that the dbus actually responds
@@ -79,7 +79,6 @@ stdenv.mkDerivation rec {
patches = [
./build-fix.patch
- ./libressl.patch
];
postInstall = ''
diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix
index a75367f0bb0..89f40589c87 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4, qmake4Hook, inkscape, wpa_supplicant }:
+{ stdenv, fetchurl, qt4, qmake4Hook, imagemagick, wpa_supplicant }:
stdenv.mkDerivation {
name = "wpa_gui-${wpa_supplicant.version}";
@@ -6,33 +6,29 @@ stdenv.mkDerivation {
inherit (wpa_supplicant) src;
buildInputs = [ qt4 ];
+ nativeBuildInputs = [ qmake4Hook imagemagick ];
- nativeBuildInputs = [ inkscape qmake4Hook ];
+ patches = [ ./remove_inkscape.patch ];
+ prePatch = ''
+ cd wpa_supplicant/wpa_gui-qt4
+ '';
- prePatch = "cd wpa_supplicant/wpa_gui-qt4";
+ preConfigure = ''
+ lrelease wpa_gui.pro
+ '';
- preConfigure =
- ''
- lrelease wpa_gui.pro
- '';
+ postBuild = ''
+ make -C icons
+ '';
- # We do not install .xpm icons. First of all, I don't know where they should
- # be install. Second, this allows us to drop imagemagick build-time dependency.
- postBuild =
- ''
- sed -e '/ICONS.*xpm/d' -i icons/Makefile
- make -C icons
- '';
-
- installPhase =
- ''
- mkdir -pv $out/bin
- cp -v wpa_gui $out/bin
- mkdir -pv $out/share/applications
- cp -v wpa_gui.desktop $out/share/applications
- mkdir -pv $out/share/icons
- cp -av icons/hicolor $out/share/icons
- '';
+ installPhase = ''
+ mkdir -pv $out/bin
+ cp -v wpa_gui $out/bin
+ mkdir -pv $out/share/applications
+ cp -v wpa_gui.desktop $out/share/applications
+ mkdir -pv $out/share/icons
+ cp -av icons/hicolor $out/share/icons
+ '';
meta = {
description = "Qt-based GUI for wpa_supplicant";
diff --git a/pkgs/os-specific/linux/wpa_supplicant/libressl.patch b/pkgs/os-specific/linux/wpa_supplicant/libressl.patch
deleted file mode 100644
index 0de3810dacc..00000000000
--- a/pkgs/os-specific/linux/wpa_supplicant/libressl.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-$OpenBSD: patch-src_crypto_tls_openssl_c,v 1.3 2015/09/29 11:57:54 dcoppa Exp $
-
-Compatibility fixes for LibreSSL
-
---- a/src/crypto/tls_openssl.c Sun Sep 27 21:02:05 2015
-+++ b/src/crypto/tls_openssl.c Mon Sep 28 13:43:46 2015
-@@ -2229,7 +2229,7 @@ static int tls_parse_pkcs12(struct tls_data *data, SSL
- }
-
- if (certs) {
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
- SSL_clear_chain_certs(ssl);
- while ((cert = sk_X509_pop(certs)) != NULL) {
- X509_NAME_oneline(X509_get_subject_name(cert), buf,
-@@ -2247,7 +2247,7 @@ static int tls_parse_pkcs12(struct tls_data *data, SSL
- /* Try to continue anyway */
- }
- sk_X509_free(certs);
--#ifndef OPENSSL_IS_BORINGSSL
-+#if !defined(OPENSSL_IS_BORINGSSL) && !defined(LIBRESSL_VERSION_NUMBER)
- res = SSL_build_cert_chain(ssl,
- SSL_BUILD_CHAIN_FLAG_CHECK |
- SSL_BUILD_CHAIN_FLAG_IGNORE_ERROR);
-@@ -2812,7 +2812,7 @@ int tls_connection_get_random(void *ssl_ctx, struct tl
- if (conn == NULL || keys == NULL)
- return -1;
- ssl = conn->ssl;
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- if (ssl == NULL || ssl->s3 == NULL || ssl->session == NULL)
- return -1;
-
-@@ -2841,7 +2841,7 @@ int tls_connection_get_random(void *ssl_ctx, struct tl
- #ifndef CONFIG_FIPS
- static int openssl_get_keyblock_size(SSL *ssl)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- const EVP_CIPHER *c;
- const EVP_MD *h;
- int md_size;
-@@ -2911,7 +2911,7 @@ static int openssl_tls_prf(struct tls_connection *conn
- "mode");
- return -1;
- #else /* CONFIG_FIPS */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- SSL *ssl;
- u8 *rnd;
- int ret = -1;
-@@ -3394,7 +3394,7 @@ int tls_connection_set_cipher_list(void *tls_ctx, stru
-
- wpa_printf(MSG_DEBUG, "OpenSSL: cipher suites: %s", buf + 1);
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- #if defined(EAP_FAST) || defined(EAP_FAST_DYNAMIC) || defined(EAP_SERVER_FAST)
- if (os_strstr(buf, ":ADH-")) {
- /*
-@@ -3977,7 +3977,7 @@ static int tls_sess_sec_cb(SSL *s, void *secret, int *
- struct tls_connection *conn = arg;
- int ret;
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- if (conn == NULL || conn->session_ticket_cb == NULL)
- return 0;
-
diff --git a/pkgs/os-specific/linux/wpa_supplicant/remove_inkscape.patch b/pkgs/os-specific/linux/wpa_supplicant/remove_inkscape.patch
new file mode 100644
index 00000000000..1bdb164e24f
--- /dev/null
+++ b/pkgs/os-specific/linux/wpa_supplicant/remove_inkscape.patch
@@ -0,0 +1,30 @@
+From 7a42ef048b420f9b939085ea8c6af6deb9c19dac Mon Sep 17 00:00:00 2001
+From: Moritz Ulrich
+Date: Sun, 30 Oct 2016 22:17:54 +0100
+Subject: [PATCH] Foo
+
+---
+ icons/Makefile | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/icons/Makefile b/icons/Makefile
+index 709514c..9a5fa94 100644
+--- a/icons/Makefile
++++ b/icons/Makefile
+@@ -9,10 +9,9 @@ all: $(ICONS)
+
+ %.png:
+ mkdir -p hicolor/$(word 1, $(subst /, ,$(@)))/apps/
+- inkscape $(subst .png,.svg, $(word 2, $(subst /, , $(@)))) --without-gui \
+- --export-width=$(word 1, $(subst x, , $(@))) \
+- --export-height=$(word 2, $(subst x, , $(subst /, , $(@)))) \
+- --export-png=hicolor/$(word 1, $(subst /, ,$(@)))/apps/$(word 2, $(subst /, , $@))
++ convert $(subst .png,.svg, $(word 2, $(subst /, , $(@)))) \
++ -size $(word 1, $(subst x, , $(@)))x$(word 2, $(subst x, , $(subst /, , $(@)))) \
++ hicolor/$(word 1, $(subst /, ,$(@)))/apps/$(word 2, $(subst /, , $@))
+
+ %.xpm:
+ mkdir -p pixmaps/
+--
+2.10.1
+
diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index 418286d81f6..b6f4fef0f05 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -11,9 +11,9 @@ let
scalaVersion = "2.11";
sha256 = "0ykcjv5dz9i5bws9my2d60pww1g9v2p2nqr67h0i2xrjm7az8a6v";
};
- "0.10" = { kafkaVersion = "0.10.0.1";
+ "0.10" = { kafkaVersion = "0.10.1.0";
scalaVersion = "2.11";
- sha256 = "0bdhzbhmm87a47162hyazcjmfibqg9r3ryzfjag7r0nxxmd64wrd";
+ sha256 = "144k6bqg8q8f3x3nk05hvaaad8xa32qjifg785i15j69cnp355bd";
};
};
in
diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix
index e60f6173c0f..72951c168dc 100644
--- a/pkgs/servers/apcupsd/default.nix
+++ b/pkgs/servers/apcupsd/default.nix
@@ -6,11 +6,11 @@ assert enableCgiScripts -> gd != null;
stdenv.mkDerivation rec {
pname = "apcupsd";
- name = "${pname}-3.14.13";
+ name = "${pname}-3.14.14";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${name}.tar.gz";
- sha256 = "1y83bly5bgpjbfaxxwmdk2mndbi4cw0svq5z9n6byj043phbvv2p";
+ sha256 = "0rwqiyzlg9p0szf3x6q1ppvrw6f6dbpn2rc5z623fk3bkdalhxyv";
};
buildInputs = [ pkgconfig utillinux man ] ++ stdenv.lib.optional enableCgiScripts gd;
diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix
index 302ff47bc20..bcba8ef21c6 100644
--- a/pkgs/servers/atlassian/confluence.nix
+++ b/pkgs/servers/atlassian/confluence.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "atlassian-confluence-${version}";
- version = "5.10.4";
+ version = "5.10.7";
src = fetchurl {
url = "https://www.atlassian.com/software/confluence/downloads/binary/${name}.tar.gz";
- sha256 = "07v31lr2jyh90ynjv6f61jh8wkry6lx02nm3yra02920k4y0w22a";
+ sha256 = "1zzkaps78nqjgriz6i6m7bdnm5srvslq27lr3vk6cizn2xz9nc1b";
};
phases = [ "unpackPhase" "buildPhase" "installPhase" ];
diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix
index 7921e78a47f..d37463f81a5 100644
--- a/pkgs/servers/atlassian/jira.nix
+++ b/pkgs/servers/atlassian/jira.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "atlassian-jira-${version}";
- version = "7.2.2";
+ version = "7.2.3";
src = fetchurl {
url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
- sha256 = "0qrxiyljcz3lv3jp29mhrfkj77r7ahfm68hvwwjl4z7424mwg9zn";
+ sha256 = "0237f1x2ir3g6ll0w7fpm6vnccqlx1xr015q37qh693hykyi1hy9";
};
phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];
diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix
index 3180238c618..a03b81583c0 100644
--- a/pkgs/servers/bird/default.nix
+++ b/pkgs/servers/bird/default.nix
@@ -2,11 +2,11 @@
, enableIPv6 ? false }:
stdenv.mkDerivation rec {
- name = "bird-1.6.0";
+ name = "bird-1.6.2";
src = fetchurl {
url = "ftp://bird.network.cz/pub/bird/${name}.tar.gz";
- sha256 = "04qf07cb04xdjnq0qxj6y8iqwyszk1vyark9gn5v6wxcvqvzwgfv";
+ sha256 = "1xlq78mgfyh9yvg9zld9mx75bxg9ajbn4cjjchnf0msh0ibzhlw8";
};
buildInputs = [ flex bison readline ];
diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix
index 5e8f2fd0caa..d04a1d124fa 100644
--- a/pkgs/servers/corosync/default.nix
+++ b/pkgs/servers/corosync/default.nix
@@ -7,11 +7,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "corosync-2.3.4";
+ name = "corosync-2.4.1";
src = fetchurl {
url = "http://build.clusterlabs.org/corosync/releases/${name}.tar.gz";
- sha256 = "1m276b060fjghr93hdzfag81whi5ph65dc2ka8ln1igm3kxr7bix";
+ sha256 = "0w8m97ih7a2g99pmjsckw4xwbgzv96xdgg62s2a4qbgnw4yl637y";
};
buildInputs = [
diff --git a/pkgs/servers/dict/dictd-db.nix b/pkgs/servers/dict/dictd-db.nix
index 995a643d7ef..500ac6fd47b 100644
--- a/pkgs/servers/dict/dictd-db.nix
+++ b/pkgs/servers/dict/dictd-db.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, callPackage }:
let
# Probably a bug in some FreeDict release files, but easier to trivially
@@ -82,4 +82,6 @@ in rec {
dbName = "mueller-names";
locale = "en_UK";
};
+ wordnet = callPackage ./dictd-wordnet.nix {};
+ wiktionary = callPackage ./dictd-wiktionary.nix {};
}
diff --git a/pkgs/servers/dict/dictd-wiktionary.nix b/pkgs/servers/dict/dictd-wiktionary.nix
index 42eb3c0757e..8637d043836 100644
--- a/pkgs/servers/dict/dictd-wiktionary.nix
+++ b/pkgs/servers/dict/dictd-wiktionary.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl, python, dict, glibcLocales, writeScript}:
stdenv.mkDerivation rec {
- version = "20140118";
+ version = "20161001";
name = "dict-db-wiktionary-${version}";
data = fetchurl {
url = "http://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2";
- sha256 = "892c9fc16b248a31e2d3e42590267161c1b899b31fe923eb1ede1deb6d24cfa8";
+ sha256 = "0g3k7kxp2nzg0v56i4cz253af3aqvhn1lwkys2fnam51cn3yqm7m";
};
convert = ./wiktionary2dict.py;
diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index e55b3eeb18b..810fabb253f 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, libtool, perl, libxml2
+{ stdenv, lib, fetchurl, openssl, libtool, perl, libxml2
, libseccomp ? null }:
let version = "9.10.4-P3"; in
@@ -33,8 +33,7 @@ stdenv.mkDerivation rec {
"--without-pkcs11"
"--without-purify"
"--without-python"
- "--enable-seccomp"
- ];
+ ] ++ lib.optional (stdenv.isi686 || stdenv.isx86_64) "--enable-seccomp";
postInstall = ''
moveToOutput bin/bind9-config $dev
diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix
index 368f95b3a18..603709b31ce 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.12";
+ name = "nsd-4.1.13";
src = fetchurl {
url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz";
- sha256 = "fd1979dff1fba55310fd4f439dc9f3f4701d435c0ec4fb9af533e12c7f27d5de";
+ sha256 = "1bwiabj1m7h14ppsa2azw017dqkqjgdl9gmj6ghjg80146xd8p64";
};
buildInputs = [ libevent openssl ];
diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix
index 0a6bcdc72af..5a566973787 100644
--- a/pkgs/servers/emby/default.nix
+++ b/pkgs/servers/emby/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "emby-${version}";
- version = "3.0.7300";
+ version = "3.0.8300";
src = fetchurl {
url = "https://github.com/MediaBrowser/Emby/archive/${version}.tar.gz";
- sha256 = "0xm3jw8ll49akr4fxa5qjbsglcgb6fq6nc54zppannxdlfkqj5jk";
+ sha256 = "13hr87jrhw8kkh94rknzjmlshd2a6kbbkygikigmfyvf3g7r4jf8";
};
buildInputs = with pkgs; [
diff --git a/pkgs/servers/fleet/default.nix b/pkgs/servers/fleet/default.nix
index 5d8620ed775..3e097c0ebd4 100644
--- a/pkgs/servers/fleet/default.nix
+++ b/pkgs/servers/fleet/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "fleet-${version}";
- version = "0.11.5";
+ version = "0.11.8";
src = fetchFromGitHub {
owner = "coreos";
repo = "fleet";
rev = "v${version}";
- sha256 = "0dc95dpqqc2rclbvgdqjcilrkji7lrpigdrzpwm3nbgz58vkfnz3";
+ sha256 = "13kwaa4hkiic602wnvnk13pflrxqhk2vxwpk1bn52ilwxkjyvkig";
};
buildInputs = [ go ];
@@ -27,7 +27,11 @@ stdenv.mkDerivation rec {
description = "A distributed init system";
homepage = http://coreos.com/using-coreos/clustering/;
license = licenses.asl20;
- maintainers = with maintainers; [ cstrahan offline ];
+ maintainers = with maintainers; [
+ cstrahan
+ jgeerds
+ offline
+ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix
index c0aed4655b3..cfd608962d8 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.4";
- sha256 = "0fvb09ycxz3xnyynav6ybj6miwh9kv8jcb2vzrmvqhzn8cgiq8h6";
+ version = "1.11.5";
+ sha256 = "1xmn5m1wjx1n11lwwlcg71836acb43gwq9ngk088jpx78liqlgr2";
})
diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix
index e677b181bb5..8d91f4e4b9b 100644
--- a/pkgs/servers/http/nginx/stable.nix
+++ b/pkgs/servers/http/nginx/stable.nix
@@ -1,6 +1,6 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // {
- version = "1.10.1";
- sha256 = "00d8hxj8453c7989qd7z4f1mjp0k3ib8k29i1qyf11b4ar35ilqz";
+ version = "1.10.2";
+ sha256 = "1hk5szkwns6s0xsvd0aiy392sqbvk3wdl480bpxf55m3hx4sqi8h";
})
diff --git a/pkgs/servers/inginious/default.nix b/pkgs/servers/inginious/default.nix
index ba6a54fc973..c85d96100c3 100644
--- a/pkgs/servers/inginious/default.nix
+++ b/pkgs/servers/inginious/default.nix
@@ -1,7 +1,9 @@
-{ pkgs, lib, pythonPackages }:
+{ pkgs, lib, python2Packages }:
with lib;
let
+ pythonPackages = python2Packages;
+
docker_1_7_2 = pythonPackages.docker.override rec {
name = "docker-py-1.7.2";
diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
index b5ea7acb9d2..7ad5f6e9ad5 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 = "6.0.0p1";
+ version = "6.0.2p1";
nativeBuildInputs = [ autoconf automake libtool bison ];
buildInputs = [ libasr libevent zlib openssl db pam ];
src = fetchurl {
url = "https://www.opensmtpd.org/archives/${name}.tar.gz";
- sha256 = "07gq21bx62w367512d0bbp9hm3pfgqh3kksg2by7n574kxc7jzm9";
+ sha256 = "1b4h64w45hpmfq5721smhg4s0shs64gbcjqjpx3fbiw4hz8bdy9a";
};
patches = [ ./proc_path.diff ];
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 0367b0b8350..bcd1793315c 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -26,7 +26,7 @@ in pythonPackages.buildPythonApplication rec {
blist canonicaljson daemonize dateutil frozendict pillow pybcrypt pyasn1
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
+ matrix-angular-sdk bleach netaddr jinja2 psycopg2
ldap3 psutil msgpack
];
diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 5024f00caee..bcbda0d5c09 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/
- cp -R ./* $out/
+ cp -R . $out/
'';
meta = {
diff --git a/pkgs/servers/nosql/cassandra/3.0.nix b/pkgs/servers/nosql/cassandra/3.0.nix
index b0975c7a93c..04348568baf 100644
--- a/pkgs/servers/nosql/cassandra/3.0.nix
+++ b/pkgs/servers/nosql/cassandra/3.0.nix
@@ -1,6 +1,6 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // {
- version = "3.0.8";
- sha256 = "02chk8q3pbl0y6rijfk2gbd0p1ani8daypsx9m9ingqkdx8ajljq";
+ version = "3.0.9";
+ sha256 = "16jdh20cr4h47ldjqlnp2cdnb9zshqvnll6995s2a75d8m030c0g";
})
diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix
index 1614049bf22..b2cc7afb804 100644
--- a/pkgs/servers/nosql/influxdb/default.nix
+++ b/pkgs/servers/nosql/influxdb/default.nix
@@ -1,16 +1,21 @@
-{ lib, buildGoPackage, fetchFromGitHub, src, version }:
+{ lib, buildGoPackage, fetchFromGitHub, }:
buildGoPackage rec {
name = "influxdb-${version}";
+ version = "1.0.2";
+
+ src = fetchFromGitHub {
+ owner = "influxdata";
+ repo = "influxdb";
+ rev = "v${version}";
+ sha256 = "0z8y995gm2hpxny7l5nx5fjc5c26hfgvghwmzva8d1mrlnapcsyc";
+ };
goPackagePath = "github.com/influxdata/influxdb";
excludedPackages = "test";
-
- inherit src;
- # Generated with the `gdm2nix.rb` script and the `Godeps` file from the
- # influxdb repo root.
+ # Generated with the nix2go
goDeps = ./. + builtins.toPath "/deps-${version}.nix";
meta = with lib; {
diff --git a/pkgs/servers/nosql/influxdb/deps-0.13.0.json.nix b/pkgs/servers/nosql/influxdb/deps-0.13.0.json.nix
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/pkgs/servers/nosql/influxdb/deps-0.13.0.nix b/pkgs/servers/nosql/influxdb/deps-0.13.0.nix
deleted file mode 100644
index 1b8885a1a0f..00000000000
--- a/pkgs/servers/nosql/influxdb/deps-0.13.0.nix
+++ /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";
- };
-}
-]
diff --git a/pkgs/servers/nosql/influxdb/gdm2nix.rb b/pkgs/servers/nosql/influxdb/gdm2nix.rb
deleted file mode 100755
index 4feb78f54bb..00000000000
--- a/pkgs/servers/nosql/influxdb/gdm2nix.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env ruby
-#
-#
-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",
-}
-
-godeps = ARGV[0] || "Godeps"
-
-deps = File.read(godeps).lines.map do |line|
- (name, rev) = line.split(" ")
-
- host = redirects.fetch(name, name)
-
- url = "https://#{host}.git"
-
- xxx = JSON.load(`nix-prefetch-git #{url} #{rev}`)
-
- {
- goPackagePath: name,
- fetch: {
- type: "git",
- url: url,
- rev: rev,
- sha256: xxx['sha256'],
- }
- }
-end
-
-#TODO: move to deps.nix in NIXON format
-File.write("deps.json", JSON.pretty_generate(deps))
diff --git a/pkgs/servers/nosql/influxdb/v0.nix b/pkgs/servers/nosql/influxdb/v0.nix
deleted file mode 100644
index fca5f8ba622..00000000000
--- a/pkgs/servers/nosql/influxdb/v0.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ lib, buildGoPackage, fetchFromGitHub }@args:
-
-import ./default.nix (args // rec {
-
- version = "0.13.0";
-
- src = fetchFromGitHub {
- owner = "influxdata";
- repo = "influxdb";
- rev = "v${version}";
- sha256 = "0f7af5jb1f65qnslhc7zccml1qvk6xx5naczqfsf4s1zc556fdi4";
- };
-})
diff --git a/pkgs/servers/nosql/influxdb/v1.nix b/pkgs/servers/nosql/influxdb/v1.nix
deleted file mode 100644
index 57d62a596e3..00000000000
--- a/pkgs/servers/nosql/influxdb/v1.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ lib, buildGoPackage, fetchFromGitHub }@args:
-
-import ./default.nix (args // rec {
-
- version = "1.0.2";
-
- src = fetchFromGitHub {
- owner = "influxdata";
- repo = "influxdb";
- rev = "v${version}";
- sha256 = "0z8y995gm2hpxny7l5nx5fjc5c26hfgvghwmzva8d1mrlnapcsyc";
- };
-})
diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix
index 75838ebbe5d..287e92d99ca 100644
--- a/pkgs/servers/nosql/neo4j/default.nix
+++ b/pkgs/servers/nosql/neo4j/default.nix
@@ -1,31 +1,30 @@
-{ stdenv, fetchurl, makeWrapper, jre, which, gnused }:
+{ stdenv, fetchurl, makeWrapper, jre8, which, gawk }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "neo4j-${version}";
- version = "2.1.3";
+ version = "3.0.6";
src = fetchurl {
url = "http://dist.neo4j.org/neo4j-community-${version}-unix.tar.gz";
- sha256 = "0gcyy6ayn8qvxj6za5463lgy320mn4rq7q5qysc26fxjd73drrrk";
+ sha256 = "efeab41183e9e5fa94a2d396c65ea93a24e9f105cb3b5f0d0a8e42fb709f4660";
};
- buildInputs = [ makeWrapper jre which gnused ];
-
- patchPhase = ''
- substituteInPlace "bin/neo4j" --replace "NEO4J_INSTANCE=\$NEO4J_HOME" ""
- '';
+ buildInputs = [ makeWrapper jre8 which gawk ];
installPhase = ''
mkdir -p "$out/share/neo4j"
cp -R * "$out/share/neo4j"
mkdir -p "$out/bin"
- makeWrapper "$out/share/neo4j/bin/neo4j" "$out/bin/neo4j" \
- --prefix PATH : "${stdenv.lib.makeBinPath [ jre which gnused ]}"
- makeWrapper "$out/share/neo4j/bin/neo4j-shell" "$out/bin/neo4j-shell" \
- --prefix PATH : "${stdenv.lib.makeBinPath [ jre which gnused ]}"
+ for NEO4J_SCRIPT in neo4j neo4j-admin neo4j-import neo4j-shell
+ do
+ makeWrapper "$out/share/neo4j/bin/$NEO4J_SCRIPT" \
+ "$out/bin/$NEO4J_SCRIPT" \
+ --prefix PATH : "${stdenv.lib.makeBinPath [ jre8 which gawk ]}" \
+ --set JAVA_HOME "$jre8"
+ done
'';
meta = with stdenv.lib; {
diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index 7dbdf5f04a2..59f2b4ac5cf 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, lua }:
stdenv.mkDerivation rec {
- version = "3.2.3";
+ version = "3.2.5";
name = "redis-${version}";
src = fetchurl {
url = "http://download.redis.io/releases/${name}.tar.gz";
- sha256 = "05az2g3gna5lkhh6x1a5m6yardbiig1l4ysggldlk5if8ww9qkk7";
+ sha256 = "05ak12xfkcinky6wvhy77knzd95m4vlshwka6jrdcjfqxyqww2c5";
};
buildInputs = [ lua ];
diff --git a/pkgs/servers/quagga/default.nix b/pkgs/servers/quagga/default.nix
index b73086ca7c7..45c195c2cb2 100644
--- a/pkgs/servers/quagga/default.nix
+++ b/pkgs/servers/quagga/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "quagga-${version}";
- version = "1.0.20160315";
+ version = "1.0.20161017";
src = fetchurl {
url = "mirror://savannah/quagga/${name}.tar.gz";
- sha256 = "0qrjhp6l1hw35jrvcwyl0df4zjx1kqhrsafx307i6pzgs2xbgzr1";
+ sha256 = "0629f7bkyh0a3n90kkr202g2i44id09qzkl05y8z66blvd6p49lg";
};
buildInputs =
diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix
index 14f28c37696..d41e1bce7f5 100644
--- a/pkgs/servers/sabnzbd/default.nix
+++ b/pkgs/servers/sabnzbd/default.nix
@@ -1,7 +1,7 @@
-{stdenv, fetchurl, python, par2cmdline, unzip, unrar, p7zip, makeWrapper}:
+{stdenv, fetchurl, python2, par2cmdline, unzip, unrar, p7zip, makeWrapper}:
let
- pythonEnv = python.withPackages(ps: with ps; [ pyopenssl python.modules.sqlite3 cheetah]);
+ pythonEnv = python2.withPackages(ps: with ps; [ pyopenssl cheetah]);
path = stdenv.lib.makeBinPath [ par2cmdline unrar unzip p7zip ];
in stdenv.mkDerivation rec {
version = "1.1.0";
diff --git a/pkgs/servers/samba/4.x-fix-ctdb-deps.patch b/pkgs/servers/samba/4.x-fix-ctdb-deps.patch
deleted file mode 100644
index 33886348412..00000000000
--- a/pkgs/servers/samba/4.x-fix-ctdb-deps.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/ctdb/wscript b/ctdb/wscript
-index 3e2a992..3fe15cc 100755
---- a/ctdb/wscript
-+++ b/ctdb/wscript
-@@ -568,7 +568,7 @@ def build(bld):
- source='ib/ibwrapper_test.c',
- includes='include include/internal',
- deps='''replace talloc ctdb-client ctdb-common
-- ctdb-system''' +
-+ ctdb-system ctdb-common-util''' +
- ib_deps,
- install_path='${CTDB_TEST_LIBDIR}')
-
diff --git a/pkgs/servers/samba/4.x-no-persistent-install.patch b/pkgs/servers/samba/4.x-no-persistent-install.patch
index c3e013f7862..efb539bfaea 100644
--- a/pkgs/servers/samba/4.x-no-persistent-install.patch
+++ b/pkgs/servers/samba/4.x-no-persistent-install.patch
@@ -1,26 +1,7 @@
-diff --git a/dynconfig/wscript b/dynconfig/wscript
-index aa4e66e..d53f433 100755
---- a/dynconfig/wscript
-+++ b/dynconfig/wscript
-@@ -379,9 +379,9 @@ def build(bld):
- cflags=cflags)
-
- # install some extra empty directories
-- bld.INSTALL_DIRS("", "${CONFIGDIR} ${PRIVATE_DIR} ${LOGFILEBASE}");
-- bld.INSTALL_DIRS("", "${PRIVATE_DIR} ${PRIVILEGED_SOCKET_DIR}")
-- bld.INSTALL_DIRS("", "${STATEDIR} ${CACHEDIR}");
-+ #bld.INSTALL_DIRS("", "${CONFIGDIR} ${PRIVATE_DIR} ${LOGFILEBASE}");
-+ #bld.INSTALL_DIRS("", "${PRIVATE_DIR} ${PRIVILEGED_SOCKET_DIR}")
-+ #bld.INSTALL_DIRS("", "${STATEDIR} ${CACHEDIR}");
-
- # these might be on non persistent storage
-- bld.INSTALL_DIRS("", "${LOCKDIR} ${PIDDIR} ${SOCKET_DIR}")
-+ #bld.INSTALL_DIRS("", "${LOCKDIR} ${PIDDIR} ${SOCKET_DIR}")
-diff --git a/ctdb/wscript b/ctdb/wscript
-index 3e2a992..1b93a4d 100755
---- a/ctdb/wscript
-+++ b/ctdb/wscript
-@@ -473,10 +473,10 @@ def build(bld):
+diff -ru3 samba-4.4.6/ctdb/wscript samba-4.4.6-new/ctdb/wscript
+--- samba-4.4.6/ctdb/wscript 2016-09-22 09:42:48.000000000 +0300
++++ samba-4.4.6-new/ctdb/wscript 2016-10-15 23:31:13.932088237 +0300
+@@ -581,7 +581,7 @@
for t in etc_subdirs:
files = SUBDIR_MODE('%s/%s' % (configdir, t), trim_path=configdir)
for fmode in files:
@@ -28,12 +9,8 @@ index 3e2a992..1b93a4d 100755
+ bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}', 'config/%s' % fmode[0],
destname=fmode[0], chmod=fmode[1])
-- bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'config/functions',
-+ bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}', 'config/functions',
- destname='functions')
-
- etc_scripts = [
-@@ -489,18 +489,18 @@ def build(bld):
+ bld.SAMBA_GENERATOR('ctdb-functions',
+@@ -601,23 +601,19 @@
]
for t in etc_scripts:
@@ -41,8 +18,12 @@ index 3e2a992..1b93a4d 100755
+ bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}', 'config/%s' % t,
destname=t, chmod=0755)
-- bld.INSTALL_FILES('${SYSCONFDIR}/sudoers.d', 'config/ctdb.sudoers',
-+ bld.INSTALL_FILES('${EXEC_PREFIX}${SYSCONFDIR}/sudoers.d', 'config/ctdb.sudoers',
+ bld.SAMBA_GENERATOR('ctdb-sudoers',
+ source='config/ctdb.sudoers',
+ target='ctdb.sudoers',
+ rule='sed %s ${SRC} > ${TGT}' % (sed_cmdline))
+- bld.INSTALL_FILES('${SYSCONFDIR}/sudoers.d', 'ctdb.sudoers',
++ bld.INSTALL_FILES('${EXEC_PREFIX}${SYSCONFDIR}/sudoers.d', 'ctdb.sudoers',
destname='ctdb')
- bld.INSTALL_FILES('${CTDB_ETCDIR}/notify.d', 'config/notify.d.README',
@@ -52,9 +33,22 @@ index 3e2a992..1b93a4d 100755
- bld.install_dir(bld.env.CTDB_LOGDIR)
- bld.install_dir(bld.env.CTDB_RUNDIR)
- bld.install_dir(bld.env.CTDB_VARDIR)
-+ #bld.install_dir(bld.env.CTDB_LOGDIR)
-+ #bld.install_dir(bld.env.CTDB_RUNDIR)
-+ #bld.install_dir(bld.env.CTDB_VARDIR)
-
- sed_expr = 's/@PACKAGE_VERSION@/%s/g' % VERSION
- t = bld.SAMBA_GENERATOR('ctdb-pc',
+-
+ # Unit tests
+ ctdb_unit_tests = [
+ 'db_hash_test',
+diff -ru3 samba-4.4.6/dynconfig/wscript samba-4.4.6-new/dynconfig/wscript
+--- samba-4.4.6/dynconfig/wscript 2016-01-26 14:45:46.000000000 +0300
++++ samba-4.4.6-new/dynconfig/wscript 2016-10-15 22:21:18.159705132 +0300
+@@ -416,11 +416,3 @@
+ public_headers=os_path_relpath(os.path.join(Options.launch_dir, version_header), bld.curdir),
+ header_path='samba',
+ cflags=cflags)
+-
+- # install some extra empty directories
+- bld.INSTALL_DIRS("", "${CONFIGDIR} ${PRIVATE_DIR} ${LOGFILEBASE}");
+- bld.INSTALL_DIRS("", "${PRIVATE_DIR} ${PRIVILEGED_SOCKET_DIR}")
+- bld.INSTALL_DIRS("", "${STATEDIR} ${CACHEDIR}");
+-
+- # these might be on non persistent storage
+- bld.INSTALL_DIRS("", "${LOCKDIR} ${PIDDIR} ${SOCKET_DIR}")
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index a3bb2d44216..2dfdf3709ee 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -18,18 +18,18 @@
with lib;
stdenv.mkDerivation rec {
- name = "samba-4.3.11";
+ name = "samba-${version}";
+ version = "4.4.6";
src = fetchurl {
url = "mirror://samba/pub/samba/stable/${name}.tar.gz";
- sha256 = "1v2grwivm6rasz1ganbybs0ikz1lydaniy65kxf1v8rl1qqngach";
+ sha256 = "1361ijz7vpgf66w3j9z7qb37rnlrydxw01ibjnfhjqqcb7fj7i1p";
};
outputs = [ "out" "dev" "man" ];
patches =
[ ./4.x-no-persistent-install.patch
- ./4.x-fix-ctdb-deps.patch
];
buildInputs =
diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix
index d9e324efd44..faee8415f4b 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.52";
+ version = "5.5.53";
src = fetchurl {
url = "mirror://mysql/MySQL-5.5/${name}.tar.gz";
- sha256 = "1zb2h6nmmm42qcc808bwa3sdlhyyyglv44jy4pfxmx5kwqyy283q";
+ sha256 = "1snnyz8s7dd3ypm73vbpw36pflz7wqh2bawdvp4riri44pa6va57";
};
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
index a2052eca9c2..5823cc57fba 100644
--- a/pkgs/servers/sql/mysql/5.7.x.nix
+++ b/pkgs/servers/sql/mysql/5.7.x.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "mysql-${version}";
- version = "5.7.15";
+ version = "5.7.16";
src = fetchurl {
url = "mirror://mysql/MySQL-5.7/${name}.tar.gz";
- sha256 = "0mlrxcvkn6bf869hjw9fb6m24ak26ndffnd91b4mknmz8cqkb1ch";
+ sha256 = "198qhd9bdm0fnpp307mgby2aar92yzya0937kxi7bcpdfjcvada9";
};
preConfigure = stdenv.lib.optional stdenv.isDarwin ''
diff --git a/pkgs/servers/web-apps/selfoss/default.nix b/pkgs/servers/web-apps/selfoss/default.nix
index 9b11e126137..1606cc9e76b 100644
--- a/pkgs/servers/web-apps/selfoss/default.nix
+++ b/pkgs/servers/web-apps/selfoss/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "selfoss-${version}";
- version = "2.15";
+ name = "selfoss-unstable-${version}";
+ version = "2016-07-31";
src = fetchFromGitHub {
owner = "SSilence";
repo = "selfoss";
- rev = version;
- sha256 = "0ljpyd354yalpnqwj6xk9b9mq4h6p8jbqznapj7nvfybas8faq15";
+ rev = "ceb431ad9208e2c5e31dafe593c75e5eb8b65cf7";
+ sha256 = "00vrpw7sb95x6lwpaxrlzxyj98k98xblqcrjr236ykv0ha97xv30";
};
buildPhases = ["unpackPhase" "installPhase"];
diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix
new file mode 100644
index 00000000000..83c0a6c1034
--- /dev/null
+++ b/pkgs/servers/web-apps/shaarli/default.nix
@@ -0,0 +1,60 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "shaarli-${version}";
+ version = "0.8.0";
+
+ src = fetchurl {
+ url = "https://github.com/shaarli/Shaarli/releases/download/v0.8.0/shaarli-v0.8.0-full.tar.gz";
+ sha256 = "04151fl62rs8vxsmdyq4qm8fi7fr7i6x0zhrg1zgssv8w8lfx1ww";
+ };
+
+ outputs = [ "out" "doc" ];
+
+ patchPhase = ''
+ substituteInPlace index.php \
+ --replace "new ConfigManager();" "new ConfigManager(getenv('SHAARLI_CONFIG'));"
+ '';
+
+# Point $SHAARLI_CONFIG to your configuration file, see https://github.com/shaarli/Shaarli/wiki/Shaarli-configuration.
+# For example:
+#
+
+ installPhase = ''
+ rm -r {cache,pagecache,tmp,data}/
+ mv doc/ $doc/
+ mkdir $out/
+ cp -R ./* $out
+ '';
+
+ meta = with stdenv.lib; {
+ description = "The personal, minimalist, super-fast, database free, bookmarking service";
+ license = licenses.gpl3Plus;
+ homepage = https://github.com/shaarli/Shaarli;
+ maintainers = with maintainers; [ schneefux ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix
new file mode 100644
index 00000000000..68732b2e169
--- /dev/null
+++ b/pkgs/servers/web-apps/wallabag/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "wallabag-${version}";
+ version = "2.1.2";
+
+ # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur
+
+ src = fetchurl {
+ url = "https://framabag.org/wallabag-release-${version}.tar.gz";
+ sha256 = "01i4xdzw126wwwkxy0d97dizrikvawpzqj95bykd1g25m7jzvb7k";
+ };
+
+ outputs = [ "out" "doc" ];
+
+ patchPhase = ''
+ rm Makefile # use the "shared hosting" package with bundled dependencies
+ substituteInPlace app/AppKernel.php \
+ --replace "__DIR__" "getenv('WALLABAG_DATA')"
+ substituteInPlace var/bootstrap.php.cache \
+ --replace "\$this->rootDir = \$this->getRootDir()" "\$this->rootDir = getenv('WALLABAG_DATA')"
+ ''; # exposes $WALLABAG_DATA
+
+ installPhase = ''
+ mv docs $doc/
+ mkdir $out/
+ cp -R * $out/
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Web page archiver";
+ longDescription = ''
+ wallabag is a self hostable application for saving web pages.
+
+ To use, point the environment variable $WALLABAG_DATA to a directory called `app` that contains the folder `config` with wallabag's configuration files. These need to be updated every package upgrade. In `app`'s parent folder, a directory called `var` containing wallabag's data will be created.
+ After a package upgrade, empty the `var/cache` folder.
+ '';
+ license = licenses.mit;
+ homepage = http://wallabag.org;
+ platforms = platforms.all;
+ };
+}
+
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index d892135740c..640c200e7cf 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1880,11 +1880,11 @@ let
}) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;};
xf86videonouveau = (mkDerivation "xf86videonouveau" {
- name = "xf86-video-nouveau-1.0.12";
+ name = "xf86-video-nouveau-1.0.13";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.12.tar.bz2;
- sha256 = "07irv1zkk0rkyn1d7f2gn1icgcz2ix0pwv74sjian763gynmg80f";
+ url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.13.tar.bz2;
+ sha256 = "1js7vak68g2800f1cy5r41wl5x2j7dbmbd7zxypzfgcw2fx454kd";
};
buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
meta.platforms = stdenv.lib.platforms.unix;
@@ -2353,11 +2353,11 @@ let
}) // {inherit ;};
xorgserver = (mkDerivation "xorgserver" {
- name = "xorg-server-1.18.3";
+ name = "xorg-server-1.18.4";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/xserver/xorg-server-1.18.3.tar.bz2;
- sha256 = "1ka206v4nbw6qz072gh0543aq44azq2zv9f0yysy5nvwa4i9qwza";
+ url = mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2;
+ sha256 = "1j1i3n5xy1wawhk95kxqdc54h34kg7xp4nnramba2q8xqfr5k117";
};
buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 930132bb071..c87acfee43a 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -217,6 +217,7 @@ in
libXrender = attrs: attrs // {
outputs = [ "out" "dev" "doc" ];
+ propagatedBuildInputs = [ xorg.renderproto ];
preConfigure = setMalloc0ReturnsNullCrossCompiling;
};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 5e7a9e81416..b2b5f2dc236 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -131,7 +131,7 @@ 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.1.tar.bz2
-mirror://xorg/individual/driver/xf86-video-nouveau-1.0.12.tar.bz2
+mirror://xorg/individual/driver/xf86-video-nouveau-1.0.13.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
mirror://xorg/individual/driver/xf86-video-dummy-0.3.7.tar.bz2
@@ -183,7 +183,7 @@ mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2
mirror://xorg/individual/app/xmag-1.0.6.tar.bz2
mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2
mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2
-mirror://xorg/individual/xserver/xorg-server-1.18.3.tar.bz2
+mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2
mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2
mirror://xorg/individual/app/xprop-1.2.2.tar.bz2
diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix
index fe0e2d3c4b6..73a3367f9f7 100644
--- a/pkgs/shells/oh-my-zsh/default.nix
+++ b/pkgs/shells/oh-my-zsh/default.nix
@@ -7,12 +7,12 @@
stdenv.mkDerivation rec {
name = "oh-my-zsh-${version}";
- version = "2016-10-08";
+ version = "2016-10-25";
src = fetchgit {
url = "https://github.com/robbyrussell/oh-my-zsh";
- rev = "cd37d19ddaf9cc5acbf443f93f88ca355f74090d";
- sha256 = "1vqgxbd09jhysjhp0xq48673xxry0xcs8mq2wrx5zs7chhq1w2y3";
+ rev = "0ee89d965ecaa4f32cf2d1039e9d84a73eb206cf";
+ sha256 = "1c90yl9kc1a7690bry1jbs48vsdlkxvbnvzgarx5wj99fygb8w2f";
};
phases = "installPhase";
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index fc81d3fec8d..1bc983d6312 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -29,7 +29,7 @@ in rec {
export NIX_ENFORCE_NO_NATIVE="''${NIX_ENFORCE_NO_NATIVE-1}"
export NIX_IGNORE_LD_THROUGH_GCC=1
stripAllFlags=" " # the Darwin "strip" command doesn't know "-s"
- export MACOSX_DEPLOYMENT_TARGET=10.7
+ export MACOSX_DEPLOYMENT_TARGET=10.10
export SDKROOT=
export CMAKE_OSX_ARCHITECTURES=x86_64
# Workaround for https://openradar.appspot.com/22671534 on 10.11.
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index 11a52eb423e..10d2b4decdd 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -197,14 +197,49 @@ in rec {
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
- libs=$(otool -L "$i" | tail -n +2 | grep -v Libsystem | cat)
+ libs=$(otool -L "$i" | tail -n +2 | grep -v libSystem | cat)
if [ -n "$libs" ]; then
install_name_tool -add_rpath $out/lib $i
fi
@@ -214,9 +249,24 @@ in rec {
ln -s bash $out/bin/sh
ln -s bzip2 $out/bin/bunzip2
+ # Provide a gunzip script.
+ cat > $out/bin/gunzip < $out/bin/egrep
+ echo "exec $out/bin/grep -E \"\$@\"" >> $out/bin/egrep
+ echo "#! $out/bin/sh" > $out/bin/fgrep
+ echo "exec $out/bin/grep -F \"\$@\"" >> $out/bin/fgrep
+
cat >$out/bin/dsymutil << EOF
#!$out/bin/sh
EOF
+
+ chmod +x $out/bin/egrep $out/bin/fgrep $out/bin/dsymutil
'';
allowedReferences = [ "out" ];
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix
index 96f07ae9fc6..3035d87e1fc 100644
--- a/pkgs/stdenv/default.nix
+++ b/pkgs/stdenv/default.nix
@@ -16,9 +16,7 @@ rec {
# i.e., the stuff in /bin, /usr/bin, etc. This environment should
# be used with care, since many Nix packages will not build properly
# with it (e.g., because they require GNU Make).
- stdenvNative = (import ./native {
- inherit system allPackages config;
- }).stdenv;
+ inherit (import ./native { inherit system allPackages config; }) stdenvNative;
stdenvNativePkgs = allPackages {
bootStdenv = stdenvNative;
@@ -33,12 +31,12 @@ rec {
pkgs = stdenvNativePkgs;
};
- stdenvFreeBSD = (import ./freebsd { inherit system allPackages platform config; }).stdenvFreeBSD;
+ inherit (import ./freebsd { inherit system allPackages platform config; }) stdenvFreeBSD;
# Linux standard environment.
- stdenvLinux = (import ./linux { inherit system allPackages platform config lib; }).stdenvLinux;
+ inherit (import ./linux { inherit system allPackages platform config lib; }) stdenvLinux;
- stdenvDarwin = (import ./darwin { inherit system allPackages platform config;}).stdenvDarwin;
+ inherit (import ./darwin { inherit system allPackages platform config;}) stdenvDarwin;
# Select the appropriate stdenv for the platform `system'.
stdenv =
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 372fd3cfa52..edd5c2785dc 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -44,7 +44,7 @@ let
throw "whitelistedLicenses and blacklistedLicenses are not mutually exclusive.";
hasLicense = attrs:
- builtins.hasAttr "meta" attrs && builtins.hasAttr "license" attrs.meta;
+ attrs ? meta.license;
hasWhitelistedLicense = assert areLicenseListsValid; attrs:
hasLicense attrs && builtins.elem attrs.meta.license whitelist;
@@ -128,8 +128,7 @@ let
throwEvalHelp = { reason, errormsg }:
# uppercase the first character of string s
let up = s: with lib;
- let cs = lib.stringToCharacters s;
- in concatStrings (singleton (toUpper (head cs)) ++ tail cs);
+ (toUpper (substring 0 1 s)) + (substring 1 (stringLength s) s);
in
assert builtins.elem reason ["unfree" "broken" "blacklisted"];
@@ -235,6 +234,7 @@ let
outputs = outputs';
} else { })))) (
{
+ overrideAttrs = f: mkDerivation (attrs // (f attrs));
# The meta attribute is passed in the resulting attribute set,
# but it's not part of the actual derivation, i.e., it's not
# passed to the builder and is not a dependency. But since we
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 291ef5a5079..fcd0805275b 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -141,5 +141,5 @@ rec {
};
- stdenv = stdenvBoot2;
+ stdenvNative = stdenvBoot2;
}
diff --git a/pkgs/tools/X11/oblogout/default.nix b/pkgs/tools/X11/oblogout/default.nix
new file mode 100644
index 00000000000..26bb32b17b0
--- /dev/null
+++ b/pkgs/tools/X11/oblogout/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, intltool, file, pythonPackages, cairo }:
+
+pythonPackages.buildPythonApplication rec {
+ name = "oblogout-unstable-${version}";
+ version = "2009-11-18";
+
+ src = fetchFromGitHub {
+ owner = "nikdoof";
+ repo = "oblogout";
+ rev = "ee023158c03dee720a1af9b1307b14ed5a95f5a0";
+ sha256 = "0nj87q94idb5ki4wnb2xipfgc6k6clr3rmm4xxh46b58z4zhhbmj";
+ };
+
+ nativeBuildInputs = [ intltool file pythonPackages.distutils_extra ];
+
+ buildInputs = [ cairo ];
+
+ propagatedBuildInputs = [ pythonPackages.pygtk pythonPackages.pillow pythonPackages.dbus-python ];
+
+ patches = [ ./oblogout-0.3-fixes.patch ];
+
+ postPatch = ''
+ substituteInPlace data/oblogout --replace sys.prefix \"$out/${pythonPackages.python.sitePackages}\"
+ substituteInPlace oblogout/__init__.py --replace sys.prefix \"$out\"
+ mkdir -p $out/share/doc
+ cp -a README $out/share/doc
+ '';
+
+ meta = {
+ description = "Openbox logout script";
+ homepage = "https://launchpad.net/oblogout";
+ license = stdenv.lib.licenses.gpl2;
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.romildo ];
+ };
+}
diff --git a/pkgs/tools/X11/oblogout/oblogout-0.3-fixes.patch b/pkgs/tools/X11/oblogout/oblogout-0.3-fixes.patch
new file mode 100644
index 00000000000..c58103c6d40
--- /dev/null
+++ b/pkgs/tools/X11/oblogout/oblogout-0.3-fixes.patch
@@ -0,0 +1,66 @@
+diff --git a/data/oblogout b/data/oblogout
+index 8058c4a..dfe5285 100755
+--- a/data/oblogout
++++ b/data/oblogout
+@@ -77,8 +77,10 @@ def main(argv = None):
+ config = 'data/oblogout.conf'
+ elif os.path.isfile('%s/.config/oblogout.conf' % os.getenv("HOME")):
+ config = '%s/.config/oblogout.conf' % os.getenv("HOME")
+- else:
++ elif os.path.isfile('/etc/oblogout.conf'):
+ config = '/etc/oblogout.conf'
++ else:
++ config = sys.prefix + '/etc/oblogout.conf'
+
+ # Check config in local path, if it exists pass it on
+ if not os.path.isfile(config):
+diff --git a/data/oblogout.conf b/data/oblogout.conf
+index 810872c..b1c1009 100644
+--- a/data/oblogout.conf
++++ b/data/oblogout.conf
+@@ -1,11 +1,11 @@
+ [settings]
+-usehal = true
++usehal = false
+
+ [looks]
+ opacity = 70
+ bgcolor = black
+ buttontheme = simplistic
+-buttons = cancel, logout, restart, shutdown, suspend, lock
++buttons = cancel, logout, restart, shutdown, suspend
+
+ [shortcuts]
+ cancel = Escape
+@@ -17,11 +17,11 @@ lock = K
+ hibernate = H
+
+ [commands]
+-shutdown = shutdown -h now
+-restart = reboot
+-suspend = pmi action suspend
+-hibernate = pmi action hibernate
+-safesuspend = safesuspend
+-lock = gnome-screensaver-command -l
+-switchuser = gdm-control --switch-user
++shutdown = systemctl poweroff
++restart = systemctl reboot
++suspend = systemctl suspend
++hibernate = systemctl hibernate
++# safesuspend = safesuspend
++# lock = gnome-screensaver-command -l
++# switchuser = gdm-control --switch-user
+ logout = openbox --exit
+diff --git a/oblogout/__init__.py b/oblogout/__init__.py
+index b9e4e01..12f521f 100644
+--- a/oblogout/__init__.py
++++ b/oblogout/__init__.py
+@@ -138,7 +138,7 @@ class OpenboxLogout():
+ self.logger.debug("Rendering Fade")
+ # Convert Pixbuf to PIL Image
+ wh = (pb.get_width(),pb.get_height())
+- pilimg = Image.fromstring("RGB", wh, pb.get_pixels())
++ pilimg = Image.frombytes("RGB", wh, pb.get_pixels())
+
+ pilimg = pilimg.point(lambda p: (p * self.opacity) / 255 )
+
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 9d438dc84b3..871d5a9dbd8 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -1,17 +1,20 @@
-{ stdenv, fetchurl, pythonPackages, pkgconfig
+{ stdenv, lib, fetchurl, pythonPackages, pkgconfig
, xorg, gtk2, glib, pango, cairo, gdk_pixbuf, atk
, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config
, ffmpeg, x264, libvpx, libwebp
-, libfakeXinerama }:
+, libfakeXinerama
+, gst_all_1, pulseaudioLight, gobjectIntrospection }:
+
+with lib;
let
inherit (pythonPackages) python cython buildPythonApplication;
in buildPythonApplication rec {
- name = "xpra-0.17.5";
+ name = "xpra-0.17.6";
namePrefix = "";
src = fetchurl {
url = "http://xpra.org/src/${name}.tar.xz";
- sha256 = "01k5iax42820pblfadig8rqfa1wlcgpakmjp142gx3fg59fnav3i";
+ sha256 = "1z7v58m45g10icpv22qg4dipafcfsdqkxqz73z3rwsb6r0kdyrpj";
};
buildInputs = [
@@ -26,11 +29,19 @@ in buildPythonApplication rec {
ffmpeg libvpx x264 libwebp
+ gobjectIntrospection
+ gst_all_1.gstreamer
+ gst_all_1.gst-plugins-base
+ gst_all_1.gst-plugins-good
+ gst_all_1.gst-plugins-bad
+ gst_all_1.gst-libav
+
makeWrapper
];
propagatedBuildInputs = with pythonPackages; [
pillow pygtk pygobject2 rencode pycrypto cryptography pycups lz4 dbus-python
+ netifaces numpy websockify pygobject3 gst-python
];
preBuild = ''
@@ -49,8 +60,10 @@ in buildPythonApplication rec {
--set FONTCONFIG_FILE "${fontsConf}" \
--set XPRA_LOG_DIR "\$HOME/.xpra" \
--set XPRA_INSTALL_PREFIX "$out" \
+ --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" \
+ --set GST_PLUGIN_SYSTEM_PATH_1_0 "$GST_PLUGIN_SYSTEM_PATH_1_0" \
--prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \
- --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux ]}
+ --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux pulseaudioLight ]} \
'';
preCheck = "exit 0";
@@ -65,7 +78,7 @@ in buildPythonApplication rec {
meta = {
homepage = http://xpra.org/;
description = "Persistent remote applications for X";
- platforms = stdenv.lib.platforms.linux;
- maintainers = with stdenv.lib.maintainers; [ tstrobel ];
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ tstrobel offline ];
};
}
diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix
index cfee6a8b94c..bdb9fd2d477 100644
--- a/pkgs/tools/admin/cli53/default.nix
+++ b/pkgs/tools/admin/cli53/default.nix
@@ -1,8 +1,7 @@
-{ lib, pythonPackages, fetchurl }:
+{ lib, python2Packages, fetchurl }:
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
name = "cli53-${version}";
- namePrefix = ""; # Suppress "python27-" name prefix
version = "0.4.4";
src = fetchurl {
@@ -10,7 +9,7 @@ pythonPackages.buildPythonApplication rec {
sha256 = "0s9jzigq6a16m2c3qklssx2lz16cf13g5zh80vh24kxazaxqzbig";
};
- propagatedBuildInputs = with pythonPackages; [
+ propagatedBuildInputs = with python2Packages; [
argparse
boto
dns
diff --git a/pkgs/tools/admin/dehydrated/default.nix b/pkgs/tools/admin/dehydrated/default.nix
new file mode 100644
index 00000000000..6bd915e7050
--- /dev/null
+++ b/pkgs/tools/admin/dehydrated/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, bash, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub }:
+let
+ pkgName = "dehydrated";
+ version = "0.3.1";
+in
+stdenv.mkDerivation rec {
+ name = pkgName + "-" + version;
+
+ src = fetchFromGitHub {
+ owner = "lukas2511";
+ repo = "dehydrated";
+ rev = "v${version}";
+ sha256 = "0prg940ykbsfb4w48bc03j5abycg8v7f9rg9x3kcva37y8ml0jsp";
+ };
+
+ buildInputs = [ makeWrapper ];
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp -a dehydrated $out/bin
+ wrapProgram "$out/bin/dehydrated" --prefix PATH : "${stdenv.lib.makeBinPath [ openssl coreutils gnused gnugrep diffutils curl gawk ]}"
+ '';
+
+ meta = with stdenv.lib; {
+ inherit (src.meta) homepage;
+ description = "Letsencrypt/acme client implemented as a shell-script";
+ license = licenses.mit;
+ platforms = platforms.all;
+ maintainers = [ maintainers.pstn ];
+ };
+}
diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix
index 0e927dfe1c7..3386ed86a2a 100644
--- a/pkgs/tools/admin/salt/default.nix
+++ b/pkgs/tools/admin/salt/default.nix
@@ -1,23 +1,21 @@
{
- stdenv, fetchurl, pythonPackages, openssl,
+ stdenv, fetchurl, python2Packages, openssl,
# Many Salt modules require various Python modules to be installed,
# passing them in this array enables Salt to find them.
extraInputs ? []
}:
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
name = "salt-${version}";
version = "2016.3.3";
- disabled = pythonPackages.isPy3k;
-
src = fetchurl {
url = "mirror://pypi/s/salt/${name}.tar.gz";
sha256 = "1djjglnh6203y8dirziz5w6zh2lgszxp8ivi86nb7fgijj2h61jr";
};
- propagatedBuildInputs = with pythonPackages; [
+ propagatedBuildInputs = with python2Packages; [
futures
jinja2
markupsafe
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index 05d8bd0990f..c7b1d695041 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -92,8 +92,6 @@ in pythonPackages.buildPythonApplication rec {
pythonPackages.pathlib
pythonPackages.pyyaml
pythonPackages.unidecode
- pythonPackages.python.modules.sqlite3
- pythonPackages.python.modules.readline
] ++ optional enableAcoustid pythonPackages.pyacoustid
++ optional (enableFetchart
|| enableEmbyupdate
diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/tools/audio/darkice/default.nix
index d9e1d196915..bb2df52f84c 100644
--- a/pkgs/tools/audio/darkice/default.nix
+++ b/pkgs/tools/audio/darkice/default.nix
@@ -1,24 +1,9 @@
-{ stdenv, buildEnv, fetchurl
+{ stdenv, buildEnv, fetchurl, pkgconfig
, libjack2, alsaLib, libpulseaudio
, faac, lame, libogg, libopus, libvorbis, libsamplerate
}:
-let
- oggEnv = buildEnv {
- name = "env-darkice-ogg";
- paths = [
- libopus.dev libopus libvorbis.dev libvorbis libogg.dev libogg
- ];
- };
-
- darkiceEnv = buildEnv {
- name = "env-darkice";
- paths = [
- lame.out lame.lib libpulseaudio libpulseaudio.dev alsaLib alsaLib.dev libsamplerate.out libsamplerate.dev
- ];
- };
-
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
name = "darkice-${version}";
version = "1.3";
@@ -27,17 +12,16 @@ in stdenv.mkDerivation rec {
sha256 = "1rlxds7ssq7nk2in4s46xws7xy9ylxsqgcz85hxjgh17lsm0y39c";
};
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [
+ libopus libvorbis libogg libpulseaudio alsaLib libsamplerate libjack2 lame
+ ];
+
+ NIX_CFLAGS_COMPILE = "-fpermissive";
+
configureFlags = [
- "--with-alsa-prefix=${darkiceEnv}"
"--with-faac-prefix=${faac}"
- "--with-jack-prefix=${libjack2}"
- "--with-lame-prefix=${darkiceEnv}"
- "--with-opus-prefix=${oggEnv}"
- "--with-pulseaudio-prefix=${darkiceEnv}"
- "--with-samplerate-prefix=${darkiceEnv}"
- "--with-vorbis-prefix=${oggEnv}"
-# "--with-aacplus-prefix=${aacplus}" ### missing: aacplus
-# "--with-twolame-prefix=${twolame}" ### missing: twolame
+ "--with-lame-prefix=${lame.lib}"
];
patches = [ ./fix-undeclared-memmove.patch ];
diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix
index beb69db8581..bbec851b25c 100644
--- a/pkgs/tools/audio/mpdris2/default.nix
+++ b/pkgs/tools/audio/mpdris2/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, autoreconfHook, intltool
-, pythonPackages, pythonFull
+, pythonPackages
}:
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ intltool autoreconfHook pythonPackages.wrapPython ];
- propagatedBuildInputs = with pythonPackages; [ pythonFull pygtk dbus-python ];
+ propagatedBuildInputs = with pythonPackages; [ python pygtk dbus-python ];
pythonPath = with pythonPackages; [ mpd pygtk dbus-python notify ];
postInstall = "wrapPythonPrograms";
diff --git a/pkgs/tools/audio/qastools/default.nix b/pkgs/tools/audio/qastools/default.nix
index 3fe5b4b8d1a..3456f098648 100644
--- a/pkgs/tools/audio/qastools/default.nix
+++ b/pkgs/tools/audio/qastools/default.nix
@@ -1,19 +1,20 @@
-{ stdenv, fetchurl, cmake, alsaLib, udev, qt4 }:
+{ stdenv, fetchurl, cmake, alsaLib, udev, qtbase,
+ qtsvg, qttools, makeQtWrapper }:
let
- version = "0.18.1";
+ version = "0.21.0";
in
stdenv.mkDerivation {
name = "qastools-${version}";
src = fetchurl {
- url = "mirror://sourceforge/qastools/qastools_${version}.tar.bz2";
- sha256 = "1sac6a0j1881wgpv4491b2f4jnhqkab6xyldmcg1wfqb5qkdgzvg";
+ url = "mirror://sourceforge/project/qastools/${version}/qastools_${version}.tar.bz2";
+ sha256 = "1zl9cn5h43n63yp3z1an87xvw554k9hlcz75ddb30lvpcczkmwrh";
};
buildInputs = [
- cmake alsaLib udev qt4
+ cmake alsaLib udev qtbase qtsvg qttools makeQtWrapper
];
cmakeFlags = [
diff --git a/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix b/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix
new file mode 100644
index 00000000000..d5f47f9a6c0
--- /dev/null
+++ b/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, python2Packages }:
+
+python2Packages.buildPythonApplication rec {
+ name = "amazon-glacier-cmd-interface-${version}";
+ version = "2016-09-01";
+
+ src = fetchFromGitHub {
+ owner = "uskudnik";
+ repo = "amazon-glacier-cmd-interface";
+ rev = "9f28132f9872e1aad9e956e5613b976504e930c8";
+ sha256 = "1k5z8kda9v6klr4536pf5qbq9zklxvyysv7nc48gllschl09jywc";
+ };
+
+ propagatedBuildInputs = with python2Packages; [
+ argparse
+ boto
+ dateutil
+ prettytable
+ pytz
+ ];
+
+ meta = {
+ description = "Command line interface for Amazon Glacier";
+ homepage = https://github.com/uskudnik/amazon-glacier-cmd-interface;
+ license = stdenv.lib.licenses.gpl2;
+ maintainers = [ stdenv.lib.maintainers.lovek323 ];
+ };
+
+}
diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix
index 79da3f8cf9b..ffa119b3c53 100644
--- a/pkgs/tools/backup/bareos/default.nix
+++ b/pkgs/tools/backup/bareos/default.nix
@@ -12,14 +12,14 @@ let
in
stdenv.mkDerivation rec {
name = "bareos-${version}";
- version = "15.2.1";
+ version = "15.2.4";
src = fetchFromGitHub {
owner = "bareos";
repo = "bareos";
rev = "Release/${version}";
name = "${name}-src";
- sha256 = "01vnqahzjj598jjk4y7qzfnq415jh227v40sgkrdl4qcpn76spxi";
+ sha256 = "02k6wmr2n12dc6vwda8xczmbqidg6fs8nfg9n2cwwpm3k1a21qnd";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index 911819f48aa..09821b01700 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
name = "borgbackup-${version}";
- version = "1.0.7";
+ version = "1.0.8";
namePrefix = "";
src = fetchurl {
url = "https://github.com/borgbackup/borg/releases/download/"
+ "${version}/${name}.tar.gz";
- sha256 = "1l9iw55w5x51yxl3q89cf6avg80lajxvc8qz584hrsmnk6i56cr0";
+ sha256 = "1fdfi0yzzdrrlml6780n4fh61sqm7pw6fcd1y67kfkvw8hy5c0k9";
};
nativeBuildInputs = with python3Packages; [
diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix
index 25bcc6e27ad..c63e6c515a5 100644
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/pkgs/tools/backup/duplicity/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, pythonPackages, librsync, ncftp, gnupg, rsync, makeWrapper
+{ stdenv, fetchurl, python2Packages, librsync, ncftp, gnupg, rsync, makeWrapper
}:
let
version = "0.7.07.1";
- inherit (pythonPackages) boto ecdsa lockfile paramiko pycrypto python setuptools;
+ inherit (python2Packages) boto cffi cryptography ecdsa enum idna ipaddress lockfile paramiko pyasn1 pycrypto python setuptools six;
in stdenv.mkDerivation {
name = "duplicity-${version}";
@@ -15,10 +15,10 @@ in stdenv.mkDerivation {
installPhase = ''
python setup.py install --prefix=$out
wrapProgram $out/bin/duplicity \
- --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pycrypto}):$(toPythonPath ${ecdsa}):$(toPythonPath ${paramiko}):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})" \
+ --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${idna}):$(toPythonPath ${cffi}):$(toPythonPath ${ipaddress}):$(toPythonPath ${pyasn1}):$(toPythonPath ${six}):$(toPythonPath ${enum}):$(toPythonPath ${setuptools}):$(toPythonPath ${cryptography}):$(toPythonPath ${pycrypto}):$(toPythonPath ${ecdsa}):$(toPythonPath ${paramiko}):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})" \
--prefix PATH : "${stdenv.lib.makeBinPath [ gnupg ncftp rsync ]}"
wrapProgram $out/bin/rdiffdir \
- --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pycrypto}):$(toPythonPath ${ecdsa}):$(toPythonPath ${paramiko}):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})"
+ --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${idna}):$(toPythonPath ${cffi}):$(toPythonPath ${ipaddress}):$(toPythonPath ${pyasn1}):$(toPythonPath ${six}):$(toPythonPath ${enum}):$(toPythonPath ${setuptools}):$(toPythonPath ${cryptography}):$(toPythonPath ${pycrypto}):$(toPythonPath ${ecdsa}):$(toPythonPath ${paramiko}):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})"
'';
buildInputs = [ python librsync makeWrapper setuptools ];
diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix
index a58f2b5504b..525aa2fec28 100644
--- a/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -2,14 +2,14 @@
, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt
}:
-let version = "4.6.1"; in
+let version = "4.8.2"; in
stdenv.mkDerivation rec {
name = "btrfs-progs-${version}";
src = fetchurl {
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
- sha256 = "06c9l6m3w29dndk17jrlpgr01wykl10h34zva8zc2c571z6mrlaf";
+ sha256 = "0pswcfmdnfc586770h74abp67gn2xv8fd46vxlimnmn837sj7h41";
};
buildInputs = [
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 07bfec41f47..a5df46b6ba4 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -1,6 +1,6 @@
{ stdenv, ensureNewerSourcesHook, autoconf, automake, makeWrapper, pkgconfig
, libtool, which, git
-, boost, python, pythonPackages, libxml2, zlib
+, boost, python2Packages, libxml2, zlib
# Optional Dependencies
, snappy ? null, leveldb ? null, yasm ? null, fcgi ? null, expat ? null
@@ -30,6 +30,7 @@ assert cryptopp != null || (nss != null && nspr != null);
with stdenv;
with stdenv.lib;
let
+ inherit (python2Packages) python;
mkFlag = trueStr: falseStr: cond: name: val:
if cond == null then null else
"--${if cond != false then trueStr else falseStr}${name}"
@@ -99,8 +100,7 @@ let
};
wrapArgs = "--set PYTHONPATH \"$(toPythonPath $lib)\""
- + " --prefix PYTHONPATH : \"$(toPythonPath ${python.modules.readline})\""
- + " --prefix PYTHONPATH : \"$(toPythonPath ${pythonPackages.flask})\""
+ + " --prefix PYTHONPATH : \"$(toPythonPath ${python2Packages.flask})\""
+ " --set PATH \"$out/bin\"";
in
stdenv.mkDerivation {
@@ -117,12 +117,12 @@ stdenv.mkDerivation {
(ensureNewerSourcesHook { year = "1980"; })
]
++ optionals (versionAtLeast version "9.0.2") [
- pythonPackages.setuptools pythonPackages.argparse
+ python2Packages.setuptools python2Packages.argparse
];
buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [
- boost python libxml2 optYasm optLibatomic_ops optLibs3 malloc pythonPackages.flask zlib
+ boost python libxml2 optYasm optLibatomic_ops optLibs3 malloc python2Packages.flask zlib
] ++ optionals (versionAtLeast version "9.0.0") [
- pythonPackages.sphinx # Used for docs
+ python2Packages.sphinx # Used for docs
] ++ optionals stdenv.isLinux [
linuxHeaders libuuid udev keyutils optLibaio optLibxfs optZfs
] ++ optionals hasServer [
diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/tools/filesystems/gitfs/default.nix
index 31c4ceccbc0..bb652c28580 100644
--- a/pkgs/tools/filesystems/gitfs/default.nix
+++ b/pkgs/tools/filesystems/gitfs/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, pythonPackages }:
+{ stdenv, fetchFromGitHub, python2Packages }:
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
name = "gitfs-0.2.5";
src = fetchFromGitHub {
@@ -15,7 +15,12 @@ pythonPackages.buildPythonApplication rec {
echo > requirements.txt
'';
- propagatedBuildInputs = with pythonPackages; [ atomiclong fusepy pygit2 ];
+ buildInputs = with python2Packages; [ pytest pytestcov mock ];
+ propagatedBuildInputs = with python2Packages; [ atomiclong fusepy pygit2 ];
+
+ checkPhase = ''
+ py.test
+ '';
meta = {
description = "A FUSE filesystem that fully integrates with git";
@@ -29,4 +34,4 @@ pythonPackages.buildPythonApplication rec {
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.robbinch ];
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index e97f246e70b..32c87667ee3 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python, ncurses, readline,
+{stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python2, ncurses, readline,
autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite
, liburcu, attr
}:
@@ -13,7 +13,7 @@ let
sha256="0f715r6bf12b37s1l3259qzfbz8l2g3mdsnnh2lflagzazn6jnap";
};
buildInputs = [
- fuse bison flex_2_5_35 openssl python ncurses readline
+ fuse bison flex_2_5_35 openssl python2 ncurses readline
autoconf automake libtool pkgconfig zlib libaio libxml2
acl sqlite liburcu attr
];
diff --git a/pkgs/tools/filesystems/vmfs-tools/default.nix b/pkgs/tools/filesystems/vmfs-tools/default.nix
new file mode 100644
index 00000000000..d563f438020
--- /dev/null
+++ b/pkgs/tools/filesystems/vmfs-tools/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, pkgconfig
+, asciidoc, docbook_xml_xslt, fuse, libuuid, libxslt }:
+
+stdenv.mkDerivation rec {
+ name = "vmfs-tools";
+
+ src = fetchFromGitHub {
+ owner = "glandium";
+ repo = "vmfs-tools";
+ rev = "4ab76ef5b074bdf06e4b518ff6d50439de05ae7f";
+ sha256 = "14y412ww5hxk336ils62s3fwykfh6mx1j0iiaa5cwc615pi6qvi4";
+ };
+
+ nativeBuildInputs = [ asciidoc docbook_xml_xslt fuse libuuid libxslt pkgconfig ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/glandium/vmfs-tools;
+ description = "FUSE-based VMFS (vmware) mounting tools";
+ maintainers = with maintainers; [ peterhoeg ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
index 3ca6f3ffcfe..161982ac618 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
@@ -4,24 +4,20 @@
stdenv.mkDerivation rec {
name = "ibus-uniemoji-${version}";
- version = "2016-09-20";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "salty-horse";
repo = "ibus-uniemoji";
- rev = "c8931a4807a721168e45463ecba00805adb3fe8d";
- sha256 = "0fydxkdjsbfbrbb8238rfnshmhp11c38hsa7y2gp1ii6mkjngb1j";
+ rev = "v${version}";
+ sha256 = "121zh3q0li1k537fcvbd4ns4jgl9bbb9gm9ihy8cfxgirv38lcfa";
};
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
- '';
+ "PYTHON=${python3Packages.python.interpreter}"
+ ];
meta = with stdenv.lib; {
isIbusEngine = true;
diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix
index 05c3d6a7819..e61f99d2bbf 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.148";
+ version = "1.152";
src = fetchurl {
url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
- sha256 = "1d0qqzln5w7f7kkw75cp8g8hg43f85xj0h68y6j6yw7d62q1406g";
+ sha256 = "1hk5g0zhj78p74z0hdx3v29s5bpx0npabwdawaigwwxrrj03q9mw";
};
buildInputs = [ dpkg ];
diff --git a/pkgs/tools/misc/bibtex2html/default.nix b/pkgs/tools/misc/bibtex2html/default.nix
new file mode 100644
index 00000000000..068d3e3866e
--- /dev/null
+++ b/pkgs/tools/misc/bibtex2html/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, ocaml }:
+
+stdenv.mkDerivation rec {
+ name = "bibtex2html-${version}";
+ version = "1.98";
+
+ src = fetchurl {
+ url = http://www.lri.fr/~filliatr/ftp/bibtex2html/bibtex2html-1.98.tar.gz;
+ sha256 = "1mh6hxmc9qv05hgjc11m2zh5mk9mk0kaqp59pny18ypqgfws09g9";
+ };
+
+ buildInputs = [ ocaml ];
+
+ meta = with stdenv.lib; {
+ description = "A collection of tools for translating from BibTeX to HTML";
+ homepage = https://www.lri.fr/~filliatr/bibtex2html/;
+ licence = licenses.gpl2;
+ platforms = ocaml.meta.platforms or [];
+ maintainers = [ maintainers.scolobb ];
+ };
+}
diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix
index 4201fb25f98..f466da91dff 100644
--- a/pkgs/tools/misc/brltty/default.nix
+++ b/pkgs/tools/misc/brltty/default.nix
@@ -1,17 +1,21 @@
-{ stdenv, fetchurl, pkgconfig, alsaSupport, alsaLib ? null, bluez }:
+{ stdenv, fetchurl, pkgconfig, alsaSupport, alsaLib ? null, bluez, systemdSupport, systemd ? null }:
assert alsaSupport -> alsaLib != null;
+assert systemdSupport -> systemd != null;
stdenv.mkDerivation rec {
- name = "brltty-5.2";
+ name = "brltty-5.4";
src = fetchurl {
url = "http://brltty.com/archive/${name}.tar.gz";
- sha256 = "1zaab5pxkqrv081n23p3am445d30gk0km4azqdirvcpw9z15q0cz";
+ sha256 = "1993brxa76yf7z3ckax0bbmqv6jp8vjwxp19h425v4gpm0m17k7l";
};
+
+ patches = [ ./systemd.patch ];
- buildInputs = [ pkgconfig alsaLib bluez ]
- ++ stdenv.lib.optional alsaSupport alsaLib;
+ buildInputs = [ pkgconfig bluez ]
+ ++ stdenv.lib.optional alsaSupport alsaLib
+ ++ stdenv.lib.optional systemdSupport systemd;
meta = {
description = "Access software for a blind person using a braille display";
@@ -27,7 +31,9 @@ stdenv.mkDerivation rec {
platforms = stdenv.lib.platforms.all;
};
- patchPhase = ''
+ preConfigurePhases = [ "preConfigure" ];
+
+ preConfigure = ''
substituteInPlace configure --replace /sbin/ldconfig ldconfig
'';
}
diff --git a/pkgs/tools/misc/brltty/systemd.patch b/pkgs/tools/misc/brltty/systemd.patch
new file mode 100644
index 00000000000..24a0d617b30
--- /dev/null
+++ b/pkgs/tools/misc/brltty/systemd.patch
@@ -0,0 +1,22 @@
+diff --git a/config.mk.in b/config.mk.in
+index 5093b9c..b707bd4 100644
+--- a/config.mk.in
++++ b/config.mk.in
+@@ -235,7 +235,7 @@ TUNE_OBJECTS = tune.$O notes.$O $(BEEP_OBJECTS) $(PCM_OBJECTS) $(MIDI_OBJECTS) $
+ ASYNC_OBJECTS = async_handle.$O async_data.$O async_wait.$O async_alarm.$O async_task.$O async_io.$O async_event.$O async_signal.$O thread.$O
+ BASE_OBJECTS = log.$O addresses.$O file.$O device.$O parse.$O variables.$O datafile.$O unicode.$O $(CHARSET_OBJECTS) timing.$O $(ASYNC_OBJECTS) queue.$O lock.$O $(DYNLD_OBJECTS) $(PORTS_OBJECTS) $(SYSTEM_OBJECTS)
+ OPTIONS_OBJECTS = options.$O $(PARAMS_OBJECTS)
+-PROGRAM_OBJECTS = program.$O $(PGMPATH_OBJECTS) $(SERVICE_OBJECTS) $(SERVICE_LIBS) pid.$O $(OPTIONS_OBJECTS) $(BASE_OBJECTS)
++PROGRAM_OBJECTS = program.$O $(PGMPATH_OBJECTS) $(SERVICE_OBJECTS) pid.$O $(OPTIONS_OBJECTS) $(BASE_OBJECTS)
+
+ CC = @CC@
+ CPPFLAGS = -I$(BLD_DIR) -I$(SRC_DIR) -I$(BLD_TOP:/=)/$(PGM_DIR) -I$(SRC_TOP:/=)/$(PGM_DIR) -I$(SRC_TOP:/=)/$(HDR_DIR) -I$(BLD_TOP:/=) -I$(SRC_TOP:/=) @CPPFLAGS@ @DEFS@
+@@ -248,7 +248,7 @@ LIBCXXFLAGS = $(CXXFLAGS) @LIBCXXFLAGS@
+
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+-LDLIBS = $(ICU_LIBS) $(POLKIT_LIBS) $(SYSTEM_LIBS) @LIBS@
++LDLIBS = $(ICU_LIBS) $(POLKIT_LIBS) $(SYSTEM_LIBS) $(SERVICE_LIBS) @LIBS@
+
+ MKOBJ = @MKOBJ@
+ MKMOD = @MKMOD@
diff --git a/pkgs/tools/misc/fpp/default.nix b/pkgs/tools/misc/fpp/default.nix
index 5261035b35c..2f43dd40f13 100644
--- a/pkgs/tools/misc/fpp/default.nix
+++ b/pkgs/tools/misc/fpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python27Full }:
+{ stdenv, fetchFromGitHub, python27 }:
stdenv.mkDerivation rec {
name = "fpp-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
postPatch = ''
- substituteInPlace fpp --replace 'PYTHONCMD="python"' 'PYTHONCMD="${python27Full.interpreter}"'
+ substituteInPlace fpp --replace 'PYTHONCMD="python"' 'PYTHONCMD="${python27.interpreter}"'
'';
installPhase = ''
diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix
index 1efac3b7844..6cd451264ab 100644
--- a/pkgs/tools/misc/ipxe/default.nix
+++ b/pkgs/tools/misc/ipxe/default.nix
@@ -27,8 +27,12 @@ stdenv.mkDerivation {
];
+ enabledOptions = [ "DOWNLOAD_PROTO_HTTPS" ];
+
configurePhase = ''
- echo "#define DOWNLOAD_PROTO_HTTPS" >> src/config/general.h
+ runHook preConfigure
+ for opt in $enabledOptions; do echo "#define $opt" >> src/config/general.h; done
+ runHook postConfigure
'';
preBuild = "cd src";
diff --git a/pkgs/tools/misc/kargo/default.nix b/pkgs/tools/misc/kargo/default.nix
new file mode 100644
index 00000000000..ddc030bcf8d
--- /dev/null
+++ b/pkgs/tools/misc/kargo/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, pythonPackages }:
+
+pythonPackages.buildPythonApplication rec {
+ version = "0.4.6";
+ name = "kargo-${version}";
+
+ src = fetchurl {
+ url = "mirror://pypi/k/kargo/${name}.tar.gz";
+ sha256 = "1sm721c3d4scpc1gj2j3qwssr6jjvw6aq3p7ipvhbd9ywmm9dd7b";
+ };
+
+ doCheck = false;
+
+ propagatedBuildInputs = with pythonPackages; [
+ ansible2
+ boto
+ cffi
+ cryptography
+ libcloud
+ markupsafe
+ netaddr
+ pyasn1
+ requests2
+ setuptools
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/kubespray/kargo-cli;
+ description = "A tool helps to deploy a kubernetes cluster with Ansible.";
+ platforms = platforms.linux;
+ license = licenses.gpl3;
+ maintainers = with maintainers; [
+ jgeerds
+ ];
+ };
+}
diff --git a/pkgs/tools/misc/openopc/default.nix b/pkgs/tools/misc/openopc/default.nix
index 2fce3807ca7..9da59824e29 100644
--- a/pkgs/tools/misc/openopc/default.nix
+++ b/pkgs/tools/misc/openopc/default.nix
@@ -1,6 +1,8 @@
-{ stdenv, fetchurl, pythonFull }:
+{ stdenv, fetchurl, python }:
-stdenv.mkDerivation rec {
+let
+ pythonEnv = python.withPackages(ps: [ps.pyro3]);
+in stdenv.mkDerivation rec {
name = "openopc-${version}";
version = "1.2.0";
@@ -13,16 +15,16 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p "$out/bin"
mkdir -p "$out/share/doc/openopc"
- mkdir -p "$out/${pythonFull.python.sitePackages}"
+ mkdir -p "$out/${pythonEnv.python.sitePackages}"
mkdir -p "$out/libexec/opc"
- cp src/OpenOPC.py "$out/${pythonFull.python.sitePackages}"
+ cp src/OpenOPC.py "$out/${pythonEnv.python.sitePackages}"
cp src/opc.py "$out/libexec/opc/"
cat > "$out/bin/opc" << __EOF__
#!${stdenv.shell}
- export PYTHONPATH="$out/${pythonFull.python.sitePackages}"
- exec ${pythonFull}/bin/${pythonFull.python.executable} "$out/libexec/opc/opc.py" "\$@"
+ export PYTHONPATH="$out/${pythonEnv.python.sitePackages}"
+ exec ${pythonEnv}/bin/${pythonEnv.python.executable} "$out/libexec/opc/opc.py" "\$@"
__EOF__
chmod a+x "$out/bin/opc"
diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix
index ba179d7af91..cfce018a236 100644
--- a/pkgs/tools/misc/parted/default.nix
+++ b/pkgs/tools/misc/parted/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline, perl, python
+{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline, perl, python2
, utillinux, check, enableStatic ? false, hurd ? null }:
stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional (gettext != null) gettext
++ stdenv.lib.optional (devicemapper != null) devicemapper
++ stdenv.lib.optional (hurd != null) hurd
- ++ stdenv.lib.optionals doCheck [ check perl python ];
+ ++ stdenv.lib.optionals doCheck [ check perl python2 ];
configureFlags =
(if (readline != null)
diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix
new file mode 100644
index 00000000000..865c6b1e842
--- /dev/null
+++ b/pkgs/tools/misc/peruse/default.nix
@@ -0,0 +1,42 @@
+{
+ kdeDerivation, kdeWrapper, fetchFromGitHub, fetchurl, lib,
+ ecm, kdoctools,
+ baloo, kconfig, kfilemetadata, kinit, kirigami, plasma-framework
+}:
+
+let
+ pname = "peruse";
+ version = "1.1";
+ unarr = fetchFromGitHub {
+ owner = "zeniko";
+ repo = "unarr";
+ rev = "d1be8c43a82a4320306c8e835a86fdb7b2574ca7";
+ sha256 = "03ds5da69zipa25rsp76l6xqivrh3wcgygwyqa5x2rgcz3rjnlpr";
+ };
+ unwrapped = kdeDerivation rec {
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "mirror://kde/stable/${pname}/${name}.tar.xz";
+ sha256 = "1akk9hg12y6iis0rb5kdkznm3xk7hk04r9ccqyz8lr6y073n5f9j";
+ };
+
+ nativeBuildInputs = [ ecm kdoctools ];
+
+ propagatedBuildInputs = [ baloo kconfig kfilemetadata kinit kirigami plasma-framework ];
+
+ preConfigure = ''
+ rmdir src/qtquick/karchive-rar/external/unarr
+ ln -s ${unarr} src/qtquick/karchive-rar/external/unarr
+ '';
+
+ meta = with lib; {
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ peterhoeg ];
+ };
+
+ };
+
+in kdeWrapper unwrapped {
+ targets = [ "bin/peruse" ];
+}
diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix
index 11d6991b89c..dfda07fda4e 100644
--- a/pkgs/tools/misc/remind/default.nix
+++ b/pkgs/tools/misc/remind/default.nix
@@ -1,12 +1,33 @@
-{stdenv, fetchurl} :
+{stdenv, fetchurl, tk, tcllib, makeWrapper
+, tkremind ? true
+} :
-stdenv.mkDerivation {
+assert tkremind -> tk != null;
+assert tkremind -> tcllib != null;
+assert tkremind -> makeWrapper != null;
+
+stdenv.mkDerivation rec {
name = "remind-3.1.15";
src = fetchurl {
url = http://www.roaringpenguin.com/files/download/remind-03.01.15.tar.gz;
sha256 = "1hcfcxz5fjzl7606prlb7dgls5kr8z3wb51h48s6qm8ang0b9nla";
};
+ tclLibraries = if tkremind then [ tcllib tk ] else [];
+ tclLibPaths = stdenv.lib.concatStringsSep " "
+ (map (p: "${p}/lib/${p.libPrefix}") tclLibraries);
+
+ buildInputs = if tkremind then [ makeWrapper ] else [];
+ propagatedBuildInputs = tclLibraries;
+
+ postPatch = if tkremind then ''
+ substituteInPlace scripts/tkremind --replace "exec wish" "exec ${tk}/bin/wish"
+ '' else "";
+
+ postInstall = if tkremind then ''
+ wrapProgram $out/bin/tkremind --set TCLLIBPATH "${tclLibPaths}"
+ '' else "";
+
meta = {
homepage = http://www.roaringpenguin.com/products/remind;
description = "Sophisticated calendar and alarm program for the console";
diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix
index 972e1049278..a6891886664 100644
--- a/pkgs/tools/misc/screenfetch/default.nix
+++ b/pkgs/tools/misc/screenfetch/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, fetchgit, makeWrapper
-, coreutils, gawk, procps, gnused, findutils, xdpyinfo, xprop, gnugrep
+{ stdenv, fetchFromGitHub, makeWrapper, coreutils, gawk, procps, gnused
+, findutils, xdpyinfo, xprop, gnugrep, ncurses
}:
stdenv.mkDerivation {
- name = "screenFetch-2016-01-13";
+ name = "screenFetch-2016-10-11";
- src = fetchgit {
- url = git://github.com/KittyKatt/screenFetch.git;
- rev = "22e5bee7647453d45ec82f543f37b8a6a062835d";
- sha256 = "0xdiz02bqg7ajj547j496qq9adysm1f6zymcy3yyfgw3prnzvdir";
+ src = fetchFromGitHub {
+ owner = "KittyKatt";
+ repo = "screenFetch";
+ rev = "89e51f24018c89b3647deb24406a9af3a78bbe99";
+ sha256 = "0i2k261jj2s4sfhav7vbsd362pa0gghw6qhwafhmicmf8hq2a18v";
};
nativeBuildInputs = [ makeWrapper ];
@@ -28,7 +29,8 @@ stdenv.mkDerivation {
--prefix PATH : "${findutils}/bin" \
--prefix PATH : "${xdpyinfo}/bin" \
--prefix PATH : "${xprop}/bin" \
- --prefix PATH : "${gnugrep}/bin"
+ --prefix PATH : "${gnugrep}/bin" \
+ --prefix PATH : "${ncurses}/bin"
'';
meta = {
diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix
index 5a5d8df26ce..7eba2d2f939 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.6";
+ version = "1.7";
src = fetchFromGitHub {
owner = "spaam";
repo = "svtplay-dl";
rev = version;
- sha256 = "12r4yazsxk09sampiz9j1jqgzm3136h5fgbbdaiwg43b0y1sjg3d";
+ sha256 = "15vadnyah51pk4d0lx11bymxhfq47l5ijn72pjqr9yjx3pkgpd7w";
};
pythonPaths = [ pycrypto requests2 ];
diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix
index 998679e15eb..633371606a8 100644
--- a/pkgs/tools/misc/vdirsyncer/default.nix
+++ b/pkgs/tools/misc/vdirsyncer/default.nix
@@ -6,12 +6,12 @@ let
pythonPackages = python3Packages;
in
pythonPackages.buildPythonApplication rec {
- version = "0.13.1";
+ version = "0.14.0";
name = "vdirsyncer-${version}";
src = fetchurl {
url = "mirror://pypi/v/vdirsyncer/${name}.tar.gz";
- sha256 = "1c4kipcc7dx1rn5j1a1x7wckz09mm9ihwakf3ramwn1y78q5zanb";
+ sha256 = "1mbh2gykx9sqsnyfa962ifxksx4afl2lb9rcsbd6rsh3gj2il898";
};
propagatedBuildInputs = with pythonPackages; [
diff --git a/pkgs/tools/misc/venus/default.nix b/pkgs/tools/misc/venus/default.nix
index 6fc4e436153..9f2e4ce8eec 100644
--- a/pkgs/tools/misc/venus/default.nix
+++ b/pkgs/tools/misc/venus/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
doCheck = true;
checkPhase = "python runtests.py";
- buildInputs = [ python python.modules.bsddb libxslt
+ buildInputs = [ python libxslt
libxml2 pythonPackages.genshi pythonPackages.lxml makeWrapper ];
installPhase = ''
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 3f07ed87433..3710eef238f 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.10.07";
+ version = "2016.10.31";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
- sha256 = "56be6107275cbdc867e89caf9d20f351d184fdc4fb06d915945fef708086dbce";
+ sha256 = "b8a0889bf4fed2f54d8ebbc6ea7860feae05b122d1b192417af68159b83f0bb4";
};
buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc;
diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index 19e87d3a88b..eec84e10386 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.27.1";
+ version = "1.28.0";
src = fetchFromGitHub {
owner = "aria2";
repo = "aria2";
rev = "release-${version}";
- sha256 = "003m80gdcqfxi5jjzwiszql5y8lrj7a59gjygy0ya72fa9j4l9mi";
+ sha256 = "196prs98sxwwxiszw2m1kbcra7n7fxf758y5dcj2jkddrr37hdkw";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix
index 08bdb052d63..91472b7c61e 100644
--- a/pkgs/tools/networking/cmst/default.nix
+++ b/pkgs/tools/networking/cmst/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "cmst-${version}";
- version = "2016.04.03";
+ version = "2016.10.03";
src = fetchFromGitHub {
repo = "cmst";
owner = "andrew-bibb";
rev = name;
- sha256 = "1334ynhq1lxcfqln3bq17hy1awyfnn3zhzpsnymlyp0z3h4ydpp9";
+ sha256 = "1pvk1jg0fiw0j4f1wrnhgirgziliwa44sxfdmcq9ans4zbig4izh";
};
nativeBuildInputs = [ makeWrapper qmakeHook ];
@@ -19,16 +19,14 @@ stdenv.mkDerivation rec {
preConfigure = ''
substituteInPlace ./cmst.pro \
- --replace "/usr/bin" "$out/bin" \
- --replace "/usr/share" "$out/usr/share"
+ --replace "/usr/share" "$out/share"
substituteInPlace ./cmst.pri \
--replace "/usr/lib" "$out/lib" \
--replace "/usr/share" "$out/share"
substituteInPlace ./apps/cmstapp/cmstapp.pro \
- --replace "/usr/bin" "$out/bin" \
- --replace "/usr/share" "$out/share"
+ --replace "/usr/bin" "$out/bin"
substituteInPlace ./apps/rootapp/rootapp.pro \
--replace "/etc" "$out/etc" \
diff --git a/pkgs/tools/networking/dnscrypt-wrapper/default.nix b/pkgs/tools/networking/dnscrypt-wrapper/default.nix
index 491bf315757..9e7167989e4 100644
--- a/pkgs/tools/networking/dnscrypt-wrapper/default.nix
+++ b/pkgs/tools/networking/dnscrypt-wrapper/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "dnscrypt-wrapper-${version}";
- version = "0.2.1";
+ version = "0.2.2";
src = fetchFromGitHub {
owner = "Cofyc";
repo = "dnscrypt-wrapper";
rev = "v${version}";
- sha256 = "0gysylchvmxvqd4ims2cf2610vmxl80wlk62jhsv13p94yvrl53b";
+ sha256 = "0ip205safbpkmk1z7qf3hshqlc2q2zwhsm3i705m0y7rxc4200ms";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A tool for adding dnscrypt support to any name resolver";
homepage = https://dnscrypt.org/;
- license = licenses.gpl2;
+ license = licenses.isc;
maintainers = with maintainers; [ tstrobel joachifm ];
platforms = platforms.linux;
};
diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix
index 9ffb9a31183..64bad55d88b 100644
--- a/pkgs/tools/networking/getmail/default.nix
+++ b/pkgs/tools/networking/getmail/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pythonPackages }:
+{ stdenv, fetchurl, python2Packages }:
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
version = "4.51.0";
name = "getmail-${version}";
namePrefix = "";
diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix
index c960528322b..a5c7353905b 100644
--- a/pkgs/tools/networking/httpie/default.nix
+++ b/pkgs/tools/networking/httpie/default.nix
@@ -1,15 +1,15 @@
{ stdenv, fetchurl, pythonPackages }:
pythonPackages.buildPythonApplication rec {
- name = "httpie-0.9.3";
+ name = "httpie-0.9.6";
namePrefix = "";
src = fetchurl {
url = "mirror://pypi/h/httpie/${name}.tar.gz";
- sha256 = "0jvzxr8r6cy6ipknkw95qf8rz69nqdv5nky87h1vcp5pf8mgza1h";
+ sha256 = "1cch5y0hr9qpfn9m4nw5796c2x7v3m1ni4psjm26ajsl8pw90jx6";
};
- propagatedBuildInputs = with pythonPackages; [ pygments requests2 curses ];
+ propagatedBuildInputs = with pythonPackages; [ pygments requests2 ];
doCheck = false;
diff --git a/pkgs/tools/networking/httpstat/default.nix b/pkgs/tools/networking/httpstat/default.nix
index 49f71f44805..5a29657bd5b 100644
--- a/pkgs/tools/networking/httpstat/default.nix
+++ b/pkgs/tools/networking/httpstat/default.nix
@@ -1,26 +1,20 @@
-{ stdenv, fetchFromGitHub, curl, python, pythonPackages, ... }:
+{ stdenv, fetchFromGitHub, curl, pythonPackages, glibcLocales }:
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
name = "${pname}-${version}";
pname = "httpstat";
- version = "1.2.0";
+ version = "1.2.1";
src = fetchFromGitHub {
owner = "reorx";
repo = pname;
rev = "${version}";
- sha256 = "1zfbv3fz3g3wwvsgrcyrk2cp7pjhkpf7lmx57ry9b43c62gcd7yh";
+ sha256 = "1vriibcsq4j1hvm5yigbbmmv21dc40y5c9gvd31dg9qkaz26hml6";
};
- doCheck = false;
- propagatedBuildInputs = [ ];
+ doCheck = false; # No tests
+ buildInputs = [ glibcLocales ];
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
- '';
+ LC_ALL = "en_US.UTF-8";
meta = {
description = "curl statistics made simple";
diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix
new file mode 100644
index 00000000000..ca1846edb04
--- /dev/null
+++ b/pkgs/tools/networking/kea/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchurl, autoreconfHook, pkgconfig, openssl, botan, log4cplus
+, boost, python3, postgresql, mysql, gmp, bzip2 }:
+
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "kea";
+ version = "1.1.0";
+
+ src = fetchurl {
+ url = "https://ftp.isc.org/isc/${pname}/${version}/${name}.tar.gz";
+ sha256 = "0b9w71d7pfgr0asqpffh9h935xpvwabyfdvdzqzna6da9zp7mnf3";
+ };
+
+ patches = [ ./dont-create-var.patch ];
+
+ postPatch = ''
+ substituteInPlace ./src/bin/keactrl/Makefile.am '@sysconfdir@' "$out/etc"
+ substituteInPlace ./src/bin/keactrl/Makefile.am '@(sysconfdir)@' "$out/etc"
+ '';
+
+ configureFlags = [
+ "--localstatedir=/var"
+ "--with-botan-config=${botan}/bin/botan-config-1.10"
+ "--with-dhcp-pgsql=${postgresql}/bin/pg_config"
+ "--with-dhcp-mysql=${mysql.client.dev}/bin/mysql_config"
+ ];
+
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ buildInputs = [
+ openssl log4cplus boost python3 mysql.client
+ botan gmp bzip2
+ ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = https://kea.isc.org/;
+ description = "High-performance, extensible DHCP server by ISC";
+ longDescription = ''
+ KEA is a new open source DHCPv4/DHCPv6 server being developed by
+ Internet Systems Consortium. The objective of this project is to
+ provide a very high-performance, extensible DHCP server engine for
+ use by enterprises and service providers, either as is or with
+ extensions and modifications.
+ '';
+ license = licenses.mpl20;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ fpletz ];
+ };
+}
diff --git a/pkgs/tools/networking/kea/dont-create-var.patch b/pkgs/tools/networking/kea/dont-create-var.patch
new file mode 100644
index 00000000000..595942673c6
--- /dev/null
+++ b/pkgs/tools/networking/kea/dont-create-var.patch
@@ -0,0 +1,28 @@
+diff --git a/Makefile.am b/Makefile.am
+index 897be34..b146729 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -103,11 +103,6 @@ cppcheck:
+ --template '{file}:{line}: check_fail: {message} ({severity},{id})' \
+ src
+
+-# These steps are necessary during installation
+-install-exec-hook:
+- mkdir -p $(DESTDIR)${localstatedir}/log/
+- mkdir -p $(DESTDIR)${localstatedir}/run/${PACKAGE_NAME}
+-
+ EXTRA_DIST = tools/path_replacer.sh
+ EXTRA_DIST += tools/mk_cfgrpt.sh
+
+diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am
+index 066b410..16d3135 100755
+--- a/src/lib/dhcpsrv/Makefile.am
++++ b/src/lib/dhcpsrv/Makefile.am
+@@ -210,7 +210,3 @@ EXTRA_DIST += database_backends.dox libdhcpsrv.dox
+ # Specification file
+ EXTRA_DIST += logging.spec
+
+-install-data-local:
+- $(mkinstalldirs) $(DESTDIR)$(dhcp_data_dir)
+-
+-
diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix
index 23b0d241d17..d7b7fcb2fdc 100644
--- a/pkgs/tools/networking/lftp/default.nix
+++ b/pkgs/tools/networking/lftp/default.nix
@@ -1,28 +1,32 @@
-{ stdenv, fetchurl, gnutls, pkgconfig, readline, zlib, libidn }:
+{ stdenv, fetchurl, gnutls, pkgconfig, readline, zlib, libidn, gmp, libiconv }:
stdenv.mkDerivation rec {
- name = "lftp-4.7.1";
+ name = "lftp-4.7.3";
src = fetchurl {
urls = [
"http://lftp.yar.ru/ftp/${name}.tar.bz2"
"http://lftp.yar.ru/ftp/old/${name}.tar.bz2"
];
- sha256 = "0n4l0n6ra6z5lh6v79hc0r0hhrsq0l6c47ir15vmq80sbgc9mmwv";
+ sha256 = "06jmc9x86ga67yyx7655zv96gfv1gdm955a7g4afd3bwf6bzfxac";
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ gnutls readline zlib libidn ];
+ buildInputs = [ gnutls readline zlib libidn gmp libiconv ];
configureFlags = [
"--with-readline=${readline.dev}"
];
+ postPatch = ''
+ substituteInPlace src/lftp_rl.c --replace 'history.h' 'readline/history.h'
+ '';
+
meta = with stdenv.lib; {
description = "A file transfer program supporting a number of network protocols";
homepage = http://lftp.yar.ru/;
license = licenses.gpl3;
- platforms = platforms.linux;
+ platforms = platforms.unix;
maintainers = [ maintainers.bjornfor ];
};
}
diff --git a/pkgs/tools/networking/nc6/default.nix b/pkgs/tools/networking/nc6/default.nix
deleted file mode 100644
index 9c097929471..00000000000
--- a/pkgs/tools/networking/nc6/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation {
- name = "nc6-1.0";
-
- src = fetchurl {
- urls = [
- ftp://ftp.deepspace6.net/pub/ds6/sources/nc6/nc6-1.0.tar.bz2
- http://fossies.org/linux/privat/nc6-1.0.tar.bz2
- ];
- sha256 = "01l28zv1yal58ilfnz6albdzqqxzsx3a58vmc14r9gv0bahffdgb";
- };
-
- meta = {
- description = "A netcat implementation with IPv6 support";
- homepage = http://www.deepspace6.net/projects/netcat6.html;
- };
-}
diff --git a/pkgs/tools/networking/network-manager/PppdPath.patch b/pkgs/tools/networking/network-manager/PppdPath.patch
new file mode 100644
index 00000000000..98c1308e4db
--- /dev/null
+++ b/pkgs/tools/networking/network-manager/PppdPath.patch
@@ -0,0 +1,13 @@
+diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c
+index 89a7add..ae99eb4 100644
+--- a/src/ppp-manager/nm-ppp-manager.c
++++ b/src/ppp-manager/nm-ppp-manager.c
+@@ -843,7 +843,7 @@ create_pppd_cmd_line (NMPPPManager *self,
+
+ g_return_val_if_fail (setting != NULL, NULL);
+
+- pppd_binary = nm_utils_find_helper ("pppd", NULL, err);
++ pppd_binary = nm_utils_find_helper ("pppd", PPPD_PATH, err);
+ if (!pppd_binary)
+ return NULL;
+
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 608b9ea17fe..d96bc08495f 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -56,6 +56,8 @@ stdenv.mkDerivation rec {
"--with-libsoup=yes"
];
+ patches = [ ./PppdPath.patch ];
+
buildInputs = [ systemd libgudev libnl libuuid polkit ppp libndp
bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup ];
diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix
new file mode 100644
index 00000000000..9e0033cca90
--- /dev/null
+++ b/pkgs/tools/networking/network-manager/strongswan.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, intltool, pkgconfig, networkmanager, procps
+, gnome3, libgnome_keyring, libsecret }:
+
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "NetworkManager-strongswan";
+ version = "1.4.0";
+
+ src = fetchurl {
+ url = "https://download.strongswan.org/NetworkManager/${name}.tar.bz2";
+ sha256 = "0qfnylg949lkyw1nmyggz2ipgmy154ic5q5ljjcwcgi14r90ys02";
+ };
+
+ postPatch = ''
+ sed -i "s,nm_plugindir=.*,nm_plugindir=$out/lib/NetworkManager," "configure"
+ sed -i "s,nm_libexecdir=.*,nm_libexecdir=$out/libexec," "configure"
+ '';
+
+ buildInputs = [ networkmanager libsecret ]
+ ++ (with gnome3; [ gtk libgnome_keyring networkmanagerapplet ]);
+
+ nativeBuildInputs = [ intltool pkgconfig ];
+
+ preConfigure = ''
+ substituteInPlace "configure" \
+ --replace "/sbin/sysctl" "${procps}/bin/sysctl"
+ '';
+
+ meta = {
+ description = "NetworkManager's strongswan plugin";
+ inherit (networkmanager.meta) platforms;
+ };
+}
+
diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index 564eea23184..93541bd0603 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pythonPackages, sqlite3 }:
+{ stdenv, fetchFromGitHub, pythonPackages, }:
pythonPackages.buildPythonApplication rec {
version = "7.0.6";
@@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec {
doCheck = false;
- propagatedBuildInputs = [ sqlite3 pythonPackages.six ];
+ propagatedBuildInputs = [ pythonPackages.six ];
meta = {
description = "Synchronize emails between two repositories, so that you can read the same mailbox from multiple computers";
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index fabcda902be..064f68947b8 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -50,6 +50,7 @@ stdenv.mkDerivation rec {
# See discussion in https://github.com/NixOS/nixpkgs/pull/16966
./dont_create_privsep_path.patch
+ ./fix-CVE-2016-8858.patch
]
++ optional withGssapiPatches gssapiSrc;
@@ -92,7 +93,7 @@ stdenv.mkDerivation rec {
description = "An implementation of the SSH protocol";
license = stdenv.lib.licenses.bsd2;
platforms = platforms.unix;
- maintainers = with maintainers; [ eelco ];
+ maintainers = with maintainers; [ eelco aneeshusa ];
broken = hpnSupport; # probably after 6.7 update
};
}
diff --git a/pkgs/tools/networking/openssh/fix-CVE-2016-8858.patch b/pkgs/tools/networking/openssh/fix-CVE-2016-8858.patch
new file mode 100644
index 00000000000..e526161083c
--- /dev/null
+++ b/pkgs/tools/networking/openssh/fix-CVE-2016-8858.patch
@@ -0,0 +1,11 @@
+diff -u -r1.126 -r1.127
+--- ssh/kex.c 2016/09/28 21:44:52 1.126
++++ ssh/kex.c 2016/10/10 19:28:48 1.127
+@@ -461,6 +461,7 @@
+ if (kex == NULL)
+ return SSH_ERR_INVALID_ARGUMENT;
+
++ ssh_dispatch_set(ssh, SSH2_MSG_KEXINIT, NULL);
+ ptr = sshpkt_ptr(ssh, &dlen);
+ if ((r = sshbuf_put(kex->peer, ptr, dlen)) != 0)
+ return r;
diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
index b01566bed07..6b88d2d2b7d 100644
--- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
+++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
@@ -34,7 +34,7 @@ pythonPackages.buildPythonApplication rec {
# The `backup' command requires `sqlite3'.
propagatedBuildInputs = with pythonPackages; [
- twisted foolscap nevow simplejson zfec pycryptopp sqlite3 darcsver
+ twisted foolscap nevow simplejson zfec pycryptopp darcsver
setuptoolsTrial setuptoolsDarcs pycrypto pyasn1 zope_interface
service-identity
];
diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix
index 0ac8dca770a..46fd9e54950 100644
--- a/pkgs/tools/networking/shadowsocks-libev/default.nix
+++ b/pkgs/tools/networking/shadowsocks-libev/default.nix
@@ -11,12 +11,13 @@
, docbook_xml_dtd_45
, docbook_xsl
, libxslt
+, pcre
}:
let
- version = "2.5.0";
- sha256 = "6841e0efa1c01caef5a827f463ee304dc9e48fb4751cc9256316df5ab4490ae0";
+ version = "2.5.5";
+ sha256 = "46a72367b7301145906185f1e4136e39d6792d27643826e409ab708351b6d0dd";
in
@@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
inherit sha256;
};
- buildInputs = [ zlib asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt ]
+ buildInputs = [ zlib asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt pcre ]
++ optional (!withMbedTLS) openssl
++ optional withMbedTLS mbedtls
++ optionals enableSystemSharedLib [libev libsodium udns];
diff --git a/pkgs/tools/networking/ssldump/default.nix b/pkgs/tools/networking/ssldump/default.nix
new file mode 100644
index 00000000000..dcc78560fa3
--- /dev/null
+++ b/pkgs/tools/networking/ssldump/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, openssl, libpcap }:
+
+stdenv.mkDerivation rec {
+ name = "ssldump";
+ version = "0.9b3";
+
+ src = fetchFromGitHub {
+ owner = "adulau";
+ repo = "ssldump";
+ rev = "4529d03a50d39d3697c3e39a3d6f6c9b29448aa0";
+ sha256 = "0wwsamzxabfxcil5y2g4v2261vdspxlp12wz4xhji8607jbyjwr1";
+ };
+
+ buildInputs = [ libpcap openssl ];
+ prePatch = ''
+ sed -i -e 's|#include.*net/bpf.h|#include |' \
+ base/pcap-snoop.c
+ '';
+ configureFlags = [ "--with-pcap-lib=${libpcap}/lib"
+ "--with-pcap-inc=${libpcap}/include"
+ "--with-openssl-lib=${openssl}/lib"
+ "--with-openssl-inc=${openssl}/include" ];
+ meta = {
+ description = "ssldump is an SSLv3/TLS network protocol analyzer";
+ homepage = http://ssldump.sourceforge.net;
+ license = "BSD-style";
+ maintainers = with stdenv.lib.maintainers; [ aycanirican ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/tools/networking/statsd/node-packages.nix b/pkgs/tools/networking/statsd/node-packages.nix
index 6cf9e8478d7..fd196c249ae 100644
--- a/pkgs/tools/networking/statsd/node-packages.nix
+++ b/pkgs/tools/networking/statsd/node-packages.nix
@@ -8,7 +8,7 @@
version = "1.3.1";
bin = false;
src = fetchurl {
- url = "http://registry.npmjs.org/commander/-/commander-1.3.1.tgz";
+ url = "https://registry.npmjs.org/commander/-/commander-1.3.1.tgz";
name = "commander-1.3.1.tgz";
sha1 = "02443e02db96f4b32b674225451abb6e9510000e";
};
@@ -28,7 +28,7 @@
version = "0.0.7";
bin = false;
src = fetchurl {
- url = "http://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz";
+ url = "https://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz";
name = "connection-parse-0.0.7.tgz";
sha1 = "18e7318aab06a699267372b10c5226d25a1c9a69";
};
@@ -40,16 +40,35 @@
os = [ ];
cpu = [ ];
};
- by-spec."hashring"."1.0.1" =
- self.by-version."hashring"."1.0.1";
- by-version."hashring"."1.0.1" = self.buildNodePackage {
- name = "hashring-1.0.1";
- version = "1.0.1";
+ by-spec."generic-pool"."2.2.0" =
+ self.by-version."generic-pool"."2.2.0";
+ by-version."generic-pool"."2.2.0" = self.buildNodePackage {
+ name = "generic-pool-2.2.0";
+ version = "2.2.0";
bin = false;
src = fetchurl {
- url = "http://registry.npmjs.org/hashring/-/hashring-1.0.1.tgz";
- name = "hashring-1.0.1.tgz";
- sha1 = "b6a7b8c675a0c715ac0d0071786eb241a28d0a7c";
+ url = "https://registry.npmjs.org/generic-pool/-/generic-pool-2.2.0.tgz";
+ name = "generic-pool-2.2.0.tgz";
+ sha1 = "8b465c1a7588ea9dd2bb133bda0bb66bfef8a63e";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."hashring"."3.2.0" =
+ self.by-version."hashring"."3.2.0";
+ by-version."hashring"."3.2.0" = self.buildNodePackage {
+ name = "hashring-3.2.0";
+ version = "3.2.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/hashring/-/hashring-3.2.0.tgz";
+ name = "hashring-3.2.0.tgz";
+ sha1 = "fda4efde8aa22cdb97fb1d2a65e88401e1c144ce";
};
deps = {
"connection-parse-0.0.7" = self.by-version."connection-parse"."0.0.7";
@@ -68,7 +87,7 @@
version = "0.1.0";
bin = false;
src = fetchurl {
- url = "http://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz";
+ url = "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz";
name = "keypress-0.1.0.tgz";
sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a";
};
@@ -80,16 +99,36 @@
os = [ ];
cpu = [ ];
};
- by-spec."node-syslog"."1.1.7" =
- self.by-version."node-syslog"."1.1.7";
- by-version."node-syslog"."1.1.7" = self.buildNodePackage {
- name = "node-syslog-1.1.7";
- version = "1.1.7";
+ by-spec."modern-syslog"."1.1.2" =
+ self.by-version."modern-syslog"."1.1.2";
+ by-version."modern-syslog"."1.1.2" = self.buildNodePackage {
+ name = "modern-syslog-1.1.2";
+ version = "1.1.2";
bin = false;
src = fetchurl {
- url = "http://registry.npmjs.org/node-syslog/-/node-syslog-1.1.7.tgz";
- name = "node-syslog-1.1.7.tgz";
- sha1 = "f2b1dfce095c39f5a6d056659862ca134a08a4cb";
+ url = "https://registry.npmjs.org/modern-syslog/-/modern-syslog-1.1.2.tgz";
+ name = "modern-syslog-1.1.2.tgz";
+ sha1 = "f1fa58899f3f452d788f1573401212a4ef898de5";
+ };
+ deps = {
+ "nan-2.4.0" = self.by-version."nan"."2.4.0";
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ "!win32" ];
+ cpu = [ ];
+ };
+ by-spec."nan"."^2.0.5" =
+ self.by-version."nan"."2.4.0";
+ by-version."nan"."2.4.0" = self.buildNodePackage {
+ name = "nan-2.4.0";
+ version = "2.4.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz";
+ name = "nan-2.4.0.tgz";
+ sha1 = "fb3c59d45fe4effe215f0b890f8adf6eb32d2232";
};
deps = {
};
@@ -106,7 +145,7 @@
version = "2.2.1";
bin = false;
src = fetchurl {
- url = "http://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz";
+ url = "https://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz";
name = "sequence-2.2.1.tgz";
sha1 = "7f5617895d44351c0a047e764467690490a16b03";
};
@@ -125,7 +164,7 @@
version = "0.0.2";
bin = false;
src = fetchurl {
- url = "http://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz";
+ url = "https://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz";
name = "simple-lru-cache-0.0.2.tgz";
sha1 = "d59cc3a193c1a5d0320f84ee732f6e4713e511dd";
};
@@ -144,7 +183,7 @@
version = "0.2.3";
bin = false;
src = fetchurl {
- url = "http://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.3.tgz";
+ url = "https://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.3.tgz";
name = "stackdriver-statsd-backend-0.2.3.tgz";
sha1 = "6ffead71e5655d4d787c39da8d1c9eaaa59c91d7";
};
@@ -158,28 +197,29 @@
};
"stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.2.3";
by-spec."statsd"."*" =
- self.by-version."statsd"."0.7.2";
- by-version."statsd"."0.7.2" = self.buildNodePackage {
- name = "statsd-0.7.2";
- version = "0.7.2";
+ self.by-version."statsd"."0.8.0";
+ by-version."statsd"."0.8.0" = self.buildNodePackage {
+ name = "statsd-0.8.0";
+ version = "0.8.0";
bin = true;
src = fetchurl {
- url = "http://registry.npmjs.org/statsd/-/statsd-0.7.2.tgz";
- name = "statsd-0.7.2.tgz";
- sha1 = "88901c5f30fa51da5fa3520468c94d7992ef576e";
+ url = "https://registry.npmjs.org/statsd/-/statsd-0.8.0.tgz";
+ name = "statsd-0.8.0.tgz";
+ sha1 = "92041479e174a214df7147f2fab1348af0839052";
};
deps = {
+ "generic-pool-2.2.0" = self.by-version."generic-pool"."2.2.0";
};
optionalDependencies = {
- "node-syslog-1.1.7" = self.by-version."node-syslog"."1.1.7";
- "hashring-1.0.1" = self.by-version."hashring"."1.0.1";
+ "modern-syslog-1.1.2" = self.by-version."modern-syslog"."1.1.2";
+ "hashring-3.2.0" = self.by-version."hashring"."3.2.0";
"winser-0.1.6" = self.by-version."winser"."0.1.6";
};
peerDependencies = [];
os = [ ];
cpu = [ ];
};
- "statsd" = self.by-version."statsd"."0.7.2";
+ "statsd" = self.by-version."statsd"."0.8.0";
by-spec."statsd-influxdb-backend"."*" =
self.by-version."statsd-influxdb-backend"."0.6.0";
by-version."statsd-influxdb-backend"."0.6.0" = self.buildNodePackage {
@@ -187,7 +227,7 @@
version = "0.6.0";
bin = false;
src = fetchurl {
- url = "http://registry.npmjs.org/statsd-influxdb-backend/-/statsd-influxdb-backend-0.6.0.tgz";
+ url = "https://registry.npmjs.org/statsd-influxdb-backend/-/statsd-influxdb-backend-0.6.0.tgz";
name = "statsd-influxdb-backend-0.6.0.tgz";
sha1 = "25fb83cf0b3af923dfc7d506eb1208def8790d78";
};
@@ -207,7 +247,7 @@
version = "0.1.7";
bin = false;
src = fetchurl {
- url = "http://registry.npmjs.org/statsd-librato-backend/-/statsd-librato-backend-0.1.7.tgz";
+ url = "https://registry.npmjs.org/statsd-librato-backend/-/statsd-librato-backend-0.1.7.tgz";
name = "statsd-librato-backend-0.1.7.tgz";
sha1 = "270dc406481c0e6a6f4e72957681a73015f478f6";
};
@@ -227,7 +267,7 @@
version = "0.1.6";
bin = true;
src = fetchurl {
- url = "http://registry.npmjs.org/winser/-/winser-0.1.6.tgz";
+ url = "https://registry.npmjs.org/winser/-/winser-0.1.6.tgz";
name = "winser-0.1.6.tgz";
sha1 = "08663dc32878a12bbce162d840da5097b48466c9";
};
diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index 1443c9bfb7d..4362dc57e68 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "unbound-${version}";
- version = "1.5.9";
+ version = "1.5.10";
src = fetchurl {
url = "http://unbound.net/downloads/${name}.tar.gz";
- sha256 = "01328cfac99ab5b8c47115151896a244979e442e284eb962c0ea84b7782b6990";
+ sha256 = "11lli8jgq4n917gcx6nw728g1hqc2lszwlxa5mdb78m2ri7qp6x3";
};
outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Validating, recursive, and caching DNS resolver";
license = licenses.bsd3;
- homepage = http://www.unbound.net;
+ homepage = https://www.unbound.net;
maintainers = with maintainers; [ ehmry fpletz ];
platforms = stdenv.lib.platforms.unix;
};
diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix
index d693b8db953..2613fe7ab09 100644
--- a/pkgs/tools/networking/wicd/default.nix
+++ b/pkgs/tools/networking/wicd/default.nix
@@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
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 ${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 ${pygobject2}):$(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})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-curses.in
rm po/ast.po
'';
diff --git a/pkgs/tools/package-management/koji/default.nix b/pkgs/tools/package-management/koji/default.nix
index 28a1f3d00b7..7d2022ee91b 100644
--- a/pkgs/tools/package-management/koji/default.nix
+++ b/pkgs/tools/package-management/koji/default.nix
@@ -1,6 +1,8 @@
-{ stdenv, fetchurl, pythonPackages, python }:
+{ stdenv, fetchurl, python2 }:
-stdenv.mkDerivation rec {
+let
+ pythonEnv = python2.withPackages(ps : [ps.pycurl]);
+in stdenv.mkDerivation rec {
name = "koji-1.8";
src = fetchurl {
@@ -8,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "10dph209h4jgajb5jmbjhqy4z4hd22i7s2d93vm3ikdf01i8iwf1";
};
- propagatedBuildInputs = [ pythonPackages.pycurl python ];
+ propagatedBuildInputs = [ pythonEnv ];
makeFlags = "DESTDIR=$(out)";
diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix
index 7948ebc43fb..9c4c2600fb4 100644
--- a/pkgs/tools/package-management/nixops/generic.nix
+++ b/pkgs/tools/package-management/nixops/generic.nix
@@ -1,9 +1,9 @@
-{ lib, pythonPackages, fetchurl, libxslt, docbook5_xsl, openssh
+{ lib, python2Packages, fetchurl, libxslt, docbook5_xsl, openssh
# version args
, src, version
}:
-pythonPackages.buildPythonApplication {
+python2Packages.buildPythonApplication {
name = "nixops-${version}";
namePrefix = "";
@@ -11,18 +11,17 @@ pythonPackages.buildPythonApplication {
buildInputs = [ libxslt ];
- pythonPath =
- [ pythonPackages.prettytable
- pythonPackages.boto
- pythonPackages.sqlite3
- pythonPackages.hetzner
- pythonPackages.libcloud
- pythonPackages.azure-storage
- pythonPackages.azure-mgmt-compute
- pythonPackages.azure-mgmt-network
- pythonPackages.azure-mgmt-resource
- pythonPackages.azure-mgmt-storage
- pythonPackages.adal
+ pythonPath = with python2Packages;
+ [ prettytable
+ boto
+ hetzner
+ libcloud
+ azure-storage
+ azure-mgmt-compute
+ azure-mgmt-network
+ azure-mgmt-resource
+ azure-mgmt-storage
+ adal
];
doCheck = false;
diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix
index 582b5ceae11..4981d8fa062 100644
--- a/pkgs/tools/security/ecryptfs/default.nix
+++ b/pkgs/tools/security/ecryptfs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, perl, utillinux, keyutils, nss, nspr, python, pam
+{ stdenv, fetchurl, pkgconfig, perl, utillinux, keyutils, nss, nspr, python2, pam
, intltool, makeWrapper, coreutils, bash, gettext, cryptsetup, lvm2, rsync, which, lsof }:
stdenv.mkDerivation rec {
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
done
'';
- buildInputs = [ pkgconfig perl nss nspr python pam intltool makeWrapper ];
+ buildInputs = [ pkgconfig perl nss nspr python2 pam intltool makeWrapper ];
propagatedBuildInputs = [ coreutils gettext cryptsetup lvm2 rsync keyutils which ];
postInstall = ''
diff --git a/pkgs/tools/security/ecryptfs/helper.nix b/pkgs/tools/security/ecryptfs/helper.nix
index 40e6771251a..0d4b37a8efc 100644
--- a/pkgs/tools/security/ecryptfs/helper.nix
+++ b/pkgs/tools/security/ecryptfs/helper.nix
@@ -1,7 +1,7 @@
{ stdenv
, fetchurl
, makeWrapper
-, python
+, python2
}:
stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin $out/libexec
cp $src $out/libexec/ecryptfs-helper.py
- makeWrapper "${python.interpreter} $out/libexec/ecryptfs-helper.py" $out/bin/ecryptfs-helper
+ makeWrapper "${python2.interpreter} $out/libexec/ecryptfs-helper.py" $out/bin/ecryptfs-helper
'';
meta = with stdenv.lib; {
diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix
index 70dfb9e82c6..695bfcce3a5 100644
--- a/pkgs/tools/security/fail2ban/default.nix
+++ b/pkgs/tools/security/fail2ban/default.nix
@@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication {
sha256 = "1m8gqj35kwrn30rqwd488sgakaisz22xa5v9llvz6gwf4f7ps0a9";
};
- propagatedBuildInputs = [ python.modules.sqlite3 gamin ]
+ propagatedBuildInputs = [ gamin ]
++ (stdenv.lib.optional stdenv.isLinux pythonPackages.systemd);
preConfigure = ''
diff --git a/pkgs/tools/security/fpm2/default.nix b/pkgs/tools/security/fpm2/default.nix
new file mode 100644
index 00000000000..8bb3cba15c4
--- /dev/null
+++ b/pkgs/tools/security/fpm2/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, gnupg, gtk2
+, libxml2, intltool
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+ name = "fpm2-${version}";
+ version = "0.79";
+
+ src = fetchurl {
+ url = "http://als.regnet.cz/fpm2/download/fpm2-${version}.tar.bz2";
+ sha256 = "d55e9ce6be38a44fc1053d82db2d117cf3991a51898bd86d7913bae769f04da7";
+ };
+
+ buildInputs = [ pkgconfig gnupg gtk2 libxml2 intltool ];
+
+ meta = {
+ description = "FPM2 is GTK2 port from Figaro's Password Manager originally developed by John Conneely, with some new enhancements.";
+ homepage = http://als.regnet.cz/fpm2/;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ hce ];
+ };
+}
diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix
index 8441fbbb761..871ba1d8b85 100644
--- a/pkgs/tools/security/gencfsm/default.nix
+++ b/pkgs/tools/security/gencfsm/default.nix
@@ -1,5 +1,7 @@
{ stdenv, fetchurl, autoconf, automake, intltool, libtool, pkgconfig, encfs
-, glib , gnome3, gtk3, libgnome_keyring, vala_0_23, wrapGAppsHook, xorg }:
+, glib , gnome3, gtk3, libgnome_keyring, vala_0_23, wrapGAppsHook, xorg
+, libgee_0_6
+}:
stdenv.mkDerivation rec {
version = "1.8.16";
@@ -11,7 +13,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ autoconf automake intltool libtool pkgconfig vala_0_23 glib encfs
- gtk3 libgnome_keyring gnome3.libgee_1 xorg.libSM xorg.libICE
+ gtk3 libgnome_keyring libgee_0_6 xorg.libSM xorg.libICE
wrapGAppsHook ];
patches = [ ./makefile-mkdir.patch ];
@@ -30,5 +32,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.spacefrogg ];
+ broken = true;
};
}
diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix
index 932bf508c2f..fd79419d82a 100644
--- a/pkgs/tools/security/gnupg/20.nix
+++ b/pkgs/tools/security/gnupg/20.nix
@@ -3,13 +3,13 @@
# Each of the dependencies below are optional.
# Gnupg can be built without them at the cost of reduced functionality.
-, pinentry ? null, x11Support ? true
+, pinentry ? null, guiSupport ? true
, openldap ? null, bzip2 ? null, libusb ? null, curl ? null
}:
with stdenv.lib;
-assert x11Support -> pinentry != null;
+assert guiSupport -> pinentry != null;
stdenv.mkDerivation rec {
name = "gnupg-2.0.30";
@@ -35,7 +35,8 @@ stdenv.mkDerivation rec {
patch gl/stdint_.h < ${./clang.patch}
'';
- configureFlags = optional x11Support "--with-pinentry-pgm=${pinentry}/bin/pinentry";
+ pinentryBinaryPath = pinentry.binaryPath or "bin/pinentry";
+ configureFlags = optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}";
postConfigure = "substituteAllInPlace tools/gpgkey2ssh.c";
diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix
index 34042d802cc..b7a71332e77 100644
--- a/pkgs/tools/security/gnupg/21.nix
+++ b/pkgs/tools/security/gnupg/21.nix
@@ -3,14 +3,14 @@
# Each of the dependencies below are optional.
# Gnupg can be built without them at the cost of reduced functionality.
-, pinentry ? null, x11Support ? true
+, pinentry ? null, guiSupport ? true
, adns ? null, gnutls ? null, libusb ? null, openldap ? null
, readline ? null, zlib ? null, bzip2 ? null
}:
with stdenv.lib;
-assert x11Support -> pinentry != null;
+assert guiSupport -> pinentry != null;
stdenv.mkDerivation rec {
name = "gnupg-${version}";
@@ -27,11 +27,13 @@ stdenv.mkDerivation rec {
readline libusb gnutls adns openldap zlib bzip2
];
+ patches = [ ./fix-libusb-include-path.patch ];
postPatch = stdenv.lib.optionalString stdenv.isLinux ''
sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c
''; #" fix Emacs syntax highlighting :-(
- configureFlags = optional x11Support "--with-pinentry-pgm=${pinentry}/bin/pinentry";
+ pinentryBinaryPath = pinentry.binaryPath or "bin/pinentry";
+ configureFlags = optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}";
meta = with stdenv.lib; {
homepage = http://gnupg.org;
diff --git a/pkgs/tools/security/gnupg/fix-libusb-include-path.patch b/pkgs/tools/security/gnupg/fix-libusb-include-path.patch
new file mode 100644
index 00000000000..18c4f110738
--- /dev/null
+++ b/pkgs/tools/security/gnupg/fix-libusb-include-path.patch
@@ -0,0 +1,11 @@
+--- a/configure
++++ b/configure
+@@ -8872,7 +8872,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking libusb include dir" >&5
+ $as_echo_n "checking libusb include dir... " >&6; }
+ usb_incdir_found="no"
+- for _incdir in "" "/usr/include/libusb-1.0" "/usr/local/include/libusb-1.0"; do
++ for _incdir in "$($PKG_CONFIG --variable=includedir libusb-1.0)/libusb-1.0"; do
+ _libusb_save_cppflags=$CPPFLAGS
+ if test -n "${_incdir}"; then
+ CPPFLAGS="-I${_incdir} ${CPPFLAGS}"
diff --git a/pkgs/tools/security/knockknock/default.nix b/pkgs/tools/security/knockknock/default.nix
index 5ff93ae6a03..ce7663b18cf 100644
--- a/pkgs/tools/security/knockknock/default.nix
+++ b/pkgs/tools/security/knockknock/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, pythonPackages, hping }:
+{ stdenv, fetchFromGitHub, python2Packages, hping }:
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
rev = "bf14bbff";
name = "knockknock-r${rev}";
@@ -11,7 +11,10 @@ pythonPackages.buildPythonApplication rec {
sha256 = "1chpfs3w2vkjrgay69pbdr116z1jldv53fi768a1i05fdqhy1px4";
};
- propagatedBuildInputs = [ pythonPackages.pycrypto ];
+ propagatedBuildInputs = [ python2Packages.pycrypto ];
+
+ # No tests
+ doCheck = false;
patchPhase = ''
sed -i '/build\//d' setup.py
diff --git a/pkgs/tools/security/mpw/default.nix b/pkgs/tools/security/mpw/default.nix
index 813c7e5c06c..e30866021da 100644
--- a/pkgs/tools/security/mpw/default.nix
+++ b/pkgs/tools/security/mpw/default.nix
@@ -1,37 +1,41 @@
-{ stdenv, fetchurl, autoconf, automake, openssl, libxml2 }:
+{ stdenv, fetchzip, autoconf, automake, openssl, libxml2, fetchFromGitHub, ncurses }:
let
- scrypt_src = fetchurl {
- url = "http://masterpasswordapp.com/libscrypt-b12b554.tar.gz";
- sha256 = "02vz4i66v1acd15xjgki4ilmmp28m6a5603gi4hf8id3d3ndl9n7";
+ scrypt_src = fetchzip {
+ url = "http://www.tarsnap.com/scrypt/scrypt-1.2.0.tgz";
+ sha256 = "0ahylib2pimlhjcm566kpim6n16jci5v749xwdkr9ivgfjrv3xn4";
};
in stdenv.mkDerivation {
- name = "mpw-2.1-cli4";
+ name = "mpw-2.1-6834f36";
- srcs = [
- (fetchurl {
- url = "https://ssl.masterpasswordapp.com/mpw-2.1-cli4-0-gf6b2287.tar.gz";
- sha256 = "141bzb3nj18rbnbpdvsri8cdwwwxz4d6akyhfa834542xf96b9vf";
- })
- scrypt_src
- ];
-
- sourceRoot = ".";
+ src = fetchFromGitHub {
+ owner = "Lyndir";
+ repo = "MasterPassword";
+ rev = "6834f3689f5dfd4e59ad6959961d349c224977ee";
+ sha256 = "0zlpx3hb1y2l60hg961h05lb9yf3xb5phnyycvazah2674gkwb2p";
+ };
postUnpack = ''
- cp -R libscrypt-b12b554/* lib/scrypt
+ sourceRoot+=/MasterPassword/C
'';
prePatch = ''
patchShebangs .
+ mkdir lib/scrypt/src
+ cp -R --no-preserve=ownership ${scrypt_src}/* lib/scrypt/src
+ chmod +w -R lib/scrypt/src
+ substituteInPlace lib/scrypt/src/libcperciva/cpusupport/Build/cpusupport.sh \
+ --replace dirname "$(type -P dirname)"
+ substituteInPlace lib/scrypt/src/Makefile.in --replace "command -p mv" "mv"
'';
NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2";
- buildInputs = [ autoconf automake openssl libxml2 ];
+ buildInputs = [ autoconf automake openssl libxml2 ncurses ];
buildPhase = ''
+ substituteInPlace build --replace '"curses"' '"ncurses"'
targets="mpw mpw-tests" ./build
'';
diff --git a/pkgs/tools/security/nitrokey-app/FixInstallDestination.patch b/pkgs/tools/security/nitrokey-app/FixInstallDestination.patch
new file mode 100644
index 00000000000..74e466069d9
--- /dev/null
+++ b/pkgs/tools/security/nitrokey-app/FixInstallDestination.patch
@@ -0,0 +1,57 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -251,23 +251,23 @@
+ # ${CMAKE_SOURCE_DIR}/data/icons/48x48
+ # ${CMAKE_SOURCE_DIR}/data/icons/128x128
+ ${CMAKE_SOURCE_DIR}/data/icons/
+- DESTINATION usr/share/icons/
++ DESTINATION share/icons/
+ )
+
+ install(FILES
+ ${CMAKE_SOURCE_DIR}/data/nitrokey-app.desktop
+- DESTINATION usr/share/applications
++ DESTINATION share/applications
+ )
+
+ install(FILES
+ ${CMAKE_SOURCE_DIR}/data/icons/hicolor/128x128/apps/nitrokey-app.png
+- DESTINATION usr/share/pixmaps
++ DESTINATION share/pixmaps
+ )
+
+ # Install Nitrokey udev rules
+ install(FILES
+ ${CMAKE_SOURCE_DIR}/data/40-nitrokey.rules
+- DESTINATION usr/lib/udev/rules.d
++ DESTINATION lib/udev/rules.d
+ )
+
+ # Install autocompletion scripts
+@@ -278,7 +278,7 @@
+
+ install(FILES
+ ${CMAKE_SOURCE_DIR}/po/de_DE/nitrokey-app.mo
+- DESTINATION usr/share/locale/de_DE/LC_MESSAGES
++ DESTINATION share/locale/de_DE/LC_MESSAGES
+ )
+
+ install(FILES
+@@ -286,7 +286,7 @@
+ ${CMAKE_SOURCE_DIR}/images/quit.png
+ ${CMAKE_SOURCE_DIR}/images/safe_zahlenkreis.png
+ ${CMAKE_SOURCE_DIR}/images/settings.png
+- DESTINATION usr/share/nitrokey
++ DESTINATION share/nitrokey
+ )
+
+ ENDIF () # NOT WIN32
+@@ -299,7 +299,7 @@
+ ${resources_ouput}
+ )
+
+-INSTALL(TARGETS nitrokey-app DESTINATION usr/bin)
++INSTALL(TARGETS nitrokey-app DESTINATION bin)
+
+ TARGET_LINK_LIBRARIES(nitrokey-app
+ ${QT_LIBRARIES}
diff --git a/pkgs/tools/security/nitrokey-app/HeaderPath.patch b/pkgs/tools/security/nitrokey-app/HeaderPath.patch
new file mode 100644
index 00000000000..695b7559116
--- /dev/null
+++ b/pkgs/tools/security/nitrokey-app/HeaderPath.patch
@@ -0,0 +1,13 @@
+diff --git a/src/utils/hid_libusb.c b/src/utils/hid_libusb.c
+index bd8c14e..537292d 100644
+--- a/src/utils/hid_libusb.c
++++ b/src/utils/hid_libusb.c
+@@ -44,7 +44,7 @@
+ #include
+
+ /* GNU / LibUSB */
+-#include "libusb.h"
++#include "libusb-1.0/libusb.h"
+ #include "iconv.h"
+
+ #include "hidapi.h"
diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix
new file mode 100644
index 00000000000..91d5e75272b
--- /dev/null
+++ b/pkgs/tools/security/nitrokey-app/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, cmake, fetchFromGitHub, libusb1, pkgconfig, qt5 }:
+
+stdenv.mkDerivation rec {
+ name = "nitrokey-app";
+ version = "0.5.1";
+
+ src = fetchFromGitHub {
+ owner = "Nitrokey";
+ repo = "nitrokey-app";
+ rev = "v${version}";
+ sha256 = "0acb2502r3wa0mry6h8sz1k16zaa4bgnhxwxqd1vd1y42xc6g9bw";
+ };
+
+ buildInputs = [
+ cmake
+ libusb1
+ pkgconfig
+ qt5.qtbase
+ ];
+ patches = [
+ ./FixInstallDestination.patch
+ ./HeaderPath.patch
+ ];
+ cmakeFlags = "-DHAVE_LIBAPPINDICATOR=NO";
+ meta = {
+ description = "Provides extra functionality for the Nitrokey Pro and Storage";
+ longDescription = ''
+ The nitrokey-app provides a QT system tray widget with wich you can
+ access the extra functionality of a Nitrokey Storage or Nitrokey Pro.
+ See https://www.nitrokey.com/ for more information.
+ '';
+ homepage = https://github.com/Nitrokey/nitrokey-app;
+ repositories.git = https://github.com/Nitrokey/nitrokey-app.git;
+ license = stdenv.lib.licenses.gpl3;
+ maintainer = stdenv.lib.maintainers.kaiha;
+ };
+}
diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix
index 847faa2479e..9413f992086 100644
--- a/pkgs/tools/security/nmap/default.nix
+++ b/pkgs/tools/security/nmap/default.nix
@@ -22,11 +22,11 @@ let
in stdenv.mkDerivation rec {
name = "nmap${optionalString graphicalSupport "-graphical"}-${version}";
- version = "7.12";
+ version = "7.31";
src = fetchurl {
- url = "http://nmap.org/dist/nmap-${version}.tar.bz2";
- sha256 = "014vagh9ak10hidwzp9s6g30y5h5fhsh8wykcnc1hnn9hwm0ipv3";
+ url = "https://nmap.org/dist/nmap-${version}.tar.bz2";
+ sha256 = "0hiqb28950kn4bjsmw0ksfyss7j2qdmgrj3xsjf7073pq01lx7yb";
};
patches = ./zenmap.patch;
diff --git a/pkgs/tools/security/pinentry-mac/default.nix b/pkgs/tools/security/pinentry-mac/default.nix
index faf8c613ea8..7116d1777d6 100644
--- a/pkgs/tools/security/pinentry-mac/default.nix
+++ b/pkgs/tools/security/pinentry-mac/default.nix
@@ -17,6 +17,10 @@ stdenv.mkDerivation rec {
mv build/Release/pinentry-mac.app $out/Applications
'';
+ passthru = {
+ binaryPath = "Applications/pinentry-mac.app/Contents/MacOS/pinentry-mac";
+ };
+
meta = {
description = "Pinentry for GPG on Mac";
license = stdenv.lib.licenses.gpl2Plus;
diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index b31d60247d8..b430fd8aad0 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.18";
+ name = "sudo-1.8.18p1";
src = fetchurl {
urls =
[ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz"
"ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz"
];
- sha256 = "04xywg2f9x2kfw81abdf8gsraldaz5v0w0x2zi8aqlgsjygfj6c5";
+ sha256 = "0d4l6y03khmzdd8vhfnq8lrb8gcxplzf7gav0a9sd08jf8f4g875";
};
configureFlags = [
diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index 0e69729a226..8fbf35caf1d 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.8";
+ name = "tor-0.2.8.9";
src = fetchurl {
url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz";
- sha256 = "1pp3h0a1cl25fv04b3j6wp8aw1sfpbd2lmag397dpp2k2b305bxi";
+ sha256 = "3f5c273bb887be4aff11f4d99b9e2e52d293b81ff4f6302b730161ff16dc5316";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/security/tor/tor-arm.nix b/pkgs/tools/security/tor/tor-arm.nix
index 1857cfcbe22..432b1cbfcee 100644
--- a/pkgs/tools/security/tor/tor-arm.nix
+++ b/pkgs/tools/security/tor/tor-arm.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
cp -R src/TorCtl $out/libexec
wrapProgram $out/bin/arm \
- --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pythonPackages.curses}):$out/libexec:$PYTHONPATH" \
+ --prefix PYTHONPATH : "$(toPythonPath $out):$out/libexec:$PYTHONPATH" \
--set TERMINFO "${ncurses.out}/share/terminfo" \
--set TERM "xterm"
'';
diff --git a/pkgs/tools/text/a2ps/default.nix b/pkgs/tools/text/a2ps/default.nix
index e38de5e6bd8..2535354aa22 100644
--- a/pkgs/tools/text/a2ps/default.nix
+++ b/pkgs/tools/text/a2ps/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, libpaper, gperf, file, perl }:
+{ stdenv, fetchurl, fetchpatch, autoconf, bison, libpaper, gperf, file, perl }:
stdenv.mkDerivation rec {
name = "a2ps-4.14";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
substituteInPlace tests/defs.in --replace "/bin/rm" "rm"
'';
- nativeBuildInputs = [ file perl ];
+ nativeBuildInputs = [ autoconf file bison perl ];
buildInputs = [ libpaper gperf ];
meta = with stdenv.lib; {
diff --git a/pkgs/tools/text/grin/default.nix b/pkgs/tools/text/grin/default.nix
index 149af7baa2d..7c1df7f8819 100644
--- a/pkgs/tools/text/grin/default.nix
+++ b/pkgs/tools/text/grin/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pythonPackages }:
+{ stdenv, fetchurl, python2Packages }:
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
name = "grin-1.2.1";
namePrefix = "";
@@ -9,8 +9,8 @@ pythonPackages.buildPythonApplication rec {
sha256 = "1swzwb17wibam8jszdv98h557hlx44pg6psv6rjz7i33qlxk0fdz";
};
- buildInputs = with pythonPackages; [ nose ];
- propagatedBuildInputs = with pythonPackages; [ argparse ];
+ buildInputs = with python2Packages; [ nose ];
+ propagatedBuildInputs = with python2Packages; [ argparse ];
meta = {
homepage = https://pypi.python.org/pypi/grin;
diff --git a/pkgs/tools/text/ruby-zoom/Gemfile b/pkgs/tools/text/ruby-zoom/Gemfile
new file mode 100644
index 00000000000..4bb5d8c175d
--- /dev/null
+++ b/pkgs/tools/text/ruby-zoom/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'ruby-zoom'
diff --git a/pkgs/tools/text/ruby-zoom/Gemfile.lock b/pkgs/tools/text/ruby-zoom/Gemfile.lock
new file mode 100644
index 00000000000..29d5fe1da5b
--- /dev/null
+++ b/pkgs/tools/text/ruby-zoom/Gemfile.lock
@@ -0,0 +1,25 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+ djinni (2.0.1)
+ fagin (~> 0.1, >= 0.1.2)
+ ruby-terminfo (~> 0.1, >= 0.1.1)
+ fagin (0.1.2)
+ hilighter (0.1.7)
+ json_config (0.1.2)
+ ruby-terminfo (0.1.1)
+ ruby-zoom (4.1.0)
+ djinni (~> 2.0, >= 2.0.1)
+ hilighter (~> 0.1, >= 0.1.3)
+ json_config (~> 0.1, >= 0.1.2)
+ scoobydoo (~> 0.1, >= 0.1.4)
+ scoobydoo (0.1.4)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ ruby-zoom
+
+BUNDLED WITH
+ 1.13.1
diff --git a/pkgs/tools/text/ruby-zoom/default.nix b/pkgs/tools/text/ruby-zoom/default.nix
new file mode 100644
index 00000000000..eb3968a0db9
--- /dev/null
+++ b/pkgs/tools/text/ruby-zoom/default.nix
@@ -0,0 +1,18 @@
+{ lib, bundlerEnv, ruby, stdenv }:
+
+bundlerEnv {
+ pname = "ruby-zoom";
+
+ inherit ruby;
+ gemfile = ./Gemfile;
+ lockfile = ./Gemfile.lock;
+ gemset = ./gemset.nix;
+
+ meta = with lib; {
+ description = "Quickly open CLI search results in your favorite editor!";
+ homepage = https://gitlab.com/mjwhitta/zoom;
+ license = with licenses; gpl3;
+ maintainers = with stdenv.lib.maintainers; [ vmandela ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/tools/text/ruby-zoom/gemset.nix b/pkgs/tools/text/ruby-zoom/gemset.nix
new file mode 100644
index 00000000000..7d3836a3c33
--- /dev/null
+++ b/pkgs/tools/text/ruby-zoom/gemset.nix
@@ -0,0 +1,58 @@
+{
+ djinni = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0wl4q4qs1nyla5n2b2ys6n3i35gvli8xb8mxz2xv0ik306cikqm6";
+ type = "gem";
+ };
+ version = "2.0.1";
+ };
+ fagin = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "17d419vkfr26gdbad97fg2ikskhn82vs3bnxlzd27w6lwyf13qxk";
+ type = "gem";
+ };
+ version = "0.1.2";
+ };
+ hilighter = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1a9a9clgd6kx63a82msjzi6abznfqivsgmds7qaqwb1dsl1nznbh";
+ type = "gem";
+ };
+ version = "0.1.7";
+ };
+ json_config = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "16q3q0j9s8w93lzxa7rrvh5wqk11np7s2nmgmdlrh8gl3w76xcz6";
+ type = "gem";
+ };
+ version = "0.1.2";
+ };
+ ruby-terminfo = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0rl4ic5pzvrpgd42z0c1s2n3j39c9znksblxxvmhkzrc0ckyg2cm";
+ type = "gem";
+ };
+ version = "0.1.1";
+ };
+ ruby-zoom = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "132pk0zp3rayvvbccfs5ksigg9zpflp9734b4r0jz5aimmv2qpvp";
+ type = "gem";
+ };
+ version = "4.1.0";
+ };
+ scoobydoo = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1w83zgip3qvh20pgqgcp9yp0k35ypn7ny0d61xcv1ik0r3ab8ga0";
+ type = "gem";
+ };
+ version = "0.1.4";
+ };
+}
\ No newline at end of file
diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix
index fcd7d350f30..2f12020afc3 100644
--- a/pkgs/tools/text/silver-searcher/default.nix
+++ b/pkgs/tools/text/silver-searcher/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "silver-searcher-${version}";
- version = "0.32.0";
+ version = "0.33.0";
src = fetchFromGitHub {
owner = "ggreer";
repo = "the_silver_searcher";
rev = "${version}";
- sha256 = "0mz0i41fb6yrvn5x99bwaa66wqv5c8s5wd9pbnn90mgppxbn1037";
+ sha256 = "19705cgn8h476hkfyal3s5kx9mnz64hiz6dihnrx22fa3xvjfzlg";
};
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock
index fc0abf038a9..0212db3816a 100644
--- a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock
+++ b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock
@@ -4,33 +4,33 @@ GEM
Ascii85 (1.0.2)
addressable (2.4.0)
afm (0.2.2)
- asciidoctor (1.5.4)
+ asciidoctor (1.5.5)
asciidoctor-bespoke (1.0.0.alpha.1)
asciidoctor (>= 1.5.0)
slim (~> 3.0.6)
thread_safe (~> 0.3.5)
- asciidoctor-diagram (1.4.0)
+ asciidoctor-diagram (1.5.2)
asciidoctor (~> 1.5.0)
- asciidoctor-latex (1.5.0.8.dev)
+ asciidoctor-latex (1.5.0.17.dev)
asciidoctor (~> 1.5, >= 1.5.2)
htmlentities (~> 4.3)
opal (~> 0.6.3)
- asciidoctor-pdf (1.5.0.alpha.11)
- asciidoctor (~> 1.5.0)
+ asciidoctor-pdf (1.5.0.alpha.13)
+ asciidoctor (>= 1.5.0)
prawn (>= 1.3.0, < 3.0.0)
- prawn-icon (= 1.0.0)
- prawn-svg (= 0.21.0)
+ prawn-icon (= 1.2.0)
+ prawn-svg (>= 0.21.0, < 0.26.0)
prawn-table (= 0.2.2)
prawn-templates (= 0.0.3)
safe_yaml (~> 1.0.4)
thread_safe (~> 0.3.5)
treetop (= 1.5.3)
concurrent-ruby (1.0.2)
- css_parser (1.4.1)
+ css_parser (1.4.6)
addressable
hashery (2.1.2)
htmlentities (4.3.4)
- json (1.8.3)
+ json (2.0.2)
opal (0.6.3)
source_map
sprockets
@@ -45,30 +45,30 @@ GEM
prawn (2.1.0)
pdf-core (~> 0.6.1)
ttfunk (~> 1.4.0)
- prawn-icon (1.0.0)
+ prawn-icon (1.2.0)
prawn (>= 1.1.0, < 3.0.0)
- prawn-svg (0.21.0)
+ prawn-svg (0.25.2)
css_parser (~> 1.3)
- prawn (>= 0.8.4, < 3)
+ prawn (>= 0.11.1, < 3)
prawn-table (0.2.2)
prawn (>= 1.3.0, < 3.0.0)
prawn-templates (0.0.3)
pdf-reader (~> 1.3)
prawn (>= 0.15.0)
- rack (1.6.4)
+ rack (2.0.1)
ruby-rc4 (0.1.5)
safe_yaml (1.0.4)
- slim (3.0.6)
- temple (~> 0.7.3)
+ slim (3.0.7)
+ temple (~> 0.7.6)
tilt (>= 1.3.3, < 2.1)
source_map (3.0.1)
json
- sprockets (3.6.0)
+ sprockets (3.7.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
- temple (0.7.6)
+ temple (0.7.7)
thread_safe (0.3.5)
- tilt (2.0.2)
+ tilt (2.0.5)
treetop (1.5.3)
polyglot (~> 0.3)
ttfunk (1.4.0)
@@ -84,4 +84,4 @@ DEPENDENCIES
asciidoctor-pdf
BUNDLED WITH
- 1.11.2
+ 1.13.6
diff --git a/pkgs/tools/typesetting/asciidoctor/gemset.nix b/pkgs/tools/typesetting/asciidoctor/gemset.nix
index 0c67be72e8a..4c26c6a434a 100644
--- a/pkgs/tools/typesetting/asciidoctor/gemset.nix
+++ b/pkgs/tools/typesetting/asciidoctor/gemset.nix
@@ -26,10 +26,10 @@
asciidoctor = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0xrli1fjsf1f0h6d9g55vzivxbqac2ygawcacx5ijnqn522wg9qc";
+ sha256 = "0kj2lls8f83nlhfkdkmbf7k5q9c9kk1cc15b1a4dy6arx4yzmvw7";
type = "gem";
};
- version = "1.5.4";
+ version = "1.5.5";
};
asciidoctor-bespoke = {
source = {
@@ -42,26 +42,26 @@
asciidoctor-diagram = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0yb2gqzzbvgf5im0bhv26s3h09m9m6a0pjlq3swqcvwi1szc64k5";
+ sha256 = "1di271v0ic6d5xkqbbwg6scjyj1ypklgy211gdmhf18xzpka3fvi";
type = "gem";
};
- version = "1.4.0";
+ version = "1.5.2";
};
asciidoctor-latex = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0wdrhcxz0sz9kx2zxn3qbqm5p664n9gzvv3lmg3214pj3si5wxnn";
+ sha256 = "02qvn1ngp4s9y22vk23zzssd4w1bpyk84akjwiq6nqn8im6s4awz";
type = "gem";
};
- version = "1.5.0.8.dev";
+ version = "1.5.0.17.dev";
};
asciidoctor-pdf = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "06jsbn1yiavg6r07k93rmjxj6ah8csqla5mpymqjzslrkgjg5brs";
+ sha256 = "0lp1q1yxy4y9k3znxxgj6pl0cbymz0yk5hsif73sg2bnpk62id9i";
type = "gem";
};
- version = "1.5.0.alpha.11";
+ version = "1.5.0.alpha.13";
};
concurrent-ruby = {
source = {
@@ -74,10 +74,10 @@
css_parser = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ql5q4n39278prbdjdsxx9wkxkxblgzzn0qcdqnwibgd1dkvb5av";
+ sha256 = "0zsldn0ihmzl7nqk4lww9h8ijv1zb3l8g92y7b4w0da2d6cnyjw8";
type = "gem";
};
- version = "1.4.1";
+ version = "1.4.6";
};
hashery = {
source = {
@@ -98,10 +98,10 @@
json = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc";
+ sha256 = "1lhinj9vj7mw59jqid0bjn2hlfcnq02bnvsx9iv81nl2han603s0";
type = "gem";
};
- version = "1.8.3";
+ version = "2.0.2";
};
opal = {
source = {
@@ -146,18 +146,18 @@
prawn-icon = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07dcsvxg52zdywhg28p6zsbj7ybz3xzbklawc1n7jwym2mli3916";
+ sha256 = "101npavqvv5w44vgphlkqn3gdawxmsnd4j8bk6lzbxz7niqgaqny";
type = "gem";
};
- version = "1.0.0";
+ version = "1.2.0";
};
prawn-svg = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1p5fsamh33xqp2gld0j4ii80awsxmm4ffp5pq13m0s1gavzaapc3";
+ sha256 = "19zc7i6jxycs9m00frvv9g3x98sgzsyb1xf1xnn3h1ki574ibnip";
type = "gem";
};
- version = "0.21.0";
+ version = "0.25.2";
};
prawn-table = {
source = {
@@ -178,10 +178,10 @@
rack = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5";
+ sha256 = "053bqbrxr5gjw5k3rrmh6i35s83kgdycxv292lid072vpwrq1xv1";
type = "gem";
};
- version = "1.6.4";
+ version = "2.0.1";
};
ruby-rc4 = {
source = {
@@ -202,10 +202,10 @@
slim = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1szs71hh0msm5gj6qbcxw44m3hqnwybx4yh02scwixnwg576058k";
+ sha256 = "122hmc2kn3g151m8c41imadw29mghnsjwyzj8wav5zb1q69y4iqp";
type = "gem";
};
- version = "3.0.6";
+ version = "3.0.7";
};
source_map = {
source = {
@@ -218,18 +218,18 @@
sprockets = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "16fnlp4fqzrdxlbalbx3r0bir7dwyr1asg7s9lsmmczngl0x7fw7";
+ sha256 = "0jzsfiladswnzbrwqfiaj1xip68y58rwx0lpmj907vvq47k87gj1";
type = "gem";
};
- version = "3.6.0";
+ version = "3.7.0";
};
temple = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ysraljv7lkb04z5vdyrkijab7j1jzj1mgz4bj82744dp7d0rhb0";
+ sha256 = "0xlf1if32xj14mkfwh8nxy3zzjzd9lipni0v2bghknp2kfc1hcz6";
type = "gem";
};
- version = "0.7.6";
+ version = "0.7.7";
};
thread_safe = {
source = {
@@ -242,10 +242,10 @@
tilt = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0lkd40xfdqkp333vdfhrfjmi2y7k2hjs4azawfb62mrkfp7ivj84";
+ sha256 = "0lgk8bfx24959yq1cn55php3321wddw947mgj07bxfnwyipy9hqf";
type = "gem";
};
- version = "2.0.2";
+ version = "2.0.5";
};
treetop = {
source = {
diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix
index ce65a587ddf..7ffccde2c03 100644
--- a/pkgs/tools/typesetting/tex/dblatex/default.nix
+++ b/pkgs/tools/typesetting/tex/dblatex/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, libxslt, texlive
+{ stdenv, fetchurl, python2, libxslt, texlive
, enableAllFeatures ? false, imagemagick ? null, transfig ? null, inkscape ? null, fontconfig ? null, ghostscript ? null
, tex ? texlive.combine { # satisfy all packages that ./configure mentions
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
sha256 = "0bkjgrn03dy5c7438s429wnv6z5ynxkr4pbhp2z49kynskgkzkjr";
};
- buildInputs = [ python libxslt tex ]
+ buildInputs = [ python2 libxslt tex ]
++ stdenv.lib.optionals enableAllFeatures [ imagemagick transfig ];
# TODO: dblatex tries to execute texindy command, but nixpkgs doesn't have
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
dontBuild = true;
installPhase = ''
- python ./setup.py install --prefix="$out" --use-python-path --verbose
+ ${python2.interpreter} ./setup.py install --prefix="$out" --use-python-path --verbose
'';
passthru = { inherit tex; };
diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index fe3c0b71b9b..d41dbcfef0d 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl
, texlive
-, zlib, bzip2, ncurses, libpng, flex, bison, libX11, libICE, xproto
+, zlib, bzip2, ncurses, libiconv, libpng, flex, bison, libX11, libICE, xproto
, freetype, t1lib, gd, libXaw, icu, ghostscript, ed, libXt, libXpm, libXmu, libXext
, xextproto, perl, libSM, ruby, expat, curl, libjpeg, python, fontconfig, pkgconfig
, poppler, libpaper, graphite2, zziplib, harfbuzz, texinfo, potrace, gmp, mpfr
@@ -296,7 +296,7 @@ xindy = stdenv.mkDerivation {
pkgconfig perl
(texlive.combine { inherit (texlive) scheme-basic cyrillic ec; })
];
- buildInputs = [ clisp ];
+ buildInputs = [ clisp libiconv ];
configureFlags = [ "--with-clisp-runtime=system" "--disable-xindy-docs" ];
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 14c3e513d6c..c328f74729e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -29,7 +29,6 @@ doNotDisplayTwice rec {
btrfsProgs = btrfs-progs; # added 2016-01-03
bundler_HEAD = bundler; # added 2015-11-15
checkbashism = checkbashisms; # added 2016-08-16
- cheetahTemplate = pythonPackages.cheetah; # 2015-06-15
cifs_utils = cifs-utils; # added 2016-08
clangAnalyzer = clang-analyzer; # added 2015-02-20
clawsMail = claws-mail; # added 2016-04-29
@@ -51,6 +50,7 @@ doNotDisplayTwice rec {
fuse_zip = fuse-zip; # added 2016-04-27
gettextWithExpat = gettext; # 2016-02-19
git-hub = gitAndTools.git-hub; # added 2016-04-29
+ googleAuthenticator = google-authenticator; # added 2016-10-16
grantlee5 = qt5.grantlee; # added 2015-12-19
gupnptools = gupnp-tools; # added 2015-12-19
gnustep-make = gnustep.make; # added 2016-7-6
@@ -59,6 +59,7 @@ doNotDisplayTwice rec {
inotifyTools = inotify-tools;
joseki = apache-jena-fuseki; # added 2016-02-28
jquery_ui = jquery-ui; # added 2014-09-07
+ keepassx2-http = keepassx-reboot; # added 2016-10-17
keybase-go = keybase; # added 2016-08-24
letsencrypt = certbot; # added 2016-05-16
libdbusmenu_qt5 = qt5.libdbusmenu; # added 2015-12-19
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 589d077f0f4..547895a340c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6,7 +6,6 @@
* Hint: ### starts category names.
*/
{ system, bootStdenv, noSysDirs, config, crossSystem, platform, lib
-, pkgsWithOverrides
, ... }:
self: pkgs:
@@ -35,19 +34,6 @@ in
newScope = extra: lib.callPackageWith (defaultScope // extra);
- # Easily override this package set.
- # Warning: this function is very expensive and must not be used
- # from within the nixpkgs repository.
- #
- # Example:
- # pkgs.overridePackages (self: super: {
- # foo = super.foo.override { ... };
- # }
- #
- # The result is `pkgs' where all the derivations depending on `foo'
- # will use the new version.
- overridePackages = f: pkgsWithOverrides f;
-
# Override system. This is useful to build i686 packages on x86_64-linux.
forceSystem = system: kernel: (import ../..) {
inherit system;
@@ -264,6 +250,8 @@ in
fetchNuGet = callPackage ../build-support/fetchnuget { };
buildDotnetPackage = callPackage ../build-support/build-dotnet-package { };
+ fetchgx = callPackage ../build-support/fetchgx { };
+
resolveMirrorURLs = {url}: fetchurl {
showURLs = true;
inherit url;
@@ -395,6 +383,10 @@ in
albert = qt5.callPackage ../applications/misc/albert {};
+ amazon-glacier-cmd-interface = callPackage ../tools/backup/amazon-glacier-cmd-interface { };
+
+ ammonite-repl = callPackage ../development/tools/ammonite {};
+
amtterm = callPackage ../tools/system/amtterm {};
analog = callPackage ../tools/admin/analog {};
@@ -562,7 +554,7 @@ in
qt4Support = config.avahi.qt4Support or false;
};
- avro-cpp = callPackage ../development/libraries/avro-c++ { };
+ avro-cpp = callPackage ../development/libraries/avro-c++ { boost = boost160; };
aws = callPackage ../tools/virtualization/aws { };
@@ -606,6 +598,8 @@ in
bibutils = callPackage ../tools/misc/bibutils { };
+ bibtex2html = callPackage ../tools/misc/bibtex2html { };
+
bindfs = callPackage ../tools/filesystems/bindfs { };
bins = callPackage ../tools/graphics/bins { };
@@ -646,6 +640,7 @@ in
brltty = callPackage ../tools/misc/brltty {
alsaSupport = (!stdenv.isDarwin);
+ systemdSupport = stdenv.isLinux;
};
bro = callPackage ../applications/networking/ids/bro { };
@@ -770,8 +765,12 @@ in
ddate = callPackage ../tools/misc/ddate { };
+ dehydrated = callPackage ../tools/admin/dehydrated { };
+
deis = callPackage ../development/tools/deis {};
+ deisctl = callPackage ../development/tools/deisctl {};
+
diagrams-builder = callPackage ../tools/graphics/diagrams-builder {
inherit (haskellPackages) ghcWithPackages diagrams-builder;
};
@@ -1474,7 +1473,7 @@ in
ecryptfs = callPackage ../tools/security/ecryptfs { };
- ecryptfs-helper = callPackage ../tools/security/ecryptfs/helper.nix { python = python2; };
+ ecryptfs-helper = callPackage ../tools/security/ecryptfs/helper.nix { };
editres = callPackage ../tools/graphics/editres { };
@@ -1848,8 +1847,12 @@ in
gnupg1orig = callPackage ../tools/security/gnupg/1.nix { };
gnupg1compat = callPackage ../tools/security/gnupg/1compat.nix { };
gnupg1 = gnupg1compat; # use config.packageOverrides if you prefer original gnupg1
- gnupg20 = callPackage ../tools/security/gnupg/20.nix { };
- gnupg21 = callPackage ../tools/security/gnupg/21.nix { };
+ gnupg20 = callPackage ../tools/security/gnupg/20.nix {
+ pinentry = if stdenv.isDarwin then pinentry_mac else pinentry;
+ };
+ gnupg21 = callPackage ../tools/security/gnupg/21.nix {
+ pinentry = if stdenv.isDarwin then pinentry_mac else pinentry;
+ };
gnupg = gnupg21;
gnuplot = callPackage ../tools/graphics/gnuplot { qt = qt4; };
@@ -1876,7 +1879,7 @@ in
# rename to upower-notify?
go-upower-notify = callPackage ../tools/misc/upower-notify { };
- googleAuthenticator = callPackage ../os-specific/linux/google-authenticator { };
+ google-authenticator = callPackage ../os-specific/linux/google-authenticator { };
google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { };
@@ -2071,6 +2074,8 @@ in
inherit gfortran;
});
+ hecate = callPackage ../applications/editors/hecate { };
+
heimdall = callPackage ../tools/misc/heimdall { };
hevea = callPackage ../tools/typesetting/hevea { };
@@ -2156,8 +2161,8 @@ in
ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix {
inherit (haskellPackages) ihaskell ghcWithPackages;
- ipython = pythonFull.buildEnv.override {
- extraLibs = with pythonPackages; [ ipython ipykernel jupyter_client notebook ];
+ ipython = python3.buildEnv.override {
+ extraLibs = with python3Packages; [ ipython ipykernel jupyter_client notebook ];
};
packages = config.ihaskell.packages or (self: []);
@@ -2262,6 +2267,8 @@ in
k2pdfopt = callPackage ../applications/misc/k2pdfopt { };
+ kargo = callPackage ../tools/misc/kargo { };
+
kazam = callPackage ../applications/video/kazam { };
kalibrate-rtl = callPackage ../tools/misc/kalibrate-rtl { };
@@ -2298,6 +2305,8 @@ in
kronometer = qt5.callPackage ../tools/misc/kronometer { };
+ peruse = qt5.callPackage ../tools/misc/peruse { };
+
kst = qt5.callPackage ../tools/graphics/kst { gsl = gsl_1; };
kytea = callPackage ../tools/text/kytea { };
@@ -2318,8 +2327,12 @@ in
ffmpeg = ffmpeg_2;
};
+ lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { };
+
lnav = callPackage ../tools/misc/lnav { };
+ loc = callPackage ../development/misc/loc { };
+
lockfileProgs = callPackage ../tools/misc/lockfile-progs { };
logstash = callPackage ../tools/misc/logstash { };
@@ -2410,11 +2423,6 @@ in
ninka = callPackage ../development/tools/misc/ninka { };
- nodejs-0_10 = callPackage ../development/web/nodejs/v0_10.nix {
- libtool = darwin.cctools;
- inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices Carbon Foundation;
- };
-
nodejs-4_x = callPackage ../development/web/nodejs/v4.nix {
libtool = darwin.cctools;
};
@@ -2423,10 +2431,7 @@ in
libtool = darwin.cctools;
};
- nodejs = if stdenv.system == "armv5tel-linux" then
- nodejs-0_10
- else
- nodejs-4_x;
+ nodejs = nodejs-4_x;
nodePackages_6_x = callPackage ../development/node-packages/default-v6.nix {
nodejs = pkgs.nodejs-6_x;
@@ -2436,20 +2441,15 @@ in
nodejs = pkgs.nodejs-4_x;
};
- nodePackages_0_10 = callPackage ../development/node-packages/default-v0_10.nix {
- nodejs = pkgs.nodejs-0_10;
- };
-
- nodePackages = if stdenv.system == "armv5tel-linux" then
- nodePackages_0_10
- else
- nodePackages_4_x;
+ nodePackages = nodePackages_4_x;
# Can be used as a user shell
nologin = shadow;
npm2nix = nodePackages.npm2nix;
+ kea = callPackage ../tools/networking/kea { };
+
kindlegen = callPackage ../tools/typesetting/kindlegen { };
ldapvi = callPackage ../tools/misc/ldapvi { };
@@ -2793,8 +2793,6 @@ in
nco = callPackage ../development/libraries/nco { };
- nc6 = callPackage ../tools/networking/nc6 { };
-
ncftp = callPackage ../tools/networking/ncftp { };
ncompress = callPackage ../tools/compression/ncompress { };
@@ -2832,6 +2830,8 @@ in
networkmanager_openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { };
+ networkmanager_strongswan = callPackage ../tools/networking/network-manager/strongswan.nix { };
+
networkmanagerapplet = newScope gnome2 ../tools/networking/network-manager-applet { };
newsbeuter = callPackage ../applications/networking/feedreaders/newsbeuter { };
@@ -2948,9 +2948,7 @@ in
odt2txt = callPackage ../tools/text/odt2txt { };
- offlineimap = callPackage ../tools/networking/offlineimap {
- inherit (pythonPackages) sqlite3;
- };
+ offlineimap = callPackage ../tools/networking/offlineimap { };
oh-my-zsh = callPackage ../shells/oh-my-zsh { };
@@ -2977,11 +2975,7 @@ in
openobex = callPackage ../tools/bluetooth/openobex { };
- openopc = callPackage ../tools/misc/openopc {
- pythonFull = python27.buildEnv.override {
- extraLibs = [ python27Packages.pyro3 ];
- };
- };
+ openopc = callPackage ../tools/misc/openopc { };
openresolv = callPackage ../tools/networking/openresolv { };
@@ -3336,7 +3330,7 @@ in
qalculate-gtk = callPackage ../applications/science/math/qalculate-gtk { };
- qastools = callPackage ../tools/audio/qastools { };
+ qastools = qt5.callPackage ../tools/audio/qastools { };
qesteidutil = qt5.callPackage ../tools/security/qesteidutil { } ;
qdigidoc = qt5.callPackage ../tools/security/qdigidoc { } ;
@@ -3676,6 +3670,8 @@ in
sshuttle = callPackage ../tools/security/sshuttle { };
+ ssldump = callPackage ../tools/networking/ssldump { };
+
sstp = callPackage ../tools/networking/sstp {};
sudo = callPackage ../tools/security/sudo { };
@@ -4004,16 +4000,15 @@ in
SDL = SDL_sixel;
};
- openconnect = openconnect_openssl;
+ openconnect = openconnect_gnutls;
openconnect_openssl = callPackage ../tools/networking/openconnect.nix {
gnutls = null;
};
- openconnect_gnutls = lowPrio (openconnect.override {
+ openconnect_gnutls = callPackage ../tools/networking/openconnect.nix {
openssl = null;
- gnutls = gnutls;
- });
+ };
vtun = callPackage ../tools/networking/vtun { };
@@ -4393,9 +4388,7 @@ in
es = callPackage ../shells/es { };
- fish = callPackage ../shells/fish {
- python = python27Full;
- };
+ fish = callPackage ../shells/fish { };
fish-foreign-env = callPackage ../shells/fish-foreign-env { };
@@ -4500,7 +4493,7 @@ in
#Use this instead of stdenv to build with clang
clangStdenv = if stdenv.isDarwin then stdenv else lowPrio llvmPackages.stdenv;
- libcxxStdenv = stdenvAdapters.overrideCC stdenv (clangWrapSelf llvmPackages.clang-unwrapped);
+ libcxxStdenv = lowPrio llvmPackages.libcxxStdenv;
clean = callPackage ../development/compilers/clean { };
@@ -4779,16 +4772,19 @@ in
version = "4.7-2013q3-20130916";
releaseType = "update";
sha256 = "1bd9bi9q80xn2rpy0rn1vvj70rh15kb7dmah0qs4q2rv78fqj40d";
+ ncurses = pkgsi686Linux.ncurses5;
};
gcc-arm-embedded-4_8 = callPackage_i686 ../development/compilers/gcc-arm-embedded {
version = "4.8-2014q1-20140314";
releaseType = "update";
sha256 = "ce92859550819d4a3d1a6e2672ea64882b30afa2c08cf67fa8e1d93788c2c577";
+ ncurses = pkgsi686Linux.ncurses5;
};
gcc-arm-embedded-4_9 = callPackage_i686 ../development/compilers/gcc-arm-embedded {
version = "4.9-2015q1-20150306";
releaseType = "update";
sha256 = "c5e0025b065750bbd76b5357b4fc8606d88afbac9ff55b8a82927b4b96178154";
+ ncurses = pkgsi686Linux.ncurses5;
};
gcc-arm-embedded-5 = pkgs.callPackage_i686 ../development/compilers/gcc-arm-embedded {
dirName = "5.0";
@@ -4796,6 +4792,7 @@ in
version = "5.4-2016q2-20160622";
releaseType = "update";
sha256 = "1r0rqbnw7rf94f5bsa3gi8bick4xb7qnp1dkvdjfbvqjvysvc44r";
+ ncurses = pkgsi686Linux.ncurses5;
};
gcc-arm-embedded = gcc-arm-embedded-5;
@@ -4840,6 +4837,8 @@ in
dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {});
+ glslang = callPackage ../development/compilers/glslang { };
+
go_bootstrap = callPackage ../development/compilers/go/1.4.nix {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -5086,7 +5085,7 @@ in
inherit (ocamlPackages) ocaml-top;
opa = callPackage ../development/compilers/opa {
- nodejs = nodejs-0_10;
+ nodejs = nodejs-4_x;
};
inherit (ocaml-ng.ocamlPackages_4_01_0) opam_1_0_0;
@@ -5097,7 +5096,9 @@ in
stdenv = overrideCC stdenv gcc49;
};
- ponyc = callPackage ../development/compilers/ponyc { };
+ ponyc = callPackage ../development/compilers/ponyc {
+ llvm = llvm_39;
+ };
pony-stable = callPackage ../development/compilers/ponyc/pony-stable.nix { };
@@ -5223,7 +5224,9 @@ in
inherit libc extraBuildCommands;
};
- wrapCC = wrapCCWith (callPackage ../build-support/cc-wrapper) stdenv.cc.libc "";
+ ccWrapperFun = callPackage ../build-support/cc-wrapper;
+
+ wrapCC = wrapCCWith ccWrapperFun stdenv.cc.libc "";
# legacy version, used for gnat bootstrapping
wrapGCC-old = baseGCC: callPackage ../build-support/gcc-wrapper-old {
nativeTools = stdenv.cc.nativeTools or false;
@@ -5497,17 +5500,26 @@ in
};
purePackages = recurseIntoAttrs (callPackage ./pure-packages.nix {});
+ # Python interpreters. All standard library modules are included except for tkinter, which is
+ # available as `pythonPackages.tkinter` and can be used as any other Python package.
python = python2;
python2 = python27;
python3 = python35;
+ # Python interpreter that is build with all modules, including tkinter.
+ # These are for compatibility and should not be used inside Nixpkgs.
+ pythonFull = python.override{x11Support=true;};
+ python2Full = python2.override{x11Support=true;};
+ python3Full = python3.override{x11Support=true;};
+ python27Full = python2Full;
+
# pythonPackages further below, but assigned here because they need to be in sync
pythonPackages = python2Packages;
python2Packages = python27Packages;
python3Packages = python35Packages;
python26 = callPackage ../development/interpreters/python/cpython/2.6 {
- db = db47;
+ db = db4;
self = python26;
};
python27 = callPackage ../development/interpreters/python/cpython/2.7 {
@@ -5516,6 +5528,7 @@ in
};
python33 = callPackage ../development/interpreters/python/cpython/3.3 {
self = python33;
+ inherit (darwin) CF configd;
};
python34 = hiPrio (callPackage ../development/interpreters/python/cpython/3.4 {
inherit (darwin) CF configd;
@@ -5534,17 +5547,7 @@ in
pypy27 = callPackage ../development/interpreters/python/pypy/2.7 {
self = pypy27;
- };
-
- pythonFull = python2Full;
- python2Full = python27Full;
- python26Full = python26.override {
- includeModules = true;
- self = python26Full;
- };
- python27Full = python27.override {
- includeModules = true;
- self = python27Full;
+ python = python27.override{x11Support=true;};
};
python2nix = callPackage ../tools/package-management/python2nix { };
@@ -5706,9 +5709,9 @@ in
augeas = callPackage ../tools/system/augeas { };
- ansible = pythonPackages.ansible;
+ ansible = python2Packages.ansible;
- ansible2 = pythonPackages.ansible2;
+ ansible2 = python2Packages.ansible2;
antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { };
@@ -5729,6 +5732,8 @@ in
astyle = callPackage ../development/tools/misc/astyle { };
+ awf = callPackage ../development/tools/misc/awf { };
+
electron = callPackage ../development/tools/electron { };
autobuild = callPackage ../development/tools/misc/autobuild { };
@@ -5796,9 +5801,15 @@ in
wxGTK = wxGTK30;
};
- 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 = callPackage ../development/tools/build-managers/buildbot {
+ pythonPackages = python2Packages;
+ };
+ buildbot-worker = callPackage ../development/tools/build-managers/buildbot/worker.nix {
+ pythonPackages = python2Packages;
+ };
+ buildbot-plugins = callPackage ../development/tools/build-managers/buildbot/plugins.nix {
+ pythonPackages = python2Packages;
+ };
buildbot-ui = self.buildbot.override {
plugins = with self.buildbot-plugins; [ www ];
};
@@ -6041,7 +6052,6 @@ in
gnum4 = callPackage ../development/tools/misc/gnum4 { };
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 = gnumake382;
gnumake40 = callPackage ../development/tools/build-managers/gnumake/4.0 { };
@@ -6284,6 +6294,8 @@ in
redo = callPackage ../development/tools/build-managers/redo { };
+ reno = callPackage ../development/tools/reno { };
+
re2c = callPackage ../development/tools/parsing/re2c { };
remake = callPackage ../development/tools/build-managers/remake { };
@@ -6341,6 +6353,8 @@ in
spin = callPackage ../development/tools/analysis/spin { };
+ spirv-tools = callPackage ../development/tools/spirv-tools { };
+
splint = callPackage ../development/tools/analysis/splint {
flex = flex_2_5_35;
};
@@ -6486,11 +6500,14 @@ in
aprutil = callPackage ../development/libraries/apr-util {
bdbSupport = true;
- db = if stdenv.isFreeBSD then db47 else db;
+ db = if stdenv.isFreeBSD then db4 else db;
# XXX: only the db_185 interface was available through
# apr with db58 on freebsd (nov 2015), for unknown reasons
};
+ arb = callPackage ../development/libraries/arb {};
+ arb-git = callPackage ../development/libraries/arb/git.nix {};
+
armadillo = callPackage ../development/libraries/armadillo {};
assimp = callPackage ../development/libraries/assimp { };
@@ -6571,6 +6588,8 @@ in
ndn-cxx = callPackage ../development/libraries/ndn-cxx { };
+ cddlib = callPackage ../development/libraries/cddlib {};
+
cdk = callPackage ../development/libraries/cdk {};
cimg = callPackage ../development/libraries/cimg { };
@@ -6695,9 +6714,6 @@ in
# bsd-like license
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 = db53;
db53 = callPackage ../development/libraries/db/db-5.3.nix { };
@@ -6744,6 +6760,8 @@ in
dxflib = callPackage ../development/libraries/dxflib {};
+ eclib = callPackage ../development/libraries/eclib {};
+
eigen = callPackage ../development/libraries/eigen {};
eigen2 = callPackage ../development/libraries/eigen/2.0.nix {};
@@ -6789,6 +6807,9 @@ in
fcgi = callPackage ../development/libraries/fcgi { };
+ fflas-ffpack = callPackage ../development/libraries/fflas-ffpack {};
+ fflas-ffpack_1 = callPackage ../development/libraries/fflas-ffpack/1.nix {};
+
ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
@@ -6846,6 +6867,8 @@ in
flann = callPackage ../development/libraries/flann { };
+ flint = callPackage ../development/libraries/flint { };
+
flite = callPackage ../development/libraries/flite { };
fltk13 = callPackage ../development/libraries/fltk { };
@@ -6855,6 +6878,9 @@ in
fmod42416 = callPackage ../development/libraries/fmod/4.24.16.nix { };
+ fplll = callPackage ../development/libraries/fplll {};
+ fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix {};
+
freeimage = callPackage ../development/libraries/freeimage { };
freetts = callPackage ../development/libraries/freetts { };
@@ -6940,6 +6966,8 @@ in
gettext = callPackage ../development/libraries/gettext { };
+ gf2x = callPackage ../development/libraries/gf2x {};
+
gd = callPackage ../development/libraries/gd {
libtiff = null;
libXpm = null;
@@ -6957,6 +6985,10 @@ in
gio-sharp = callPackage ../development/libraries/gio-sharp { };
+ givaro = callPackage ../development/libraries/givaro {};
+ givaro_3 = callPackage ../development/libraries/givaro/3.nix {};
+ givaro_3_7 = callPackage ../development/libraries/givaro/3.7.nix {};
+
icon-lang = callPackage ../development/interpreters/icon-lang { };
libgit2 = callPackage ../development/libraries/git2 (
@@ -7040,10 +7072,16 @@ in
#GMP ex-satellite, so better keep it near gmp
mpfr = callPackage ../development/libraries/mpfr/default.nix { };
+
+ mpfi = callPackage ../development/libraries/mpfi { };
+
+ # A GMP fork
+ mpir = callPackage ../development/libraries/mpir {};
gobjectIntrospection = callPackage ../development/libraries/gobject-introspection {
nixStoreDir = config.nix.storeDir or builtins.storeDir;
inherit (darwin) cctools;
+ python = python2;
};
goocanvas = callPackage ../development/libraries/goocanvas { };
@@ -7155,7 +7193,8 @@ in
gtkmathview = callPackage ../development/libraries/gtkmathview { };
- glib = callPackage ../development/libraries/glib { };
+ glib = callPackage ../development/libraries/glib {
+ };
glib-tested = glib.override { # checked version separate to break cycles
doCheck = true;
libffi = libffi.override { doCheck = true; };
@@ -7229,7 +7268,7 @@ in
gts = callPackage ../development/libraries/gts { };
gvfs = callPackage ../development/libraries/gvfs {
- gnome = self.gnome2;
+ gnome = self.gnome3;
};
gwenhywfar = callPackage ../development/libraries/aqbanking/gwenhywfar.nix { };
@@ -7267,6 +7306,8 @@ in
inherit (perlPackages) IOStringy;
};
+ hound = callPackage ../development/tools/misc/hound { };
+
hspell = callPackage ../development/libraries/hspell { };
hspellDicts = callPackage ../development/libraries/hspell/dicts.nix { };
@@ -7277,7 +7318,7 @@ in
htmlcxx = callPackage ../development/libraries/htmlcxx { };
- http-parser = callPackage ../development/libraries/http-parser { inherit (pythonPackages) gyp; };
+ http-parser = callPackage ../development/libraries/http-parser { };
hunspell = callPackage ../development/libraries/hunspell { };
@@ -7312,6 +7353,8 @@ in
imv = callPackage ../applications/graphics/imv/default.nix { };
+ iml = callPackage ../development/libraries/iml { };
+
imlib2 = callPackage ../development/libraries/imlib2 { };
imlibsetroot = callPackage ../applications/graphics/imlibsetroot { libXinerama = xorg.libXinerama; } ;
@@ -7658,6 +7701,8 @@ in
libgadu = callPackage ../development/libraries/libgadu { };
+ libgap = callPackage ../development/libraries/libgap { };
+
libgdata = gnome3.libgdata;
libgee_0_6 = callPackage ../development/libraries/libgee/0.6.nix { };
@@ -7764,6 +7809,8 @@ in
inherit (perlPackages) libintlperl GetoptLong SysVirt;
};
+ libgumbo = callPackage ../development/libraries/libgumbo { };
+
libhangul = callPackage ../development/libraries/libhangul { };
libharu = callPackage ../development/libraries/libharu { };
@@ -7882,10 +7929,18 @@ in
(if crossSystem.libc == "glibc" then libcCross
else if crossSystem.libc == "libSystem" then darwin.libiconv
else libiconvReal)
- else if stdenv.isGlibc then stdenv.cc.libc
+ else if stdenv.isGlibc then glibcIconv stdenv.cc.libc
else if stdenv.isDarwin then darwin.libiconv
else libiconvReal;
+ glibcIconv = libc: let
+ inherit (builtins.parseDrvName libc.name) name version;
+ libcDev = lib.getDev libc;
+ in runCommand "${name}-iconv-${version}" {} ''
+ mkdir -p $out/include
+ ln -sv ${libcDev}/include/iconv.h $out/include
+ '';
+
libiconvReal = callPackage ../development/libraries/libiconv {
fetchurl = fetchurlBoot;
};
@@ -8278,7 +8333,8 @@ in
libxmi = callPackage ../development/libraries/libxmi { };
- libxml2 = callPackage ../development/libraries/libxml2 { };
+ libxml2 = callPackage ../development/libraries/libxml2 {
+ };
libxml2Python = pkgs.buildEnv { # slightly hacky
name = "libxml2+py-${self.libxml2.version}";
paths = with libxml2; [ dev bin py ];
@@ -8748,6 +8804,8 @@ in
protobufc1_1 = callPackage ../development/libraries/protobufc/1.1.nix { };
protobufc1_0 = callPackage ../development/libraries/protobufc/1.0.nix { };
+ flatbuffers = callPackage ../development/libraries/flatbuffers { };
+
pth = callPackage ../development/libraries/pth { };
ptlib = callPackage ../development/libraries/ptlib {};
@@ -8776,7 +8834,7 @@ in
qt48 = callPackage ../development/libraries/qt-4.x/4.8 {
# GNOME dependencies are not used unless gtkStyle == true
mesa = mesa_noglu;
- inherit (pkgs.gnome) libgnomeui GConf gnome_vfs;
+ inherit (pkgs.gnome2) libgnomeui GConf gnome_vfs;
cups = if stdenv.isLinux then cups else null;
# XXX: mariadb doesn't built on fbsd as of nov 2015
@@ -8833,6 +8891,8 @@ in
grantlee = callPackage ../development/libraries/grantlee/5.x.nix { };
+ kirigami = callPackage ../development/libraries/kirigami { };
+
libcommuni = callPackage ../development/libraries/libcommuni { };
libdbusmenu = callPackage ../development/libraries/libdbusmenu-qt/qt-5.5.nix { };
@@ -9159,6 +9219,8 @@ in
t1lib = callPackage ../development/libraries/t1lib { };
+ tachyon = callPackage ../development/libraries/tachyon {};
+
taglib = callPackage ../development/libraries/taglib { };
taglib_1_9 = callPackage ../development/libraries/taglib/1.9.nix { };
@@ -9325,9 +9387,7 @@ in
vid-stab = callPackage ../development/libraries/vid-stab { };
- vigra = callPackage ../development/libraries/vigra {
- inherit (pkgs.pythonPackages) numpy;
- };
+ vigra = callPackage ../development/libraries/vigra { };
vlock = callPackage ../misc/screensavers/vlock { };
@@ -9345,6 +9405,8 @@ in
CoreText IOSurface ImageIO OpenGL GLUT;
};
+ vulkan-loader = callPackage ../development/libraries/vulkan-loader { };
+
vtkWithQt4 = vtk.override { qtLib = qt4; };
vxl = callPackage ../development/libraries/vxl {
@@ -9876,10 +9938,6 @@ in
dictDBCollector = callPackage ../servers/dict/dictd-db-collector.nix {};
- dictdWiktionary = callPackage ../servers/dict/dictd-wiktionary.nix {};
-
- dictdWordnet = callPackage ../servers/dict/dictd-wordnet.nix {};
-
diod = callPackage ../servers/diod { lua = lua5_1; };
#dnschain = callPackage ../servers/dnschain { };
@@ -9940,7 +9998,7 @@ in
grafana = callPackage ../servers/monitoring/grafana { };
- groovebasin = callPackage ../applications/audio/groovebasin { nodejs = nodejs-0_10; };
+ groovebasin = callPackage ../applications/audio/groovebasin { nodejs = nodejs-4_x; };
haka = callPackage ../tools/security/haka { };
@@ -10107,9 +10165,7 @@ in
riak = callPackage ../servers/nosql/riak/2.1.1.nix { };
- influxdb = callPackage ../servers/nosql/influxdb/v0.nix { };
-
- influxdb10 = callPackage ../servers/nosql/influxdb/v1.nix { };
+ influxdb = callPackage ../servers/nosql/influxdb { };
mysql55 = callPackage ../servers/sql/mysql/5.5.x.nix {
inherit (darwin) cctools;
@@ -10161,6 +10217,8 @@ in
cbfstool = callPackage ../applications/virtualization/cbfstool { };
+ vmfs-tools = callPackage ../tools/filesystems/vmfs-tools { };
+
pgpool92 = pgpool.override { postgresql = postgresql92; };
pgpool93 = pgpool.override { postgresql = postgresql93; };
pgpool94 = pgpool.override { postgresql = postgresql94; };
@@ -10288,6 +10346,8 @@ in
seyren = callPackage ../servers/monitoring/seyren { };
+ ruby-zoom = callPackage ../tools/text/ruby-zoom { };
+
sensu = callPackage ../servers/monitoring/sensu {
ruby = ruby_2_1;
};
@@ -10334,6 +10394,8 @@ in
selfoss = callPackage ../servers/web-apps/selfoss { };
+ shaarli = callPackage ../servers/web-apps/shaarli { };
+
axis2 = callPackage ../servers/http/tomcat/axis2 { };
unifi = callPackage ../servers/unifi { };
@@ -10346,6 +10408,8 @@ in
vsftpd = callPackage ../servers/ftp/vsftpd { };
+ wallabag = callPackage ../servers/web-apps/wallabag { };
+
winstone = callPackage ../servers/http/winstone { };
xinetd = callPackage ../servers/xinetd { };
@@ -10367,11 +10431,12 @@ in
inherit clangStdenv fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig
libxslt expat libpng zlib perl mesa_drivers spice_protocol libunwind
dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook
- autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman
+ autoconf automake libtool xmlto asciidoc flex bison mtdev pixman
cairo epoxy;
inherit (darwin) apple_sdk cf-private libobjc;
bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null;
mesa = mesa_noglu;
+ python = python2; # Incompatible with Python 3x
udev = if stdenv.isLinux then udev else null;
libdrm = if stdenv.isLinux then libdrm else null;
fglrxCompat = config.xorg.fglrxCompat or false; # `config` because we have no `xorg.override`
@@ -10454,6 +10519,8 @@ in
busybox = callPackage ../os-specific/linux/busybox { };
+ cachefilesd = callPackage ../os-specific/linux/cachefilesd { };
+
cgmanager = callPackage ../os-specific/linux/cgmanager { };
checkpolicy = callPackage ../os-specific/linux/checkpolicy { };
@@ -10553,11 +10620,7 @@ in
drbd = callPackage ../os-specific/linux/drbd { };
- dstat = callPackage ../os-specific/linux/dstat {
- # pythonFull includes the "curses" standard library module, for pretty
- # dstat color output
- python = pythonFull;
- };
+ dstat = callPackage ../os-specific/linux/dstat { };
libossp_uuid = callPackage ../development/libraries/libossp-uuid { };
@@ -10814,20 +10877,6 @@ in
];
};
- linux_4_7 = callPackage ../os-specific/linux/kernel/linux-4.7.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"
- ]
- ++ lib.optionals ((platform.kernelArch or null) == "mips")
- [ kernelPatches.mips_fpureg_emu
- kernelPatches.mips_fpu_sigill
- kernelPatches.mips_ext3_n32
- ];
- };
-
linux_4_8 = callPackage ../os-specific/linux/kernel/linux-4.8.nix {
kernelPatches =
[ kernelPatches.bridge_stp_helper
@@ -11012,12 +11061,10 @@ in
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!
@@ -11750,6 +11797,8 @@ in
orbitron = callPackage ../data/fonts/orbitron { };
+ overpass = callPackage ../data/fonts/overpass { };
+
oxygenfonts = callPackage ../data/fonts/oxygenfonts { };
paper-icon-theme = callPackage ../data/icons/paper-icon-theme { };
@@ -11772,6 +11821,8 @@ in
sampradaya = callPackage ../data/fonts/sampradaya { };
+ shaderc = callPackage ../development/compilers/shaderc { };
+
shared_mime_info = callPackage ../data/misc/shared-mime-info { };
shared_desktop_ontologies = callPackage ../data/misc/shared-desktop-ontologies { };
@@ -11801,6 +11852,8 @@ in
r5rs = callPackage ../data/documentation/rnrs/r5rs.nix { };
+ raleway = callPackage ../data/fonts/raleway { };
+
roboto = callPackage ../data/fonts/roboto { };
roboto-mono = callPackage ../data/fonts/roboto-mono { };
@@ -12136,6 +12189,8 @@ in
bspwm = callPackage ../applications/window-managers/bspwm { };
+ bspwm-unstable = callPackage ../applications/window-managers/bspwm/unstable.nix { };
+
bvi = callPackage ../applications/editors/bvi { };
bviplus = callPackage ../applications/editors/bviplus { };
@@ -12682,7 +12737,7 @@ in
keepassx = callPackage ../applications/misc/keepassx { };
keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { };
- keepassx2-http = callPackage ../applications/misc/keepassx/2.0-http.nix { };
+ keepassx-reboot = callPackage ../applications/misc/keepassx/reboot.nix { };
inherit (gnome3) evince;
evolution_data_server = gnome3.evolution_data_server;
@@ -12739,11 +12794,12 @@ in
gksu = callPackage ../applications/misc/gksu { };
gnuradio = callPackage ../applications/misc/gnuradio {
- inherit (pythonPackages) lxml matplotlib numpy python pyopengl pyqt4 scipy wxPython pygtk;
+ inherit (python2Packages) cheetah lxml matplotlib numpy python pyopengl pyqt4 scipy wxPython pygtk;
fftw = fftwFloat;
};
gnuradio-with-packages = callPackage ../applications/misc/gnuradio/wrapper.nix {
+ inherit (python2Packages) python;
extraPackages = [ gnuradio-nacl gnuradio-osmosdr gnuradio-gsm gnuradio-ais gnuradio-rds ];
};
@@ -12821,9 +12877,9 @@ in
inherit (callPackages ../applications/networking/browsers/firefox {
inherit (gnome2) libIDL;
- inherit (pythonPackages) pysqlite;
libpng = libpng_apng;
enableGTK3 = false;
+ python = python2;
}) firefox-unwrapped firefox-esr-unwrapped;
firefox = wrapFirefox firefox-unwrapped { };
@@ -13163,7 +13219,8 @@ in
hydrogen = callPackage ../applications/audio/hydrogen { };
- hyperterm = callPackage ../applications/misc/hyperterm { inherit (gnome2) GConf; };
+ hyper = callPackage ../applications/misc/hyper { inherit (gnome2) GConf; };
+ hyperterm = self.hyper;
slack = callPackage ../applications/networking/instant-messengers/slack { };
@@ -13608,7 +13665,9 @@ in
MMA = callPackage ../applications/audio/MMA { };
- mmex = callPackage ../applications/office/mmex { };
+ mmex = callPackage ../applications/office/mmex {
+ wxGTK30 = wxGTK30.override { withWebKit = true ; };
+ };
moc = callPackage ../applications/audio/moc {
ffmpeg = ffmpeg_2;
@@ -13718,6 +13777,8 @@ in
mrxvt = callPackage ../applications/misc/mrxvt { };
+ mtpaint = callPackage ../applications/graphics/mtpaint { };
+
multimarkdown = callPackage ../tools/typesetting/multimarkdown { };
multimon-ng = callPackage ../applications/misc/multimon-ng { };
@@ -13785,6 +13846,8 @@ in
stdenv = stdenv_32bit;
};
+ scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { };
+
shotcut = qt5.callPackage ../applications/video/shotcut { };
smplayer = qt5.callPackage ../applications/video/smplayer { };
@@ -13814,6 +13877,8 @@ in
sxhkd = callPackage ../applications/window-managers/sxhkd { };
+ sxhkd-unstable = callPackage ../applications/window-managers/sxhkd/unstable.nix { };
+
mpop = callPackage ../applications/networking/mpop {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -13888,6 +13953,8 @@ in
inherit (gnome2) libglade;
};
+ oblogout = callPackage ../tools/X11/oblogout { };
+
obs-studio = qt5.callPackage ../applications/video/obs-studio {
alsaSupport = stdenv.isLinux;
pulseaudioSupport = config.pulseaudio or true;
@@ -13921,9 +13988,7 @@ in
openscad = callPackage ../applications/graphics/openscad {};
- opera = callPackage ../applications/networking/browsers/opera {
- inherit (pkgs.kde4) kdelibs;
- };
+ opera = callPackage ../applications/networking/browsers/opera {};
osmctools = callPackage ../applications/misc/osmctools { };
@@ -14172,6 +14237,8 @@ in
withKDE = false;
};
+ quassel-webserver = callPackage ../applications/networking/irc/quassel-webserver { };
+
quirc = callPackage ../tools/graphics/quirc {};
quodlibet = callPackage ../applications/audio/quodlibet { };
@@ -14192,6 +14259,10 @@ in
fltk = fltk13;
};
+ inherit (callPackage ../applications/virtualization/rancher-compose {})
+ rancher-compose
+ rancher-compose_0_10;
+
renoise = callPackage ../applications/audio/renoise {
demo = false;
};
@@ -14401,7 +14472,7 @@ in
stella = callPackage ../misc/emulators/stella { };
statsd = callPackage ../tools/networking/statsd {
- nodejs = nodejs-0_10;
+ nodejs = nodejs-4_x;
};
linuxstopmotion = callPackage ../applications/video/linuxstopmotion { };
@@ -14626,7 +14697,7 @@ in
};
termite = callPackage ../applications/misc/termite {
- vte = gnome3.vte-select-text;
+ vte = gnome3_20.vte-select-text;
};
tesseract = callPackage ../applications/graphics/tesseract { };
@@ -14731,6 +14802,8 @@ in
umurmur = callPackage ../applications/networking/umurmur { };
+ unigine-valley = callPackage ../applications/graphics/unigine-valley { };
+
inherit (ocamlPackages) unison;
unpaper = callPackage ../tools/graphics/unpaper { };
@@ -14919,6 +14992,7 @@ in
weechat = callPackage ../applications/networking/irc/weechat {
inherit (darwin) libobjc;
+ inherit (darwin) libresolv;
};
westonLite = callPackage ../applications/window-managers/weston {
@@ -15103,10 +15177,9 @@ in
xdotool = callPackage ../tools/X11/xdotool { };
- xen_4_5_0 = callPackage ../applications/virtualization/xen/4.5.0.nix { stdenv = overrideCC stdenv gcc49; };
- xen_4_5_2 = callPackage ../applications/virtualization/xen/4.5.2.nix { stdenv = overrideCC stdenv gcc49; };
- xen_xenServer = callPackage ../applications/virtualization/xen/4.5.0.nix { xenserverPatched = true; stdenv = overrideCC stdenv gcc49; };
- xen = xen_4_5_2;
+ xen_4_5 = callPackage ../applications/virtualization/xen/4.5.nix { stdenv = overrideCC stdenv gcc49; };
+ xen_xenServer = callPackage ../applications/virtualization/xen/4.5.nix { xenserverPatched = true; stdenv = overrideCC stdenv gcc49; };
+ xen = xen_4_5;
win-spice = callPackage ../applications/virtualization/driver/win-spice { };
win-virtio = callPackage ../applications/virtualization/driver/win-virtio { };
@@ -15303,9 +15376,7 @@ in
angband = callPackage ../games/angband { };
- anki = callPackage ../games/anki {
- inherit (pythonPackages) wrapPython pysqlite sqlalchemy pyaudio beautifulsoup httplib2 matplotlib pyqt4;
- };
+ anki = callPackage ../games/anki { };
armagetronad = callPackage ../games/armagetronad { };
@@ -15435,6 +15506,8 @@ in
fairymax = callPackage ../games/fairymax {};
+ fava = callPackage ../applications/office/fava {};
+
fish-fillets-ng = callPackage ../games/fish-fillets-ng {};
flightgear = qt5.callPackage ../games/flightgear { };
@@ -15452,6 +15525,8 @@ in
freeorion = callPackage ../games/freeorion { };
+ frotz = callPackage ../games/frotz { };
+
fsg = callPackage ../games/fsg {
wxGTK = wxGTK28.override { unicode = false; };
};
@@ -15474,6 +15549,8 @@ in
gltron = callPackage ../games/gltron { };
+ gmad = callPackage ../games/gmad { };
+
gnubg = callPackage ../games/gnubg { };
gnuchess = callPackage ../games/gnuchess { };
@@ -15919,7 +15996,9 @@ in
gnome3_20 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.20 { });
- gnome3 = gnome3_20;
+ gnome3_22 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.22 { });
+
+ gnome3 = gnome3_22;
hsetroot = callPackage ../tools/X11/hsetroot { };
@@ -15931,6 +16010,8 @@ in
kdePackagesFor
{
libusb = libusb1;
+ python2Packages = python2Packages;
+ inherit (python2Packages) python;
libcanberra = libcanberra_kde;
boost = boost155;
kdelibs = kde5.kdelibs;
@@ -16181,7 +16262,7 @@ in
in
recurseIntoAttrs (lib.makeScope qt5.newScope merged);
- vertex-theme = callPackage ../misc/themes/vertex { };
+ theme-vertex = callPackage ../misc/themes/vertex { };
xfce = xfce4-12;
xfce4-12 = recurseIntoAttrs (callPackage ../desktops/xfce { });
@@ -16298,6 +16379,8 @@ in
metis = callPackage ../development/libraries/science/math/metis {};
+ nauty = callPackage ../applications/science/math/nauty {};
+
sage = callPackage ../applications/science/math/sage { };
suitesparse_4_2 = callPackage ../development/libraries/science/math/suitesparse/4.2.nix { };
@@ -16306,6 +16389,8 @@ in
superlu = callPackage ../development/libraries/science/math/superlu {};
+ symmetrica = callPackage ../applications/science/math/symmetrica {};
+
ipopt = callPackage ../development/libraries/science/math/ipopt { openblas = openblasCompat; };
gmsh = callPackage ../applications/science/math/gmsh { };
@@ -16349,6 +16434,10 @@ in
cmake = cmakeCurses;
});
+ ### PHYSICS
+
+ sacrifice = callPackage ../applications/science/physics/sacrifice {};
+
### SCIENCE/PROGRAMMING
plm = callPackage ../applications/science/programming/plm { };
@@ -16394,6 +16483,7 @@ in
domains = callPackage ../development/coq-modules/domains {};
fiat = callPackage ../development/coq-modules/fiat {};
+ fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {};
flocq = callPackage ../development/coq-modules/flocq {};
@@ -16437,6 +16527,8 @@ in
ssreflect = callPackage ../development/coq-modules/ssreflect { };
+ fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {};
+
};
coqPackages = mkCoqPackages_8_4 coqPackages;
@@ -16455,6 +16547,8 @@ in
gappa = callPackage ../applications/science/logic/gappa { };
+ gfan = callPackage ../applications/science/math/gfan {};
+
ginac = callPackage ../applications/science/math/ginac { };
glucose = callPackage ../applications/science/logic/glucose { };
@@ -16591,11 +16685,15 @@ in
geogebra = callPackage ../applications/science/math/geogebra { };
- maxima = callPackage ../applications/science/math/maxima { };
+ maxima = callPackage ../applications/science/math/maxima { ecl = null; };
+ maxima-ecl = callPackage ../applications/science/math/maxima { sbcl = null; };
wxmaxima = callPackage ../applications/science/math/wxmaxima { wxGTK = wxGTK30; };
pari = callPackage ../applications/science/math/pari {};
+ pari-unstable = callPackage ../applications/science/math/pari/unstable.nix {};
+
+ ratpoints = callPackage ../applications/science/math/ratpoints {};
calc = callPackage ../applications/science/math/calc { };
@@ -16606,6 +16704,9 @@ in
};
singular = callPackage ../applications/science/math/singular {};
+ libsingular = callPackage ../applications/science/math/singular {
+ asLibsingular = true;
+ };
scilab = callPackage ../applications/science/math/scilab {
withXaw3d = false;
@@ -16672,6 +16773,8 @@ in
### SCIENCE / PHYSICS
+ fastjet = callPackage ../development/libraries/physics/fastjet { };
+
geant4 = callPackage ../development/libraries/physics/geant4 {
enableMultiThreading = true;
enableG3toG4 = false;
@@ -16698,6 +16801,22 @@ in
g4py = callPackage ../development/libraries/physics/geant4/g4py { };
+ hepmc = callPackage ../development/libraries/physics/hepmc { };
+
+ herwig = callPackage ../development/libraries/physics/herwig { };
+
+ lhapdf = callPackage ../development/libraries/physics/lhapdf { };
+
+ nlojet = callPackage ../development/libraries/physics/nlojet { };
+
+ pythia = callPackage ../development/libraries/physics/pythia { };
+
+ rivet = callPackage ../development/libraries/physics/rivet { };
+
+ thepeg = callPackage ../development/libraries/physics/thepeg { };
+
+ yoda = callPackage ../development/libraries/physics/yoda { };
+
### MISC
antimicro = qt5.callPackage ../tools/misc/antimicro { };
@@ -16714,6 +16833,8 @@ in
blackbird = callPackage ../misc/themes/blackbird { };
+ bootil = callPackage ../development/libraries/bootil { };
+
brgenml1lpr = callPackage_i686 ../misc/cups/drivers/brgenml1lpr {};
brgenml1cupswrapper = callPackage ../misc/cups/drivers/brgenml1cupswrapper {};
@@ -16929,9 +17050,7 @@ in
nut = callPackage ../applications/misc/nut { };
- solfege = callPackage ../misc/solfege {
- pysqlite = pkgs.pythonPackages.sqlite3;
- };
+ solfege = callPackage ../misc/solfege { };
disnix = callPackage ../tools/package-management/disnix { };
@@ -16998,6 +17117,8 @@ in
pt = callPackage ../applications/misc/pt { };
+ pyload = callPackage ../applications/networking/pyload {};
+
uae = callPackage ../misc/emulators/uae { };
fsuae = callPackage ../misc/emulators/fs-uae { };
@@ -17039,6 +17160,9 @@ in
mfcj470dw-cupswrapper = callPackage ../misc/cups/drivers/mfcj470dwcupswrapper { };
mfcj470dwlpr = callPackage_i686 ../misc/cups/drivers/mfcj470dwlpr { };
+ mfcj6510dw-cupswrapper = callPackage ../misc/cups/drivers/mfcj6510dwcupswrapper { };
+ mfcj6510dwlpr = callPackage_i686 ../misc/cups/drivers/mfcj6510dwlpr { };
+
samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung { };
samsung-unified-linux-driver = callPackage ../misc/cups/drivers/samsung/4.00.39 { };
@@ -17337,13 +17461,15 @@ in
zimg = callPackage ../development/libraries/zimg { };
- zk-shell = callPackage ../applications/misc/zk-shell {
- inherit (pythonPackages) buildPythonApplication;
- };
+ zk-shell = callPackage ../applications/misc/zk-shell { };
zuki-themes = callPackage ../misc/themes/zuki { };
zoom-us = qt55.callPackage ../applications/networking/instant-messengers/zoom-us {};
xulrunner = firefox-unwrapped;
+
+ nitrokey-app = callPackage ../tools/security/nitrokey-app { };
+
+ fpm2 = callPackage ../tools/security/fpm2 { };
}
diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix
index 2eb7fb34b4d..c54b23853c5 100644
--- a/pkgs/top-level/default.nix
+++ b/pkgs/top-level/default.nix
@@ -61,6 +61,35 @@ let
inherit system bootStdenv noSysDirs config crossSystem platform lib;
};
+ stdenvAdapters = self: super:
+ let res = import ../stdenv/adapters.nix self; in res // {
+ stdenvAdapters = res;
+ };
+
+ trivialBuilders = self: super:
+ (import ../build-support/trivial-builders.nix {
+ inherit lib; inherit (self) stdenv stdenvNoCC; inherit (self.xorg) lndir;
+ });
+
+ stdenvDefault = self: super: (import ./stdenv.nix topLevelArguments) {} pkgs;
+
+ allPackages = self: super:
+ let res = import ./all-packages.nix topLevelArguments res self;
+ in res;
+
+ aliases = self: super: import ./aliases.nix super;
+
+ # stdenvOverrides is used to avoid circular dependencies for building
+ # the standard build environment. This mechanism uses the override
+ # mechanism to implement some staged compilation of the stdenv.
+ #
+ # We don't want stdenv overrides in the case of cross-building, or
+ # otherwise the basic overridden packages will not be built with the
+ # crossStdenv adapter.
+ stdenvOverrides = self: super:
+ lib.optionalAttrs (crossSystem == null && super.stdenv ? overrides)
+ (super.stdenv.overrides super);
+
# Allow packages to be overridden globally via the `packageOverrides'
# configuration option, which must be a function that takes `pkgs'
# as an argument and returns a set of new or overridden packages.
@@ -68,54 +97,34 @@ let
# (un-overridden) set of packages, allowing packageOverrides
# attributes to refer to the original attributes (e.g. "foo =
# ... pkgs.foo ...").
- pkgs = pkgsWithOverrides (self: config.packageOverrides or (super: {}));
+ configOverrides = self: super:
+ lib.optionalAttrs (bootStdenv == null)
+ ((config.packageOverrides or (super: {})) super);
- # Return the complete set of packages, after applying the overrides
- # returned by the `overrider' function (see above). Warning: this
- # function is very expensive!
- pkgsWithOverrides = overrider:
- let
- stdenvAdapters = self: super:
- let res = import ../stdenv/adapters.nix self; in res // {
- stdenvAdapters = res;
- };
+ # The complete chain of package set builders, applied from top to bottom
+ toFix = lib.foldl' (lib.flip lib.extends) (self: {}) [
+ stdenvAdapters
+ trivialBuilders
+ stdenvDefault
+ allPackages
+ aliases
+ stdenvOverrides
+ configOverrides
+ ];
- trivialBuilders = self: super:
- (import ../build-support/trivial-builders.nix {
- inherit lib; inherit (self) stdenv stdenvNoCC; inherit (self.xorg) lndir;
- });
+ # Use `overridePackages` to easily override this package set.
+ # Warning: this function is very expensive and must not be used
+ # from within the nixpkgs repository.
+ #
+ # Example:
+ # pkgs.overridePackages (self: super: {
+ # foo = super.foo.override { ... };
+ # }
+ #
+ # The result is `pkgs' where all the derivations depending on `foo'
+ # will use the new version.
- stdenvDefault = self: super: (import ./stdenv.nix topLevelArguments) {} pkgs;
-
- allPackagesArgs = topLevelArguments // { inherit pkgsWithOverrides; };
- allPackages = self: super:
- let res = import ./all-packages.nix allPackagesArgs res self;
- in res;
-
- aliases = self: super: import ./aliases.nix super;
-
- # stdenvOverrides is used to avoid circular dependencies for building
- # the standard build environment. This mechanism uses the override
- # mechanism to implement some staged compilation of the stdenv.
- #
- # We don't want stdenv overrides in the case of cross-building, or
- # otherwise the basic overridden packages will not be built with the
- # crossStdenv adapter.
- stdenvOverrides = self: super:
- lib.optionalAttrs (crossSystem == null && super.stdenv ? overrides)
- (super.stdenv.overrides super);
-
- customOverrides = self: super:
- lib.optionalAttrs (bootStdenv == null) (overrider self super);
- in
- lib.fix' (
- lib.extends customOverrides (
- lib.extends stdenvOverrides (
- lib.extends aliases (
- lib.extends allPackages (
- lib.extends stdenvDefault (
- lib.extends trivialBuilders (
- lib.extends stdenvAdapters (
- self: {}))))))));
-in
- pkgs
+ # Return the complete set of packages. Warning: this function is very
+ # expensive!
+ pkgs = lib.makeExtensibleWithCustomName "overridePackages" toFix;
+in pkgs
diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 3508f1a1547..c0a7adb1d7f 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -181,6 +181,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
outputFiles = [ "bin/*" ];
};
+ OpenNAT = fetchNuGet {
+ baseName = "Open.NAT";
+ version = "2.1.0";
+ sha256 = "1jyd30fwycdwx5ck96zhp2xf20yz0sp7g3pjbqhmay4kd322mfwk";
+ outputFiles = [ "lib/*" ];
+ };
+
MonoNat = fetchNuGet {
baseName = "Mono.Nat";
version = "1.2.24";
diff --git a/pkgs/top-level/guile-2-test.nix b/pkgs/top-level/guile-2-test.nix
deleted file mode 100644
index 9d2fbcbef5c..00000000000
--- a/pkgs/top-level/guile-2-test.nix
+++ /dev/null
@@ -1,84 +0,0 @@
-/* A Hydra jobset to test Guile-using applications and libraries with the
- Guile 2.x pre-releases.
-
- -- ludo@gnu.org */
-
-let
- allPackages = import ../..;
-
- pkgsFun = { system ? builtins.currentSystem }:
- allPackages {
- inherit system;
- config.packageOverrides = pkgs: {
- guile = pkgs.guile_2_0;
- };
- };
-
- pkgs = pkgsFun {};
-
- toJob = x: if builtins.isAttrs x then x else
- { type = "job"; systems = x; schedulingPriority = 10; };
-
- /* Perform a job on the given set of platforms. The function `f' is
- called by Hydra for each platform, and should return some job
- to build on that platform. `f' is passed the Nixpkgs collection
- for the platform in question. */
- testOn = systems: f: {system ? builtins.currentSystem}:
- if pkgs.lib.elem system systems
- then f (pkgsFun {inherit system;})
- else {};
-
- /* Map an attribute of the form `foo = [platforms...]' to `testOn
- [platforms...] (pkgs: pkgs.foo)'. */
- mapTestOn = pkgs.lib.mapAttrsRecursiveCond
- (as: !(as ? type && as.type == "job"))
- (path: value:
- let
- job = toJob value;
- getPkg = pkgs:
- pkgs.lib.addMetaAttrs { schedulingPriority = toString job.schedulingPriority; }
- (pkgs.lib.getAttrFromPath path pkgs);
- in testOn job.systems getPkg);
-
- inherit (pkgs.lib.platforms) linux darwin cygwin allBut all;
-
-in (mapTestOn {
- /* The package list below was obtained with:
-
- cat top-level/all-packages.nix \
- | grep -B3 'guile[^=]*$' \
- | grep '^[[:blank:]]*[a-zA-Z0-9_]\+[[:blank:]]*=' \
- | sed -es'/^[[:blank:]]*\(.\+\)[[:blank:]]*=.*$/\1= linux;/g'
-
- with some minor edits.
- */
-
- guile = linux;
-
- autogen = linux;
- lsh = linux;
- mailutils = linux;
- mcron = linux;
- texmacs = linux;
- guileCairo = linux;
- guileGnome = linux;
- guile_lib = linux;
- guileLint = linux;
- guile_ncurses = linux;
- gwrap = linux;
- swig = linux;
- gnutls = linux;
- slibGuile = linux;
- dico = linux;
- trackballs = linux;
- beast = linux;
- elinks = linux;
- gnucash = linux;
- gnunet = linux;
- snd = linux;
- ballAndPaddle = linux;
- drgeo = linux;
- lilypond = linux;
- liquidwar = linux;
- freetalk = linux;
-})
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index bda35e9383f..58e9512e31c 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -441,6 +441,8 @@ let
typerep_p4 = callPackage ../development/ocaml-modules/typerep { };
+ uchar = callPackage ../development/ocaml-modules/uchar { };
+
utop = callPackage ../development/tools/ocaml/utop { };
uuidm = callPackage ../development/ocaml-modules/uuidm { };
@@ -691,6 +693,9 @@ let
in lib.fix' (lib.extends overrides packageSet);
in rec
{
+
+ inherit mkOcamlPackages;
+
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; });
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d7b0108ce69..b5824b2e05a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2758,10 +2758,10 @@ let self = _self // overrides; _self = with self; {
};
CryptX = buildPerlPackage rec {
- name = "CryptX-0.040";
+ name = "CryptX-0.041";
src = fetchurl {
url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz";
- sha256 = "0e1e44811e951fa04971912a8b03cf41de540d8cf8d464c5655aaf3bf976db50";
+ sha256 = "481f8c9285d6ce3cf330e1fa52c835a202debdac5d81e1acd20bd1d93b99790e";
};
propagatedBuildInputs = [ JSONMaybeXS ];
meta = {
@@ -3603,6 +3603,8 @@ let self = _self // overrides; _self = with self; {
};
DBIxClass = buildPerlPackage rec {
+ # tests broken again
+ doCheck = false;
name = "DBIx-Class-0.082840";
src = fetchurl {
url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz";
@@ -3615,7 +3617,6 @@ let self = _self // overrides; _self = with self; {
homepage = http://www.dbix-class.org/;
description = "Extensible and flexible object <-> relational mapper";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
- maintainers = [ maintainers.rycee ];
};
};
@@ -6489,10 +6490,10 @@ let self = _self // overrides; _self = with self; {
};
Importer = buildPerlPackage rec {
- name = "Importer-0.014";
+ name = "Importer-0.024";
src = fetchurl {
url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz";
- sha256 = "79b088cdead749d2c5a8cf585456cba064b4847c003a28d02d10a6cc2231b989";
+ sha256 = "1d19760ceb366b664985ace9a7ee1b54a438b1e060a5bca6eff0c6a35b07a557";
};
meta = {
description = "Alternative but compatible interface to modules that export symbols";
@@ -10083,10 +10084,10 @@ let self = _self // overrides; _self = with self; {
};
PDFAPI2 = buildPerlPackage rec {
- name = "PDF-API2-2.028";
+ name = "PDF-API2-2.030";
src = fetchurl {
url = "mirror://cpan/authors/id/S/SS/SSIMMS/${name}.tar.gz";
- sha256 = "a642b41362884b7005e421ec93c7d3a54f7adef7657540331e0d4ca89d106b04";
+ sha256 = "a802c25c1f00b093778223fc7aea94ebd87a9abdb915151746b8ee5d4a358769";
};
propagatedBuildInputs = [ FontTTF ];
meta = {
@@ -10753,10 +10754,10 @@ let self = _self // overrides; _self = with self; {
};
PodWeaver = buildPerlPackage rec {
- name = "Pod-Weaver-4.014";
+ name = "Pod-Weaver-4.015";
src = fetchurl {
url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
- sha256 = "5ca76396710e077b91e12ce32de82514d4785c49eb1ad95b9278045d77c260f5";
+ sha256 = "5af25b29a55783e495a9df5ef6293240e2c9ab02764613d79f1ed50b12dec5ae";
};
buildInputs = [ PPI SoftwareLicense TestDifferences ];
propagatedBuildInputs = [ ConfigMVP ConfigMVPReaderINI DateTime ListMoreUtils LogDispatchouli MixinLinewise ModuleRuntime Moose ParamsUtil PodElemental StringFlogger StringFormatter StringRewritePrefix namespaceautoclean ];
@@ -12898,10 +12899,10 @@ let self = _self // overrides; _self = with self; {
TestSimple = null;
TestSimple13 = buildPerlPackage rec {
- name = "Test-Simple-1.302056";
+ name = "Test-Simple-1.302062";
src = fetchurl {
url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz";
- sha256 = "7ba4d821545051f3bc2a6a3308cc43a45f242eec0121a6c85394601785f2e2e8";
+ sha256 = "6729060d4ab12e2db3a3c6d6376ee6a9fb77c0ba0308b66919365a1e8bf156ea";
};
meta = {
description = "Basic utilities for writing tests";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index df27eb0221f..185043b27e3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -27,15 +27,7 @@ let
buildPythonApplication = args: buildPythonPackage ({namePrefix="";} // args );
- modules = python.modules or {
- readline = null;
- sqlite3 = null;
- curses = null;
- curses_panel = null;
- crypt = null;
- };
-
-in modules // {
+in {
inherit python bootstrapped-pip isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPyPy isPy3k mkPythonDerivation buildPythonPackage buildPythonApplication;
@@ -877,13 +869,17 @@ in modules // {
propagatedBuildInputs = with self; [
pycrypto paramiko jinja2 pyyaml httplib2 boto six
+ netaddr dns
] ++ optional windowsSupport pywinrm;
meta = {
homepage = "http://www.ansible.com";
description = "A simple automation tool";
license = with licenses; [ gpl3] ;
- maintainers = with maintainers; [ joamaki ];
+ maintainers = with maintainers; [
+ jgeerds
+ joamaki
+ ];
platforms = with platforms; linux ++ darwin;
};
};
@@ -909,14 +905,18 @@ in modules // {
windowsSupport = true;
propagatedBuildInputs = with self; [
- pycrypto paramiko jinja2 pyyaml httplib2 boto six readline
+ pycrypto paramiko jinja2 pyyaml httplib2 boto six
+ netaddr dns
] ++ optional windowsSupport pywinrm;
meta = with stdenv.lib; {
homepage = "http://www.ansible.com";
description = "A simple automation tool";
license = with licenses; [ gpl3 ];
- maintainers = with maintainers; [ copumpkin ];
+ maintainers = with maintainers; [
+ copumpkin
+ jgeerds
+ ];
platforms = with platforms; linux ++ darwin;
};
};
@@ -1027,11 +1027,11 @@ in modules // {
} else null;
funcsigs = buildPythonPackage rec {
- name = "funcsigs-0.4";
+ name = "funcsigs-1.0.2";
src = pkgs.fetchurl {
url = "mirror://pypi/f/funcsigs/${name}.tar.gz";
- sha256 = "d83ce6df0b0ea6618700fe1db353526391a8a3ada1b7aba52fed7a61da772033";
+ sha256 = "0l4g5818ffyfmfs1a924811azhjj8ax9xd1cffr1mzd3ycn0zfx7";
};
buildInputs = with self; [
@@ -1452,13 +1452,13 @@ in modules // {
awscli = buildPythonPackage rec {
name = "awscli-${version}";
- version = "1.10.51";
+ version = "1.11.10";
namePrefix = "";
src = pkgs.fetchurl {
url = "mirror://pypi/a/awscli/${name}.tar.gz";
- sha256 = "19n7r6fwnwpi0cyrqh20w80mrcj0b6j3if5p58hi1k3fdp60nscq";
+ sha256 = "174lfpai5cga1ml2bwswjil6h544m57js9ki7hqkr9gdbpa8pyrk";
};
# No tests included
@@ -1500,7 +1500,7 @@ in modules // {
url = "mirror://pypi/a/aws-shell/aws-shell-${version}.tar.gz";
};
propagatedBuildInputs = with self; [
- configobj prompt_toolkit awscli boto3 pygments sqlite3 mock pytest
+ configobj prompt_toolkit awscli boto3 pygments mock pytest
pytestcov unittest2 tox
];
@@ -1751,6 +1751,25 @@ in modules // {
};
};
+ backports_functools_lru_cache = buildPythonPackage rec {
+ name = "backports.functools_lru_cache-${version}";
+ version = "1.3";
+
+ src = pkgs.fetchurl {
+ url = "mirror://pypi/b/backports_functools_lru_cache/${name}.tar.gz";
+ sha256 = "444a21bcec4ae177da554321f81a78dc879eaa8f6ea9920cb904830585d31e95";
+ };
+
+ buildInputs = with self; [ setuptools_scm ];
+ doCheck = false; # No proper test
+
+ meta = {
+ description = "Backport of functools.lru_cache";
+ homepage = https://github.com/jaraco/backports.functools_lru_cache;
+ license = licenses.mit;
+ };
+ };
+
backports_shutil_get_terminal_size = if !(pythonOlder "3.3") then null else buildPythonPackage rec {
name = "backports.shutil_get_terminal_size-${version}";
version = "1.0.0";
@@ -2036,7 +2055,7 @@ in modules // {
sha256 = "0grid93yz6i6jb2zggrqncp5awdf7qi88j5y2k7dq0k9r6b8zydw";
};
- propagatedBuildInputs = with stdenv.lib; with pkgs; [ modules.curses zlib xz ncompress gzip bzip2 gnutar p7zip cabextract lzma self.pycrypto ]
+ propagatedBuildInputs = with stdenv.lib; with pkgs; [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract lzma self.pycrypto ]
++ optional visualizationSupport pyqtgraph;
meta = with stdenv.lib; {
@@ -2202,6 +2221,9 @@ in modules // {
patchShebangs src/make.sh
'';
propagatedBuildInputs = [ ];
+ preCheck = ''
+ mv src/libcapstone.so capstone
+ '';
meta = with pkgs.stdenv.lib; {
homepage = "http://www.capstone-engine.org/";
license = licenses.bsdOriginal;
@@ -2235,11 +2257,11 @@ in modules // {
channels = buildPythonPackage rec {
name = "channels-${version}";
- version = "0.17.2";
+ version = "0.17.3";
src = pkgs.fetchurl {
url = "mirror://pypi/c/channels/${name}.tar.gz";
- sha256 = "1a7fzm25sm3qqgxf7j3hml2lkipvf0yapdg4rkk7x3m11zm0xgv9";
+ sha256 = "03nalz0mqjxqlgqwkmranair2c1amry2aw52dd78ihf07dfinnc9";
};
# Files are missing in the distribution
@@ -2594,7 +2616,7 @@ in modules // {
sha256 = "1j4f51dxic39mdwf6alj7gd769wy6mhk916v031wjali51xkh3xb";
};
- buildInputs = with self; [ hypothesis sqlite3 ];
+ buildInputs = with self; [ hypothesis ];
propagatedBuildInputs = with self; [ chardet ];
@@ -2664,11 +2686,11 @@ in modules // {
blaze = buildPythonPackage rec {
name = "blaze-${version}";
- version = "0.10.2";
+ version = "0.11.0";
src = pkgs.fetchurl {
- url = "mirror://pypi/b/blaze/${name}.tar.gz";
- sha256 = "16m1nzs5gzwa62pwybjsxgbdpd9jy10rhs3c3niacyf6aa6hr9jh";
+ url = "https://github.com/blaze/blaze/archive/${version}.tar.gz";
+ sha256 = "07zrrxkmdqk84xvdmp29859zcfzlpx5pz6g62l28nqp6n6a7yq9a";
};
buildInputs = with self; [ pytest ];
@@ -2798,7 +2820,7 @@ in modules // {
sha256 = "1ilf58qq7sazmcgg4f1wswbhcn2gb8qbbrpgm6gf0j2lbm60gabl";
};
- propagatedBuildInputs = with self; [ modules.curses pygments ];
+ propagatedBuildInputs = with self; [ pygments ];
doCheck = false;
meta = {
@@ -2839,11 +2861,11 @@ in modules // {
bokeh = buildPythonPackage rec {
name = "bokeh-${version}";
- version = "0.12.1";
+ version = "0.12.3";
src = pkgs.fetchurl {
url = "mirror://pypi/b/bokeh/${name}.tar.gz";
- sha256 = "06d3ed14308f550376d5b0c7e9f2bacb3ff5bbcceefd7f6369d070de71dfa563";
+ sha256 = "e138941b62f59bc48bc5b8d249e90c03fed31c1d5abe47ab2ce9e4c83202f73c";
};
disabled = isPyPy;
@@ -2860,7 +2882,6 @@ in modules // {
werkzeug
itsdangerous
dateutil
- futures
requests2
six
pygments
@@ -2871,6 +2892,7 @@ in modules // {
tornado
colorama
]
+ ++ optionals ( !isPy3k ) [ futures ]
++ optionals ( isPy26 ) [ argparse ]
++ optionals ( !isPy3k && !isPyPy ) [ websocket_client ]
++ optionals ( !isPyPy ) [ numpy pandas greenlet ];
@@ -2919,16 +2941,16 @@ in modules // {
boto3 = buildPythonPackage rec {
name = "boto3-${version}";
- version = "1.3.1";
+ version = "1.4.1";
src = pkgs.fetchFromGitHub {
owner = "boto";
repo = "boto3";
rev = version;
- sha256 = "1rbwcslk9dgayrg3vy3m0bqj767hdy1aphy5wjgz925bsydgxdg6";
+ sha256 = "19ij6cs2n3p5fgipbrq1dybq2sjjvlhg9n5a5sv9wi95x9wqi5wb";
};
- propagatedBuildInputs = [ self.botocore self.jmespath ] ++
+ propagatedBuildInputs = [ self.botocore self.jmespath self.s3transfer ] ++
(if isPy3k then [] else [self.futures]);
buildInputs = [ self.docutils self.nose self.mock ];
checkPhase = ''
@@ -2956,12 +2978,12 @@ in modules // {
};
botocore = buildPythonPackage rec {
- version = "1.4.41"; # This version is required by awscli
+ version = "1.4.67"; # This version is required by awscli
name = "botocore-${version}";
src = pkgs.fetchurl {
url = "mirror://pypi/b/botocore/${name}.tar.gz";
- sha256 = "0c3abr2rxiilqklika8x360pr0mgx7hlhbhj8w72izs2r6ww4dys";
+ sha256 = "15fh3ng33mcbhm76pk9qqglf342qj471gfcqxv0nrl9f8sn3v60q";
};
propagatedBuildInputs =
@@ -3129,11 +3151,11 @@ in modules // {
devpi-common = buildPythonPackage rec {
name = "devpi-common";
- version = "2.0.8";
+ version = "3.0.1";
src = pkgs.fetchurl {
url = "mirror://pypi/d/devpi-common/devpi-common-${version}.tar.gz";
- sha256 = "a059c4099002d4af8f3ccfc8a9f4bf133b20ea404049b21a31fc1003e1d79452";
+ sha256 = "0l3a7iyk596x6pvzg7604lzzi012qszr804fqn6f517zcy1xz23j";
};
propagatedBuildInputs = [ self.requests2 self.py ];
@@ -3142,7 +3164,7 @@ in modules // {
homepage = https://bitbucket.org/hpk42/devpi;
description = "Utilities jointly used by devpi-server and devpi-client";
license = licenses.mit;
- maintainers = with maintainers; [ lewo ];
+ maintainers = with maintainers; [ lewo makefu ];
};
};
@@ -3984,7 +4006,6 @@ in modules // {
propagatedBuildInputs = with self; [
pyparsing
- modules.readline
urwid
];
@@ -4031,9 +4052,20 @@ in modules // {
homepage = https://github.com/cablehead/python-consul;
license = licenses.mit;
maintainers = with maintainers; [ desiderius ];
+ broken = true;
};
});
+ contexter = buildPythonPackage rec {
+ name = "contexter-${version}";
+ version = "0.1.3";
+
+ src = pkgs.fetchurl {
+ url = "mirror://pypi/c/contexter/${name}.tar.gz";
+ sha256 = "0xrnkjya29ya0hkj8y4k9ni2mnr58i6r0xfqlj7wk07v4jfrkc8n";
+ };
+ };
+
contextlib2 = buildPythonPackage rec {
name = "contextlib2-${version}";
@@ -4155,9 +4187,16 @@ in modules // {
# For testing
nativeBuildInputs = with self; [ numpy pkgs.ncurses ];
+ # cython's testsuite requires npy_isinf to return sign of the infinity, but
+ # a C99 conformant is only required to return a non zero value
+ patches = [ ../development/python-modules/cython_test.patch ];
+
+ # cython's testsuite is not working very well with libc++
+ # We are however optimistic about things outside of testsuite still working
checkPhase = ''
export HOME="$NIX_BUILD_TOP"
- ${python.interpreter} runtests.py
+ ${python.interpreter} runtests.py \
+ ${if stdenv.cc.isClang or false then ''--exclude="(cpdef_extern_func|libcpp_algo)"'' else ""}
'';
meta = {
@@ -4200,7 +4239,7 @@ in modules // {
name = "cryptacular-1.4.1";
buildInputs = with self; [ coverage nose ];
- propagatedBuildInputs = with self; [ pbkdf2 modules.crypt ];
+ propagatedBuildInputs = with self; [ pbkdf2 ];
src = pkgs.fetchurl {
url = "mirror://pypi/c/cryptacular/${name}.tar.gz";
@@ -4228,7 +4267,7 @@ in modules // {
buildInputs = [ pkgs.openssl self.pretend self.cryptography_vectors
self.iso8601 self.pyasn1 self.pytest_29 self.py self.hypothesis self.pytz ]
++ optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.Security;
- propagatedBuildInputs = with self; [ six idna ipaddress pyasn1 cffi pyasn1-modules modules.sqlite3 pytz ]
+ propagatedBuildInputs = with self; [ six idna ipaddress pyasn1 cffi pyasn1-modules pytz ]
++ optional (pythonOlder "3.4") self.enum34;
# IOKit's dependencies are inconsistent between OSX versions, so this is the best we
@@ -4794,6 +4833,16 @@ in modules // {
};
};
+ pytest_30 = self.pytest_27.override rec {
+ name = "pytest-3.0.3";
+
+ propagatedBuildInputs = with self; [ hypothesis py ];
+ src = pkgs.fetchurl {
+ url = "mirror://pypi/p/pytest/${name}.tar.gz";
+ sha256 = "1rxydacrdb8s312l3bn0ybrqsjp13abzyim1x21s80386l5504zj";
+ };
+ };
+
pytestcache = buildPythonPackage rec {
name = "pytest-cache-1.0";
src = pkgs.fetchurl {
@@ -4884,11 +4933,11 @@ in modules // {
pytestflakes = buildPythonPackage rec {
name = "pytest-flakes-${version}";
- version = "1.0.0";
+ version = "1.0.1";
src = pkgs.fetchurl {
url = "mirror://pypi/p/pytest-flakes/${name}.tar.gz";
- sha256 = "0vvfprga6k4v2zq1qsr3yq1bjl22vygfsnvyn3hh80cc2386dk6h";
+ sha256 = "9c2271654294020e134624020a2144cb93b7334809d70fb3f470cd31ec788a3a";
};
propagatedBuildInputs = with self ; [ pytest pyflakes pytestcache ];
@@ -5435,7 +5484,7 @@ in modules // {
sha256 = "671969d00719fa3e80476b128dc9232025926884d0110d4d235abdd9c3508fc0";
};
- buildInputs = with self; [ mock sqlite3 ];
+ buildInputs = with self; [ mock ];
propagatedBuildInputs = with self; [ self.six requests2 ];
@@ -5591,11 +5640,11 @@ in modules // {
dateutil = buildPythonPackage (rec {
name = "dateutil-${version}";
- version = "2.4.2";
+ version = "2.5.3";
src = pkgs.fetchurl {
url = "mirror://pypi/p/python-dateutil/python-${name}.tar.gz";
- sha256 = "3e95445c1db500a344079a47b171c45ef18f57d188dffdb0e4165c71bea8eb3d";
+ sha256 = "1v9j9fmf8g911yg6k01xa2db6dx3wv73zkk7fncsj7vagjqgs20l";
};
propagatedBuildInputs = with self; [ self.six ];
@@ -5682,7 +5731,7 @@ in modules // {
make -f Makefile.prep synctus/ddar_pb2.py
'';
- propagatedBuildInputs = with self; [ protobuf modules.sqlite3 ];
+ propagatedBuildInputs = with self; [ protobuf ];
meta = {
description = "Unix de-duplicating archiver";
@@ -6239,14 +6288,17 @@ in modules // {
};
};
- easy-process = buildPythonPackage rec {
- name = "EasyProcess-0.1.9";
+ EasyProcess = buildPythonPackage rec {
+ name = "EasyProcess-0.2.3";
src = pkgs.fetchurl {
url = "mirror://pypi/E/EasyProcess/${name}.tar.gz";
- sha256 = "c9980c0b0eeab97969305d8829bed966a3e28a77284e4f45a9b38fb23ce83633";
+ sha256 = "94e241cadc9a46f55b5c06000df85618849602e7e1865b8de87576b90a22e61f";
};
+ # No tests
+ doCheck = false;
+
meta = {
description = "Easy to use python subprocess interface";
homepage = "https://github.com/ponty/EasyProcess";
@@ -6409,7 +6461,6 @@ in modules // {
pymongo_2_9_1
simplejson
werkzeug
-
];
# tests call a running mongodb instance
@@ -6624,7 +6675,7 @@ in modules // {
sha256 = "105swvzshgn3g6bjwk67xd8pslnhpxwa63mdsw6cl4c7cjp2blx9";
};
- propagatedBuildInputs = with self; [ python_fedora modules.sqlite3 pyopenssl ];
+ propagatedBuildInputs = with self; [ python_fedora pyopenssl ];
postInstall = "mv $out/bin/fedpkg $out/bin/fedora-cert-fedpkg";
doCheck = false;
};
@@ -6803,7 +6854,7 @@ in modules // {
repo = "GateOne";
sha256 = "1ghrawlqwv7wnck6alqpbwy9mpv0y21cw2jirrvsxaracmvgk6vv";
};
- propagatedBuildInputs = with self; [tornado futures html5lib readline pkgs.openssl pkgs.cacert pkgs.openssh];
+ propagatedBuildInputs = with self; [tornado futures html5lib pkgs.openssl pkgs.cacert pkgs.openssh];
meta = {
homepage = https://liftoffsoftware.com/;
description = "GateOne is a web-based terminal emulator and SSH client";
@@ -6844,6 +6895,7 @@ in modules // {
homepage = "https://cloud.google.com/compute/docs/gcutil/";
license = licenses.asl20;
maintainers = with maintainers; [ phreedom ];
+ broken = true;
};
};
@@ -7467,7 +7519,6 @@ in modules // {
pyyaml
redis
six
- modules.sqlite3
pkgs.zlib
];
@@ -7861,8 +7912,7 @@ in modules // {
sha256 = "1dnmnkc21zdfaypskbpvkwl0wpkpn0nagj1fc338w64mbxrk8ny7";
};
- propagatedBuildInputs = with self;
- [
+ propagatedBuildInputs = with self; [
apipkg
bottle
gevent
@@ -7877,7 +7927,7 @@ in modules // {
simplejson
sqlite3dbm
timelib
- ] ++ optionals (!isPy3k) [ modules.sqlite3 ];
+ ];
meta = {
description = "Library for parsing MediaWiki articles and converting them to different output formats";
@@ -8128,12 +8178,12 @@ in modules // {
};
passlib = buildPythonPackage rec {
- version = "1.6.2";
+ version = "1.6.5";
name = "passlib-${version}";
src = pkgs.fetchurl {
url = "mirror://pypi/p/passlib/passlib-${version}.tar.gz";
- sha256 = "e987f6000d16272f75314c7147eb015727e8532a3b747b1a8fb58e154c68392d";
+ sha256 = "1z27wdxs5rj5xhhqfzvzn3yg682irkxw6dcs5jj7mcf97psk8gd8";
};
buildInputs = with self; [ nose pybcrypt];
@@ -9502,7 +9552,7 @@ in modules // {
};
propagatedBuildInputs = with self; [
- pyGtkGlade pkgs.libtorrentRasterbar_1_0 twisted Mako chardet pyxdg self.pyopenssl modules.curses service-identity
+ pyGtkGlade pkgs.libtorrentRasterbar_1_0 twisted Mako chardet pyxdg self.pyopenssl service-identity
];
nativeBuildInputs = [ pkgs.intltool ];
@@ -9746,7 +9796,7 @@ in modules // {
doCheck = false;
# Requires Django >= 1.8
- buildInputs = with self ; [ sqlite3 django ];
+ buildInputs = with self; [ django ];
meta = {
description = "Django extension that provides database and form color fields";
@@ -9845,7 +9895,7 @@ in modules // {
sha256 = "1m7y3brk3697hr2cvkzl8dry4pp7wkmhvxmf8db1ardz1r9d8895";
};
- buildInputs = with self ; [ pytestrunner pytestdjango django_environ mock sqlite3 ];
+ buildInputs = with self ; [ pytestrunner pytestdjango django_environ mock ];
propagatedBuildInputs = with self ; [ django six ];
checkPhase = ''
@@ -11621,6 +11671,9 @@ in modules // {
sha256 = "07rqwfpbv13mk6gg8mf0bmvcf6siyffjpgai1xd8ky7r801j4xb4";
};
+ # SyntaxError in tests.
+ disabled = isPy3k;
+
propagatedBuildInputs = with self; [ gevent ];
};
@@ -11703,20 +11756,20 @@ in modules // {
glances = buildPythonPackage rec {
name = "glances-${version}";
- version = "2.6.2";
+ version = "2.7.1_1";
disabled = isPyPy;
src = pkgs.fetchFromGitHub {
owner = "nicolargo";
repo = "glances";
rev = "v${version}";
- sha256 = "0gysvx1yai303gb9ks5z3jy1qk7ilnwwy30l7gp3kyfbv2cifbb1";
+ sha256 = "0gc2qgpzmy7q31z8b11ls4ifb0lwrz94xnz1kj27kc369a01gbxv";
};
doCheck = false;
buildInputs = with self; [ unittest2 ];
- propagatedBuildInputs = with self; [ modules.curses modules.curses_panel psutil setuptools bottle batinfo pkgs.hddtemp pysnmp ];
+ propagatedBuildInputs = with self; [ psutil setuptools bottle batinfo pkgs.hddtemp pysnmp ];
preConfigure = ''
sed -i 's/data_files\.append((conf_path/data_files.append(("etc\/glances"/' setup.py;
@@ -11917,6 +11970,8 @@ in modules // {
../development/python-modules/gyp/no-darwin-cflags.patch
];
+ disabled = isPy3k;
+
meta = {
description = "A tool to generate native build files";
homepage = https://chromium.googlesource.com/external/gyp/+/master/README.md;
@@ -12158,7 +12213,7 @@ in modules // {
};
buildInputs = with self; [ flake8 pytest flaky ];
- propagatedBuildInputs = with self; ([ uncompyle6 ] ++ optionals isPy27 [ enum34 modules.sqlite3 ]);
+ propagatedBuildInputs = with self; ([ uncompyle6 ] ++ optionals isPy27 [ enum34 ]);
# https://github.com/DRMacIver/hypothesis/issues/300
checkPhase = ''
@@ -12179,6 +12234,9 @@ in modules // {
url = "mirror://pypi/c/colored/${name}.tar.gz";
sha256 = "1r1vsypk8v7az82d66bidbxlndx1h7xd4m43hpg1a6hsjr30wrm3";
};
+
+ # No proper test suite
+ doCheck = false;
};
@@ -12293,6 +12351,32 @@ in modules // {
icdiff = callPackage ../tools/text/icdiff {};
+ imageio = buildPythonPackage rec {
+ name = "imageio-${version}";
+ version = "1.6";
+
+ src = pkgs.fetchurl {
+ url = "https://github.com/imageio/imageio/archive/v${version}.tar.gz";
+ sha256 = "195snkk3fsbjqd5g1cfsd9alzs5q45gdbi2ka9ph4yxqb31ijrbv";
+ };
+
+ buildInputs = with self; [ pytest ];
+ propagatedBuildInputs = with self; [ numpy ];
+
+ checkPhase = ''
+ py.test
+ '';
+
+ # Tries to write in /var/tmp/.imageio
+ doCheck = false;
+
+ meta = {
+ description = "Library for reading and writing a wide range of image, video, scientific, and volumetric data formats";
+ homepage = http://imageio.github.io/;
+ license = licenses.bsd2;
+ };
+ };
+
importlib = buildPythonPackage rec {
name = "importlib-1.0.2";
@@ -12354,6 +12438,9 @@ in modules // {
sha256 = "07mxp4mla7fwfc032f3mxrhjarnhkjqdxxibf9ba87c93z3dq8jj";
};
+ # requires network
+ doCheck = false;
+
buildInputs = with self; [ html5lib ];
propagatedBuildInputs = (with self; [ six beautifulsoup4 ])
++ (with pkgs; [ ffmpeg swftools rtmpdump ]);
@@ -12508,7 +12595,7 @@ in modules // {
propagatedBuildInputs = with self;
[ backports_shutil_get_terminal_size decorator pickleshare prompt_toolkit
- simplegeneric traitlets requests2 pathlib2 pexpect sqlite3 ]
+ simplegeneric traitlets requests2 pathlib2 pexpect ]
++ optionals stdenv.isDarwin [appnope];
LC_ALL="en_US.UTF-8";
@@ -12811,11 +12898,11 @@ in modules // {
};
jmespath = buildPythonPackage rec {
- name = "jmespath-0.7.1";
+ name = "jmespath-0.9.0";
src = pkgs.fetchurl {
url = "mirror://pypi/j/jmespath/${name}.tar.gz";
- sha256 = "1lazbx65imassd7h24z49za001rvx1lmx8r0l21h4izs7pp14nnd";
+ sha256 = "0g9xvl69y7nr3w7ag4fsp6sm4fqf6vrqjw7504x2hzrrsh3ampq8";
};
buildInputs = with self; [ nose ];
@@ -12839,7 +12926,7 @@ in modules // {
};
propagatedBuildInputs = with self; [
- pytz six tzlocal keyring modules.readline argparse dateutil_1_5
+ pytz six tzlocal keyring argparse dateutil_1_5
parsedatetime
];
@@ -13248,7 +13335,7 @@ in modules // {
sed -i 's/version=version/version="${version}"/' setup.py
'';
buildInputs = with self; [ pkgs.git ];
- propagatedBuildInputs = with self; [ modules.sqlite3 ];
+ propagatedBuildInputs = with self; [ ];
doCheck = false;
@@ -13417,12 +13504,15 @@ in modules // {
url = "https://github.com/openstack/pylockfile/archive/${version}.tar.gz";
};
- doCheck = true;
OSLO_PACKAGE_VERSION = "${version}";
buildInputs = with self; [
pbr nose sphinx_1_2
];
+ checkPhase = ''
+ nosetests
+ '';
+
meta = {
homepage = http://launchpad.net/pylockfile;
description = "Platform-independent advisory file locking capability for Python applications";
@@ -13641,6 +13731,38 @@ in modules // {
};
};
+ markdown-macros = buildPythonPackage rec {
+ name = "markdown-macros-${version}";
+ version = "0.1.2";
+
+ src = pkgs.fetchurl {
+ url = "mirror://pypi/m/markdown-macros/${name}.tar.gz";
+ sha256 = "1lzvrb7nci22yp21ab2qqc9p0fhkazqj29vw0wln2r4ckb2nbawv";
+ };
+
+ patches = [
+ # Fixes a bug with markdown>2.4
+ (pkgs.fetchpatch {
+ url = "https://github.com/wnielson/markdown-macros/pull/1.patch";
+ sha256 = "17njbgq2srzkf03ar6yn92frnsbda3g45cdi529fdh0x8mmyxci0";
+ })
+ ];
+
+ prePatch = ''
+ substituteInPlace setup.py --replace "distribute" "setuptools"
+ '';
+
+ propagatedBuildInputs = with self; [ markdown ];
+
+ doCheck = false;
+
+ meta = {
+ description = "An extension for python-markdown that makes writing trac-like macros easy";
+ homepage = https://github.com/wnielson/markdown-macros;
+ license = licenses.mit;
+ maintainers = [ maintainers.abigailbuccaneer ];
+ };
+ };
mathics = buildPythonPackage rec {
name = "mathics-${version}";
@@ -13674,9 +13796,6 @@ in modules // {
dateutil
colorama
six
-
- readline
- sqlite3
];
meta = {
@@ -13848,7 +13967,7 @@ in modules // {
buildInputs = with self; [ pyflakes pep8 ];
propagatedBuildInputs = with self; [
django_1_6 filebrowser_safe grappelli_safe bleach tzlocal beautifulsoup4
- requests2 requests_oauthlib future pillow modules.sqlite3
+ requests2 requests_oauthlib future pillow
];
# Tests Fail Due to Syntax Warning, Fixed for v3.1.11+
@@ -13905,6 +14024,26 @@ in modules // {
};
};
+ moviepy = buildPythonPackage rec {
+ name = "moviepy-${version}";
+ version = "0.2.2.11";
+
+ src = pkgs.fetchurl {
+ url = "mirror://pypi/m/moviepy/${name}.tar.gz";
+ sha256 = "d937d817e534efc54eaee2fc4c0e70b48fcd81e1528cd6425f22178704681dc3";
+ };
+
+ # No tests
+ doCheck = false;
+ propagatedBuildInputs = with self; [ numpy decorator imageio tqdm ];
+
+ meta = {
+ description = "Video editing with Python";
+ homepage = http://zulko.github.io/moviepy/;
+ license = licenses.mit;
+ };
+ };
+
munch = buildPythonPackage rec {
name = "munch-${version}";
version = "2.0.4";
@@ -13987,7 +14126,7 @@ in modules // {
buildInputs = with self; [
pkgs.libjpeg pkgs.freetype pkgs.zlib pkgs.glibcLocales
- pillow twitter pyfiglet requests2 arrow dateutil modules.readline pysocks
+ pillow twitter pyfiglet requests2 arrow dateutil pysocks
pocket
];
@@ -14062,15 +14201,16 @@ in modules // {
description = ''Man-in-the-middle proxy'';
homepage = "http://mitmproxy.org/";
license = licenses.mit;
+ broken = true;
};
};
mock = buildPythonPackage (rec {
- name = "mock-1.3.0";
+ name = "mock-2.0.0";
src = pkgs.fetchurl {
url = "mirror://pypi/m/mock/${name}.tar.gz";
- sha256 = "1xm0xkaz8d8d26kdk09f2n9vn543ssd03vmpkqlmgq3crjz7s90y";
+ sha256 = "1flbpksir5sqrvq2z0dp8sl4bzbadg21sj4d42w3klpdfvgvcn5i";
};
buildInputs = with self; [ unittest2 ];
@@ -14253,8 +14393,6 @@ in modules // {
sha256 = "1gfrxf71xll1w6zb69znqg5c9j0g7036fsalkvqprh2id640cl3a";
};
- propagatedBuildInputs = [ pkgs.mpd_clientlib ];
-
buildInputs = with self; [ mock ];
patchPhase = ''
sed -i -e '/tests_require/d' \
@@ -14265,7 +14403,7 @@ in modules // {
description = "A Python client module for the Music Player Daemon";
homepage = "https://github.com/Mic92/python-mpd2";
license = licenses.lgpl3Plus;
- maintainers = with maintainers; [ rvl ];
+ maintainers = with maintainers; [ rvl mic92 ];
};
};
@@ -14303,7 +14441,7 @@ in modules // {
LC_ALL="en_US.UTF-8";
- propagatedBuildInputs = with self; [ argparse jinja2 six modules.readline ] ++
+ propagatedBuildInputs = with self; [ argparse jinja2 six ] ++
(optionals isPy26 [ importlib ordereddict ]);
meta = {
@@ -15021,7 +15159,6 @@ in modules // {
propagatedBuildInputs = with self; [
numpy
nose
- modules.sqlite3
];
# Failing tests
@@ -15413,12 +15550,15 @@ in modules // {
name = "ntplib-0.3.3";
src = pkgs.fetchurl {
url = mirror://pypi/n/ntplib/ntplib-0.3.3.tar.gz;
-
sha256 = "c4621b64d50be9461d9bd9a71ba0b4af06fbbf818bbd483752d95c1a4e273ede";
};
+ # Require networking
+ doCheck = false;
+
meta = {
description = "Python NTP library";
+ license = licenses.mit;
};
};
@@ -15704,7 +15844,7 @@ in modules // {
sha256 = "1v49sym6mrci9dxy0a7cpbp4bv6fg2ijj6rwk4wzg18c2x4qzkhn";
};
- propagatedBuildInputs = with self; [ curses livestreamer ];
+ propagatedBuildInputs = with self; [ livestreamer ];
meta = {
homepage = https://github.com/gapato/livestreamer-curses;
@@ -17095,11 +17235,11 @@ in modules // {
fasteners = buildPythonPackage rec {
name = "fasteners-${version}";
- version = "0.13.0";
+ version = "0.14.1";
src = pkgs.fetchurl {
- url = "mirror://pypi/f/fasteners/fasteners-0.13.0.tar.gz";
- sha256 = "0nghdq3zihiqg10dp76ls7yn44m5wjncyz7fk8isagkrspkh9a3n";
+ url = "mirror://pypi/f/fasteners/${name}.tar.gz";
+ sha256 = "063y20kx01ihbz2mziapmjxi2cd0dq48jzg587xdsdp07xvpcz22";
};
propagatedBuildInputs = with self; [ six monotonic testtools ];
@@ -17367,7 +17507,6 @@ in modules // {
sqlalchemy
lxml
html5lib
- modules.sqlite3
beautifulsoup4
openpyxl
tables
@@ -17575,6 +17714,29 @@ in modules // {
};
};
+ patch = buildPythonPackage rec {
+ name = "${pname}-${version}";
+ version = "1.16";
+ pname = "patch";
+
+ src = pkgs.fetchzip {
+ url = "mirror://pypi/p/${pname}/${name}.zip";
+ sha256 = "1nj55hvyvzax4lxq7vkyfbw91pianzr3hp7ka7j12pgjxccac50g";
+ stripRoot = false;
+ };
+
+ # No tests included in archive
+ doCheck = false;
+
+ meta = {
+ description = "A library to parse and apply unified diffs";
+ homepage = https://github.com/techtonik/python-patch/;
+ license = licenses.mit;
+ platforms = platforms.all;
+ maintainers = [ maintainers.igsha ];
+ };
+ };
+
pathos = buildPythonPackage rec {
name = "pathos-${version}";
version = "0.2.0";
@@ -17865,7 +18027,12 @@ in modules // {
url = "https://github.com/GreenSteam/pep257/archive/${version}.tar.gz";
sha256 = "0v8aq0xzsa7clazszxl42904c3jpq69lg8a5hg754bqcqf72hfrn";
};
- buildInputs = with self; [ pytest ];
+ LC_ALL="en_US.UTF-8";
+ buildInputs = with self; [ pkgs.glibcLocales pytest ];
+
+ checkPhase = ''
+ py.test
+ '';
meta = {
homepage = https://github.com/GreenSteam/pep257/;
@@ -17885,7 +18052,7 @@ in modules // {
sha256 = "169s5mhw1s60qbsd6pkf9bb2x6wfgx8hn8nw9d4qgc68qnnpp2cj";
};
- propagatedBuildInputs = with self; [ modules.curses ];
+ propagatedBuildInputs = with self; [ ];
meta = {
homepage = https://github.com/mooz/percol;
@@ -18967,7 +19134,7 @@ in modules // {
disabled = isPy3k || isPyPy;
- propagatedBuildInputs = with self; [ sqlite3 vobject lxml requests urwid pyxdg ];
+ propagatedBuildInputs = with self; [ vobject lxml requests urwid pyxdg ];
meta = {
description = "Command-line interface carddav client";
@@ -19260,7 +19427,7 @@ in modules // {
sha256 = "0hqsap82zklhi5fxhc69kxrwzb0g9566f7sdpz7f9gyxkmyam839";
};
- propagatedBuildInputs = with self; [ pkgs.curl pkgs.openssl ];
+ propagatedBuildInputs = with self; [ pkgs.curl pkgs.openssl.out ];
# error: invalid command 'test'
doCheck = false;
@@ -19270,6 +19437,11 @@ in modules // {
export PYCURL_SSL_LIBRARY=openssl
'';
+ #TODO no idea why this is needed
+ postInstall = ''
+ ln -s ${pkgs.openssl.out}/lib/libcrypto* $out/lib/
+ '';
+
meta = {
homepage = http://pycurl.sourceforge.net/;
description = "Python wrapper for libcurl";
@@ -19277,7 +19449,6 @@ in modules // {
};
});
-
pycurl2 = buildPythonPackage (rec {
name = "pycurl2-7.20.0";
disabled = isPy3k;
@@ -20206,7 +20377,7 @@ in modules // {
sha256 = "0jgyhkkq36wn36rymn4jiyqh2vdslmradq4a2mjkxfbk2cz6wpi5";
};
- buildInputs = with self; [ six pytest hypothesis ] ++ optional (!isPy3k) modules.sqlite3;
+ buildInputs = with self; [ six pytest hypothesis ];
checkPhase = ''
py.test
@@ -20592,6 +20763,13 @@ in modules // {
LC_ALL = "en_US.UTF-8";
buildInputs = [ pkgs.glibcLocales ];
+ checkPhase = ''
+ ${python.interpreter} -m unittest discover -s Tests
+ '';
+
+ # Tests broken on Python 3.x
+ doCheck = !(isPy3k);
+
meta = {
description = "A Pure-Python library built as a PDF toolkit";
homepage = "http://mstamy2.github.com/PyPDF2/";
@@ -21204,7 +21382,7 @@ in modules // {
};
buildInputs = with self; [ nose ];
- propagatedBuildInputs = with self; [ modules.sqlite3 six ];
+ propagatedBuildInputs = with self; [ six ];
checkPhase = "nosetests";
@@ -21604,27 +21782,6 @@ in modules // {
};
};
- Whoosh = buildPythonPackage rec {
- name = "Whoosh-${version}";
- version = "2.7.0";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/W/Whoosh/Whoosh-${version}.tar.gz";
- sha256 = "1xx8rqk1v2xs7mxvy9q4sgz2qmgvhf6ygbqjng3pl83ka4f0xz6d";
- };
-
- propagatedBuildInputs = with self; [
-
- ];
- buildInputs = with self; [
- pytest
- ];
-
- meta = with stdenv.lib; {
- homepage = "http://bitbucket.org/mchaput/whoosh";
- };
- };
-
pysolr = buildPythonPackage rec {
name = "pysolr-${version}";
version = "3.3.3";
@@ -21660,7 +21817,7 @@ in modules // {
buildInputs = with self; [ coverage mock nose geopy ];
propagatedBuildInputs = with self; [
- django_1_6 dateutil_1_5 Whoosh pysolr elasticsearch
+ django_1_6 dateutil_1_5 whoosh pysolr elasticsearch
];
patchPhase = ''
@@ -21747,7 +21904,7 @@ in modules // {
propagatedBuildInputs = with self;
[ django_1_6 recaptcha_client pytz memcached dateutil_1_5 paramiko flup
- pygments djblets django_evolution pycrypto modules.sqlite3 pysvn pillow
+ pygments djblets django_evolution pycrypto pysvn pillow
psycopg2 django-haystack python_mimeparse markdown django-multiselectfield
];
};
@@ -21915,7 +22072,7 @@ in modules // {
sha256 = "1lf5f4x80f7d983bmkx12sxcizzii21kghs8kf63a1mj022a5x5j";
};
- propagatedBuildInputs = with self; [ pygments wxPython modules.sqlite3 ];
+ propagatedBuildInputs = with self; [ pygments wxPython ];
# ride_postinstall.py checks that needed deps are installed and creates a
# desktop shortcut. We don't really need it and it clutters up bin/ so
@@ -21947,7 +22104,7 @@ in modules // {
disabled = isPy3k;
- propagatedBuildInputs = with self; [ pkgs.root readline numpy matplotlib ];
+ propagatedBuildInputs = with self; [ pkgs.root numpy matplotlib ];
meta = {
homepage = "http://www.rootpy.org";
@@ -22019,7 +22176,7 @@ in modules // {
url = "mirror://pypi/r/ropper/${name}.tar.gz";
sha256 = "1676e07947a19df9d17002307a7555c2647a4224d6f2869949e8fc4bd18f2e87";
};
- propagatedBuildInputs = with self; [ capstone filebytes readline ];
+ propagatedBuildInputs = with self; [ capstone filebytes ];
meta = with pkgs.stdenv.lib; {
homepage = "https://scoding.de/ropper/";
license = licenses.gpl2;
@@ -22224,12 +22381,12 @@ in modules // {
};
s3transfer = buildPythonPackage rec {
- version = "0.0.1"; # This version is required by awscli
+ version = "0.1.9";
name = "s3transfer-${version}";
src = pkgs.fetchurl {
url = "mirror://pypi/s/s3transfer/${name}.tar.gz";
- sha256 = "0ma31zvv7gy240xgd1zw853lpzkdci6mapzpg3x4vycann6yvf9b";
+ sha256 = "0m67nhdnp2pd11j8h4bgz63zq0mvn2f205vrxmr3my8m45kpvb8p";
};
foo = 1;
@@ -22345,8 +22502,6 @@ in modules // {
sha256 = "1bqmp0xglkndrqgmybpwmzkv462mir8qlkfwsxwbvvzh9li3ndn5";
};
- propagatedBuildInputs = [ modules.readline ];
-
meta = {
description = "Powerful interactive network packet manipulation program";
homepage = http://www.secdev.org/projects/scapy/;
@@ -22382,16 +22537,19 @@ in modules // {
scikitimage = buildPythonPackage rec {
name = "scikit-image-${version}";
- version = "0.11.3";
+ version = "0.12.3";
src = pkgs.fetchurl {
url = "mirror://pypi/s/scikit-image/${name}.tar.gz";
- sha256 = "768e568f3299966c294b7eb8cd114fc648f7bfaef422ee9cc750dd8d9d09e44b";
+ sha256 = "1iypjww5hk46i9vzg2zlfc9w4vdw029cfyakkkl02isj1qpiknl2";
};
- buildInputs = with self; [ cython nose numpy six ];
+ buildInputs = with self; [ cython dask nose numpy scipy six ];
- propagatedBuildInputs = with self; [ pillow matplotlib networkx scipy ];
+ propagatedBuildInputs = with self; [ pillow matplotlib networkx scipy six numpy ];
+
+ # the test fails because the loader cannot create test objects!
+ doCheck = false;
meta = {
description = "Image processing routines for SciPy";
@@ -22815,8 +22973,6 @@ in modules // {
sha256 = "4721607e0b817b89efdba7e79cab881a03164b94777f4cf796ad5dd59a7612c5";
};
- buildInputs = with self; [ modules.sqlite3 ];
-
meta = {
description = "sqlite-backed dictionary";
homepage = "http://github.com/Yelp/sqlite3dbm";
@@ -22849,8 +23005,6 @@ in modules // {
sha256 = "0g8sjky8anrmcisc697b5qndp88qmay35kng9sz9x46wd3agm9pa";
};
- propagatedBuildInputs = with self; [ modules.sqlite3 ];
-
meta = with pkgs.stdenv.lib; {
homepage = "http://sqlmap.org";
license = licenses.gpl2;
@@ -23141,6 +23295,18 @@ in modules // {
};
};
+ pip2nix = buildPythonPackage rec {
+ name = "pip2nix-${version}";
+ version = "0.3.0";
+
+ src = pkgs.fetchurl {
+ url = "mirror://pypi/p/pip2nix/${name}.tar.gz";
+ sha256 = "1s76i8r4khq8y5r6g4218jg2c6qldmw5xhzymxad51ii8hafpwq6";
+ };
+
+ propagatedBuildInputs = with self; [ click configobj contexter jinja2 pytest ];
+ };
+
pychef = buildPythonPackage rec {
name = "PyChef-${version}";
version = "0.3.0";
@@ -23311,7 +23477,7 @@ in modules // {
# 4 failing tests, 2to3
doCheck = false;
- propagatedBuildInputs = with self; [ modules.curses ];
+ propagatedBuildInputs = with self; [ ];
meta = {
maintainers = with maintainers; [ domenkozar ];
@@ -23689,7 +23855,6 @@ in modules // {
sha256 = "94933b64e2fe0807da0612c574a021c0dac28c7bd3c4a23723ae5a39ea8f3d04";
};
patches = [];
- disabled = isPy35;
# Tests requires Pygments >=2.0.2 which isn't worth keeping around for this:
doCheck = false;
};
@@ -23907,7 +24072,6 @@ in modules // {
buildInputs = with self; [ nose mock ]
++ stdenv.lib.optional doCheck pysqlite;
- propagatedBuildInputs = with self; [ modules.sqlite3 ];
checkPhase = ''
${python.executable} sqla_nose.py
@@ -23933,7 +24097,6 @@ in modules // {
buildInputs = with self; [ pytest mock pytest_xdist ]
++ stdenv.lib.optional (!isPy3k) pysqlite;
- propagatedBuildInputs = with self; [ modules.sqlite3 ];
# Test-only dependency pysqlite doesn't build on Python 3. This isn't an
# acceptable reason to make all dependents unavailable on Python 3 as well
@@ -24698,6 +24861,27 @@ in modules // {
};
};
+ # Tkinter/tkinter is part of the Python standard library.
+ # The Python interpreters in Nixpkgs come without tkinter by default.
+ # To make the module available, we make it available as any other
+ # Python package.
+ tkinter = let
+ py = python.override{x11Support=true;};
+ in mkPythonDerivation rec {
+ name = "tkinter-${python.version}";
+ src = py;
+
+ disabled = isPy26 || isPyPy;
+
+ installPhase = ''
+ mkdir -p $out/${py.sitePackages}
+ ls -Al lib/${py.libPrefix}/lib-dynload/ | grep tkinter
+ mv lib/${py.libPrefix}/lib-dynload/_tkinter* $out/${py.sitePackages}/
+ '';
+
+ inherit (py) meta;
+ };
+
tlslite = buildPythonPackage rec {
name = "tlslite-${version}";
version = "0.4.8";
@@ -24777,7 +24961,7 @@ in modules // {
tox = buildPythonPackage rec {
name = "tox-${version}";
- version = "2.3.1";
+ version = "2.4.1";
propagatedBuildInputs = with self; [ py virtualenv pluggy ];
@@ -24785,7 +24969,7 @@ in modules // {
src = pkgs.fetchurl {
url = "mirror://pypi/t/tox/${name}.tar.gz";
- sha256 = "1vj73ar4rimq3fwy5r2z3jv4g9qbh8rmpmncsc00g0k310acqzxz";
+ sha256 = "1nwn4jz8ns53n17bm1xkzlz4zyyxbgjwrcg2cjsn25ab7hd5fwv6";
};
};
@@ -24862,7 +25046,7 @@ in modules // {
PYTHON_EGG_CACHE = "`pwd`/.egg-cache";
- propagatedBuildInputs = with self; [ genshi setuptools modules.sqlite3 ];
+ propagatedBuildInputs = with self; [ genshi ];
meta = {
description = "Enhanced wiki and issue tracking system for software development projects";
@@ -25002,6 +25186,7 @@ in modules // {
sha256 = "0n2shilamgwhzmvf534xg7f6hrnznbixyl5pw2f5a3f391gwy37h";
};
+ doCheck = false;
propagatedBuildInputs = with self; [ requests2 six requests_oauthlib ];
meta = {
@@ -25420,7 +25605,7 @@ in modules // {
virtual-display = buildPythonPackage rec {
name = "PyVirtualDisplay-0.1.5";
- propagatedBuildInputs = with self; [ easy-process ];
+ propagatedBuildInputs = with self; [ EasyProcess ];
src = pkgs.fetchurl {
url = "mirror://pypi/P/PyVirtualDisplay/${name}.tar.gz";
@@ -25447,7 +25632,7 @@ in modules // {
patches = [ ../development/python-modules/virtualenv-change-prefix.patch ];
- propagatedBuildInputs = with self; [ modules.readline modules.sqlite3 modules.curses ];
+ propagatedBuildInputs = with self; [ ];
# Tarball doesn't contain tests
doCheck = false;
@@ -25868,7 +26053,7 @@ in modules // {
sha256 = "e03dd26ea694b877a2b3b7b4dcca8e79420e7f346abab34292bff43d992a8cc5";
};
- buildInputs = with self; [ pytest modules.sqlite3 ];
+ buildInputs = with self; [ pytest ];
propagatedBuildInputs = with self; [ feedparser pytz lxml praw pyenchant pygeoip backports_ssl_match_hostname ];
checkPhase = ''
py.test test
@@ -26910,7 +27095,7 @@ in modules // {
};
buildInputs = with self; [ unittest2 nose mock ];
- propagatedBuildInputs = with self; [ modules.curses libarchive ];
+ propagatedBuildInputs = with self; [ libarchive ];
# tests are still failing
doCheck = false;
@@ -27452,7 +27637,7 @@ in modules // {
sha256 = "472a4403fd5b5364939aee10e78f171b1489e5f6bfe6f150ed9cae8476410114";
};
- propagatedBuildInputs = with self; [ django_1_5 django_tagging modules.sqlite3 whisper pycairo ldap memcached ];
+ propagatedBuildInputs = with self; [ django_1_5 django_tagging whisper pycairo ldap memcached ];
postInstall = ''
wrapProgram $out/bin/run-graphite-devel-server.py \
@@ -28243,6 +28428,18 @@ in modules // {
];
};
+ pynac = buildPythonPackage rec {
+ name = "pynac-${version}";
+ version = "0.2";
+
+ src = pkgs.fetchurl {
+ url = "mirror://sourceforge/project/pynac/pynac/pynac-0.2/pynac-0.2.tar.gz";
+ sha256 = "0avzqqcxl54karjmla9jbsyid98mva36lxahwmrsx5h40ys2ggxp";
+ };
+
+ propagatedBuildInputs = with self; [];
+ };
+
pymacaroons-pynacl = buildPythonPackage rec {
name = "pymacaroons-pynacl-${version}";
version = "0.9.3";
@@ -28347,6 +28544,7 @@ in modules // {
description = "A smart imaging service";
homepage = https://github.com/globocom/thumbor/wiki;
license = licenses.mit;
+ broken = true;
};
};
@@ -28572,14 +28770,22 @@ in modules // {
ofxtools = buildPythonPackage rec {
name = "ofxtools-0.3.8";
- src = pkgs.fetchurl {
- url = "mirror://pypi/o/ofxtools/${name}.tar.gz";
- sha256 = "88f289a60f4312a1599c38a8fb3216e2b46d10cc34476f9a16a33ac8aac7ec35";
- };
+ src = pkgs.fetchurl {
+ url = "mirror://pypi/o/ofxtools/${name}.tar.gz";
+ sha256 = "88f289a60f4312a1599c38a8fb3216e2b46d10cc34476f9a16a33ac8aac7ec35";
+ };
+
+ checkPhase = ''
+ ${python.interpreter} -m unittest discover -s ofxtools
+ '';
+
+ buildInputs = with self; [ sqlalchemy ];
+
meta = {
homepage = "https://github.com/csingley/ofxtools";
description = "Library for working with Open Financial Exchange (OFX) formatted data used by financial institutions";
license = licenses.mit;
+ broken = true;
};
};
@@ -28808,12 +29014,12 @@ in modules // {
};
neovim = buildPythonPackage rec {
- version = "0.1.9";
+ version = "0.1.10";
name = "neovim-${version}";
src = pkgs.fetchurl {
url = "mirror://pypi/n/neovim/${name}.tar.gz";
- sha256 = "09q7yz0v9i90grp4cmb1w8dps58q9xny7sb12kgmd8gcr8xwk4dx";
+ sha256 = "1n6xxh0n250qbvrdl0cw114d890nfv6d0wjk5wpr505sg2bg9jx4";
};
buildInputs = with self; [ nose ];
@@ -28840,22 +29046,18 @@ in modules // {
neovim_gui = buildPythonPackage rec {
name = "neovim-pygui-${self.neovim.version}";
- version = "0.1.2";
+ version = "0.1.3";
disabled = !isPy27;
src = pkgs.fetchFromGitHub {
owner = "neovim";
repo = "python-gui";
rev = version;
- sha256 = "0sc5apxwxgfj57q7d9cih404jgvczbp7slz5z8wqdyxpxlb42pn2";
+ sha256 = "1vpvr3zm3f9sxg1z1cl7f7gi8v1xksjdvxj62qnw65aqj3zqxnkz";
};
- buildInputs = with self; [ neovim ];
-
propagatedBuildInputs = [
- self.msgpack
- self.greenlet
- self.trollius
+ self.neovim
self.click
self.pygobject3
pkgs.gobjectIntrospection
@@ -29158,6 +29360,10 @@ in modules // {
patches = [ ../development/python-modules/suds-0.4-CVE-2013-2217.patch ];
meta = with stdenv.lib; {
+ # Broken for security issues:
+ # - https://github.com/NixOS/nixpkgs/issues/19678
+ # - https://lwn.net/Vulnerabilities/559200/
+ broken = true;
description = "Lightweight SOAP client";
homepage = https://fedorahosted.org/suds;
license = licenses.lgpl3Plus;
@@ -30090,6 +30296,41 @@ in modules // {
};
};
+ tensorflowCuDNN = buildPythonPackage rec {
+ name = "tensorflow";
+ version = "0.11.0rc0";
+ format = "wheel";
+
+ src = pkgs.fetchurl {
+ url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow-${version}-cp27-none-linux_x86_64.whl";
+ sha256 = "1r8zlz95sw7bnjzg5zdbpa9dj8wmp8cvvgyl9sv3amsscagnnfj5";
+ };
+
+ buildInputs = with self; [ pkgs.swig ];
+ propagatedBuildInputs = with self; [ numpy six protobuf3_0 pkgs.cudatoolkit75 pkgs.cudnn5_cudatoolkit75 pkgs.gcc49 self.mock ];
+
+ # Note that we need to run *after* the fixup phase because the
+ # libraries are loaded at runtime. If we run in preFixup then
+ # patchelf --shrink-rpath will remove the cuda libraries.
+ postFixup = let rpath = stdenv.lib.makeLibraryPath [
+ pkgs.gcc49.cc.lib
+ pkgs.zlib pkgs.cudatoolkit75
+ pkgs.cudnn5_cudatoolkit75
+ pkgs.linuxPackages.nvidia_x11
+ ]; in ''
+ find $out -name '*.so' -exec patchelf --set-rpath "${rpath}" {} \;
+ '';
+
+ doCheck = false;
+
+ meta = {
+ description = "TensorFlow helps the tensors flow (no gpu support)";
+ homepage = http://tensorflow.org;
+ license = licenses.asl20;
+ platforms = platforms.linux;
+ };
+ };
+
tflearn = buildPythonPackage rec {
name = "tflearn-0.2.1";
@@ -30401,6 +30642,8 @@ in modules // {
sha256 = "08n7vxdbsl0637b1ap2x3rg698d2as0wzvvpx05dzkrdgsgxrx3g";
};
+ propagatedBuildInputs = with self; [ backports_functools_lru_cache ];
+
doCheck = false;
buildInputs = with self; [ setuptools_scm ];
@@ -30660,8 +30903,8 @@ in modules // {
postPatch = ''
rm tests/test_reading.py
'';
- checkPhase = ''
- py.test
+ checkPhase = ''
+ py.test -k "not test_timelimit"
'';
meta = {
@@ -30691,4 +30934,71 @@ in modules // {
platforms = platforms.all;
};
};
+
+ pwntools = buildPythonPackage rec {
+ name = "pwntools-${version}";
+ version = "3.1.0";
+
+ src = pkgs.fetchurl {
+ url = "mirror://pypi/p/pwntools/${name}.tar.gz";
+ sha256 = "1siyky6iq2b155sfjhx10yg2ihvjp2s3kr6i0n5z9v5pi0r7gc6d";
+ };
+ propagatedBuildInputs = with self; [ Mako packaging pysocks pygments ROPGadget capstone paramiko pip psutil pyelftools pypandoc pyserial dateutil requests2 tox pkgs.pandoc ];
+
+ disabled = isPy3k;
+
+ meta = {
+ homepage = "http://pwntools.com";
+ description = "CTF framework and exploit development library";
+ license = licenses.mit;
+ maintainers = with maintainers; [ bennofs ];
+ };
+ };
+
+ ROPGadget = buildPythonPackage rec {
+ name = "ROPGadget-5.4";
+ src = pkgs.fetchurl {
+ url = "mirror://pypi/R/ROPGadget/${name}.tar.gz";
+ sha256 = "19wly4x3mq73c91pplqjk0c7sx6710887czh514qk5l7j0ky6dxg";
+ };
+ propagatedBuildInputs = with self; [ capstone ];
+ meta = with pkgs.stdenv.lib; {
+ description = "Tool to search for gadgets in binaries to facilitate ROP exploitation";
+ homepage = "http://shell-storm.org/project/ROPgadget/";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ bennofs ];
+ };
+ };
+
+ packaging = buildPythonPackage rec {
+ name = "packaging-16.7";
+ src = pkgs.fetchurl {
+ url = "mirror://pypi/p/packaging/${name}.tar.gz";
+ sha256 = "07h18mrpqs0lv2x4fl43pqi0xj6hdrmrnm6v9q634yliagg6q91f";
+ };
+ propagatedBuildInputs = with self; [ pyparsing six ];
+ buildInputs = with self; [ pytest pretend ];
+ meta = with pkgs.stdenv.lib; {
+ description = "Core utilities for Python packages";
+ homepage = "https://github.com/pypa/packaging";
+ license = [ licenses.bsd2 licenses.asl20 ];
+ maintainers = with maintainers; [ bennofs ];
+ };
+ };
+
+ pypandoc = buildPythonPackage rec {
+ name = "pypandoc-1.2.0";
+ src = pkgs.fetchurl {
+ url = "mirror://pypi/p/pypandoc/${name}.zip";
+ sha256 = "1sxmgrpy0a0yy3nyxiymzqrw715gm23s01fq53q4vgn79j47jakm";
+ };
+ propagatedBuildInputs = with self; [ self.pip ];
+ buildInputs = [ pkgs.pandoc pkgs.texlive.combined.scheme-small pkgs.haskellPackages.pandoc-citeproc ];
+ meta = with pkgs.stdenv.lib; {
+ description = "Thin wrapper for pandoc";
+ homepage = "https://github.com/bebraw/pypandoc";
+ license = licenses.mit;
+ maintainers = with maintainers; [ bennofs ];
+ };
+ };
}
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index ad7d07f44cc..8ab27bc171d 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -130,7 +130,6 @@ with import ./release-lib.nix { inherit supportedSystems; };
portmap = linux;
procps = linux;
python = allBut cygwin;
- pythonFull = linux;
readline = all;
rlwrap = all;
rpm = linux;
diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index 20cc1396653..332fe71f64f 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-09-29";
- rev = "12dc47026cadf5aa2823c9d0fdd055b9f2c0f52c";
- sha256 = "0la6wlnbiwjixcxbq6k0d8m5js8lk5wz5f3mvdx8hwl5car20w6m";
+ version = "2016-10-29";
+ rev = "623cc0d9328bfb949b54209443f2b4f06c41961e";
+ sha256 = "1jyb0ixnrxb7m0c18p6yfi6x8rsy3yz5yc3nyz9f462fr4g6azcs";
src = fetchFromGitHub {
inherit rev;