public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Vladimír Čunát 2016-10-05 19:02:48 +02:00
commit 30f551d8b2
95 changed files with 3278 additions and 2109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@ -13,12 +13,12 @@ build daemon as so-called channels. To get channel information via git, add
``` ```
For stability and maximum binary package support, it is recommended to maintain For stability and maximum binary package support, it is recommended to maintain
custom changes on top of one of the channels, e.g. `nixos-16.03` for the latest custom changes on top of one of the channels, e.g. `nixos-16.09` for the latest
release and `nixos-unstable` for the latest successful build of master: release and `nixos-unstable` for the latest successful build of master:
``` ```
% git remote update channels % git remote update channels
% git rebase channels/nixos-16.03 % git rebase channels/nixos-16.09
``` ```
For pull-requests, please rebase onto nixpkgs `master`. For pull-requests, please rebase onto nixpkgs `master`.
@ -32,9 +32,9 @@ For pull-requests, please rebase onto nixpkgs `master`.
* [Manual (NixOS)](https://nixos.org/nixos/manual/) * [Manual (NixOS)](https://nixos.org/nixos/manual/)
* [Nix Wiki](https://nixos.org/wiki/) (deprecated, see milestone ["Move the Wiki!"](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22Move+the+wiki%21%22)) * [Nix Wiki](https://nixos.org/wiki/) (deprecated, see milestone ["Move the Wiki!"](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22Move+the+wiki%21%22))
* [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined) * [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
* [Continuous package builds for 16.03 release](https://hydra.nixos.org/jobset/nixos/release-16.03) * [Continuous package builds for 16.09 release](https://hydra.nixos.org/jobset/nixos/release-16.09)
* [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents) * [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
* [Tests for 16.03 release](https://hydra.nixos.org/job/nixos/release-16.03/tested#tabs-constituents) * [Tests for 16.09 release](https://hydra.nixos.org/job/nixos/release-16.09/tested#tabs-constituents)
Communication: Communication:

1
lib/maintainers.nix
View File

@ -213,6 +213,7 @@
kampfschlaefer = "Arnold Krille <arnold@arnoldarts.de>"; kampfschlaefer = "Arnold Krille <arnold@arnoldarts.de>";
kevincox = "Kevin Cox <kevincox@kevincox.ca>"; kevincox = "Kevin Cox <kevincox@kevincox.ca>";
khumba = "Bryan Gardiner <bog@khumba.net>"; khumba = "Bryan Gardiner <bog@khumba.net>";
KibaFox = "Kiba Fox <kiba.fox@foxypossibilities.com>";
kkallio = "Karn Kallio <tierpluspluslists@gmail.com>"; kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
koral = "Koral <koral@mailoo.org>"; koral = "Koral <koral@mailoo.org>";
kovirobi = "Kovacsics Robert <kovirobi@gmail.com>"; kovirobi = "Kovacsics Robert <kovirobi@gmail.com>";

2
nixos/doc/manual/development/reviewing-contributions.xml
View File

@ -212,7 +212,7 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
- [ ] build time only dependencies are declared in `nativeBuildInputs` - [ ] build time only dependencies are declared in `nativeBuildInputs`
- [ ] source is fetched using the appropriate function - [ ] source is fetched using the appropriate function
- [ ] phases are respected - [ ] phases are respected
- [ ] patches that are remotely available are fetched with `fetchPatch` - [ ] patches that are remotely available are fetched with `fetchpatch`
##### Possible improvements ##### Possible improvements

18
nixos/modules/services/databases/mysql.nix
View File

@ -43,6 +43,7 @@ in
services.mysql = { services.mysql = {
enable = mkOption { enable = mkOption {
type = types.bool;
default = false; default = false;
description = " description = "
Whether to enable the MySQL server. Whether to enable the MySQL server.
@ -51,6 +52,7 @@ in
package = mkOption { package = mkOption {
type = types.package; type = types.package;
default = pkgs.mysql;
example = literalExample "pkgs.mysql"; example = literalExample "pkgs.mysql";
description = " description = "
Which MySQL derivation to use. Which MySQL derivation to use.
@ -58,16 +60,19 @@ in
}; };
port = mkOption { port = mkOption {
default = "3306"; type = types.int;
default = 3306;
description = "Port of MySQL"; description = "Port of MySQL";
}; };
user = mkOption { user = mkOption {
type = types.str;
default = "mysql"; default = "mysql";
description = "User account under which MySQL runs"; description = "User account under which MySQL runs";
}; };
dataDir = mkOption { dataDir = mkOption {
type = types.path;
default = "/var/mysql"; # !!! should be /var/db/mysql default = "/var/mysql"; # !!! should be /var/db/mysql
description = "Location where MySQL stores its table files"; description = "Location where MySQL stores its table files";
}; };
@ -78,6 +83,7 @@ in
}; };
extraOptions = mkOption { extraOptions = mkOption {
type = types.lines;
default = ""; default = "";
example = '' example = ''
key_buffer_size = 6G key_buffer_size = 6G
@ -115,32 +121,39 @@ in
replication = { replication = {
role = mkOption { role = mkOption {
type = types.enum [ "master" "slave" "none" ];
default = "none"; default = "none";
description = "Role of the MySQL server instance. Can be either: master, slave or none"; description = "Role of the MySQL server instance.";
}; };
serverId = mkOption { serverId = mkOption {
type = types.int;
default = 1; default = 1;
description = "Id of the MySQL server instance. This number must be unique for each instance"; description = "Id of the MySQL server instance. This number must be unique for each instance";
}; };
masterHost = mkOption { masterHost = mkOption {
type = types.str;
description = "Hostname of the MySQL master server"; description = "Hostname of the MySQL master server";
}; };
slaveHost = mkOption { slaveHost = mkOption {
type = types.str;
description = "Hostname of the MySQL slave server"; description = "Hostname of the MySQL slave server";
}; };
masterUser = mkOption { masterUser = mkOption {
type = types.str;
description = "Username of the MySQL replication user"; description = "Username of the MySQL replication user";
}; };
masterPassword = mkOption { masterPassword = mkOption {
type = types.str;
description = "Password of the MySQL replication user"; description = "Password of the MySQL replication user";
}; };
masterPort = mkOption { masterPort = mkOption {
type = types.int;
default = 3306; default = 3306;
description = "Port number on which the MySQL master server runs"; description = "Port number on which the MySQL master server runs";
}; };
@ -167,6 +180,7 @@ in
systemd.services.mysql = systemd.services.mysql =
{ description = "MySQL Server"; { description = "MySQL Server";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
unitConfig.RequiresMountsFor = "${cfg.dataDir}"; unitConfig.RequiresMountsFor = "${cfg.dataDir}";

2
nixos/modules/services/editors/emacs.xml
View File

@ -72,7 +72,7 @@
<term><varname>emacs25-nox</varname></term> <term><varname>emacs25-nox</varname></term>
<listitem> <listitem>
<para> <para>
Emacs 24 built without any dependency on X11 Emacs 25 built without any dependency on X11
libraries. libraries.
</para> </para>
</listitem> </listitem>

9
nixos/modules/services/web-servers/phpfpm/default.nix
View File

@ -7,8 +7,6 @@ let
stateDir = "/run/phpfpm"; stateDir = "/run/phpfpm";
pidFile = "${stateDir}/phpfpm.pid";
mkPool = n: p: '' mkPool = n: p: ''
[${n}] [${n}]
listen = ${p.listen} listen = ${p.listen}
@ -17,9 +15,8 @@ let
cfgFile = pkgs.writeText "phpfpm.conf" '' cfgFile = pkgs.writeText "phpfpm.conf" ''
[global] [global]
pid = ${pidFile}
error_log = syslog error_log = syslog
daemonize = yes daemonize = no
${cfg.extraConfig} ${cfg.extraConfig}
${concatStringsSep "\n" (mapAttrsToList mkPool cfg.pools)} ${concatStringsSep "\n" (mapAttrsToList mkPool cfg.pools)}
@ -43,7 +40,7 @@ in {
description = '' description = ''
Extra configuration that should be put in the global section of Extra configuration that should be put in the global section of
the PHP-FPM configuration file. Do not specify the options the PHP-FPM configuration file. Do not specify the options
<literal>pid</literal>, <literal>error_log</literal> or <literal>error_log</literal> or
<literal>daemonize</literal> here, since they are generated by <literal>daemonize</literal> here, since they are generated by
NixOS. NixOS.
''; '';
@ -129,8 +126,8 @@ in {
mkdir -p "${stateDir}" mkdir -p "${stateDir}"
''; '';
serviceConfig = { serviceConfig = {
Type = "notify";
ExecStart = "${cfg.phpPackage}/bin/php-fpm -y ${cfgFile} -c ${phpIni}"; ExecStart = "${cfg.phpPackage}/bin/php-fpm -y ${cfgFile} -c ${phpIni}";
PIDFile = pidFile;
}; };
}; };

4
pkgs/applications/audio/cava/default.nix
View File

@ -3,7 +3,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "cava-${version}"; name = "cava-${version}";
version = "0.4.1"; version = "0.4.2";
buildInputs = [ buildInputs = [
alsaLib alsaLib
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
owner = "karlstav"; owner = "karlstav";
repo = "cava"; repo = "cava";
rev = version; rev = version;
sha256 = "157hw4cn3qjic7ymn5vy67paxmzssc33h1zswx72ss7j6nc8707f"; sha256 = "1c5gl8ghmd89f6097rjd2dzrgh1z4i4v9m4vn5wkpnnm68b96yyc";
}; };
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];

36
pkgs/applications/editors/emacs-modes/elpa-generated.nix
View File

@ -471,10 +471,10 @@
debbugs = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, soap-client }: debbugs = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, soap-client }:
elpaBuild { elpaBuild {
pname = "debbugs"; pname = "debbugs";
version = "0.10"; version = "0.11";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/debbugs-0.10.tar"; url = "https://elpa.gnu.org/packages/debbugs-0.11.tar";
sha256 = "0vrsa70h6ipsq01qr9qzlaw1704xqviby321ri6w69wkwlcjkpin"; sha256 = "10v9s7ayvfzd6j6hqfc9zihxgmsc2j0xhxrgy3ah30qkqn6z8w6n";
}; };
packageRequires = [ cl-lib soap-client ]; packageRequires = [ cl-lib soap-client ];
meta = { meta = {
@ -711,10 +711,10 @@
}) {}; }) {};
exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild { exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild {
pname = "exwm"; pname = "exwm";
version = "0.10"; version = "0.11";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/exwm-0.10.tar"; url = "https://elpa.gnu.org/packages/exwm-0.11.tar";
sha256 = "1c8558dxy7a2m61a0bc0p5vrdw3nw03zq9s8wxgmdvlklyzbqa22"; sha256 = "108n09b6512y05rskq754hzwc5nzqmkq1lfrarl34my41wsc1qnf";
}; };
packageRequires = [ xelb ]; packageRequires = [ xelb ];
meta = { meta = {
@ -767,10 +767,10 @@
ggtags = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: ggtags = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild { elpaBuild {
pname = "ggtags"; pname = "ggtags";
version = "0.8.11"; version = "0.8.12";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/ggtags-0.8.11.el"; url = "https://elpa.gnu.org/packages/ggtags-0.8.12.el";
sha256 = "1q2bp2b7lylf7n6c1psfn5swyjg0y78ykm0ak2kd84pbyhqak2mq"; sha256 = "0ny3llk021g6r0s75xdm4hzpbxv393ddm2r6f2xdk8kqnq4gnirp";
}; };
packageRequires = [ cl-lib emacs ]; packageRequires = [ cl-lib emacs ];
meta = { meta = {
@ -1336,10 +1336,10 @@
}) {}; }) {};
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org"; pname = "org";
version = "20160912"; version = "20161003";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/org-20160912.tar"; url = "https://elpa.gnu.org/packages/org-20161003.tar";
sha256 = "0g44hcyk9x0103mfkmkbrn4f36vlyrfxil1qd3fpwardcnaxr5w4"; sha256 = "077v69l3w5q0rfbj1mm92cs2pz5yh3p89qnxxj0zn3g5m0dg9yjm";
}; };
packageRequires = []; packageRequires = [];
meta = { meta = {
@ -1687,10 +1687,10 @@
}) {}; }) {};
stream = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { stream = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
pname = "stream"; pname = "stream";
version = "2.2.2"; version = "2.2.3";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/stream-2.2.2.el"; url = "https://elpa.gnu.org/packages/stream-2.2.3.el";
sha256 = "00p24ipn8frlhhwzrz6za7dq4fkhs8i8cwp48yhsq9zpnj9y38xb"; sha256 = "1y9nh5473p0dd149g675nybsdnzp8c4mq3wdql066nir7scz6rhy";
}; };
packageRequires = [ emacs ]; packageRequires = [ emacs ];
meta = { meta = {
@ -2061,10 +2061,10 @@
ztree = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: ztree = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild { elpaBuild {
pname = "ztree"; pname = "ztree";
version = "1.0.3"; version = "1.0.4";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/ztree-1.0.3.tar"; url = "https://elpa.gnu.org/packages/ztree-1.0.4.tar";
sha256 = "1mwzk48sah4w5jmlmzqxnwhnlnc2mf25ayhgymv24sv8c6hdllsw"; sha256 = "0xiiaa660s8z7901siwvmqkqz30agfzsy3zcyry2r017m3ghqjph";
}; };
packageRequires = [ cl-lib ]; packageRequires = [ cl-lib ];
meta = { meta = {

2529
pkgs/applications/editors/emacs-modes/melpa-generated.nix
View File

File diff suppressed because it is too large Load Diff

743
pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
View File

File diff suppressed because it is too large Load Diff

12
pkgs/applications/editors/emacs-modes/org-generated.nix
View File

@ -1,10 +1,10 @@
{ callPackage }: { { callPackage }: {
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org"; pname = "org";
version = "20160912"; version = "20161003";
src = fetchurl { src = fetchurl {
url = "http://orgmode.org/elpa/org-20160912.tar"; url = "http://orgmode.org/elpa/org-20161003.tar";
sha256 = "1xawj0pdvqrgzlixxgbfa01gzajfaz47anr5m4aw035rhc6s02r7"; sha256 = "1q59s9ir9x8ig4nfx6vbq3dj3ah01sjwvqax2x2dqxn2mk2igr4x";
}; };
packageRequires = []; packageRequires = [];
meta = { meta = {
@ -14,10 +14,10 @@
}) {}; }) {};
org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org-plus-contrib"; pname = "org-plus-contrib";
version = "20160912"; version = "20161003";
src = fetchurl { src = fetchurl {
url = "http://orgmode.org/elpa/org-plus-contrib-20160912.tar"; url = "http://orgmode.org/elpa/org-plus-contrib-20161003.tar";
sha256 = "15id0gz60hqbhr183vnz4winpisa2kwrh47zqz37a5yx5b8fc84r"; sha256 = "0phi7jdkv7m4y7q7ilkz0dfw9g11d52dd34pv41dvawf032wvwn7";
}; };
packageRequires = []; packageRequires = [];
meta = { meta = {

26
pkgs/applications/editors/textadept/default.nix
View File

@ -43,22 +43,23 @@ let
# These lists are taken from the Makefile. # These lists are taken from the Makefile.
scintilla_tgz = "scintilla365.tgz"; scintilla_tgz = "scintilla367.tgz";
tre_zip = "cdce45e8dd7a3b36954022b4a4d3570e1ac5a4f8.zip";
scinterm_zip = "scinterm_1.8.zip"; scinterm_zip = "scinterm_1.8.zip";
scintillua_zip = "scintillua_3.6.5-1.zip"; scintillua_zip = "scintillua_3.6.7-1.zip";
lua_tgz = "lua-5.3.2.tar.gz"; lua_tgz = "lua-5.3.3.tar.gz";
lpeg_tgz = "lpeg-1.0.0.tar.gz"; lpeg_tgz = "lpeg-1.0.0.tar.gz";
lfs_zip = "v_1_6_3.zip"; lfs_zip = "v_1_6_3.zip";
luautf8_zip = "0.1.1.zip";
lspawn_zip = "lspawn_1.5.zip"; lspawn_zip = "lspawn_1.5.zip";
luajit_tgz = "LuaJIT-2.0.3.tar.gz"; luajit_tgz = "LuaJIT-2.0.3.tar.gz";
libluajit_tgz = "libluajit_2.0.3.x86_64.tgz"; libluajit_tgz = "libluajit_2.0.3.x86_64.tgz";
gtdialog_zip = "gtdialog_1.2.zip"; gtdialog_zip = "gtdialog_1.3.zip";
cdk_tgz = "cdk-5.0-20150928.tgz"; cdk_tgz = "cdk-5.0-20150928.tgz";
termkey_tgz = "libtermkey-0.17.tar.gz"; termkey_tgz = "libtermkey-0.17.tar.gz";
bombay_zip = "bombay.zip"; bombay_zip = "bombay.zip";
scinterm_url = "http://foicica.com/scinterm/download/" + scinterm_zip; scinterm_url = "http://foicica.com/scinterm/download/" + scinterm_zip;
tre_url = "https://github.com/laurikari/tre/archive/" + tre_zip;
scintillua_url = "http://foicica.com/scintillua/download/" + scintillua_zip; scintillua_url = "http://foicica.com/scintillua/download/" + scintillua_zip;
gtdialog_url = "http://foicica.com/gtdialog/download/" + gtdialog_zip; gtdialog_url = "http://foicica.com/gtdialog/download/" + gtdialog_zip;
lspawn_url = "http://foicica.com/lspawn/download/" + lspawn_zip; lspawn_url = "http://foicica.com/lspawn/download/" + lspawn_zip;
@ -67,7 +68,6 @@ let
lua_url = "http://www.lua.org/ftp/" + lua_tgz; lua_url = "http://www.lua.org/ftp/" + lua_tgz;
lpeg_url = "http://www.inf.puc-rio.br/~roberto/lpeg/" + lpeg_tgz; lpeg_url = "http://www.inf.puc-rio.br/~roberto/lpeg/" + lpeg_tgz;
lfs_url = "https://github.com/keplerproject/luafilesystem/archive/" + lfs_zip; lfs_url = "https://github.com/keplerproject/luafilesystem/archive/" + lfs_zip;
luautf8_url = "https://github.com/starwing/luautf8/archive/" + luautf8_zip;
luajit_url = "http://luajit.org/download/" + luajit_tgz; luajit_url = "http://luajit.org/download/" + luajit_tgz;
libluajit_url = "http://foicica.com/textadept/download/" + libluajit_tgz; libluajit_url = "http://foicica.com/textadept/download/" + libluajit_tgz;
cdk_url = "http://invisible-mirror.net/archives/cdk/" + cdk_tgz; cdk_url = "http://invisible-mirror.net/archives/cdk/" + cdk_tgz;
@ -75,13 +75,13 @@ let
termkey_url = "http://www.leonerd.org.uk/code/libtermkey/" + termkey_tgz; termkey_url = "http://www.leonerd.org.uk/code/libtermkey/" + termkey_tgz;
get_scintilla = get_url scintilla_url "1s5zbkn5f3vs8gbnjlkfzw4b137y12m3c89lyc4pmvqvrvxgyalj"; get_scintilla = get_url scintilla_url "0rh1xgd06qcnj4l0vi8g4i94vi63s76366b8hhqky3iqdjgwsxpi";
get_tre = get_url tre_url "0mw8npwk5nnhc33352j4akannhpx77kqvfam8jdq1n4yf8js1gi7";
get_scinterm = get_url scinterm_url "02ax6cjpxylfz7iqp1cjmsl323in066a38yklmsyzdl3w7761nxi"; get_scinterm = get_url scinterm_url "02ax6cjpxylfz7iqp1cjmsl323in066a38yklmsyzdl3w7761nxi";
get_scintillua = get_url scintillua_url "0s4q7a9mgvxh0msi18llkczhcgafaiizw9qm1p9w18r2a7wjq9wc"; get_scintillua = get_url scintillua_url "0fhyjrkfj2cvxnql65687nx1d0sfyg5lbrxmylyzhnfh4s4jnwmq";
get_lua = get_url lua_url "13x6knpv5xsli0n2bib7g1nrga2iacy7qfy63i798dm94fxwfh67"; get_lua = get_url lua_url "18mcfbbmjyp8f2l9yy7n6dzk066nq6man0kpwly4bppphilc04si";
get_lpeg = get_url lpeg_url "13mz18s359wlkwm9d9iqlyyrrwjc6iqfpa99ai0icam2b3khl68h"; get_lpeg = get_url lpeg_url "13mz18s359wlkwm9d9iqlyyrrwjc6iqfpa99ai0icam2b3khl68h";
get_lfs = get_url_zip lfs_url "1hxcnqj53540ysyw8fzax7f09pl98b8f55s712gsglcdxp2g2pri"; get_lfs = get_url_zip lfs_url "1hxcnqj53540ysyw8fzax7f09pl98b8f55s712gsglcdxp2g2pri";
get_luautf8_zip = get_url_zip luautf8_url "1dgmxdk88njpic4d4sn2wzlni4b6sfqcsmh2hrraxivpqf9ps7f7";
get_lspawn = get_url lspawn_url "09c6v9irblay2kv1n7i59pyj9g4xb43c6rfa7ba5m353lymcwwqi"; get_lspawn = get_url lspawn_url "09c6v9irblay2kv1n7i59pyj9g4xb43c6rfa7ba5m353lymcwwqi";
get_luajit = get_url luajit_url "0ydxpqkmsn2c341j4r2v6r5r0ig3kbwv3i9jran3iv81s6r6rgjm"; get_luajit = get_url luajit_url "0ydxpqkmsn2c341j4r2v6r5r0ig3kbwv3i9jran3iv81s6r6rgjm";
get_libluajit = get_url libluajit_url "1nhvcdjpqrhd5qbihdm3bxpw84irfvnw2vmfqnsy253ay3dxzrgy"; get_libluajit = get_url libluajit_url "1nhvcdjpqrhd5qbihdm3bxpw84irfvnw2vmfqnsy253ay3dxzrgy";
@ -93,12 +93,12 @@ let
get_deps = get_scintilla get_deps = get_scintilla
+ get_tre
+ get_scinterm + get_scinterm
+ get_scintillua + get_scintillua
+ get_lua + get_lua
+ get_lpeg + get_lpeg
+ get_lfs + get_lfs
+ get_luautf8_zip
+ get_lspawn + get_lspawn
+ get_luajit + get_luajit
+ get_libluajit + get_libluajit
@ -108,7 +108,7 @@ let
+ get_termkey; + get_termkey;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "8.7"; version = "9.0";
name = "textadept-${version}"; name = "textadept-${version}";
buildInputs = [ buildInputs = [
@ -118,7 +118,7 @@ stdenv.mkDerivation rec {
src = fetchhg { src = fetchhg {
url = http://foicica.com/hg/textadept; url = http://foicica.com/hg/textadept;
rev = "textadept_${version}"; rev = "textadept_${version}";
sha256 = "1gi73wk11w3rbkxqqdp8z9g83qiyhx6gxry221vxjxpqsl9pvhlf"; sha256 = "1fkxblf2db4i0kbfww94xwps7nbn88qc4fwghrm4dcszcq32jlfi";
}; };
preConfigure = '' preConfigure = ''

4
pkgs/applications/networking/corebird/default.nix
View File

@ -2,14 +2,14 @@
, automake, autoconf, libtool, pkgconfig, gnome3, gst_all_1, wrapGAppsHook }: , automake, autoconf, libtool, pkgconfig, gnome3, gst_all_1, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.3.2"; version = "1.3.3";
name = "corebird-${version}"; name = "corebird-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "baedert"; owner = "baedert";
repo = "corebird"; repo = "corebird";
rev = version; rev = version;
sha256 = "1ps4l37dyj2pmzcly9jb95y7cqa8zm8hyfja5prsqj7pbka1fibn"; sha256 = "09k0jrhjqrmpvyz5pf1g7wkidflkhpvw5869a95vnhfxjd45kzs3";
}; };
preConfigure = '' preConfigure = ''

4
pkgs/applications/networking/instant-messengers/hipchat/default.nix
View File

@ -4,7 +4,7 @@
let let
version = "4.26.0.1657"; version = "4.27.0.1658";
rpath = stdenv.lib.makeLibraryPath [ rpath = stdenv.lib.makeLibraryPath [
xdg_utils xdg_utils
@ -44,7 +44,7 @@ let
if stdenv.system == "x86_64-linux" then if stdenv.system == "x86_64-linux" then
fetchurl { fetchurl {
url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb";
sha256 = "1ififcy1lhm0g4x9sprwfxlg34pkarkypww5ywsf8hvbcdnj02gp"; sha256 = "1f0rgy5p9xcxfll6prir49vb7hjlnqx6xjaxlimhca4l30jvdsvn";
} }
else else
throw "HipChat is not supported on ${stdenv.system}"; throw "HipChat is not supported on ${stdenv.system}";

2
pkgs/applications/science/logic/matita/130312.nix
View File

@ -1,10 +1,8 @@
{stdenv, fetchurl, ocaml, findlib, gdome2, ocaml_expat, gmetadom, ocaml_http, lablgtk, ocaml_mysql, ocamlnet, ulex08, camlzip, ocaml_pcre, automake, autoconf }: {stdenv, fetchurl, ocaml, findlib, gdome2, ocaml_expat, gmetadom, ocaml_http, lablgtk, ocaml_mysql, ocamlnet, ulex08, camlzip, ocaml_pcre, automake, autoconf }:
let let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
version = "0.99.1pre130312"; version = "0.99.1pre130312";
pname = "matita"; pname = "matita";
in in
stdenv.mkDerivation { stdenv.mkDerivation {

2
pkgs/applications/science/logic/matita/default.nix
View File

@ -1,10 +1,8 @@
{stdenv, fetchurl, ocaml, findlib, gdome2, ocaml_expat, gmetadom, ocaml_http, lablgtk, lablgtkmathview, ocaml_mysql, ocaml_sqlite3, ocamlnet, ulex08, camlzip, ocaml_pcre }: {stdenv, fetchurl, ocaml, findlib, gdome2, ocaml_expat, gmetadom, ocaml_http, lablgtk, lablgtkmathview, ocaml_mysql, ocaml_sqlite3, ocamlnet, ulex08, camlzip, ocaml_pcre }:
let let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
version = "0.5.8"; version = "0.5.8";
pname = "matita"; pname = "matita";
in in
stdenv.mkDerivation { stdenv.mkDerivation {

4
pkgs/applications/science/math/glsurf/default.nix
View File

@ -1,9 +1,5 @@
{ stdenv, fetchdarcs, ocaml, findlib, lablgl, camlimages, mesa, freeglut, ocaml_mysql, mysql, mlgmp, mpfr, gmp, libtiff, libjpeg, libpng, giflib }: { stdenv, fetchdarcs, ocaml, findlib, lablgl, camlimages, mesa, freeglut, ocaml_mysql, mysql, mlgmp, mpfr, gmp, libtiff, libjpeg, libpng, giflib }:
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "glsurf-3.3"; name = "glsurf-3.3";

4
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -10,7 +10,7 @@
}: }:
let let
version = "2.10.0"; version = "2.10.1";
svn = subversionClient.override { perlBindings = true; }; svn = subversionClient.override { perlBindings = true; };
in in
@ -19,7 +19,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
sha256 = "1rr9zyafb6q3wixyjar6cc7z7vdh1dqa4b5irz3gz1df02n68cy7"; sha256 = "1ijd1b6szvfw0dmqa3dz1m5g5hbkl9xkb86a9qcjrz0w0vwjvhx9";
}; };
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

2
pkgs/applications/video/dvd-slideshow/default.nix
View File

@ -4,7 +4,7 @@ let
binPath = lib.makeBinPath [ cdrtools dvdauthor ffmpeg imagemagick lame mjpegtools sox transcode vorbis-tools ]; binPath = lib.makeBinPath [ cdrtools dvdauthor ffmpeg imagemagick lame mjpegtools sox transcode vorbis-tools ];
wrapper = writeScript "dvd-slideshow.sh" '' wrapper = writeScript "dvd-slideshow.sh" ''
#!/bin/bash #!${stdenv.shell}
# wrapper script for dvd-slideshow programs # wrapper script for dvd-slideshow programs
export PATH=${binPath}:$PATH export PATH=${binPath}:$PATH

2
pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh Normal file → Executable file
View File

@ -1,4 +1,4 @@
#!/bin/bash #!@shell@
set -e set -e
set -u set -u

0
pkgs/build-support/dotnetbuildhelpers/patch-fsharp-targets.sh Normal file → Executable file
View File

2
pkgs/build-support/gcc-wrapper-old/ld-solaris-wrapper.sh Normal file → Executable file
View File

@ -1,4 +1,4 @@
#!/bin/bash #!@shell@
set -e set -e
set -u set -u

6
pkgs/build-support/ocaml/default.nix
View File

@ -9,13 +9,12 @@
meta ? {}, ... meta ? {}, ...
}@args: }@args:
let let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
defaultMeta = { defaultMeta = {
platforms = ocaml.meta.platforms or []; platforms = ocaml.meta.platforms or [];
}; };
in in
assert minimumSupportedOcamlVersion != null -> assert minimumSupportedOcamlVersion != null ->
stdenv.lib.versionOlder minimumSupportedOcamlVersion ocaml_version; stdenv.lib.versionOlder minimumSupportedOcamlVersion ocaml.version;
stdenv.mkDerivation (args // { stdenv.mkDerivation (args // {
name = "ocaml-${name}-${version}"; name = "ocaml-${name}-${version}";
@ -24,11 +23,10 @@ stdenv.mkDerivation (args // {
setupHook = if setupHook == null && hasSharedObjects setupHook = if setupHook == null && hasSharedObjects
then writeText "setupHook.sh" '' then writeText "setupHook.sh" ''
export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml_version}/site-lib/${name}/" export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}/"
'' ''
else setupHook; else setupHook;
inherit ocaml_version;
inherit createFindlibDestdir; inherit createFindlibDestdir;
inherit dontStrip; inherit dontStrip;

6
pkgs/development/compilers/ghc/head.nix
View File

@ -6,14 +6,14 @@ let
inherit (bootPkgs) ghc; inherit (bootPkgs) ghc;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
version = "8.1.20160826"; version = "8.1.20160930";
name = "ghc-${version}"; name = "ghc-${version}";
rev = "0050aff22ba04baca732bf5124002417ab667f8a"; rev = "9e862765ffe161da8a4fd9cd67b0a600874feaa9";
src = fetchgit { src = fetchgit {
url = "git://git.haskell.org/ghc.git"; url = "git://git.haskell.org/ghc.git";
inherit rev; inherit rev;
sha256 = "1iirb11fr8914pb6i988cfji56gs698ll819bgb0hpcdkrmffwqc"; sha256 = "01fmp5yrh3is8vzv2vabkzlvm1ry1zcq99m078plx9wgy20giq59";
}; };
patches = [ patches = [

1
pkgs/development/compilers/ghcjs/default.nix
View File

@ -176,4 +176,5 @@ in mkDerivation (rec {
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
platforms = ghc.meta.platforms; platforms = ghc.meta.platforms;
maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ]; maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ];
broken = true; # See http://hydra.nixos.org/build/41499439, for example.
}) })

2
pkgs/development/compilers/manticore/builder.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash #!@shell@
source $stdenv/setup source $stdenv/setup
echo "Building Manticore research compiler." echo "Building Manticore research compiler."

4
pkgs/development/compilers/nim/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, unzip }: { stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nim-0.14.2"; name = "nim-0.15.0";
src = fetchurl { src = fetchurl {
url = "http://nim-lang.org/download/${name}.tar.xz"; url = "http://nim-lang.org/download/${name}.tar.xz";
sha256 = "14jy7wza54jawja21r6v676qyj0i9kg1jpn5bxwn8wfm1vbki3cg"; sha256 = "1yv9qvc1r7m0m4gwi8mgnabdjz70mwxf5rmv8xhibcmja1856565";
}; };
buildPhase = "sh build.sh"; buildPhase = "sh build.sh";

5
pkgs/development/haskell-modules/generic-builder.nix
View File

@ -180,6 +180,11 @@ stdenv.mkDerivation ({
setupCompileFlags="${concatStringsSep " " setupCompileFlags}" setupCompileFlags="${concatStringsSep " " setupCompileFlags}"
configureFlags="${concatStringsSep " " defaultConfigureFlags} $configureFlags" configureFlags="${concatStringsSep " " defaultConfigureFlags} $configureFlags"
${optionalString (stdenv.lib.versionOlder "8" ghc.version) ''
ipid=$(echo $(basename "$out") | cut -d- -f1)
configureFlags+=" --ipid=$ipid"
''}
local inputClosure="" local inputClosure=""
for i in $propagatedNativeBuildInputs $nativeBuildInputs; do for i in $propagatedNativeBuildInputs $nativeBuildInputs; do
findInputs $i inputClosure propagated-native-build-inputs findInputs $i inputClosure propagated-native-build-inputs

612
pkgs/development/haskell-modules/hackage-packages.nix
View File

File diff suppressed because it is too large Load Diff

7
pkgs/development/interpreters/php/default.nix
View File

@ -2,7 +2,7 @@
, mysql, libxml2, readline, zlib, curl, postgresql, gettext , mysql, libxml2, readline, zlib, curl, postgresql, gettext
, openssl, pkgconfig, sqlite, config, libjpeg, libpng, freetype , openssl, pkgconfig, sqlite, config, libjpeg, libpng, freetype
, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds
, uwimap, pam, gmp, apacheHttpd, libiconv }: , uwimap, pam, gmp, apacheHttpd, libiconv, systemd }:
let let
@ -19,11 +19,12 @@ let
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = [ flex bison pkgconfig ]; buildInputs = [ flex bison pkgconfig systemd ];
configureFlags = [ configureFlags = [
"EXTENSION_DIR=$(out)/lib/php/extensions" "EXTENSION_DIR=$(out)/lib/php/extensions"
] ++ lib.optional stdenv.isDarwin "--with-iconv=${libiconv}"; ] ++ lib.optional stdenv.isDarwin "--with-iconv=${libiconv}"
++ lib.optional stdenv.isLinux "--with-fpm-systemd";
flags = { flags = {

4
pkgs/development/libraries/libass/default.nix
View File

@ -19,11 +19,11 @@ in
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libass-${version}"; name = "libass-${version}";
version = "0.13.2"; version = "0.13.4";
src = fetchurl { src = fetchurl {
url = "https://github.com/libass/libass/releases/download/${version}/${name}.tar.xz"; url = "https://github.com/libass/libass/releases/download/${version}/${name}.tar.xz";
sha256 = "1kpsw4zw95v4cjvild9wpk73dzavn1khsm3bm32kcz6amnkd166n"; sha256 = "1dlzkjybnpl2fkvyjq0qblb7qw12cs893bs7zj3rvf8ij342yjnq";
}; };
configureFlags = [ configureFlags = [

5
pkgs/development/ocaml-modules/camlzip/default.nix
View File

@ -1,9 +1,8 @@
{stdenv, fetchurl, zlib, ocaml, findlib}: {stdenv, fetchurl, zlib, ocaml, findlib}:
let let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
param = param =
if stdenv.lib.versionAtLeast ocaml_version "4.02" if stdenv.lib.versionAtLeast ocaml.version "4.02"
then { then {
version = "1.06"; version = "1.06";
url = "1616"; url = "1616";
@ -45,7 +44,7 @@ stdenv.mkDerivation {
inherit (param) installTargets; inherit (param) installTargets;
postInstall = '' postInstall = ''
ln -s $out/lib/ocaml/${ocaml_version}/site-lib/{,caml}zip ln -s $out/lib/ocaml/${ocaml.version}/site-lib/{,caml}zip
''; '';
meta = { meta = {

8
pkgs/development/ocaml-modules/camomile/0.8.2.nix
View File

@ -1,12 +1,8 @@
{stdenv, fetchurl, ocaml, findlib, camlp4}: {stdenv, fetchurl, ocaml, findlib, camlp4}:
let stdenv.mkDerivation rec {
ocaml_version = (builtins.parseDrvName ocaml.name).version;
version = "0.8.2";
in
stdenv.mkDerivation {
name = "camomile-${version}"; name = "camomile-${version}";
version = "0.8.2";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/camomile/camomile-${version}.tar.bz2"; url = "mirror://sourceforge/camomile/camomile-${version}.tar.bz2";

9
pkgs/development/ocaml-modules/camomile/default.nix
View File

@ -1,11 +1,8 @@
{stdenv, fetchurl, ocaml, findlib, camlp4}: {stdenv, fetchurl, ocaml, findlib, camlp4}:
let stdenv.mkDerivation rec {
ocaml_version = (builtins.parseDrvName ocaml.name).version; name = "camomile-${version}";
in version = "0.8.5";
stdenv.mkDerivation {
name = "camomile-0.8.5";
src = fetchurl { src = fetchurl {
url = https://github.com/yoriyuki/Camomile/releases/download/rel-0.8.5/camomile-0.8.5.tar.bz2; url = https://github.com/yoriyuki/Camomile/releases/download/rel-0.8.5/camomile-0.8.5.tar.bz2;

9
pkgs/development/ocaml-modules/cmdliner/default.nix
View File

@ -2,15 +2,14 @@
let let
pname = "cmdliner"; pname = "cmdliner";
version = "0.9.8";
ocaml_version = (builtins.parseDrvName ocaml.name).version;
in in
assert stdenv.lib.versionAtLeast ocaml_version "3.12"; assert stdenv.lib.versionAtLeast ocaml.version "3.12";
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "ocaml-${pname}-${version}"; name = "ocaml-${pname}-${version}";
version = "0.9.8";
src = fetchurl { src = fetchurl {
url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz"; url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz";
@ -27,7 +26,7 @@ stdenv.mkDerivation {
installPhase = '' installPhase = ''
opam-installer --script --prefix=$out ${pname}.install > install.sh opam-installer --script --prefix=$out ${pname}.install > install.sh
sh install.sh sh install.sh
ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/ ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

8
pkgs/development/ocaml-modules/cryptgps/default.nix
View File

@ -1,12 +1,8 @@
{stdenv, fetchurl, ocaml, findlib}: {stdenv, fetchurl, ocaml, findlib}:
let stdenv.mkDerivation rec {
ocaml_version = (builtins.parseDrvName ocaml.name).version;
version = "0.2.1";
in
stdenv.mkDerivation {
name = "ocaml-cryptgps-${version}"; name = "ocaml-cryptgps-${version}";
version = "0.2.1";
src = fetchurl { src = fetchurl {
url = "http://download.camlcity.org/download/cryptgps-0.2.1.tar.gz"; url = "http://download.camlcity.org/download/cryptgps-0.2.1.tar.gz";

13
pkgs/development/ocaml-modules/cryptokit/default.nix
View File

@ -1,13 +1,10 @@
{stdenv, fetchurl, zlib, ocaml, findlib, ncurses}: {stdenv, fetchurl, zlib, ocaml, findlib, ncurses}:
let assert stdenv.lib.versionAtLeast ocaml.version "3.12";
ocaml_version = (builtins.parseDrvName ocaml.name).version;
in
assert stdenv.lib.versionAtLeast ocaml_version "3.12"; stdenv.mkDerivation rec {
name = "cryptokit-${version}";
stdenv.mkDerivation { version = "1.10";
name = "cryptokit-1.10";
src = fetchurl { src = fetchurl {
url = http://forge.ocamlcore.org/frs/download.php/1493/cryptokit-1.10.tar.gz; url = http://forge.ocamlcore.org/frs/download.php/1493/cryptokit-1.10.tar.gz;
@ -18,7 +15,7 @@ stdenv.mkDerivation {
buildFlags = "setup.data build"; buildFlags = "setup.data build";
preBuild = "mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib/cryptokit"; preBuild = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/cryptokit";
meta = { meta = {
homepage = "http://pauillac.inria.fr/~xleroy/software.html"; homepage = "http://pauillac.inria.fr/~xleroy/software.html";

7
pkgs/development/ocaml-modules/dypgen/default.nix
View File

@ -1,13 +1,12 @@
{stdenv, fetchurl, ocaml, findlib}: {stdenv, fetchurl, ocaml, findlib}:
let let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
pname = "dypgen"; pname = "dypgen";
version = "20120619-1";
in in
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
version = "20120619-1";
src = fetchurl { src = fetchurl {
url = "http://dypgen.free.fr/dypgen-20120619-1.tar.bz2"; url = "http://dypgen.free.fr/dypgen-20120619-1.tar.bz2";
@ -22,7 +21,7 @@ stdenv.mkDerivation {
make make
''; '';
makeFlags = "BINDIR=$(out)/bin MANDIR=$(out)/usr/share/man/man1 DYPGENLIBDIR=$(out)/lib/ocaml/${ocaml_version}/site-lib"; makeFlags = "BINDIR=$(out)/bin MANDIR=$(out)/usr/share/man/man1 DYPGENLIBDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib";
meta = { meta = {
homepage = http://dypgen.free.fr; homepage = http://dypgen.free.fr;

5
pkgs/development/ocaml-modules/expat/default.nix
View File

@ -1,8 +1,6 @@
{stdenv, fetchurl, ocaml, findlib, ounit, expat}: {stdenv, fetchurl, ocaml, findlib, ounit, expat}:
let let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
version = "0.9.1";
pname = "ocaml-expat"; pname = "ocaml-expat";
testcase = fetchurl { testcase = fetchurl {
url = "http://www.w3.org/TR/1998/REC-xml-19980210.xml"; url = "http://www.w3.org/TR/1998/REC-xml-19980210.xml";
@ -11,8 +9,9 @@ let
in in
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
version = "0.9.1";
src = fetchurl { src = fetchurl {
url = "http://www.xs4all.nl/~mmzeeman/ocaml/${pname}-${version}.tar.gz"; url = "http://www.xs4all.nl/~mmzeeman/ocaml/${pname}-${version}.tar.gz";

8
pkgs/development/ocaml-modules/gmetadom/default.nix
View File

@ -1,14 +1,12 @@
{stdenv, fetchurl, ocaml, findlib, gdome2, libxslt, pkgconfig}: {stdenv, fetchurl, ocaml, findlib, gdome2, libxslt, pkgconfig}:
let let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
version = "0.2.6";
pname = "gmetadom"; pname = "gmetadom";
in in
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
version = "0.2.6";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/project/${pname}/${pname}/${version}/${pname}-${version}.tar.gz"; url = "mirror://sourceforge/project/${pname}/${pname}/${version}/${pname}-${version}.tar.gz";
@ -20,7 +18,7 @@ stdenv.mkDerivation {
dontDisableStatic = true; dontDisableStatic = true;
preConfigure='' preConfigure=''
configureFlags="--with-ocaml-lib-prefix=$out/lib/ocaml/${ocaml_version}/site-lib" configureFlags="--with-ocaml-lib-prefix=$out/lib/ocaml/${ocaml.version}/site-lib"
''; '';

7
pkgs/development/ocaml-modules/javalib/default.nix
View File

@ -1,13 +1,12 @@
{stdenv, fetchurl, which, ocaml, findlib, camlzip, extlib, camlp4}: {stdenv, fetchurl, which, ocaml, findlib, camlzip, extlib, camlp4}:
let let
pname = "javalib"; pname = "javalib";
version = "2.3";
webpage = "http://sawja.inria.fr/"; webpage = "http://sawja.inria.fr/";
ocaml_version = (builtins.parseDrvName ocaml.name).version;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ocaml-${pname}-${version}"; name = "ocaml-${pname}-${version}";
version = "2.3";
src = fetchurl { src = fetchurl {
url = "https://gforge.inria.fr/frs/download.php/33090/${pname}-${version}.tar.bz2"; url = "https://gforge.inria.fr/frs/download.php/33090/${pname}-${version}.tar.bz2";
@ -28,7 +27,7 @@ stdenv.mkDerivation rec {
preBuild = '' preBuild = ''
make ptrees; make ptrees;
make installptrees; make installptrees;
export OCAMLPATH=$out/lib/ocaml/${ocaml_version}/site-lib/:$OCAMLPATH; export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH;
''; '';
propagatedBuildInputs = [ camlzip extlib ]; propagatedBuildInputs = [ camlzip extlib ];

11
pkgs/development/ocaml-modules/lablgl/default.nix
View File

@ -1,13 +1,12 @@
{stdenv, fetchurl, ocaml, lablgtk, findlib, mesa, freeglut, camlp4 } : {stdenv, fetchurl, ocaml, lablgtk, findlib, mesa, freeglut, camlp4 } :
let let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
pname = "lablgl"; pname = "lablgl";
version = "1.05";
in in
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
version = "1.05";
src = fetchurl { src = fetchurl {
url = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgl-${version}.tar.gz"; url = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgl-${version}.tar.gz";
@ -22,8 +21,8 @@ stdenv.mkDerivation {
preConfigure = '' preConfigure = ''
substituteInPlace Makefile.config \ substituteInPlace Makefile.config \
--subst-var-by BINDIR $out/bin \ --subst-var-by BINDIR $out/bin \
--subst-var-by INSTALLDIR $out/lib/ocaml/${ocaml_version}/site-lib/lablgl \ --subst-var-by INSTALLDIR $out/lib/ocaml/${ocaml.version}/site-lib/lablgl \
--subst-var-by DLLDIR $out/lib/ocaml/${ocaml_version}/site-lib/lablgl \ --subst-var-by DLLDIR $out/lib/ocaml/${ocaml.version}/site-lib/lablgl \
--subst-var-by TKINCLUDES "" \ --subst-var-by TKINCLUDES "" \
--subst-var-by XINCLUDES "" --subst-var-by XINCLUDES ""
''; '';
@ -33,7 +32,7 @@ stdenv.mkDerivation {
buildFlags = "lib libopt glut glutopt"; buildFlags = "lib libopt glut glutopt";
postInstall = '' postInstall = ''
cp ./META $out/lib/ocaml/${ocaml_version}/site-lib/lablgl cp ./META $out/lib/ocaml/${ocaml.version}/site-lib/lablgl
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

9
pkgs/development/ocaml-modules/lablgtk/2.14.0.nix
View File

@ -1,13 +1,12 @@
{ stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4 }: { stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4 }:
let let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
pname = "lablgtk"; pname = "lablgtk";
version = "2.14.0";
in in
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
version = "2.14.0";
src = fetchurl { src = fetchurl {
url = "https://forge.ocamlcore.org/frs/download.php/561/${name}.tar.gz"; url = "https://forge.ocamlcore.org/frs/download.php/561/${name}.tar.gz";
@ -16,12 +15,12 @@ stdenv.mkDerivation (rec {
buildInputs = [ ocaml findlib pkgconfig gtk2 libgnomecanvas libglade gtksourceview camlp4 ]; buildInputs = [ ocaml findlib pkgconfig gtk2 libgnomecanvas libglade gtksourceview camlp4 ];
configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml_version}/site-lib"; configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib";
buildFlags = "world"; buildFlags = "world";
preInstall = '' preInstall = ''
mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib
export OCAMLPATH=$out/lib/ocaml/${ocaml_version}/site-lib/:$OCAMLPATH export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH
''; '';
meta = { meta = {

14
pkgs/development/ocaml-modules/lablgtk/default.nix
View File

@ -1,15 +1,15 @@
{stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4}: {stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4}:
let let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
pname = "lablgtk"; pname = "lablgtk";
version = "2.18.3";
in in
assert stdenv.lib.versionAtLeast ocaml_version "3.12"; assert stdenv.lib.versionAtLeast ocaml.version "3.12";
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
version = "2.18.3";
src = fetchurl { src = fetchurl {
url = https://forge.ocamlcore.org/frs/download.php/1479/lablgtk-2.18.3.tar.gz; url = https://forge.ocamlcore.org/frs/download.php/1479/lablgtk-2.18.3.tar.gz;
sha256 = "1bybn3jafxf4cx25zvn8h2xj9agn1xjbn7j3ywxxqx6az7rfnnwp"; sha256 = "1bybn3jafxf4cx25zvn8h2xj9agn1xjbn7j3ywxxqx6az7rfnnwp";
@ -17,12 +17,12 @@ stdenv.mkDerivation {
buildInputs = [ocaml findlib pkgconfig gtk2 libgnomecanvas libglade gtksourceview camlp4]; buildInputs = [ocaml findlib pkgconfig gtk2 libgnomecanvas libglade gtksourceview camlp4];
configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml_version}/site-lib"; configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib";
buildFlags = "world"; buildFlags = "world";
preInstall = '' preInstall = ''
mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib
export OCAMLPATH=$out/lib/ocaml/${ocaml_version}/site-lib/:$OCAMLPATH export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

8
pkgs/development/ocaml-modules/lablgtkmathview/default.nix
View File

@ -1,14 +1,12 @@
{stdenv, fetchurl, pkgconfig, ocaml, findlib, gmetadom, gtkmathview, lablgtk }: {stdenv, fetchurl, pkgconfig, ocaml, findlib, gmetadom, gtkmathview, lablgtk }:
let let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
version = "0.7.2";
pname = "lablgtkmathview"; pname = "lablgtkmathview";
in in
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
version = "0.7.2";
src = fetchurl { src = fetchurl {
url = "http://helm.cs.unibo.it/mml-widget/sources/${pname}-${version}.tar.gz"; url = "http://helm.cs.unibo.it/mml-widget/sources/${pname}-${version}.tar.gz";
@ -22,7 +20,7 @@ stdenv.mkDerivation {
propagatedBuildInputs = [gtkmathview]; propagatedBuildInputs = [gtkmathview];
prePatch = '' prePatch = ''
substituteInPlace Makefile.in --replace "PROPCC = @OCAML_LIB_DIR@" "PROPCC = ${lablgtk}/lib/ocaml/${ocaml_version}/site-lib" substituteInPlace Makefile.in --replace "PROPCC = @OCAML_LIB_DIR@" "PROPCC = ${lablgtk}/lib/ocaml/${ocaml.version}/site-lib"
''; '';
buildPhase = '' buildPhase = ''

9
pkgs/development/ocaml-modules/lwt/default.nix
View File

@ -1,15 +1,12 @@
{ stdenv, fetchzip, which, cryptopp, ocaml, findlib, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, ocaml_text, glib, camlp4, ppx_tools }: { stdenv, fetchzip, which, cryptopp, ocaml, findlib, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, ocaml_text, glib, camlp4, ppx_tools }:
let let
version = "2.5.2";
inherit (stdenv.lib) optional getVersion versionAtLeast; inherit (stdenv.lib) optional getVersion versionAtLeast;
ocaml_version = getVersion ocaml;
in in
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "ocaml-lwt-${version}"; name = "ocaml-lwt-${version}";
version = "2.5.2";
src = fetchzip { src = fetchzip {
url = "https://github.com/ocsigen/lwt/archive/${version}.tar.gz"; url = "https://github.com/ocsigen/lwt/archive/${version}.tar.gz";
@ -21,7 +18,7 @@ stdenv.mkDerivation {
propagatedBuildInputs = [ ocaml_react ocaml_ssl ocaml_text libev ]; propagatedBuildInputs = [ ocaml_react ocaml_ssl ocaml_text libev ];
configureFlags = [ "--enable-glib" "--enable-ssl" "--enable-react" "--enable-camlp4"] configureFlags = [ "--enable-glib" "--enable-ssl" "--enable-react" "--enable-camlp4"]
++ [ (if versionAtLeast ocaml_version "4.02" then "--enable-ppx" else "--disable-ppx") ]; ++ [ (if versionAtLeast ocaml.version "4.02" then "--enable-ppx" else "--disable-ppx") ];
createFindlibDestdir = true; createFindlibDestdir = true;

9
pkgs/development/ocaml-modules/mlgmp/default.nix
View File

@ -1,13 +1,12 @@
{stdenv, fetchurl, ocaml, findlib, gmp, mpfr, ncurses }: {stdenv, fetchurl, ocaml, findlib, gmp, mpfr, ncurses }:
let let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
pname = "mlgmp"; pname = "mlgmp";
version = "20120224";
in in
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
version = "20120224";
src = fetchurl { src = fetchurl {
url = "http://www-verimag.imag.fr/~monniaux/download/${pname}_${version}.tar.gz"; url = "http://www-verimag.imag.fr/~monniaux/download/${pname}_${version}.tar.gz";
@ -15,7 +14,7 @@ stdenv.mkDerivation {
}; };
makeFlags = [ makeFlags = [
"DESTDIR=$(out)/lib/ocaml/${ocaml_version}/site-lib/gmp" "DESTDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/gmp"
]; ];
preConfigure = "make clean"; preConfigure = "make clean";
@ -26,7 +25,7 @@ stdenv.mkDerivation {
propagatedbuildInputs = [gmp mpfr ncurses]; propagatedbuildInputs = [gmp mpfr ncurses];
postInstall = '' postInstall = ''
cp ${./META} $out/lib/ocaml/${ocaml_version}/site-lib/gmp/META cp ${./META} $out/lib/ocaml/${ocaml.version}/site-lib/gmp/META
''; '';
meta = { meta = {

7
pkgs/development/ocaml-modules/mysql/default.nix
View File

@ -5,13 +5,12 @@
# TODO: compilazione di moduli dipendenti da zip, ssl, tcl, gtk, gtk2 # TODO: compilazione di moduli dipendenti da zip, ssl, tcl, gtk, gtk2
let let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
pname = "ocaml-mysql"; pname = "ocaml-mysql";
version = "1.1.1";
in in
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
version = "1.1.1";
src = fetchurl { src = fetchurl {
url = "https://forge.ocamlcore.org/frs/download.php/870/${pname}-${version}.tar.gz"; url = "https://forge.ocamlcore.org/frs/download.php/870/${pname}-${version}.tar.gz";
@ -20,7 +19,7 @@ stdenv.mkDerivation {
configureFlags = [ configureFlags = [
"--prefix=$out" "--prefix=$out"
"--libdir=$out/lib/ocaml/${ocaml_version}/site-lib/mysql" "--libdir=$out/lib/ocaml/${ocaml.version}/site-lib/mysql"
]; ];
buildInputs = [ocaml findlib camlp4 ]; buildInputs = [ocaml findlib camlp4 ];

10
pkgs/development/ocaml-modules/nocrypto/default.nix
View File

@ -1,14 +1,10 @@
{ stdenv, fetchzip, ocaml, findlib, cstruct, type_conv, zarith, ounit }: { stdenv, fetchzip, ocaml, findlib, cstruct, type_conv, zarith, ounit }:
let assert stdenv.lib.versionAtLeast ocaml.version "4.01";
version = "0.5.1";
ocaml_version = stdenv.lib.getVersion ocaml;
in
assert stdenv.lib.versionAtLeast ocaml_version "4.01"; stdenv.mkDerivation rec {
stdenv.mkDerivation {
name = "ocaml-nocrypto-${version}"; name = "ocaml-nocrypto-${version}";
version = "0.5.1";
src = fetchzip { src = fetchzip {
url = "https://github.com/mirleft/ocaml-nocrypto/archive/${version}.tar.gz"; url = "https://github.com/mirleft/ocaml-nocrypto/archive/${version}.tar.gz";

15
pkgs/development/ocaml-modules/ocaml-cairo/default.nix
View File

@ -1,13 +1,12 @@
{stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk_pixbuf, glib, gtk2, pango }: {stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk_pixbuf, glib, gtk2, pango }:
let let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
pname = "ocaml-cairo"; pname = "ocaml-cairo";
version = "1.2.0";
in in
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
version = "1.2.0";
src = fetchurl { src = fetchurl {
url = "http://cgit.freedesktop.org/cairo-ocaml/snapshot/cairo-ocaml-${version}.zip"; url = "http://cgit.freedesktop.org/cairo-ocaml/snapshot/cairo-ocaml-${version}.zip";
@ -25,16 +24,16 @@ stdenv.mkDerivation {
aclocal -I support aclocal -I support
autoconf autoconf
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE `pkg-config --cflags cairo gdk-pixbuf glib gtk+ pango`" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE `pkg-config --cflags cairo gdk-pixbuf glib gtk+ pango`"
export LABLGTKDIR=${lablgtk}/lib/ocaml/${ocaml_version}/site-lib/lablgtk2 export LABLGTKDIR=${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2
cp ${lablgtk}/lib/ocaml/${ocaml_version}/site-lib/lablgtk2/pango.ml ./src cp ${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2/pango.ml ./src
cp ${lablgtk}/lib/ocaml/${ocaml_version}/site-lib/lablgtk2/gaux.ml ./src cp ${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2/gaux.ml ./src
''; '';
postInstall = '' postInstall = ''
cp META $out/lib/ocaml/${ocaml_version}/site-lib/cairo/ cp META $out/lib/ocaml/${ocaml.version}/site-lib/cairo/
''; '';
makeFlags = "INSTALLDIR=$(out)/lib/ocaml/${ocaml_version}/site-lib/cairo"; makeFlags = "INSTALLDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/cairo";
meta = { meta = {
homepage = http://cairographics.org/cairo-ocaml; homepage = http://cairographics.org/cairo-ocaml;

4
pkgs/development/ocaml-modules/ocamlfuse/default.nix
View File

@ -1,9 +1,5 @@
{ stdenv, fetchFromGitHub, ocaml, camlidl, fuse, findlib }: { stdenv, fetchFromGitHub, ocaml, camlidl, fuse, findlib }:
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ocamlfuse-2.7-3"; name = "ocamlfuse-2.7-3";
src = fetchFromGitHub { src = fetchFromGitHub {

14
pkgs/development/ocaml-modules/ocamlgraph/default.nix
View File

@ -1,12 +1,8 @@
{stdenv, fetchurl, ocaml, findlib, ocamlPackages }: {stdenv, fetchurl, ocaml, findlib, ocamlPackages }:
let stdenv.mkDerivation rec {
ocaml_version = (builtins.parseDrvName ocaml.name).version;
version = "1.8.5";
in
stdenv.mkDerivation {
name = "ocamlgraph-${version}"; name = "ocamlgraph-${version}";
version = "1.8.5";
src = fetchurl { src = fetchurl {
url = "http://ocamlgraph.lri.fr/download/ocamlgraph-${version}.tar.gz"; url = "http://ocamlgraph.lri.fr/download/ocamlgraph-${version}.tar.gz";
@ -22,9 +18,9 @@ stdenv.mkDerivation {
# * configure looked in the wrong path # * configure looked in the wrong path
# * ocaml needs that directory and the stubs directory as -I flag # * ocaml needs that directory and the stubs directory as -I flag
postPatch = '' postPatch = ''
sed -i 's@$(DESTDIR)$(OCAMLLIB)/ocamlgraph@$(DESTDIR)/lib/ocaml/${ocaml_version}/site-lib/ocamlgraph@' Makefile.in sed -i 's@$(DESTDIR)$(OCAMLLIB)/ocamlgraph@$(DESTDIR)/lib/ocaml/${ocaml.version}/site-lib/ocamlgraph@' Makefile.in
sed -i 's@$OCAMLLIB/lablgtk2@${ocamlPackages.lablgtk}/lib/ocaml/${ocaml_version}/site-lib/lablgtk2@' configure Makefile.in sed -i 's@$OCAMLLIB/lablgtk2@${ocamlPackages.lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2@' configure Makefile.in
sed -i 's@+lablgtk2@${ocamlPackages.lablgtk}/lib/ocaml/${ocaml_version}/site-lib/lablgtk2 -I ${ocamlPackages.lablgtk}/lib/ocaml/${ocaml_version}/site-lib/stublibs@' configure Makefile.in editor/Makefile sed -i 's@+lablgtk2@${ocamlPackages.lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2 -I ${ocamlPackages.lablgtk}/lib/ocaml/${ocaml.version}/site-lib/stublibs@' configure Makefile.in editor/Makefile
''; '';
createFindlibDestdir = true; createFindlibDestdir = true;

6
pkgs/development/ocaml-modules/ocamlnet/default.nix
View File

@ -1,10 +1,6 @@
{ stdenv, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip { stdenv, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip
, gnutls, nettle }: , gnutls, nettle }:
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ocamlnet-4.1.1"; name = "ocamlnet-4.1.1";
@ -27,7 +23,7 @@ stdenv.mkDerivation {
-enable-pcre -enable-pcre
-disable-gtk2 -disable-gtk2
-with-nethttpd -with-nethttpd
-datadir $out/lib/ocaml/${ocaml_version}/ocamlnet -datadir $out/lib/ocaml/${ocaml.version}/ocamlnet
) )
''; '';

5
pkgs/development/ocaml-modules/ocamlsdl/default.nix
View File

@ -1,13 +1,12 @@
{stdenv, fetchurl, ocaml, pkgconfig, findlib, SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_gfx, lablgl }: {stdenv, fetchurl, ocaml, pkgconfig, findlib, SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_gfx, lablgl }:
let let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
pname = "ocamlsdl"; pname = "ocamlsdl";
version = "0.9.1";
in in
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
version = "0.9.1";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/project/ocamlsdl/OCamlSDL/ocamlsdl-0.9.1/ocamlsdl-0.9.1.tar.gz"; url = "mirror://sourceforge/project/ocamlsdl/OCamlSDL/ocamlsdl-0.9.1/ocamlsdl-0.9.1.tar.gz";

4
pkgs/development/ocaml-modules/ounit/default.nix
View File

@ -1,9 +1,5 @@
{stdenv, fetchurl, ocaml, findlib, camlp4}: {stdenv, fetchurl, ocaml, findlib, camlp4}:
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ounit-2.0.0"; name = "ounit-2.0.0";

6
pkgs/development/ocaml-modules/sexplib/108.08.00.nix
View File

@ -1,10 +1,6 @@
{stdenv, fetchurl, ocaml, findlib, type_conv, camlp4}: {stdenv, fetchurl, ocaml, findlib, type_conv, camlp4}:
let assert stdenv.lib.versionOlder "3.12" ocaml.version;
ocaml_version = (builtins.parseDrvName ocaml.name).version;
in
assert stdenv.lib.versionOlder "3.12" ocaml_version;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ocaml-sexplib-108.08.00"; name = "ocaml-sexplib-108.08.00";

6
pkgs/development/ocaml-modules/sexplib/111.25.00.nix
View File

@ -1,10 +1,6 @@
{stdenv, fetchurl, ocaml, findlib, type_conv, camlp4}: {stdenv, fetchurl, ocaml, findlib, type_conv, camlp4}:
let assert stdenv.lib.versionOlder "4.00" ocaml.version;
ocaml_version = (builtins.parseDrvName ocaml.name).version;
in
assert stdenv.lib.versionOlder "4.00" ocaml_version;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ocaml-sexplib-111.25.00"; name = "ocaml-sexplib-111.25.00";

8
pkgs/development/ocaml-modules/ssl/default.nix
View File

@ -1,12 +1,8 @@
{stdenv, fetchurl, which, openssl, ocaml, findlib}: {stdenv, fetchurl, which, openssl, ocaml, findlib}:
let stdenv.mkDerivation rec {
ocaml_version = (builtins.parseDrvName ocaml.name).version;
version = "0.5.2";
in
stdenv.mkDerivation {
name = "ocaml-ssl-${version}"; name = "ocaml-ssl-${version}";
version = "0.5.2";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/project/savonet/ocaml-ssl/0.5.2/ocaml-ssl-0.5.2.tar.gz"; url = "mirror://sourceforge/project/savonet/ocaml-ssl/0.5.2/ocaml-ssl-0.5.2.tar.gz";

6
pkgs/development/ocaml-modules/type_conv/108.08.00.nix
View File

@ -1,10 +1,6 @@
{stdenv, fetchurl, ocaml, findlib, camlp4}: {stdenv, fetchurl, ocaml, findlib, camlp4}:
let assert stdenv.lib.versionOlder "3.12" ocaml.version;
ocaml_version = (builtins.parseDrvName ocaml.name).version;
in
assert stdenv.lib.versionOlder "3.12" ocaml_version;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ocaml-type_conv-108.08.00"; name = "ocaml-type_conv-108.08.00";

6
pkgs/development/ocaml-modules/type_conv/109.60.01.nix
View File

@ -1,10 +1,6 @@
{stdenv, fetchurl, ocaml, findlib, camlp4}: {stdenv, fetchurl, ocaml, findlib, camlp4}:
let assert stdenv.lib.versionOlder "4.00" ocaml.version;
ocaml_version = (builtins.parseDrvName ocaml.name).version;
in
assert stdenv.lib.versionOlder "4.00" ocaml_version;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ocaml-type_conv-109.60.01"; name = "ocaml-type_conv-109.60.01";

6
pkgs/development/ocaml-modules/ulex/0.8/default.nix
View File

@ -1,14 +1,12 @@
{stdenv, fetchurl, ocaml, findlib, camlp5 }: {stdenv, fetchurl, ocaml, findlib, camlp5 }:
let let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
version = "0.8";
pname = "ulex"; pname = "ulex";
in in
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
version = "0.8";
src = fetchurl { src = fetchurl {
url = "http://www.cduce.org/download/old/${pname}-${version}.tar.gz"; url = "http://www.cduce.org/download/old/${pname}-${version}.tar.gz";

6
pkgs/development/ocaml-modules/ulex/default.nix
View File

@ -1,14 +1,12 @@
{ stdenv, fetchurl, ocaml, findlib, camlp4 }: { stdenv, fetchurl, ocaml, findlib, camlp4 }:
let let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
version = "1.1";
pname = "ulex"; pname = "ulex";
in in
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
version = "1.1";
src = fetchurl { src = fetchurl {
url = "http://www.cduce.org/download/${pname}-${version}.tar.gz"; url = "http://www.cduce.org/download/${pname}-${version}.tar.gz";

7
pkgs/development/ocaml-modules/uucd/default.nix
View File

@ -1,13 +1,12 @@
{ stdenv, fetchurl, ocaml, findlib, opam, xmlm, topkg }: { stdenv, fetchurl, ocaml, findlib, opam, xmlm, topkg }:
let let
pname = "uucd"; pname = "uucd";
version = "4.0.0";
webpage = "http://erratique.ch/software/${pname}"; webpage = "http://erratique.ch/software/${pname}";
ocaml_version = (builtins.parseDrvName ocaml.name).version;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ocaml-${pname}-${version}"; name = "ocaml-${pname}-${version}";
version = "4.0.0";
src = fetchurl { src = fetchurl {
url = "${webpage}/releases/${pname}-${version}.tbz"; url = "${webpage}/releases/${pname}-${version}.tbz";
@ -25,7 +24,7 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
opam-installer --script --prefix=$out ${pname}.install > install.sh opam-installer --script --prefix=$out ${pname}.install > install.sh
sh install.sh sh install.sh
ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/ ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/
''; '';
propagatedBuildInputs = [ xmlm ]; propagatedBuildInputs = [ xmlm ];

8
pkgs/development/ocaml-modules/uunf/default.nix
View File

@ -1,16 +1,14 @@
{stdenv, fetchurl, ocaml, findlib, opam}: {stdenv, fetchurl, ocaml, findlib, opam}:
let let
pname = "uunf"; pname = "uunf";
version = "0.9.3";
webpage = "http://erratique.ch/software/${pname}"; webpage = "http://erratique.ch/software/${pname}";
ocaml_version = (builtins.parseDrvName ocaml.name).version;
in in
assert stdenv.lib.versionAtLeast ocaml_version "3.12"; assert stdenv.lib.versionAtLeast ocaml.version "3.12";
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ocaml-${pname}-${version}"; name = "ocaml-${pname}-${version}";
version = "0.9.3";
src = fetchurl { src = fetchurl {
url = "${webpage}/releases/${pname}-${version}.tbz"; url = "${webpage}/releases/${pname}-${version}.tbz";
@ -28,7 +26,7 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
opam-installer --script --prefix=$out ${pname}.install > install.sh opam-installer --script --prefix=$out ${pname}.install > install.sh
sh install.sh sh install.sh
ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/ ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

8
pkgs/development/ocaml-modules/uutf/default.nix
View File

@ -1,16 +1,14 @@
{stdenv, fetchurl, ocaml, findlib, opam}: {stdenv, fetchurl, ocaml, findlib, opam}:
let let
pname = "uutf"; pname = "uutf";
version = "0.9.3";
webpage = "http://erratique.ch/software/${pname}"; webpage = "http://erratique.ch/software/${pname}";
ocaml_version = (builtins.parseDrvName ocaml.name).version;
in in
assert stdenv.lib.versionAtLeast ocaml_version "3.12"; assert stdenv.lib.versionAtLeast ocaml.version "3.12";
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ocaml-${pname}-${version}"; name = "ocaml-${pname}-${version}";
version = "0.9.3";
src = fetchurl { src = fetchurl {
url = "${webpage}/releases/${pname}-${version}.tbz"; url = "${webpage}/releases/${pname}-${version}.tbz";
@ -28,7 +26,7 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
opam-installer --script --prefix=$out ${pname}.install > install.sh opam-installer --script --prefix=$out ${pname}.install > install.sh
sh install.sh sh install.sh
ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/ ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

8
pkgs/development/ocaml-modules/xmlm/default.nix
View File

@ -1,16 +1,14 @@
{stdenv, fetchurl, ocaml, findlib, opam}: {stdenv, fetchurl, ocaml, findlib, opam}:
let let
pname = "xmlm"; pname = "xmlm";
version = "1.2.0";
webpage = "http://erratique.ch/software/${pname}"; webpage = "http://erratique.ch/software/${pname}";
ocaml_version = (builtins.parseDrvName ocaml.name).version;
in in
assert stdenv.lib.versionAtLeast ocaml_version "3.12"; assert stdenv.lib.versionAtLeast ocaml.version "3.12";
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ocaml-${pname}-${version}"; name = "ocaml-${pname}-${version}";
version = "1.2.0";
src = fetchurl { src = fetchurl {
url = "${webpage}/releases/${pname}-${version}.tbz"; url = "${webpage}/releases/${pname}-${version}.tbz";
@ -28,7 +26,7 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
opam-installer --script --prefix=$out ${pname}.install > install.sh opam-installer --script --prefix=$out ${pname}.install > install.sh
sh install.sh sh install.sh
ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/ ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

10
pkgs/development/ocaml-modules/zarith/default.nix
View File

@ -1,10 +1,6 @@
{ stdenv, fetchurl, ocaml, findlib, pkgconfig, gmp, perl }: { stdenv, fetchurl, ocaml, findlib, pkgconfig, gmp, perl }:
let assert stdenv.lib.versionAtLeast ocaml.version "3.12.1";
ocaml_version = (builtins.parseDrvName ocaml.name).version;
in
assert stdenv.lib.versionAtLeast ocaml_version "3.12.1";
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "zarith-${version}"; name = "zarith-${version}";
@ -22,9 +18,9 @@ stdenv.mkDerivation rec {
substituteInPlace ./z_pp.pl --replace '/usr/bin/perl' '${perl}/bin/perl' substituteInPlace ./z_pp.pl --replace '/usr/bin/perl' '${perl}/bin/perl'
''; '';
configurePhase = '' configurePhase = ''
./configure -installdir $out/lib/ocaml/${ocaml_version}/site-lib ./configure -installdir $out/lib/ocaml/${ocaml.version}/site-lib
''; '';
preInstall = "mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib"; preInstall = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Fast, arbitrary precision OCaml integers"; description = "Fast, arbitrary precision OCaml integers";

3
pkgs/development/python-modules/searx.patch
View File

@ -16,7 +16,8 @@ index 0d2f61b..46481b3 100644
pyasn1-modules==0.0.8 pyasn1-modules==0.0.8
-pygments==2.1.3 -pygments==2.1.3
+pygments==2.* +pygments==2.*
pyopenssl==0.15.1 -pyopenssl==0.15.1
+pyopenssl==16.*
-python-dateutil==2.5.3 -python-dateutil==2.5.3
+python-dateutil==2.* +python-dateutil==2.*
-pyyaml==3.11 -pyyaml==3.11

10
pkgs/development/tools/misc/gpshell/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, fetchurl, pkgconfig, globalplatform, pcsclite }: { stdenv, fetchurl, pkgconfig, globalplatform, pcsclite, gppcscconnectionplugin
, makeWrapper
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gpshell-${version}"; name = "gpshell-${version}";
@ -9,7 +11,11 @@ stdenv.mkDerivation rec {
sha256 = "19a77zvyf2vazbv17185s4pynhylk2ky8vhl4i8pg9zww29sicqi"; sha256 = "19a77zvyf2vazbv17185s4pynhylk2ky8vhl4i8pg9zww29sicqi";
}; };
buildInputs = [ pkgconfig globalplatform pcsclite ]; buildInputs = [ pkgconfig globalplatform pcsclite makeWrapper ];
postFixup = ''
wrapProgram "$out/bin/gpshell" --prefix LD_LIBRARY_PATH : "${gppcscconnectionplugin}/lib"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://sourceforge.net/p/globalplatform/wiki/Home/; homepage = https://sourceforge.net/p/globalplatform/wiki/Home/;

10
pkgs/development/tools/misc/trv/default.nix
View File

@ -2,15 +2,11 @@
, re2_p4, async_extra_p4, sexplib_p4, async_shell, core_extended_p4, async_find , re2_p4, async_extra_p4, sexplib_p4, async_shell, core_extended_p4, async_find
, cohttp, uri, tzdata}: , cohttp, uri, tzdata}:
let assert stdenv.lib.versionOlder "4.02" ocaml.version;
ocaml_version = (builtins.parseDrvName ocaml.name).version;
version = "0.1.3";
in
assert stdenv.lib.versionOlder "4.02" ocaml_version; stdenv.mkDerivation rec {
stdenv.mkDerivation {
name = "trv-${version}"; name = "trv-${version}";
version = "0.1.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "afiniate"; owner = "afiniate";

4
pkgs/development/tools/nimble/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nimble-${version}"; name = "nimble-${version}";
version = "0.7.4"; version = "0.7.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nim-lang"; owner = "nim-lang";
repo = "nimble"; repo = "nimble";
rev = "v${version}"; rev = "v${version}";
sha256 = "1l477f1zlqpc738jg47pz599cwjasgy9jqdsplj3ywd12xfqpc96"; sha256 = "12znxzj1j5fflw2mkkrns9n7qg6sf207652zrdyf7h2jdyzzb73x";
}; };
buildInputs = [ nim ]; buildInputs = [ nim ];

13
pkgs/development/tools/ocaml/camlidl/default.nix
View File

@ -1,13 +1,12 @@
{stdenv, fetchurl, makeWrapper, gcc, ocaml, ncurses}: {stdenv, fetchurl, makeWrapper, gcc, ocaml, ncurses}:
let let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
pname = "camlidl"; pname = "camlidl";
version = "1.05";
webpage = "http://caml.inria.fr/pub/old_caml_site/camlidl/"; webpage = "http://caml.inria.fr/pub/old_caml_site/camlidl/";
in in
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
version = "1.05";
src = fetchurl { src = fetchurl {
url = "http://caml.inria.fr/pub/old_caml_site/distrib/bazar-ocaml/${pname}-${version}.tar.gz"; url = "http://caml.inria.fr/pub/old_caml_site/distrib/bazar-ocaml/${pname}-${version}.tar.gz";
@ -19,13 +18,13 @@ stdenv.mkDerivation {
preBuild = '' preBuild = ''
mv config/Makefile.unix config/Makefile mv config/Makefile.unix config/Makefile
substituteInPlace config/Makefile --replace BINDIR=/usr/local/bin BINDIR=$out substituteInPlace config/Makefile --replace BINDIR=/usr/local/bin BINDIR=$out
substituteInPlace config/Makefile --replace OCAMLLIB=/usr/local/lib/ocaml OCAMLLIB=$out/lib/ocaml/${ocaml_version}/site-lib/camlidl substituteInPlace config/Makefile --replace OCAMLLIB=/usr/local/lib/ocaml OCAMLLIB=$out/lib/ocaml/${ocaml.version}/site-lib/camlidl
substituteInPlace config/Makefile --replace CPP=/lib/cpp CPP=${gcc}/bin/cpp substituteInPlace config/Makefile --replace CPP=/lib/cpp CPP=${gcc}/bin/cpp
mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib/camlidl/caml mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/camlidl/caml
''; '';
postInstall = '' postInstall = ''
cat >$out/lib/ocaml/${ocaml_version}/site-lib/camlidl/META <<EOF cat >$out/lib/ocaml/${ocaml.version}/site-lib/camlidl/META <<EOF
# Courtesy of GODI # Courtesy of GODI
description = "Stub generator" description = "Stub generator"
version = "${version}" version = "${version}"

15
pkgs/development/tools/ocaml/camlp4/4_03.nix
View File

@ -1,14 +1,11 @@
{stdenv, fetchzip, which, ocaml, ocamlbuild}: {stdenv, fetchzip, which, ocaml, ocamlbuild}:
let
ocaml_version = (stdenv.lib.getVersion ocaml);
version = "4.03+1";
in assert stdenv.lib.versionAtLeast ocaml.version "4.02";
assert stdenv.lib.versionAtLeast ocaml_version "4.02";
stdenv.mkDerivation { stdenv.mkDerivation {
name = "camlp4-${version}"; name = "camlp4-${version}";
version = "4.03+1";
src = fetchzip { src = fetchzip {
url = "https://github.com/ocaml/camlp4/archive/${version}.tar.gz"; url = "https://github.com/ocaml/camlp4/archive/${version}.tar.gz";
sha256 = "1f2ndch6f1m4fgnxsjb94qbpwjnjgdlya6pard44y6n0dqxi1wsq"; sha256 = "1f2ndch6f1m4fgnxsjb94qbpwjnjgdlya6pard44y6n0dqxi1wsq";
@ -21,14 +18,14 @@ stdenv.mkDerivation {
preConfigure = '' preConfigure = ''
configureFlagsArray=( configureFlagsArray=(
--bindir=$out/bin --bindir=$out/bin
--libdir=$out/lib/ocaml/${ocaml_version}/site-lib --libdir=$out/lib/ocaml/${ocaml.version}/site-lib
--pkgdir=$out/lib/ocaml/${ocaml_version}/site-lib --pkgdir=$out/lib/ocaml/${ocaml.version}/site-lib
) )
''; '';
postConfigure = '' postConfigure = ''
substituteInPlace camlp4/META.in \ substituteInPlace camlp4/META.in \
--replace +camlp4 $out/lib/ocaml/${ocaml_version}/site-lib/camlp4 --replace +camlp4 $out/lib/ocaml/${ocaml.version}/site-lib/camlp4
''; '';

19
pkgs/development/tools/ocaml/camlp4/default.nix
View File

@ -1,14 +1,11 @@
{stdenv, fetchzip, which, ocaml}: {stdenv, fetchzip, which, ocaml}:
let
ocaml_version = (stdenv.lib.getVersion ocaml); assert stdenv.lib.versionAtLeast ocaml.version "4.02";
stdenv.mkDerivation rec {
name = "camlp4-${version}";
version = "4.02+6"; version = "4.02+6";
in
assert stdenv.lib.versionAtLeast ocaml_version "4.02";
stdenv.mkDerivation {
name = "camlp4-${version}";
src = fetchzip { src = fetchzip {
url = "https://github.com/ocaml/camlp4/archive/${version}.tar.gz"; url = "https://github.com/ocaml/camlp4/archive/${version}.tar.gz";
sha256 = "06yl4q0qazl7g25b0axd1gdkfd4qpqzs1gr5fkvmkrcbz113h1hj"; sha256 = "06yl4q0qazl7g25b0axd1gdkfd4qpqzs1gr5fkvmkrcbz113h1hj";
@ -21,14 +18,14 @@ stdenv.mkDerivation {
preConfigure = '' preConfigure = ''
configureFlagsArray=( configureFlagsArray=(
--bindir=$out/bin --bindir=$out/bin
--libdir=$out/lib/ocaml/${ocaml_version}/site-lib --libdir=$out/lib/ocaml/${ocaml.version}/site-lib
--pkgdir=$out/lib/ocaml/${ocaml_version}/site-lib --pkgdir=$out/lib/ocaml/${ocaml.version}/site-lib
) )
''; '';
postConfigure = '' postConfigure = ''
substituteInPlace camlp4/META.in \ substituteInPlace camlp4/META.in \
--replace +camlp4 $out/lib/ocaml/${ocaml_version}/site-lib/camlp4 --replace +camlp4 $out/lib/ocaml/${ocaml.version}/site-lib/camlp4
''; '';

11
pkgs/development/tools/ocaml/camlp5/5.15.nix
View File

@ -1,18 +1,17 @@
{stdenv, fetchurl, ocaml, transitional ? false}: {stdenv, fetchurl, ocaml, transitional ? false}:
let let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
pname = "camlp5"; pname = "camlp5";
version = "5.15";
webpage = http://pauillac.inria.fr/~ddr/camlp5/; webpage = http://pauillac.inria.fr/~ddr/camlp5/;
metafile = ./META; metafile = ./META;
in in
assert !stdenv.lib.versionOlder "4.00" ocaml_version; assert !stdenv.lib.versionOlder "4.00" ocaml.version;
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "${pname}${if transitional then "_transitional" else ""}-${version}"; name = "${pname}${if transitional then "_transitional" else ""}-${version}";
version = "5.15";
src = fetchurl { src = fetchurl {
url = "${webpage}/distrib/src/${pname}-${version}.tgz"; url = "${webpage}/distrib/src/${pname}-${version}.tgz";
@ -24,11 +23,11 @@ stdenv.mkDerivation {
prefixKey = "-prefix "; prefixKey = "-prefix ";
preConfigure = "configureFlagsArray=(" + (if transitional then "--transitional" else "--strict") + preConfigure = "configureFlagsArray=(" + (if transitional then "--transitional" else "--strict") +
" --libdir $out/lib/ocaml/${ocaml_version}/site-lib)"; " --libdir $out/lib/ocaml/${ocaml.version}/site-lib)";
buildFlags = "world.opt"; buildFlags = "world.opt";
postInstall = "cp ${metafile} $out/lib/ocaml/${ocaml_version}/site-lib/camlp5/META"; postInstall = "cp ${metafile} $out/lib/ocaml/${ocaml.version}/site-lib/camlp5/META";
meta = { meta = {
description = "Preprocessor-pretty-printer for OCaml"; description = "Preprocessor-pretty-printer for OCaml";

5
pkgs/development/tools/ocaml/camlp5/default.nix
View File

@ -1,7 +1,6 @@
{stdenv, fetchurl, ocaml, transitional ? false}: {stdenv, fetchurl, ocaml, transitional ? false}:
let let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
metafile = ./META; metafile = ./META;
in in
@ -19,11 +18,11 @@ stdenv.mkDerivation {
prefixKey = "-prefix "; prefixKey = "-prefix ";
preConfigure = "configureFlagsArray=(" + (if transitional then "--transitional" else "--strict") + preConfigure = "configureFlagsArray=(" + (if transitional then "--transitional" else "--strict") +
" --libdir $out/lib/ocaml/${ocaml_version}/site-lib)"; " --libdir $out/lib/ocaml/${ocaml.version}/site-lib)";
buildFlags = "world.opt"; buildFlags = "world.opt";
postInstall = "cp ${metafile} $out/lib/ocaml/${ocaml_version}/site-lib/camlp5/META"; postInstall = "cp ${metafile} $out/lib/ocaml/${ocaml.version}/site-lib/camlp5/META";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Preprocessor-pretty-printer for OCaml"; description = "Preprocessor-pretty-printer for OCaml";

12
pkgs/development/tools/ocaml/findlib/default.nix
View File

@ -1,9 +1,5 @@
{stdenv, fetchurl, m4, ncurses, ocaml, writeText}: {stdenv, fetchurl, m4, ncurses, ocaml, writeText}:
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ocaml-findlib-${version}"; name = "ocaml-findlib-${version}";
version = "1.6.1"; version = "1.6.1";
@ -23,7 +19,7 @@ stdenv.mkDerivation rec {
configureFlagsArray=( configureFlagsArray=(
-bindir $out/bin -bindir $out/bin
-mandir $out/share/man -mandir $out/share/man
-sitelib $out/lib/ocaml/${ocaml_version}/site-lib -sitelib $out/lib/ocaml/${ocaml.version}/site-lib
-config $out/etc/findlib.conf -config $out/etc/findlib.conf
) )
''; '';
@ -35,10 +31,10 @@ stdenv.mkDerivation rec {
setupHook = writeText "setupHook.sh" '' setupHook = writeText "setupHook.sh" ''
addOCamlPath () { addOCamlPath () {
if test -d "''$1/lib/ocaml/${ocaml_version}/site-lib"; then if test -d "''$1/lib/ocaml/${ocaml.version}/site-lib"; then
export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/ocaml/${ocaml_version}/site-lib/" export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/"
fi fi
export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml_version}/site-lib/" export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml.version}/site-lib/"
if test -n "$createFindlibDestdir"; then if test -n "$createFindlibDestdir"; then
mkdir -p $OCAMLFIND_DESTDIR mkdir -p $OCAMLFIND_DESTDIR
fi fi

3
pkgs/development/tools/ocaml/ocp-index/default.nix
View File

@ -8,7 +8,6 @@ assert versionAtLeast (getVersion ocpIndent) "1.4.2";
let let
version = "1.1.4"; version = "1.1.4";
ocaml_version = getVersion ocaml;
srcs = { srcs = {
"4.03.0" = { "4.03.0" = {
rev = "${version}-4.03"; rev = "${version}-4.03";
@ -27,7 +26,7 @@ let
src = fetchFromGitHub ({ src = fetchFromGitHub ({
owner = "OCamlPro"; owner = "OCamlPro";
repo = "ocp-index"; repo = "ocp-index";
} // srcs."${ocaml_version}"); } // srcs."${ocaml.version}");
in in
stdenv.mkDerivation { stdenv.mkDerivation {

2
pkgs/games/astromenace/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
cp AstroMenace $out cp AstroMenace $out
cp gamedata.vfs $out cp gamedata.vfs $out
cat > $out/bin/AstroMenace << EOF cat > $out/bin/AstroMenace << EOF
#!/bin/bash #!${stdenv.shell}
$out/AstroMenace --dir=$out $out/AstroMenace --dir=$out
EOF EOF
chmod 755 $out/bin/AstroMenace chmod 755 $out/bin/AstroMenace

2
pkgs/games/micropolis/default.nix
View File

@ -34,7 +34,7 @@ stdenv.mkDerivation {
done done
cp Micropolis $out/usr/share/games/micropolis cp Micropolis $out/usr/share/games/micropolis
cat > $out/bin/micropolis << EOF cat > $out/bin/micropolis << EOF
#!/bin/bash #!${stdenv.shell}
cd $out/usr/share/games/micropolis cd $out/usr/share/games/micropolis
./Micropolis ./Micropolis
EOF EOF

37
pkgs/games/tinyfugue/default.nix Normal file
View File

@ -0,0 +1,37 @@
{ stdenv, fetchurl, ncurses, zlib
, openssl ? null
, sslSupport ? true
}:
with stdenv.lib;
assert sslSupport -> openssl != null;
stdenv.mkDerivation rec {
name = "tinyfugue-${version}";
version = "50b8";
verUrl = "5.0%20beta%208";
src = fetchurl {
url = "mirror://sourceforge/project/tinyfugue/tinyfugue/${verUrl}/tf-${version}.tar.gz";
sha256 = "12fra2fdwqj6ilv9wdkc33rkj343rdcf5jyff4yiwywlrwaa2l1p";
};
configureFlags = optional (!sslSupport) "--disable-ssl";
buildInputs =
[ ncurses zlib ]
++ optional sslSupport openssl;
meta = {
homepage = http://tinyfugue.sourceforge.net/;
description = "A terminal UI, screen-oriented MUD client";
longDescription = ''
TinyFugue, aka "tf", is a flexible, screen-oriented MUD client, for use
with any type of text MUD.
'';
license = licenses.gpl2;
platforms = ncurses.meta.platforms;
maintainers = [ maintainers.KibaFox ];
};
}

428
pkgs/misc/vim-plugins/default.nix
View File

@ -177,11 +177,11 @@ rec {
}; };
Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "Syntastic-2016-07-21"; name = "Syntastic-2016-10-04";
src = fetchgit { src = fetchgit {
url = "git://github.com/scrooloose/syntastic"; url = "git://github.com/scrooloose/syntastic";
rev = "663fea9dc9371d574f1a4a6ba15cc9e60ebbe510"; rev = "75b1095586b1cb685ccb0e69004bcd4ae75b37da";
sha256 = "1y37m1iikki13y6rpzfgdyadd565q9zixg6xkly34bgbp1yrq5g0"; sha256 = "1hlw6ahlfm4k837zy079acv4lih2r2l9d8fwzb8d970r55p6qffb";
}; };
dependencies = []; dependencies = [];
@ -199,44 +199,44 @@ rec {
}; };
Tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation Tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "Tagbar-2015-06-19"; name = "Tagbar-2016-09-25";
src = fetchgit { src = fetchgit {
url = "git://github.com/majutsushi/tagbar"; url = "git://github.com/majutsushi/tagbar";
rev = "7b36c46d17d57db34fdb0adac9ba6382d0bb5e66"; rev = "2955f71856536d503c79c15daab3de890a6d83e9";
sha256 = "10n1c55r2arj89man01hq9dlp2lwya9gma2jh8lhhy8p9zfl95w6"; sha256 = "16hz3mvfz4q4sxg2vq2m2gkmpwhchql14yxw1ws05qqnyy0jbxk2";
}; };
dependencies = []; dependencies = [];
}; };
The_NERD_Commenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation The_NERD_Commenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "The_NERD_Commenter-2016-07-14"; name = "The_NERD_Commenter-2016-08-31";
src = fetchgit { src = fetchgit {
url = "git://github.com/scrooloose/nerdcommenter"; url = "git://github.com/scrooloose/nerdcommenter";
rev = "c3d6a2069bb0286c9633fbbffb4983797f7b8822"; rev = "fdc611c8f4dbb5bed57fe95d076cf82e9bcb5e7d";
sha256 = "0xwnx8ggqpik9jnyb4a69v7z789ffrfnxc3frl644x7bhndgaa1v"; sha256 = "0qdryph7mjny3vcb6255q75fykxps7wvyzibfb3lxrkvqv6i1dlr";
}; };
dependencies = []; dependencies = [];
}; };
The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "The_NERD_tree-2016-06-23"; name = "The_NERD_tree-2016-10-04";
src = fetchgit { src = fetchgit {
url = "git://github.com/scrooloose/nerdtree"; url = "git://github.com/scrooloose/nerdtree";
rev = "2e2b649232d6ae4d02d74793e5da0ee08480ad8d"; rev = "f26eaf83551631e683e339f00e2c97bd6e8356d7";
sha256 = "1rfm6w60bk168y1l9hjjxd4840j1jr1h0s77lsdjr9wxpxbw59ml"; sha256 = "0vljxnnlm7sdhb61z4114lzjy6gi59y3ym5fynplvccsbv0s47r2";
}; };
dependencies = []; dependencies = [];
}; };
UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "UltiSnips-2016-07-07"; name = "UltiSnips-2016-09-19";
src = fetchgit { src = fetchgit {
url = "git://github.com/SirVer/ultisnips"; url = "git://github.com/SirVer/ultisnips";
rev = "e8c485eb3c7e2c4c3ddc62beb79011f026a3ca04"; rev = "97a280417b9ebcd098283b46ba9f144c6344bb8d";
sha256 = "03cdpz136ry6v7h0sddlyvgxwvp3bl1ir7451v3sd6q867ywvbs7"; sha256 = "030n4f5mwxlq6qfizh82s5h8zlfm3qdh0lc3rc01p0nwbgpvyrg3";
}; };
dependencies = []; dependencies = [];
@ -292,11 +292,11 @@ rec {
}; };
ctrlp-py-matcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation ctrlp-py-matcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "ctrlp-py-matcher-2016-06-22"; name = "ctrlp-py-matcher-2016-09-02";
src = fetchgit { src = fetchgit {
url = "git://github.com/FelikZ/ctrlp-py-matcher"; url = "git://github.com/FelikZ/ctrlp-py-matcher";
rev = "fb831ff903d5622b39f400fc8ba80f9bbd225307"; rev = "3624f3a085681f787f1f9b7a8a24d4bed395acf1";
sha256 = "0zamyhxn910q6yyja6ypc92pxr47n28yzb6h90x20z0q2wka5842"; sha256 = "1126gphnhfvba5xzvqj4s582k61xsvi5hn86zag42v14v5csgw9d";
}; };
dependencies = []; dependencies = [];
@ -342,11 +342,11 @@ rec {
}; };
fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "fugitive-2016-07-06"; name = "fugitive-2016-08-08";
src = fetchgit { src = fetchgit {
url = "git://github.com/tpope/vim-fugitive"; url = "git://github.com/tpope/vim-fugitive";
rev = "c00ebd75ac23f4080c0d0bf9453b16304a3fb316"; rev = "aac85a268e89a6c8be79341e130ac90256fadbd6";
sha256 = "0j8vy6n70m02k2iq4y4nbpc0jnzk1ag51qnnbxj7aad4hkn8hban"; sha256 = "1hsq8lgw1gn99y0rr214bcc9vlw0kx8yajci7dimwhbh817kq5v4";
}; };
dependencies = []; dependencies = [];
@ -364,44 +364,44 @@ rec {
}; };
vim-auto-save = buildVimPluginFrom2Nix { # created by nix#NixDerivation vim-auto-save = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-auto-save-2016-07-20"; name = "vim-auto-save-2016-09-12";
src = fetchgit { src = fetchgit {
url = "git://github.com/907th/vim-auto-save"; url = "git://github.com/907th/vim-auto-save";
rev = "ef54e6c66c5a2ffeb39b45db731f00e1811f7334"; rev = "28300c8a7b8cea137c065a48fd9bcc2348f08707";
sha256 = "03kbphnkcxvbvvanzj22j0rkhp19dbbmqqsgypdz7avx9bra3nxw"; sha256 = "0n3xbp8vf3xsh6y6f855q313scldqm9593bhxydyszy1parvxwb5";
}; };
dependencies = []; dependencies = [];
}; };
vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-autoformat-2016-07-08"; name = "vim-autoformat-2016-09-09";
src = fetchgit { src = fetchgit {
url = "git://github.com/Chiel92/vim-autoformat"; url = "git://github.com/Chiel92/vim-autoformat";
rev = "06251ab31789b6c478358306ab0e476c7d03b0d5"; rev = "f6fabad46f34afd75ae74995c10813eab7021bbf";
sha256 = "0q749lbz1zzajdwyyznyg7h4mf2sdd0sq77dr24szs4f937zy007"; sha256 = "1n9ij49npiksdhzdkv2wn6cx2kyn62f3j2ins0ng85kzgh83a0jc";
}; };
dependencies = []; dependencies = [];
}; };
vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-nix-2016-05-31"; name = "vim-nix-2016-08-07";
src = fetchgit { src = fetchgit {
url = "git://github.com/LnL7/vim-nix"; url = "git://github.com/LnL7/vim-nix";
rev = "9ac8876e5beb824018b9a09d4640f7efc2fbc8ae"; rev = "a61495a762feacc00f24cab4392b09cc3250decf";
sha256 = "0whdf56c63vp4c3b2jfl1x5c0dxxrzwvxkfm5951qzpfy6xwg27x"; sha256 = "0icq9nawm6s4qzb9q62y3fdq4ixbfwmmgk141fnfqzq6ya1azxac";
}; };
dependencies = []; dependencies = [];
}; };
deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "deoplete-nvim-2016-07-26"; name = "deoplete-nvim-2016-10-01";
src = fetchgit { src = fetchgit {
url = "git://github.com/Shougo/deoplete.nvim"; url = "git://github.com/Shougo/deoplete.nvim";
rev = "cd52ac6c076720541c6b9a82581622f597778e97"; rev = "0e663c022a8f9b318ad494de4246754ad34effb3";
sha256 = "0rd9hdhk800nj5sz52zabxb2im75ckq2jmrqhff0n5dlmc61hdd2"; sha256 = "1w3riv8x8x4hgdyhabcis25f1scapgw9r4xzlnfrz809l25wwxds";
}; };
dependencies = []; dependencies = [];
@ -430,22 +430,22 @@ rec {
}; };
vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-css-color-2016-07-21"; name = "vim-css-color-2016-09-06";
src = fetchgit { src = fetchgit {
url = "git://github.com/ap/vim-css-color"; url = "git://github.com/ap/vim-css-color";
rev = "e2017678257fa8a175e4ab1191f9cfbe8cab39b2"; rev = "499a3767d5d5af8cd427007d2a38623d339f2f85";
sha256 = "1179kcm44sssw09lj38p9n3h8lrnfraxn6hf9x7azl0kx0v4jjry"; sha256 = "026n85pi85jx5ph1v2ss2fhzm2x02v9kx7w97367p3vmd2cggba3";
}; };
dependencies = []; dependencies = [];
}; };
neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "neomake-2016-07-23"; name = "neomake-2016-10-03";
src = fetchgit { src = fetchgit {
url = "git://github.com/benekastah/neomake"; url = "git://github.com/benekastah/neomake";
rev = "ab22f656cd3ce77a7092568c412b7422c15889e8"; rev = "4771be7bee6023568f80dc21fdda071693b81cca";
sha256 = "1x26srp0grvjna7cvzsncjnzynvzg22rwn96dc90zn4qlrnnhw1s"; sha256 = "1bkn98iwfx6fhccnwxjh694w2yjfvczkrbm7h6mjkl8n8zka93kc";
}; };
dependencies = []; dependencies = [];
@ -463,33 +463,44 @@ rec {
}; };
vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-tmux-navigator-2016-07-17"; name = "vim-tmux-navigator-2016-09-03";
src = fetchgit { src = fetchgit {
url = "git://github.com/christoomey/vim-tmux-navigator"; url = "git://github.com/christoomey/vim-tmux-navigator";
rev = "caf4c48141f9088632b457f488fb797af77c3ce1"; rev = "e79d4c0c24c43d3ada283b1f5a1b8fa6cf820a70";
sha256 = "0gj6klb296jqq8zi40q7ryparpbv85dx4ahx6gpfv85452zn7rml"; sha256 = "1p4kb8ja86pa3l9jh8yfjvdvdik4fwnpbpl34npjwbga52pawn65";
}; };
dependencies = []; dependencies = [];
}; };
spacevim = buildVimPluginFrom2Nix { # created by nix#NixDerivation spacevim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "spacevim-2016-07-19"; name = "spacevim-2016-09-15";
src = fetchgit { src = fetchgit {
url = "git://github.com/ctjhoa/spacevim"; url = "git://github.com/ctjhoa/spacevim";
rev = "59864e305977fa47e032529d20d9dfb589c06659"; rev = "b90e12ebc43fdc4cf6b75004d319c25b29efdf8f";
sha256 = "0d99bnrb2yz3d40kr9gdxwp369b18d6vn3jm3d3fz2n55k6xp9ww"; sha256 = "1hz84amsl9374mdsgg6szrsnf15kmqa3n2hmcagy5xmbj7fz1msc";
}; };
dependencies = []; dependencies = [];
}; };
ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "ctrlp-vim-2016-07-08"; name = "ctrlp-vim-2016-10-02";
src = fetchgit { src = fetchgit {
url = "git://github.com/ctrlpvim/ctrlp.vim"; url = "git://github.com/ctrlpvim/ctrlp.vim";
rev = "b9fa920b4abbb54799927a3bc57869fdd556321a"; rev = "c6d1fc5e58d689bfb104ff336aeb89d9ef1b48e2";
sha256 = "1h8cm9mihd3jngmb6x60hxyr0g3swg6xhq8jw36xskb1ygdvbxzp"; sha256 = "0m23yrmgbwaj35yh38sj43r16q090l4vbgijpyv1danmf7ws6q1f";
};
dependencies = [];
};
agda-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "agda-vim-2016-09-06";
src = fetchgit {
url = "git://github.com/derekelkins/agda-vim";
rev = "03e8cc9a8c7a58c431a32f50e80fe0fefe0c3f41";
sha256 = "0qkfxyddp3j14hz1vmm499dnkrgqzr2xsaxi6dz61alq65r4xbl9";
}; };
dependencies = []; dependencies = [];
@ -529,22 +540,22 @@ rec {
}; };
elm-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation elm-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "elm-vim-2016-07-25"; name = "elm-vim-2016-10-02";
src = fetchgit { src = fetchgit {
url = "git://github.com/elmcast/elm-vim"; url = "git://github.com/elmcast/elm-vim";
rev = "abc998a113a77a729bf8c2b918978c8e43e60847"; rev = "7760aed9f258cf6a7d2c56d547dd3ea45f832025";
sha256 = "1byma9dyh59b4mnmr0nmjmy0ribgn9l8m2gddbc0hfgcwbzjxy5y"; sha256 = "1f1z2929aka2shkwb8z2ky26cvw2cgx7wdcikw9mljpgc1s7nl5d";
}; };
dependencies = []; dependencies = [];
}; };
vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-localvimrc-2016-06-06"; name = "vim-localvimrc-2016-08-18";
src = fetchgit { src = fetchgit {
url = "git://github.com/embear/vim-localvimrc"; url = "git://github.com/embear/vim-localvimrc";
rev = "f104384cd9127b5a75ed889b551fd7f46faeb74a"; rev = "2d4c622da0bd04669cd149c6f424d0771708e8d6";
sha256 = "0k1ava8nhshkm7llhmagpsmvgwy8xcc0mn3chdk6hz8gzz9755py"; sha256 = "0j5344riafqr330q9jiglcqaffmcppq6r1512866cmkk000r6lc0";
}; };
dependencies = []; dependencies = [];
@ -573,22 +584,22 @@ rec {
}; };
vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-go-2016-07-26"; name = "vim-go-2016-10-04";
src = fetchgit { src = fetchgit {
url = "git://github.com/fatih/vim-go"; url = "git://github.com/fatih/vim-go";
rev = "b7ac76ad7ef469d45aa44d2209a3a61b46cb3b1a"; rev = "1f8e10cebdacfd7a6809741a9eb04b5e1c3bc6ec";
sha256 = "0dx7zqh6hq4lgjqc8jvjaa1yjc46yfcbfpj8cs4qd06zafzqf8wf"; sha256 = "1iyqa0pklba5badxmak8b8wp0xryk9fi8qky1fj9m8lchv7s69nn";
}; };
dependencies = []; dependencies = [];
}; };
vim-colorschemes = buildVimPluginFrom2Nix { # created by nix#NixDerivation vim-colorschemes = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-colorschemes-2016-03-18"; name = "vim-colorschemes-2016-08-01";
src = fetchgit { src = fetchgit {
url = "git://github.com/flazz/vim-colorschemes"; url = "git://github.com/flazz/vim-colorschemes";
rev = "189f5182bb70fd35d0f56fee451c3f22a2a80135"; rev = "b8dff40f69f1873effbed97c759a8452ecb240ed";
sha256 = "1j3r99av9rzdrp8w0c86n0r4kgiv8xry5xdghc1871kvz77sq5d4"; sha256 = "1mb08l2crl5mal0jllh9s099w2bqcb88vfjw3z5zj1jn8bbpniaj";
}; };
dependencies = []; dependencies = [];
@ -606,77 +617,77 @@ rec {
}; };
psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "psc-ide-vim-2016-07-06"; name = "psc-ide-vim-2016-09-07";
src = fetchgit { src = fetchgit {
url = "git://github.com/frigoeu/psc-ide-vim"; url = "git://github.com/frigoeu/psc-ide-vim";
rev = "8704b993fe7dced73aa871244fbf7cd2fbafb759"; rev = "3c376289d368b7175cb6c10e2960f08830ee4cb4";
sha256 = "1wvs5v59aai3q2lgavaav073gz609944j8xbck34xyyq2naqmhaq"; sha256 = "0mzczy73asw66qz3zqbf48i95qfjrv1rhky9zyl5qcwlay1gyfvj";
}; };
dependencies = []; dependencies = [];
}; };
vim-jsonnet = buildVimPluginFrom2Nix { # created by nix#NixDerivation vim-jsonnet = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-jsonnet-2016-05-10"; name = "vim-jsonnet-2016-10-01";
src = fetchgit { src = fetchgit {
url = "git://github.com/google/vim-jsonnet"; url = "git://github.com/google/vim-jsonnet";
rev = "9cde81ff3f1afb64f8e6b51e8ebba25b074e26f8"; rev = "fb99d65bb42438fa65fb46051243bbae20a75e31";
sha256 = "156lbh1xgw3vrgbdfax3mhyfdm2r6r0ak42bs001ykpqmn6dxbrx"; sha256 = "19c2jwpabsx16m23mzfspazlj565ra3xzsibm9283k46dlax9mwh";
}; };
dependencies = []; dependencies = [];
}; };
vim-leader-guide = buildVimPluginFrom2Nix { # created by nix#NixDerivation vim-leader-guide = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-leader-guide-2016-05-17"; name = "vim-leader-guide-2016-10-03";
src = fetchgit { src = fetchgit {
url = "git://github.com/hecal3/vim-leader-guide"; url = "git://github.com/hecal3/vim-leader-guide";
rev = "333bd74c6f6ad18d653061f469342f9a37664256"; rev = "0d08f2f5603d61b0099d2323e0ca4ab30f8a4d49";
sha256 = "07y4rq9d45vak5gm0hm1aazsh8r0k631aa9d0q9v9iz9k3v7irgw"; sha256 = "0035yzgswqfamcvrbxcjbxs5lywcg5vsrddlnawx8x0rzm4az5nh";
}; };
dependencies = []; dependencies = [];
}; };
idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "idris-vim-2016-07-15"; name = "idris-vim-2016-07-29";
src = fetchgit { src = fetchgit {
url = "git://github.com/idris-hackers/idris-vim"; url = "git://github.com/idris-hackers/idris-vim";
rev = "aeca73e9432c21da6eb35fceaef957f191b3d56a"; rev = "7ef7a2ed9135d69a0dea6b571a20ddf2b0bf7a90";
sha256 = "1q38sf4dabirhrr3i89p271ixap90im0x3pf39s3fc9jmb3m2jm8"; sha256 = "0py7vyg38yn6bl7pwyyhylpqp14smqjzbfj7rjzjfnlq33v7ysij";
}; };
dependencies = []; dependencies = [];
}; };
calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "calendar-vim-2016-07-18"; name = "calendar-vim-2016-09-20";
src = fetchgit { src = fetchgit {
url = "git://github.com/itchyny/calendar.vim"; url = "git://github.com/itchyny/calendar.vim";
rev = "a61af2bf6d8919d75e9ab48776316f1b3e11c336"; rev = "38b2cf96acf2cb1dc033de4b499f5b223adebacd";
sha256 = "0zxdx1q3x541ddm1d5qlwx8rl37gqhm3bgrsl1kmkn14az8nyy7k"; sha256 = "1yi16vj3if5l55f7pava75fd412skj7nmj4r73dpkqa36dg0xljw";
}; };
dependencies = []; dependencies = [];
}; };
lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "lightline-vim-2016-06-12"; name = "lightline-vim-2016-10-05";
src = fetchgit { src = fetchgit {
url = "git://github.com/itchyny/lightline.vim"; url = "git://github.com/itchyny/lightline.vim";
rev = "430ce2cb063b39a0c7950cafd617e333acb6759a"; rev = "9e8d9f68dfe9b19eba343f796ffd16933a4dc77d";
sha256 = "0336c17vkfh60cvj86y35lqz1xcd80csrlb985k1hyd5s7cayp42"; sha256 = "02sc5sv0clm79b0p0ayk20j750c6gmw0akg6k9lz9dp9aryx8r9i";
}; };
dependencies = []; dependencies = [];
}; };
thumbnail-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation thumbnail-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "thumbnail-vim-2016-03-17"; name = "thumbnail-vim-2016-09-06";
src = fetchgit { src = fetchgit {
url = "git://github.com/itchyny/thumbnail.vim"; url = "git://github.com/itchyny/thumbnail.vim";
rev = "4afdc473b47d162610965fa5ed15fa855cca65d4"; rev = "d697fb7a73a53275390c20040faab87b54f12f84";
sha256 = "1z5a9dqb788ll5j8gg3hdjjggwpx0b073v5dr8zlrk1zjwah56gw"; sha256 = "112hkblw30ym7bpv8454fylalv9kn0l3268gpkh9a5qdr2kf99b1";
}; };
dependencies = []; dependencies = [];
@ -738,11 +749,11 @@ rec {
}; };
vim-nerdtree-tabs = buildVimPluginFrom2Nix { # created by nix#NixDerivation vim-nerdtree-tabs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-nerdtree-tabs-2014-09-25"; name = "vim-nerdtree-tabs-2016-09-19";
src = fetchgit { src = fetchgit {
url = "git://github.com/jistr/vim-nerdtree-tabs"; url = "git://github.com/jistr/vim-nerdtree-tabs";
rev = "0decec122e9bb3e9328b01fa20a9650e79cc6ca7"; rev = "5a91230193fea7f9c8d792cb5c635998d868337d";
sha256 = "0m51vpxq0d3mxy9i18hczsbqsqi7vlzwgjnpryb8gb5wmy999d6l"; sha256 = "08g587bnd8n61nj44ghjadwqpbbqya4hig56afna6rhs341zwlpm";
}; };
dependencies = []; dependencies = [];
@ -782,11 +793,11 @@ rec {
}; };
fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "fzf-vim-2016-07-21"; name = "fzf-vim-2016-09-30";
src = fetchgit { src = fetchgit {
url = "git://github.com/junegunn/fzf.vim"; url = "git://github.com/junegunn/fzf.vim";
rev = "491ff9942f1bc18919176b781f0acc8bfb1ae73d"; rev = "7d1b007cb234d181fd09a50e40e50cb49642861b";
sha256 = "05g07gji55rb35hfiisbjwbnkfz7msxq6xsjajvwdl6g2v4nmfyl"; sha256 = "1011n55n6anfd5cc4cafr1clkdbb2yd9lyzpk7yb4jzmvjvsx64b";
}; };
dependencies = []; dependencies = [];
@ -804,11 +815,11 @@ rec {
}; };
vim-peekaboo = buildVimPluginFrom2Nix { # created by nix#NixDerivation vim-peekaboo = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-peekaboo-2016-07-25"; name = "vim-peekaboo-2016-08-05";
src = fetchgit { src = fetchgit {
url = "git://github.com/junegunn/vim-peekaboo"; url = "git://github.com/junegunn/vim-peekaboo";
rev = "3a7c48bd8f2ab0d30485e9d64f930f3d99b46088"; rev = "9c8415c022ab24ce51af13aa43255d5a7c7ef670";
sha256 = "0g1lhxzqf4mddm82nilff46pgcpkzcv5yb7yxkisy06byw18vbnq"; sha256 = "10c8j4wcg7g3i3vyvlcc21j0a3xmbl5ii5fl5k27iy2icf5rm018";
}; };
dependencies = []; dependencies = [];
@ -848,11 +859,11 @@ rec {
}; };
vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vimtex-2016-08-19"; name = "vimtex-2016-10-03";
src = fetchgit { src = fetchgit {
url = "git://github.com/lervag/vimtex"; url = "git://github.com/lervag/vimtex";
rev = "5bc5b14ae213deeafd2b6d8702ac11cefd4c0e8b"; rev = "abf50a3f04dff85e2e1fb7f8f5123e54dce32706";
sha256 = "0gqjxwjln82ar8dnv0dpmkhmycznxk2r0g06sddaq12y4r6bw5s9"; sha256 = "0vln1y2w13fjsvqd5pqjkqx62q3gbhmgkx49i5rdx9vblmg77n7y";
}; };
dependencies = []; dependencies = [];
@ -951,11 +962,11 @@ rec {
}; };
haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "haskell-vim-2016-07-06"; name = "haskell-vim-2016-09-08";
src = fetchgit { src = fetchgit {
url = "git://github.com/neovimhaskell/haskell-vim"; url = "git://github.com/neovimhaskell/haskell-vim";
rev = "a9ceb3d812488c1cee8a2b763cca0e4a48bfd14c"; rev = "962d39f9ef24b9f7af65f10058fd4fff31eb26b4";
sha256 = "022ckyc85i8f6r32z2grn41s9g4fg1a7fqprzbgs2kbi9k2igqni"; sha256 = "159lr2cl27chpcicdisaz8fk0iy8lz5c0p9mi2lw1advinjxz3zb";
}; };
dependencies = []; dependencies = [];
@ -973,121 +984,132 @@ rec {
}; };
vim-watchdogs = buildVimPluginFrom2Nix { # created by nix#NixDerivation vim-watchdogs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-watchdogs-2016-06-26"; name = "vim-watchdogs-2016-09-05";
src = fetchgit { src = fetchgit {
url = "git://github.com/osyo-manga/vim-watchdogs"; url = "git://github.com/osyo-manga/vim-watchdogs";
rev = "7c89466b2b7fd9b87e0189e4ac66b84f2cfbc842"; rev = "96ee0ce968da8da8ace48457665c7d5c942dd49d";
sha256 = "09swjrfrqvciw7blqd1ssklxs09x0sd7ixphy07az7cxfmpdpi4r"; sha256 = "16dk0wsikqmcywgm04vwv76p2sc6jw0krq4cg02zdpgyb4xxgp3n";
}; };
dependencies = []; dependencies = [];
}; };
vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-racer-2016-07-14"; name = "vim-racer-2016-10-01";
src = fetchgit { src = fetchgit {
url = "git://github.com/racer-rust/vim-racer"; url = "git://github.com/racer-rust/vim-racer";
rev = "ea2a41ddc3e1e504a542f6add0f6f2c10d97a099"; rev = "78774aee6be126f5dcf576042ac4872e04a1a3a7";
sha256 = "1vwxs9mqcvp3haqyx0si5hiw61vg2s2hm1alipb5s69sb38f047s"; sha256 = "10rv21g72pkaakxqr016l9r42hjiys1rhhhbnv3pmmfqv38ifx0a";
}; };
dependencies = []; dependencies = [];
}; };
purescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation purescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "purescript-vim-2016-01-04"; name = "purescript-vim-2016-08-31";
src = fetchgit { src = fetchgit {
url = "git://github.com/raichoo/purescript-vim"; url = "git://github.com/raichoo/purescript-vim";
rev = "92dd6bc647b45444e9d5e0550bdc3c56928f9762"; rev = "2c55bcefd63bc40ed2aa9d6ce9d89a590dfa3477";
sha256 = "090vpff58lzzhqp28p27am5s8s6ngjxw6j4y46zaixcxxx7wqzha"; sha256 = "1y96w8p865gd6zr29wpxn1qwsk833y06x1qp586gylgi0jp1ybzv";
};
dependencies = [];
};
vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-grammarous-2016-09-28";
src = fetchgit {
url = "git://github.com/rhysd/vim-grammarous";
rev = "580785b4313613c1fd47ac291d92e1458f3ac2e3";
sha256 = "0fxnzyb0svmgb3jc9dh6kfxli59kx3289hgwzcclfcff0m9df7q0";
}; };
dependencies = []; dependencies = [];
}; };
rust-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation rust-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "rust-vim-2016-07-16"; name = "rust-vim-2016-09-30";
src = fetchgit { src = fetchgit {
url = "git://github.com/rust-lang/rust.vim"; url = "git://github.com/rust-lang/rust.vim";
rev = "a4d6fb2ab526ccc93a6a321a2425a234f9f7665f"; rev = "2030019e1a5d0593dc662a0c37f3d06c4de8c252";
sha256 = "1i2sf5p4d9gfr3hk6nrjar0rz85dmhwgf82d5yfqqmlgil0bljds"; sha256 = "1d53aw4lprvf7qmk87jar8w7dkqara8k3hdm3qjhjlc1a7qv6i9v";
}; };
dependencies = []; dependencies = [];
}; };
neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "neoformat-2016-07-20"; name = "neoformat-2016-09-23";
src = fetchgit { src = fetchgit {
url = "git://github.com/sbdchd/neoformat"; url = "git://github.com/sbdchd/neoformat";
rev = "3ce811e317512bbdfa4be8bc5c78c253301854c5"; rev = "c15243abdbfef8d0c6d626d6f3676f3694e13131";
sha256 = "07ycc0n1y9qrgv17ykid2nnrw984hwswisjijhpnfmpqkjrxg662"; sha256 = "18qsw1z98mg0x3rdvd0j95vyl0n4kacxz4viv600aiisv20s30i3";
}; };
dependencies = []; dependencies = [];
}; };
vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-polyglot-2016-07-26"; name = "vim-polyglot-2016-09-11";
src = fetchgit { src = fetchgit {
url = "git://github.com/sheerun/vim-polyglot"; url = "git://github.com/sheerun/vim-polyglot";
rev = "3019afa721b893ebfe130eb4f955bc4c0c20ec23"; rev = "74652b465d7eff97070001317a4ea5557717378d";
sha256 = "1f463w66k6brzq3qa8a3xhz2n6xgkri451fclrz2qp41x0bdwjic"; sha256 = "18bw8fdpq5riqfy656kw4a9hmrk8s967qx36lq0s16sbyqxm15ag";
}; };
dependencies = []; dependencies = [];
}; };
neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "neocomplete-vim-2016-07-23"; name = "neocomplete-vim-2016-09-30";
src = fetchgit { src = fetchgit {
url = "git://github.com/shougo/neocomplete.vim"; url = "git://github.com/shougo/neocomplete.vim";
rev = "8d2a574c1708080ef1fac3336c99d2d9e1898fce"; rev = "16d650348538f780d282863ecbdcc45319d36522";
sha256 = "10c885hjp0w50ry1s72zziw7ddvzkri5dbjxa3wnfhisqw7awb8h"; sha256 = "0var0md485r6kfrsdbd9zmmid6z7zvqhl5n71q8fjnvsgsb9v6a6";
}; };
dependencies = []; dependencies = [];
}; };
neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "neosnippet-snippets-2016-07-14"; name = "neosnippet-snippets-2016-09-26";
src = fetchgit { src = fetchgit {
url = "git://github.com/shougo/neosnippet-snippets"; url = "git://github.com/shougo/neosnippet-snippets";
rev = "4d25b4352738ecf34e56701d0172d80daa3bd287"; rev = "be02928b14cae1effbe4388da4d5a75215344ba6";
sha256 = "01lai1gvf30iagh9f7av69ywfzw43vy2igwil882rgnri84y4zjb"; sha256 = "1r3v229plm8qizy0m83rrl0y4b5m2lawc3c22q4zpm9l28hxk084";
}; };
dependencies = []; dependencies = [];
}; };
neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "neosnippet-vim-2016-07-10"; name = "neosnippet-vim-2016-09-11";
src = fetchgit { src = fetchgit {
url = "git://github.com/shougo/neosnippet.vim"; url = "git://github.com/shougo/neosnippet.vim";
rev = "9492fbb7e9016243af3c1987b91f0bffcf4cc8e7"; rev = "a1508f88729e1c5912dd12417553f178494c4dd2";
sha256 = "0p2d762z0s9ayrc4kcqr7s1hmcghd04z818szqdn6v6rsr9lyln8"; sha256 = "14pjz6grz56ab65al2h9vn9nlqr6r9cqa8qghdg3rj0sy40lyz7a";
}; };
dependencies = []; dependencies = [];
}; };
unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "unite-vim-2016-07-26"; name = "unite-vim-2016-09-30";
src = fetchgit { src = fetchgit {
url = "git://github.com/shougo/unite.vim"; url = "git://github.com/shougo/unite.vim";
rev = "47daeed4a6934fbcc418fda8ce19ac702904520f"; rev = "504edce8c33207c522d6fe8f7864e0c25f25757f";
sha256 = "0nl57spp8pbhbad259s5xnihjpnh38sw0rqgg6i80vzmjziy9wiv"; sha256 = "0nn3h8nj258s55qwgsskcw028lnsl66x32mq0k6yyklwljplfn1s";
}; };
dependencies = []; dependencies = [];
}; };
vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vimproc-vim-2016-07-10"; name = "vimproc-vim-2016-08-06";
src = fetchgit { src = fetchgit {
url = "git://github.com/shougo/vimproc.vim"; url = "git://github.com/shougo/vimproc.vim";
rev = "b2255c66a3dc04fba1adbda3e380facff45fe6ec"; rev = "25cb83f24edec4aec1e9f1329302235e7a7a7fe0";
sha256 = "09fabq1j3grd8d8xz0y9i5y756mqzs9n7icvnlmi6hbjzkv1rkx6"; sha256 = "19nl21623cv05j6ljyn35qm38pw3680nch2by1gapqmxazp99i20";
}; };
dependencies = []; dependencies = [];
buildInputs = [ which ]; buildInputs = [ which ];
@ -1102,11 +1124,11 @@ rec {
}; };
vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vimshell-vim-2016-07-15"; name = "vimshell-vim-2016-09-05";
src = fetchgit { src = fetchgit {
url = "git://github.com/shougo/vimshell.vim"; url = "git://github.com/shougo/vimshell.vim";
rev = "c71ffb48b9ea2c718facd2eaad431f59503e58aa"; rev = "371f0774907713959fedbdb37973a55e60428f42";
sha256 = "0yvj0a50gmss56yb2vkh6f9pyarnv9cnvrrai8pyrb2jxhl3ipv6"; sha256 = "0jgfqsk2g6hlmks7c5ig0wlpzmdv6dlf91kdiiqfnli9xsfaq0i8";
}; };
dependencies = [ "vimproc-vim" ]; dependencies = [ "vimproc-vim" ];
}; };
@ -1156,11 +1178,11 @@ rec {
}; };
vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-quickrun-2016-07-02"; name = "vim-quickrun-2016-09-22";
src = fetchgit { src = fetchgit {
url = "git://github.com/thinca/vim-quickrun"; url = "git://github.com/thinca/vim-quickrun";
rev = "5149ecd1502b7fc2583cb8799ac1a0c72c41f828"; rev = "25b23f3519aabf2515fa4c70390bbea507516377";
sha256 = "1y32s42wgcq8qssm7yr578vvamvlb4kkdb1k5mhp0hmwskj2v7xp"; sha256 = "1rb1i8bv2g95l5pp5rmaf4xidqjbkk05dz8kb6b9fdzjnskr0mca";
}; };
dependencies = []; dependencies = [];
@ -1178,11 +1200,11 @@ rec {
}; };
vim-eunuch = buildVimPluginFrom2Nix { # created by nix#NixDerivation vim-eunuch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-eunuch-2016-04-16"; name = "vim-eunuch-2016-09-07";
src = fetchgit { src = fetchgit {
url = "git://github.com/tpope/vim-eunuch"; url = "git://github.com/tpope/vim-eunuch";
rev = "5ee2b82b565e6c6d80f1cb7735c78f66a159b198"; rev = "7eeb681ff3caedc1c01e50966bc293951f7b3e21";
sha256 = "108v98qy49w2pgzndmqc9nydmsql2bnbcc849wshvkxgca349ixc"; sha256 = "0hk4p1qjmplddmwrpp6b2x776z1298pkcgp855kgigib53w5srmc";
}; };
dependencies = []; dependencies = [];
@ -1222,11 +1244,11 @@ rec {
}; };
youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "youcompleteme-2016-09-01"; name = "youcompleteme-2016-10-04";
src = fetchgit { src = fetchgit {
url = "git://github.com/valloric/youcompleteme"; url = "git://github.com/valloric/youcompleteme";
rev = "e332cdb2a0c8599dead1d362b87bb9fb79c9a955"; rev = "c1cd62dc3c522d49b1989aceb64566326db2fcf2";
sha256 = "0lqmdbv2z3rhm6a9c62rhfl3i30mvpg2f7k0cjan7jvrln9588k9"; sha256 = "01bqgg7zlfhyri0cwx24mf2rbvr063c7sm5fz1kkccpqr77xiz7h";
}; };
dependencies = []; dependencies = [];
buildInputs = [ buildInputs = [
@ -1265,22 +1287,22 @@ rec {
}; };
vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-airline-themes-2016-07-19"; name = "vim-airline-themes-2016-10-03";
src = fetchgit { src = fetchgit {
url = "git://github.com/vim-airline/vim-airline-themes"; url = "git://github.com/vim-airline/vim-airline-themes";
rev = "8b58708ec4318cee43a878ea74f7dedb61c8f07a"; rev = "3e8ecba0dea8b4ea35e81780a9aa00f2ca6823e8";
sha256 = "0wfh8ayrvcl1ysshkfad1kqwgzad35nlxffljb542z3f23n84g86"; sha256 = "0dcf5pbysbfwrjf0ypnavw25h4k78y990l2j1ks1zbv6mpgg0kkw";
}; };
dependencies = []; dependencies = [];
}; };
vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-pandoc-2016-07-11"; name = "vim-pandoc-2016-09-13";
src = fetchgit { src = fetchgit {
url = "git://github.com/vim-pandoc/vim-pandoc"; url = "git://github.com/vim-pandoc/vim-pandoc";
rev = "18461740f6915540e4833a71ab54a8205c9898b8"; rev = "035d0154fc9d5c974f810ee88a4b223c7e8bec31";
sha256 = "00mawpl3wwj223g7bcmx4ghfysvxg9d3iqk1h8azykgccp6wg7p6"; sha256 = "00hrwdm5p5bjgwi29xv3hs84sxajwzy9iql6yg02qw3pgzyfa7gv";
}; };
dependencies = []; dependencies = [];
@ -1298,11 +1320,11 @@ rec {
}; };
vim-pandoc-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation vim-pandoc-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-pandoc-syntax-2016-07-23"; name = "vim-pandoc-syntax-2016-07-27";
src = fetchgit { src = fetchgit {
url = "git://github.com/vim-pandoc/vim-pandoc-syntax"; url = "git://github.com/vim-pandoc/vim-pandoc-syntax";
rev = "e9fb38706fa676320191975abf32b9f25f14b049"; rev = "34339e2a5fe936549fa758546c40d7a906537a4b";
sha256 = "18423bdw49w4pncl4ivh1fdw41wqdlcgwa3l3c66br1ja917ria7"; sha256 = "0mwhl2dn3hzj8275kaf01yjn401qb7nhi12lkdj7bdzmq856i1y1";
}; };
dependencies = []; dependencies = [];
@ -1386,11 +1408,11 @@ rec {
}; };
vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-wakatime-2016-07-06"; name = "vim-wakatime-2016-09-17";
src = fetchgit { src = fetchgit {
url = "git://github.com/wakatime/vim-wakatime"; url = "git://github.com/wakatime/vim-wakatime";
rev = "31b1a5d78244605fcab024edc20e6a0c059e449f"; rev = "927ba8d2299a65ddab3e79644c48d06386dac2d5";
sha256 = "0k5bnckv1882r9445p74a4iqys72imy23w87c1shq1gxps47cwms"; sha256 = "1qlzp5gdchvzvnjshh2sz2933wwhky8jdvg3j0rv6yyr95n14zff";
}; };
dependencies = []; dependencies = [];
buildInputs = [ python ]; buildInputs = [ python ];
@ -1413,12 +1435,23 @@ rec {
''; '';
}; };
vim-easytags = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-easytags-2015-07-01";
src = fetchgit {
url = "git://github.com/xolox/vim-easytags";
rev = "72a8753b5d0a951e547c51b13633f680a95b5483";
sha256 = "0i8ha1fa5d860b1mi0xp8kwsgb0b9vbzcg1bldzv6s5xd9yyi12i";
};
dependencies = ["vim-misc"];
};
deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "deoplete-jedi-2016-07-18"; name = "deoplete-jedi-2016-10-04";
src = fetchgit { src = fetchgit {
url = "git://github.com/zchee/deoplete-jedi"; url = "git://github.com/zchee/deoplete-jedi";
rev = "47992e47ff420d9779c1dc4e951dce48a1ae84a4"; rev = "9df866cdf35eee085a3531c838659246ede686e9";
sha256 = "0cirfir1n4c86d82z7lw4wg6i92qzzbjad35imr3f2kkf2fqbn72"; sha256 = "1qi91q0znz5qfq4f0rs07nkf5mf4x55gwb8fkk0hlfnly0qgba80";
}; };
dependencies = []; dependencies = [];
@ -1491,11 +1524,11 @@ rec {
}; };
sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "sensible-2016-03-18"; name = "sensible-2016-09-05";
src = fetchgit { src = fetchgit {
url = "git://github.com/tpope/vim-sensible"; url = "git://github.com/tpope/vim-sensible";
rev = "9e91be7e0fb42949831fe3161ef583363648aa58"; rev = "4b7535921819a5b2e39be68f81109ea684232503";
sha256 = "1g1l3v33g9229r4g4kcx8m1yrh397yf3fn6bxis57n3lg6lmb6wm"; sha256 = "0ghds721dawm8mcd8cp23hfqpgiznh811z73zxlqrm1sg2fmdq1s";
}; };
dependencies = []; dependencies = [];
@ -1513,11 +1546,11 @@ rec {
}; };
snipmate = buildVimPluginFrom2Nix { # created by nix#NixDerivation snipmate = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "snipmate-2016-06-15"; name = "snipmate-2016-09-01";
src = fetchgit { src = fetchgit {
url = "git://github.com/garbas/vim-snipmate"; url = "git://github.com/garbas/vim-snipmate";
rev = "ee433e43c76c768c95ad6d9af67c4cd4b40f7eac"; rev = "31986191ac9923afcd53bf6425c9b6c35fdbb214";
sha256 = "0rfis0rck0rk69nfzkrj6fm00hhdj75mvp809nw8vr14ldj2bvs7"; sha256 = "1l48h5xmkx412bm29mvl6kz11n7xbkk37ph8v5vgdws380d0fiag";
}; };
dependencies = ["vim-addon-mw-utils" "tlib"]; dependencies = ["vim-addon-mw-utils" "tlib"];
@ -1546,11 +1579,11 @@ rec {
}; };
table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "table-mode-2016-07-11"; name = "table-mode-2016-09-28";
src = fetchgit { src = fetchgit {
url = "git://github.com/dhruvasagar/vim-table-mode"; url = "git://github.com/dhruvasagar/vim-table-mode";
rev = "96236638a80fe73fa649824c9df25831a0042373"; rev = "441c30c35aec9d5c2de1d58a77a7d22aa8d93b06";
sha256 = "1c5xnm63hqw0jycwakdljs0f3mp26rjvd4llijrznpr9z2cvki8f"; sha256 = "04fdd2hgrcrgqqflzlvv7j9c53m8f2divi075p75g6grkxxyninv";
}; };
dependencies = []; dependencies = [];
@ -1578,11 +1611,11 @@ rec {
}; };
tlib = buildVimPluginFrom2Nix { # created by nix#NixDerivation tlib = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "tlib-2016-07-25"; name = "tlib-2016-08-07";
src = fetchgit { src = fetchgit {
url = "git://github.com/tomtom/tlib_vim"; url = "git://github.com/tomtom/tlib_vim";
rev = "e5526d34f36e5b84792a9b866f532e1221b95e33"; rev = "8c74564396e368788a5cb901b0e8017a3166cee9";
sha256 = "1dmhi4jr0vq879dzs584c01c6g6grk733cfdvq0gcyd20xc9lhn1"; sha256 = "15bh6q8g7p1giz2lybqhdf7a7xisqwpr751gprqx3vmh97drry5z";
}; };
dependencies = []; dependencies = [];
@ -1809,22 +1842,22 @@ rec {
}; };
vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-airline-2016-07-25"; name = "vim-airline-2016-09-28";
src = fetchgit { src = fetchgit {
url = "git://github.com/vim-airline/vim-airline"; url = "git://github.com/vim-airline/vim-airline";
rev = "4b5441a8f7276689fcd41e3c706eb6a2b68064a3"; rev = "2be9a044e09f68bef0eb4dff27af7d22405968fe";
sha256 = "1ckdx8qgdkmx7k7m0wpyrhm6ms574kdykikfdqvbyyin5dg015px"; sha256 = "0n9p2pdh9cw6lfhf43nh71g8r73smnq65c0kadr88ywa54y92bxg";
}; };
dependencies = []; dependencies = [];
}; };
vim-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation vim-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-coffee-script-2016-06-29"; name = "vim-coffee-script-2016-09-19";
src = fetchgit { src = fetchgit {
url = "git://github.com/kchmck/vim-coffee-script"; url = "git://github.com/kchmck/vim-coffee-script";
rev = "0f4bd9776cfd0fd2a394a4b1991630698e4fdc2d"; rev = "b91dbe92ad794a85a03b089f384fa324ff4e0c3d";
sha256 = "18n1xbs59s71zvavjcg7an8y5dhq6agrb2rc2j6y48y7na0kf8sf"; sha256 = "0rkv0n9r3rczx1269i9nf4xs3q934n7iqnrykhnlqbl255s5agd4";
}; };
dependencies = []; dependencies = [];
@ -1842,22 +1875,22 @@ rec {
}; };
vim-gista = buildVimPluginFrom2Nix { # created by nix#NixDerivation vim-gista = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-gista-2016-04-11"; name = "vim-gista-2016-09-21";
src = fetchgit { src = fetchgit {
url = "git://github.com/lambdalisue/vim-gista"; url = "git://github.com/lambdalisue/vim-gista";
rev = "7ff4d24f242d406ff71d9a65691357aee80f37f7"; rev = "8f27e74bd1f8edb3ca5711864b34cb4c526d9947";
sha256 = "0hm4lnf2mxvdvc13b67cwvyp7griir5lpacnb1sgjx4dxr0w4fzz"; sha256 = "0zymx6ww6yc9h06k373z7mbv07jmi66zv1cm15ip2qnik1nr80p7";
}; };
dependencies = []; dependencies = [];
}; };
vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-gitgutter-2016-07-12"; name = "vim-gitgutter-2016-09-30";
src = fetchgit { src = fetchgit {
url = "git://github.com/airblade/vim-gitgutter"; url = "git://github.com/airblade/vim-gitgutter";
rev = "26c6b549f287b8ae348eda083e7c77f79f4de28b"; rev = "4f9c5b0f3e2a20081edc1ec60a79640f7d55e3e0";
sha256 = "1jrz0vqd580y7psszq31jk4v4jdh2cvqvxgcy347simpc5ap16hs"; sha256 = "1bd7vvljgrbs6phwa8axpzzfhf4kcczmp0i1wwv3rn35sklnqc47";
}; };
dependencies = []; dependencies = [];
@ -1885,6 +1918,17 @@ rec {
}; };
vim-misc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-misc-2015-05-21";
src = fetchgit {
url = "git://github.com/xolox/vim-misc";
rev = "3e6b8fb6f03f13434543ce1f5d24f6a5d3f34f0b";
sha256 = "0rd9788dyfc58py50xbiaz5j7nphyvf3rpp3yal7yq2dhf0awwfi";
};
dependencies = [];
};
vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-multiple-cursors-2016-06-03"; name = "vim-multiple-cursors-2016-06-03";
src = fetchgit { src = fetchgit {
@ -1908,33 +1952,33 @@ rec {
}; };
vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-signify-2016-07-21"; name = "vim-signify-2016-09-28";
src = fetchgit { src = fetchgit {
url = "git://github.com/mhinz/vim-signify"; url = "git://github.com/mhinz/vim-signify";
rev = "472668fbd286c8f8f3db0024a02056d4c25524b1"; rev = "faf7a0307180ec10418fa0eae85e68b526eed267";
sha256 = "1lmap4amfrqngqdbp87kf9fhqnpshdacikkr9nkfry8l9mhhyqb9"; sha256 = "18wklbvx632d106wbnkh06qpvkkh6zdxsgp5cvrqwfk73scwkgh5";
}; };
dependencies = []; dependencies = [];
}; };
vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-snippets-2016-07-25"; name = "vim-snippets-2016-10-04";
src = fetchgit { src = fetchgit {
url = "git://github.com/honza/vim-snippets"; url = "git://github.com/honza/vim-snippets";
rev = "8b054b0957c3c17aa458e549c5259ed84604f976"; rev = "0acb605c5fa6058403fb2510c807b17b9a27d460";
sha256 = "0mvawc4kr1r50jvl5khcd9443mnq85nansh0vj7ic4zz4rias8h4"; sha256 = "0jdjcqigsv6dsvpc4zbavpwhx71f1g84zmwysgvsyraiqdiakq7z";
}; };
dependencies = []; dependencies = [];
}; };
vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-webdevicons-2016-07-23"; name = "vim-webdevicons-2016-10-01";
src = fetchgit { src = fetchgit {
url = "git://github.com/ryanoasis/vim-devicons"; url = "git://github.com/ryanoasis/vim-devicons";
rev = "87ee171b566cfd82bb9bfa3885c8020d83e699aa"; rev = "77bf4cef436955fb40719526746f3ba718c6fa36";
sha256 = "081srlbxd3aw6hl818i7l31g85w4hsfkz67ga9ihhwjkd94sib4s"; sha256 = "0i3rdz08xs8nia0n0m9xd2hdipnb8khrr9zb3bxvhvzd32rfqfv5";
}; };
dependencies = []; dependencies = [];
@ -1974,11 +2018,11 @@ rec {
}; };
vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vundle-2016-02-26"; name = "vundle-2016-08-05";
src = fetchgit { src = fetchgit {
url = "git://github.com/gmarik/vundle"; url = "git://github.com/gmarik/vundle";
rev = "4984767509e3d05ca051e253c8a8b37de784be45"; rev = "fef1c2f31862c44cf5295ef86c086efba4af20a9";
sha256 = "15450wz15pwv9sbvnmb60z5nshsssw4y1xy8smp332605b53kski"; sha256 = "18prk9axxj418hjh1yflijww39bgbvf3vq7z6a1501wq88d7z8zs";
}; };
dependencies = []; dependencies = [];

3
pkgs/misc/vim-plugins/vim-plugin-names
View File

@ -32,6 +32,7 @@
"github:christoomey/vim-tmux-navigator" "github:christoomey/vim-tmux-navigator"
"github:ctjhoa/spacevim" "github:ctjhoa/spacevim"
"github:ctrlpvim/ctrlp.vim" "github:ctrlpvim/ctrlp.vim"
"github:derekelkins/agda-vim"
"github:digitaltoad/vim-jade" "github:digitaltoad/vim-jade"
"github:eagletmt/neco-ghc" "github:eagletmt/neco-ghc"
"github:eikenb/acp" "github:eikenb/acp"
@ -78,6 +79,7 @@
"github:osyo-manga/vim-watchdogs" "github:osyo-manga/vim-watchdogs"
"github:racer-rust/vim-racer" "github:racer-rust/vim-racer"
"github:raichoo/purescript-vim" "github:raichoo/purescript-vim"
"github:rhysd/vim-grammarous"
"github:rust-lang/rust.vim" "github:rust-lang/rust.vim"
"github:sbdchd/neoformat" "github:sbdchd/neoformat"
"github:sheerun/vim-polyglot" "github:sheerun/vim-polyglot"
@ -111,6 +113,7 @@
"github:vim-scripts/wombat256.vim" "github:vim-scripts/wombat256.vim"
"github:wakatime/vim-wakatime" "github:wakatime/vim-wakatime"
"github:wincent/command-t" "github:wincent/command-t"
"github:xolox/vim-easytags"
"github:zchee/deoplete-jedi" "github:zchee/deoplete-jedi"
"goyo" "goyo"
"matchit.zip" "matchit.zip"

20
pkgs/os-specific/linux/kernel/linux-4.8.nix Normal file
View File

@ -0,0 +1,20 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.8";
modDirVersion = "4.8.0";
extraMeta.branch = "4.8";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a";
};
kernelPatches = args.kernelPatches;
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true;
} // (args.argsOverride or {}))

9
pkgs/os-specific/linux/rtkit/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, dbus, libcap }: { stdenv, fetchurl, fetchpatch, pkgconfig, dbus, libcap }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "rtkit-0.11"; name = "rtkit-0.11";
@ -12,6 +12,13 @@ stdenv.mkDerivation rec {
"--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
]; ];
patches = [
(fetchpatch {
url = "https://anonscm.debian.org/cgit/pkg-multimedia/rtkit.git/plain/debian/patches/0002-Drop-Removed-ControlGroup-stanza.patch?id=21f2c6be6985c777cbf113c67043353406744050";
sha256 = "0lsxk5nv08i1wjb4xh20i5fcwg3x0qq0k4f8bc0r9cczph2sv7ck";
})
];
buildInputs = [ pkgconfig dbus libcap ]; buildInputs = [ pkgconfig dbus libcap ];
meta = { meta = {

6
pkgs/servers/nosql/mongodb/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, scons, boost, gperftools, pcre-cpp, snappy { stdenv, fetchurl, fetchpatch, scons, boost, gperftools, pcre-cpp, snappy
, zlib, libyamlcpp, sasl, openssl, libpcap, wiredtiger , zlib, libyamlcpp, sasl, openssl, libpcap, wiredtiger, Security
}: }:
# Note: # Note:
@ -22,8 +22,8 @@ let version = "3.2.9";
buildInputs = [ buildInputs = [
sasl boost gperftools pcre-cpp snappy sasl boost gperftools pcre-cpp snappy
zlib libyamlcpp sasl openssl libpcap zlib libyamlcpp sasl openssl.dev openssl.out libpcap
]; # ++ optional stdenv.is64bit wiredtiger; ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
other-args = concatStringsSep " " ([ other-args = concatStringsSep " " ([
"--ssl" "--ssl"

2
pkgs/servers/x11/xquartz/X11
View File

@ -1,4 +1,4 @@
#!/bin/bash #!@shell@
set "$(dirname "$0")"/X11.bin "${@}" set "$(dirname "$0")"/X11.bin "${@}"

2
pkgs/servers/x11/xquartz/font_cache
View File

@ -1,4 +1,4 @@
#!/bin/bash #!@shell@
export PATH=@PATH@:$PATH export PATH=@PATH@:$PATH

20
pkgs/tools/graphics/asymptote/default.nix
View File

@ -4,8 +4,6 @@
, python, zlib, perl, texLive, texinfo, xz , python, zlib, perl, texLive, texinfo, xz
}: }:
assert stdenv.isLinux;
let let
s = # Generated upstream information s = # Generated upstream information
rec { rec {
@ -17,10 +15,12 @@ let
sha256="1dxwvq0xighqckkjkjva8s0igxfgy1j25z81pbwvlz6jzsrxpip9"; sha256="1dxwvq0xighqckkjkjva8s0igxfgy1j25z81pbwvlz6jzsrxpip9";
}; };
buildInputs = [ buildInputs = [
freeglut ghostscriptX imagemagick fftw ghostscriptX imagemagick fftw
boehmgc mesa_glu mesa_noglu mesa_noglu.osmesa ncurses readline gsl libsigsegv boehmgc ncurses readline gsl libsigsegv
python zlib perl texLive texinfo xz python zlib perl texLive texinfo xz ]
]; ++ stdenv.lib.optionals stdenv.isLinux
[ freeglut mesa_glu mesa_noglu mesa_noglu.osmesa ]
;
in in
stdenv.mkDerivation { stdenv.mkDerivation {
inherit (s) name version; inherit (s) name version;
@ -51,11 +51,11 @@ stdenv.mkDerivation {
enableParallelBuilding = true; enableParallelBuilding = true;
meta = { meta = with stdenv.lib; {
inherit (s) version; inherit (s) version;
description = "A tool for programming graphics intended to replace Metapost"; description = "A tool for programming graphics intended to replace Metapost";
license = stdenv.lib.licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = [stdenv.lib.maintainers.raskin stdenv.lib.maintainers.peti]; maintainers = [ maintainers.raskin maintainers.peti ];
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux ++ platforms.darwin;
}; };
} }

43
pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix Normal file
View File

@ -0,0 +1,43 @@
{ stdenv, fetchurl, cmake, pkgconfig, fcitx, gettext, libpinyin, glib, pcre, dbus, qt4 }:
stdenv.mkDerivation rec {
name = "fcitx-libpinyin-${version}";
version = "0.3.91";
src = fetchurl {
url = "http://download.fcitx-im.org/fcitx-libpinyin/${name}.tar.xz";
sha256 = "19h0p1s8bkw24v7x6v19fg7dqpz2kkjlvvrqhypi5bkkvfswf7xn";
};
buildInputs = [ cmake pkgconfig fcitx gettext libpinyin glib pcre dbus qt4 ];
preInstall = ''
substituteInPlace src/cmake_install.cmake \
--replace ${fcitx} $out
substituteInPlace po/cmake_install.cmake \
--replace ${fcitx} $out
substituteInPlace data/cmake_install.cmake \
--replace ${fcitx} $out
substituteInPlace dictmanager/cmake_install.cmake \
--replace ${fcitx} $out
'';
preBuild = let
store_path = fetchurl {
url = https://download.fcitx-im.org/data/model.text.20130308.tar.gz;
sha256 = "0s8sazix29z1ilxmkw2f0bv6i349awd89ibylf9ixy615s1vb5a5";
};
in
''
cp -rv ${store_path} $NIX_BUILD_TOP/$name/data/model.text.20130308.tar.gz
'';
meta = with stdenv.lib; {
isFcitxEngine = true;
description = "Fcitx Wrapper for libpinyin, Library to deal with pinyin";
homepage = https://github.com/fcitx/fcitx-libpinyin;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ ericsagnes ];
platforms = platforms.linux;
};
}

31
pkgs/tools/text/languagetool/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ stdenv, lib, fetchurl, unzip, jdk }:
stdenv.mkDerivation rec {
pname = "LanguageTool";
version = "3.5";
name = pname + "-" + version;
src = fetchurl {
url = "https://www.languagetool.org/download/${name}.zip";
sha256 = "1axw8fqg2wlkmv45s71q5pg44sg1s06szpkjhyscy704i7d2jc34";
};
buildInputs = [ unzip jdk ];
installPhase =
''
mkdir -p $out/{bin,share}
mv * $out/share/.
for lt in languagetool{,-commandline,-server};do
cat > $out/bin/$lt <<EXE
#!${stdenv.shell}
${jdk}/bin/java -cp $out/share/ -jar $out/share/$lt.jar $@
EXE
chmod +x $out/bin/$lt
done
'';
meta = with stdenv.lib; {
homepage = "https://languagetool.org";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ edwtjo ];
descrption = "A proofreading program for English, French German, Polish, and more";
};
}

26
pkgs/top-level/all-packages.nix
View File

@ -871,6 +871,8 @@ in
kapacitor = callPackage ../servers/monitoring/kapacitor { }; kapacitor = callPackage ../servers/monitoring/kapacitor { };
languagetool = callPackage ../tools/text/languagetool { };
long-shebang = callPackage ../misc/long-shebang {}; long-shebang = callPackage ../misc/long-shebang {};
mathics = pythonPackages.mathics; mathics = pythonPackages.mathics;
@ -1585,6 +1587,8 @@ in
table-other = callPackage ../tools/inputmethods/fcitx-engines/fcitx-table-other { }; table-other = callPackage ../tools/inputmethods/fcitx-engines/fcitx-table-other { };
cloudpinyin = callPackage ../tools/inputmethods/fcitx-engines/fcitx-cloudpinyin { }; cloudpinyin = callPackage ../tools/inputmethods/fcitx-engines/fcitx-cloudpinyin { };
libpinyin = callPackage ../tools/inputmethods/fcitx-engines/fcitx-libpinyin { };
}; };
fcitx-configtool = callPackage ../tools/inputmethods/fcitx/fcitx-configtool.nix { }; fcitx-configtool = callPackage ../tools/inputmethods/fcitx/fcitx-configtool.nix { };
@ -10045,6 +10049,7 @@ in
mongodb = callPackage ../servers/nosql/mongodb { mongodb = callPackage ../servers/nosql/mongodb {
sasl = cyrus_sasl; sasl = cyrus_sasl;
inherit (darwin.apple_sdk.frameworks) Security;
}; };
mongodb248 = callPackage ../servers/nosql/mongodb/2.4.8.nix { }; mongodb248 = callPackage ../servers/nosql/mongodb/2.4.8.nix { };
@ -10772,7 +10777,21 @@ in
]; ];
}; };
/* See https://github.com/NixOS/nixpkgs/issues/19213 before adding Linux 4.8 */ linux_4_8 = callPackage ../os-specific/linux/kernel/linux-4.8.nix {
kernelPatches =
[ kernelPatches.bridge_stp_helper
# See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
# when adding a new linux version
# !!! 4.7 patch doesn't apply, 4.8 patch not up yet, will keep checking
# kernelPatches.cpu-cgroup-v2."4.7"
kernelPatches.modinst_arg_list_too_long
]
++ lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill
kernelPatches.mips_ext3_n32
];
};
linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
kernelPatches = [ kernelPatches = [
@ -10931,7 +10950,7 @@ in
linux = linuxPackages.kernel; linux = linuxPackages.kernel;
# Update this when adding the newest kernel major version! # Update this when adding the newest kernel major version!
linuxPackages_latest = linuxPackages_4_7; linuxPackages_latest = linuxPackages_4_8;
linux_latest = linuxPackages_latest.kernel; linux_latest = linuxPackages_latest.kernel;
# Build the kernel modules for the some of the kernels. # Build the kernel modules for the some of the kernels.
@ -10944,6 +10963,7 @@ in
linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1 linuxPackages_4_1); linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1 linuxPackages_4_1);
linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4 linuxPackages_4_4); linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4 linuxPackages_4_4);
linuxPackages_4_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_7 linuxPackages_4_7); linuxPackages_4_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_7 linuxPackages_4_7);
linuxPackages_4_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_8 linuxPackages_4_8);
# Don't forget to update linuxPackages_latest! # Don't forget to update linuxPackages_latest!
# Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds.
@ -15662,6 +15682,8 @@ in
tintin = callPackage ../games/tintin { }; tintin = callPackage ../games/tintin { };
tinyfugue = callPackage ../games/tinyfugue { };
tome4 = callPackage ../games/tome4 { }; tome4 = callPackage ../games/tome4 { };
trackballs = callPackage ../games/trackballs { trackballs = callPackage ../games/trackballs {

66
pkgs/top-level/ocaml-packages.nix
View File

@ -6,8 +6,6 @@ let
packageSet = self: packageSet = self:
with self; let inherit (self) callPackage; in with self; let inherit (self) callPackage; in
{ {
ocaml_version = self.ocaml.version; #TODO: remove all mentions of ocaml_version
callPackage = newScope self; callPackage = newScope self;
inherit ocaml; inherit ocaml;
@ -37,7 +35,7 @@ let
async_unix_p4 = callPackage ../development/ocaml-modules/async_unix { }; async_unix_p4 = callPackage ../development/ocaml-modules/async_unix { };
async_p4 = async_p4 =
if lib.versionOlder "4.02" ocaml_version if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/async { } then callPackage ../development/ocaml-modules/async { }
else null; else null;
@ -53,26 +51,26 @@ let
bitstring_git = callPackage ../development/ocaml-modules/bitstring { }; bitstring_git = callPackage ../development/ocaml-modules/bitstring { };
bitstring = bitstring =
if lib.versionOlder "4.02" ocaml_version if lib.versionOlder "4.02" ocaml.version
then bitstring_git then bitstring_git
else bitstring_2_0_4; else bitstring_2_0_4;
camlidl = callPackage ../development/tools/ocaml/camlidl { }; camlidl = callPackage ../development/tools/ocaml/camlidl { };
camlp4 = camlp4 =
if lib.versionOlder "4.03" ocaml_version if lib.versionOlder "4.03" ocaml.version
then callPackage ../development/tools/ocaml/camlp4/4_03.nix { } then callPackage ../development/tools/ocaml/camlp4/4_03.nix { }
else if lib.versionOlder "4.02" ocaml_version else if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/tools/ocaml/camlp4 { } then callPackage ../development/tools/ocaml/camlp4 { }
else null; else null;
camlp5_old_strict = camlp5_old_strict =
if lib.versionOlder "4.00" ocaml_version if lib.versionOlder "4.00" ocaml.version
then camlp5_6_strict then camlp5_6_strict
else callPackage ../development/tools/ocaml/camlp5/5.15.nix { }; else callPackage ../development/tools/ocaml/camlp5/5.15.nix { };
camlp5_old_transitional = camlp5_old_transitional =
if lib.versionOlder "4.00" ocaml_version if lib.versionOlder "4.00" ocaml.version
then camlp5_6_transitional then camlp5_6_transitional
else callPackage ../development/tools/ocaml/camlp5/5.15.nix { else callPackage ../development/tools/ocaml/camlp5/5.15.nix {
transitional = true; transitional = true;
@ -227,7 +225,7 @@ let
}; };
lablgtk-extras = lablgtk-extras =
if lib.versionOlder "4.02" ocaml_version if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/lablgtk-extras { } then callPackage ../development/ocaml-modules/lablgtk-extras { }
else callPackage ../development/ocaml-modules/lablgtk-extras/1.4.nix { }; else callPackage ../development/ocaml-modules/lablgtk-extras/1.4.nix { };
@ -237,7 +235,7 @@ let
lambdaTerm-1_6 = callPackage ../development/ocaml-modules/lambda-term/1.6.nix { }; lambdaTerm-1_6 = callPackage ../development/ocaml-modules/lambda-term/1.6.nix { };
lambdaTerm = lambdaTerm =
if lib.versionOlder "4.01" ocaml_version if lib.versionOlder "4.01" ocaml.version
then callPackage ../development/ocaml-modules/lambda-term { } then callPackage ../development/ocaml-modules/lambda-term { }
else lambdaTerm-1_6; else lambdaTerm-1_6;
@ -274,7 +272,7 @@ let
core_p4 = callPackage ../development/ocaml-modules/core { }; core_p4 = callPackage ../development/ocaml-modules/core { };
ocamlbuild = ocamlbuild =
if lib.versionOlder "4.03" ocaml_version then if lib.versionOlder "4.03" ocaml.version then
callPackage ../development/tools/ocaml/ocamlbuild { } callPackage ../development/tools/ocaml/ocamlbuild { }
else else
null; null;
@ -368,11 +366,11 @@ let
type_conv_109_60_01 = callPackage ../development/ocaml-modules/type_conv/109.60.01.nix { }; type_conv_109_60_01 = callPackage ../development/ocaml-modules/type_conv/109.60.01.nix { };
type_conv_112_01_01 = callPackage ../development/ocaml-modules/type_conv/112.01.01.nix { }; type_conv_112_01_01 = callPackage ../development/ocaml-modules/type_conv/112.01.01.nix { };
type_conv = type_conv =
if lib.versionOlder "4.02" ocaml_version if lib.versionOlder "4.02" ocaml.version
then type_conv_112_01_01 then type_conv_112_01_01
else if lib.versionOlder "4.00" ocaml_version else if lib.versionOlder "4.00" ocaml.version
then type_conv_109_60_01 then type_conv_109_60_01
else if lib.versionOlder "3.12" ocaml_version else if lib.versionOlder "3.12" ocaml.version
then type_conv_108_08_00 then type_conv_108_08_00
else null; else null;
@ -381,11 +379,11 @@ let
sexplib_112_24_01 = callPackage ../development/ocaml-modules/sexplib/112.24.01.nix { }; sexplib_112_24_01 = callPackage ../development/ocaml-modules/sexplib/112.24.01.nix { };
sexplib_p4 = sexplib_p4 =
if lib.versionOlder "4.02" ocaml_version if lib.versionOlder "4.02" ocaml.version
then sexplib_112_24_01 then sexplib_112_24_01
else if lib.versionOlder "4.00" ocaml_version else if lib.versionOlder "4.00" ocaml.version
then sexplib_111_25_00 then sexplib_111_25_00
else if lib.versionOlder "3.12" ocaml_version else if lib.versionOlder "3.12" ocaml.version
then sexplib_108_08_00 then sexplib_108_08_00
else null; else null;
@ -407,17 +405,17 @@ let
pprint = callPackage ../development/ocaml-modules/pprint { }; pprint = callPackage ../development/ocaml-modules/pprint { };
ppx_blob = ppx_blob =
if lib.versionAtLeast ocaml_version "4.02" if lib.versionAtLeast ocaml.version "4.02"
then callPackage ../development/ocaml-modules/ppx_blob {} then callPackage ../development/ocaml-modules/ppx_blob {}
else null; else null;
ppx_deriving = ppx_deriving =
if lib.versionAtLeast ocaml_version "4.02" if lib.versionAtLeast ocaml.version "4.02"
then callPackage ../development/ocaml-modules/ppx_deriving {} then callPackage ../development/ocaml-modules/ppx_deriving {}
else null; else null;
ppx_tools = ppx_tools =
if lib.versionAtLeast ocaml_version "4.02" if lib.versionAtLeast ocaml.version "4.02"
then callPackage ../development/ocaml-modules/ppx_tools {} then callPackage ../development/ocaml-modules/ppx_tools {}
else null; else null;
@ -534,74 +532,74 @@ let
# Core sublibs # Core sublibs
typerep = typerep =
if lib.versionOlder "4.02" ocaml_version if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/typerep.nix {} then callPackage ../development/ocaml-modules/janestreet/typerep.nix {}
else typerep_p4; else typerep_p4;
fieldslib = fieldslib =
if lib.versionOlder "4.02" ocaml_version if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/fieldslib.nix {} then callPackage ../development/ocaml-modules/janestreet/fieldslib.nix {}
else fieldslib_p4; else fieldslib_p4;
sexplib = sexplib =
if lib.versionOlder "4.02" ocaml_version if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/sexplib.nix {} then callPackage ../development/ocaml-modules/janestreet/sexplib.nix {}
else sexplib_p4; else sexplib_p4;
variantslib = variantslib =
if lib.versionOlder "4.02" ocaml_version if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/variantslib.nix {} then callPackage ../development/ocaml-modules/janestreet/variantslib.nix {}
else variantslib_p4; else variantslib_p4;
bin_prot = bin_prot =
if lib.versionOlder "4.02" ocaml_version if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/bin_prot.nix {} then callPackage ../development/ocaml-modules/janestreet/bin_prot.nix {}
else bin_prot_p4; else bin_prot_p4;
core_kernel = core_kernel =
if lib.versionOlder "4.02" ocaml_version if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/core_kernel.nix {} then callPackage ../development/ocaml-modules/janestreet/core_kernel.nix {}
else core_kernel_p4; else core_kernel_p4;
core = core =
if lib.versionOlder "4.02" ocaml_version if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/core.nix {} then callPackage ../development/ocaml-modules/janestreet/core.nix {}
else core_p4; else core_p4;
re2 = re2 =
if lib.versionOlder "4.02" ocaml_version if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/re2.nix {} then callPackage ../development/ocaml-modules/janestreet/re2.nix {}
else re2_p4; else re2_p4;
textutils = textutils =
if lib.versionOlder "4.02" ocaml_version if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/textutils.nix {} then callPackage ../development/ocaml-modules/janestreet/textutils.nix {}
else textutils_p4; else textutils_p4;
core_extended = core_extended =
if lib.versionOlder "4.02" ocaml_version if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/core-extended.nix {} then callPackage ../development/ocaml-modules/janestreet/core-extended.nix {}
else core_extended_p4; else core_extended_p4;
async_kernel = async_kernel =
if lib.versionOlder "4.02" ocaml_version if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/async-kernel.nix {} then callPackage ../development/ocaml-modules/janestreet/async-kernel.nix {}
else async_kernel_p4; else async_kernel_p4;
async_rpc_kernel = callPackage ../development/ocaml-modules/janestreet/async-rpc-kernel.nix {}; async_rpc_kernel = callPackage ../development/ocaml-modules/janestreet/async-rpc-kernel.nix {};
async_unix = async_unix =
if lib.versionOlder "4.02" ocaml_version if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/async-unix.nix {} then callPackage ../development/ocaml-modules/janestreet/async-unix.nix {}
else async_unix_p4; else async_unix_p4;
async_extra = async_extra =
if lib.versionOlder "4.02" ocaml_version if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/async-extra.nix {} then callPackage ../development/ocaml-modules/janestreet/async-extra.nix {}
else async_extra_p4; else async_extra_p4;
async = async =
if lib.versionOlder "4.02" ocaml_version if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/async.nix {} then callPackage ../development/ocaml-modules/janestreet/async.nix {}
else async_p4; else async_p4;

221
pkgs/top-level/python-packages.nix
View File

@ -1270,12 +1270,11 @@ in modules // {
}); });
attrs = buildPythonPackage (rec { attrs = buildPythonPackage (rec {
pname = "attrs"; name = "attrs-${version}";
version = "16.0.0"; version = "16.2.0";
name = "attrs-16.0.0";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://pypi/a/attrs/${name}.tar.gz"; url = "mirror://pypi/a/attrs/${name}.tar.gz";
sha256 = "1g4asv3hbx5aqz7hjzq3q6ss2cpv1rdv66sp5d21cdyjajj2fs6y"; sha256 = "136f2ec0f94ec77ff2990830feee965d608cab1e8922370e3abdded383d52001";
}; };
# Mac OS X needs clang for testing # Mac OS X needs clang for testing
@ -2615,7 +2614,7 @@ in modules // {
blaze = buildPythonPackage rec { blaze = buildPythonPackage rec {
name = "blaze-${version}"; name = "blaze-${version}";
version = "0.10.1"; version = "0.10.2";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://pypi/b/blaze/${name}.tar.gz"; url = "mirror://pypi/b/blaze/${name}.tar.gz";
@ -3997,20 +3996,20 @@ in modules // {
}; };
cookiecutter = buildPythonPackage rec { cookiecutter = buildPythonPackage rec {
version = "1.3.0"; version = "1.4.0";
name = "cookiecutter-${version}"; name = "cookiecutter-${version}";
# dependency problems, next release of cookiecutter should unblock these # not sure why this is broken
disabled = isPy3k || isPyPy; disabled = isPyPy;
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "https://github.com/audreyr/cookiecutter/archive/${version}.tar.gz"; url = "https://github.com/audreyr/cookiecutter/archive/${version}.tar.gz";
sha256 = "1vchjvh7591nczz2zz55aghk9mhpm6kqgm62d05d4mjrx9xjkdcg"; sha256 = "1clxnabmc5s4b519r1sxyj1163x833ir8xcypmdfpf6r9kbb35vn";
}; };
buildInputs = with self; [ itsdangerous ]; buildInputs = with self; [ itsdangerous pytest freezegun docutils ];
propagatedBuildInputs = with self; [ propagatedBuildInputs = with self; [
jinja2 future binaryornot click whichcraft ruamel_yaml ]; jinja2 future binaryornot click whichcraft poyo jinja2_time ];
meta = { meta = {
homepage = https://github.com/audreyr/cookiecutter; homepage = https://github.com/audreyr/cookiecutter;
@ -5644,11 +5643,11 @@ in modules // {
decorator = buildPythonPackage rec { decorator = buildPythonPackage rec {
name = "decorator-${version}"; name = "decorator-${version}";
version = "4.0.9"; version = "4.0.10";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://pypi/d/decorator/${name}.tar.gz"; url = "mirror://pypi/d/decorator/${name}.tar.gz";
sha256 = "1a5vwhflfd9sh3rfb40xlyipldgdzfff6brman57hqv3661jw0lh"; sha256 = "9c6e98edcb33499881b86ede07d9968c81ab7c769e28e9af24075f0a5379f070";
}; };
meta = { meta = {
@ -6961,12 +6960,12 @@ in modules // {
}; };
GitPython = buildPythonPackage rec { GitPython = buildPythonPackage rec {
version = "2.0.2"; version = "2.0.8";
name = "GitPython-${version}"; name = "GitPython-${version}";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://pypi/G/GitPython/GitPython-${version}.tar.gz"; url = "mirror://pypi/G/GitPython/GitPython-${version}.tar.gz";
sha256 = "18842123a88rihgh84rmjabmbn3zq1jv0227ypcpsxc5smxzws6i"; sha256 = "7c03d1130f903aafba6ae5b89ccf8eb433a995cd3120cbb781370e53fc4eb222";
}; };
buildInputs = with self; [ mock nose ]; buildInputs = with self; [ mock nose ];
@ -7650,11 +7649,11 @@ in modules // {
jupyterlab = buildPythonPackage rec { jupyterlab = buildPythonPackage rec {
name = "jupyterlab-${version}"; name = "jupyterlab-${version}";
version = "0.1.1"; version = "0.4.1";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://pypi/j/jupyterlab/${name}.tar.gz"; url = "mirror://pypi/j/jupyterlab/${name}.tar.gz";
sha256 = "c1a08f4d1b2bb1bf06db090db30df988a22ffbfa05606e7eb026e364969388da"; sha256 = "91dc4d7dfb1e6ab97e28d6e3a2fc38f5f65d368201c00fd0ed077519258e67bb";
}; };
propagatedBuildInputs = with self; [ notebook ]; propagatedBuildInputs = with self; [ notebook ];
@ -8265,6 +8264,22 @@ in modules // {
}; };
}; };
poyo = buildPythonPackage rec {
version = "0.4.0";
name = "poyo-${version}";
src = pkgs.fetchurl {
url = "mirror://pypi/p/poyo/${name}.tar.gz";
sha256 = "1f48ffl0j1f2lmgabajps7v8w90ppxbp5168gh8kh27bjd8xk5ca";
};
meta = {
homepage = https://github.com/hackebrot/poyo;
description = "A lightweight YAML Parser for Python";
license = licenses.mit;
};
};
pudb = buildPythonPackage rec { pudb = buildPythonPackage rec {
name = "pudb-2013.3.6"; name = "pudb-2013.3.6";
@ -9476,12 +9491,12 @@ in modules // {
django_1_10 = buildPythonPackage rec { django_1_10 = buildPythonPackage rec {
name = "Django-${version}"; name = "Django-${version}";
version = "1.10.1"; version = "1.10.2";
disabled = pythonOlder "2.7"; disabled = pythonOlder "2.7";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "http://www.djangoproject.com/m/releases/1.10/${name}.tar.gz"; url = "http://www.djangoproject.com/m/releases/1.10/${name}.tar.gz";
sha256 = "1wr438yykg0m5s9xini36hc826di55jm6by8syplczxnbjrcbrnn"; sha256 = "1qdwgkwlq5wl0wn247d9gid49xpz4qggk0lcdqxq8d7v1cmg29z1";
}; };
patches = [ patches = [
@ -11490,14 +11505,21 @@ in modules // {
geventhttpclient = buildPythonPackage rec { geventhttpclient = buildPythonPackage rec {
name = "geventhttpclient-${version}"; name = "geventhttpclient-${version}";
version = "1.2.0"; version = "1.3.1";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://pypi/g/geventhttpclient/${name}.tar.gz"; url = "mirror://pypi/g/geventhttpclient/${name}.tar.gz";
sha256 = "0s1qd1qz0zyzksd5h38ynw06d1012h0k7z8522zhb6mzaq4144yz"; sha256 = "bd87af8854f5fb05738916c8973671f7035568aec69b7c842887d6faf9c0a01d";
}; };
propagatedBuildInputs = with self; [ gevent certifi backports_ssl_match_hostname_3_4_0_2 ]; buildInputs = with self; [ pytest ];
propagatedBuildInputs = with self; [ gevent certifi six backports_ssl_match_hostname ];
# Several tests fail that require network
doCheck = false;
checkPhase = ''
py.test $out
'';
meta = { meta = {
homepage = http://github.com/gwik/geventhttpclient; homepage = http://github.com/gwik/geventhttpclient;
@ -12343,12 +12365,12 @@ in modules // {
}; };
ipykernel = buildPythonPackage rec { ipykernel = buildPythonPackage rec {
version = "4.3.1"; version = "4.5.0";
name = "ipykernel-${version}"; name = "ipykernel-${version}";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://pypi/i/ipykernel/${name}.tar.gz"; url = "mirror://pypi/i/ipykernel/${name}.tar.gz";
sha256 = "0gycnxzq3nnmh6xlc24n3b4qc28gli0lw4a9yg2yzm74lgmd66c2"; sha256 = "245a798edb8fd751b95750d8645d736dd739a020e7fc7d5627dac4d1c35d8295";
}; };
buildInputs = with self; [ nose ] ++ optionals isPy27 [mock]; buildInputs = with self; [ nose ] ++ optionals isPy27 [mock];
@ -12373,12 +12395,12 @@ in modules // {
}; };
ipyparallel = buildPythonPackage rec { ipyparallel = buildPythonPackage rec {
version = "5.0.1"; version = "5.2.0";
name = "ipyparallel-${version}"; name = "ipyparallel-${version}";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://pypi/i/ipyparallel/${name}.tar.gz"; url = "mirror://pypi/i/ipyparallel/${name}.tar.gz";
sha256 = "1cpydbm1k02y5m4grp0c1z5lbgkpp5f4xp3j5v49g9lmd70ikqs8"; sha256 = "d99e760f1a136b1c402755a4ab51a8d7cb87c892cccadf641948a5e886c8a455";
}; };
buildInputs = with self; [ nose ]; buildInputs = with self; [ nose ];
@ -12459,16 +12481,16 @@ in modules // {
ipywidgets = buildPythonPackage rec { ipywidgets = buildPythonPackage rec {
version = "4.1.1"; version = "5.2.2";
name = "ipywidgets-${version}"; name = "ipywidgets-${version}";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://pypi/i/ipywidgets/${name}.tar.gz"; url = "mirror://pypi/i/ipywidgets/${name}.tar.gz";
sha256 = "ceeb325e45ade9537c2d115fed9d522e5c6e90bb161592e2f0807375dc661028"; sha256 = "baf6098f054dd5eacc2934b8ea3bef908b81ca8660d839f1f940255a72c660d2";
}; };
buildInputs = with self; [ nose ]; buildInputs = with self; [ nose ];
propagatedBuildInputs = with self; [ipython ipykernel traitlets notebook]; propagatedBuildInputs = with self; [ipython ipykernel traitlets notebook widgetsnbextension ];
meta = { meta = {
description = "IPython HTML widgets for Jupyter"; description = "IPython HTML widgets for Jupyter";
@ -12699,6 +12721,23 @@ in modules // {
}; };
}; };
jinja2_time = buildPythonPackage rec {
version = "0.2.0";
name = "jinja2-time-${version}";
src = pkgs.fetchurl {
url = "mirror://pypi/j/jinja2-time/${name}.tar.gz";
sha256 = "0h0dr7cfpjnjj8bgl2vk9063a53649pn37wnlkd8hxjy656slkni";
};
propagatedBuildInputs = with self; [ arrow jinja2 ];
meta = {
homepage = https://github.com/hackebrot/jinja2-time;
description = "Jinja2 Extension for Dates and Times";
license = licenses.mit;
};
};
jmespath = buildPythonPackage rec { jmespath = buildPythonPackage rec {
name = "jmespath-0.7.1"; name = "jmespath-0.7.1";
@ -12745,12 +12784,12 @@ in modules // {
}; };
jupyter_client = buildPythonPackage rec { jupyter_client = buildPythonPackage rec {
version = "4.3.0"; version = "4.4.0";
name = "jupyter_client-${version}"; name = "jupyter_client-${version}";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://pypi/j/jupyter_client/${name}.tar.gz"; url = "mirror://pypi/j/jupyter_client/${name}.tar.gz";
sha256 = "70b2e88403835a1d54b83858783d9e5e5771fa4bb6f6904e0b5bb8cfde4b99dd"; sha256 = "c99a52fac2e5b7a3b714e9252ebf72cbf97536d556ae2b5082baccc3e5cd52ee";
}; };
buildInputs = with self; [ nose ]; buildInputs = with self; [ nose ];
@ -12772,12 +12811,12 @@ in modules // {
}; };
jupyter_core = buildPythonPackage rec { jupyter_core = buildPythonPackage rec {
version = "4.1.1"; version = "4.2.0";
name = "jupyter_core-${version}"; name = "jupyter_core-${version}";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://pypi/j/jupyter_core/${name}.tar.gz"; url = "mirror://pypi/j/jupyter_core/${name}.tar.gz";
sha256 = "ae0e69435258126466c86cd989e465a9c334c50107ef4f257decc8693650bf4c"; sha256 = "44ec837a53bebf4e937112d3f9ccf31fee4f8db3e406dd0dd4f0378a354bed9c";
}; };
buildInputs = with self; [ pytest mock ]; buildInputs = with self; [ pytest mock ];
@ -13932,29 +13971,22 @@ in modules // {
mitmproxy = buildPythonPackage rec { mitmproxy = buildPythonPackage rec {
baseName = "mitmproxy"; baseName = "mitmproxy";
name = "${baseName}-${version}"; name = "${baseName}-${version}";
version = "0.14"; version = "0.17.1";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "mitmproxy"; owner = "mitmproxy";
repo = "mitmproxy"; repo = "mitmproxy";
rev = "v${version}"; rev = "v${version}";
sha256 = "1zxw4yviryy0v53vhccgqb7f5d3fga16dy9kp1xwp6b59w0fcc2g"; sha256 = "0a50mkvm3zf9cbs0pf6bwy00bhmy4d1l9as8c9m0bgrk6hq7h53p";
}; };
propagatedBuildInputs = with self; [ propagatedBuildInputs = with self; [
pyopenssl pyasn1 urwid pillow lxml flask protobuf netlib click pyopenssl pyasn1 urwid pillow lxml flask protobuf click
ConfigArgParse pyperclip blinker construct pyparsing html2text tornado ConfigArgParse pyperclip blinker construct pyparsing html2text tornado
]; ];
doCheck = false; doCheck = false;
postInstall = ''
for prog in "$out/bin/"*; do
wrapProgram "$prog" \
--prefix PYTHONPATH : "$PYTHONPATH"
done
'';
meta = { meta = {
description = ''Man-in-the-middle proxy''; description = ''Man-in-the-middle proxy'';
homepage = "http://mitmproxy.org/"; homepage = "http://mitmproxy.org/";
@ -14865,37 +14897,13 @@ in modules // {
}; };
}; };
netlib = buildPythonPackage rec {
baseName = "netlib";
name = "${baseName}-${version}";
disabled = (!isPy27);
version = "0.14.0";
src = pkgs.fetchurl {
url = "mirror://pypi/n/netlib/${name}.tar.gz";
sha256 = "0xcfjym780wjr32p3g50w2gifqy3589898idzd3fwgj93akv04ng";
};
propagatedBuildInputs = with self; [ pyopenssl pyasn1 certifi passlib
ipaddress backports_ssl_match_hostname_3_4_0_2 hpack ];
doCheck = false;
meta = {
description = "Man-in-the-middle proxy";
homepage = "https://github.com/cortesi/netlib";
license = licenses.mit;
};
};
nevow = buildPythonPackage (rec { nevow = buildPythonPackage (rec {
name = "nevow-${version}"; name = "nevow-${version}";
version = "0.11.1"; version = "0.14.2";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://pypi/N/Nevow/Nevow-${version}.tar.gz"; url = "mirror://pypi/N/Nevow/Nevow-${version}.tar.gz";
sha256 = "1z0y8a5q4fa2nmh0dap7cs9pp5xs3jm6q0g4vpwcw77q7jagdmw9"; sha256 = "0wsh40ysj5gvfc777nrdvf5vbkr606r1gh7ibvw7x8b5g8afdy3y";
name = "${name}.tar.gz"; name = "${name}.tar.gz";
}; };
@ -15209,12 +15217,12 @@ in modules // {
}; };
notebook = buildPythonPackage rec { notebook = buildPythonPackage rec {
version = "4.2.2"; version = "4.2.3";
name = "notebook-${version}"; name = "notebook-${version}";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://pypi/n/notebook/${name}.tar.gz"; url = "mirror://pypi/n/notebook/${name}.tar.gz";
sha256 = "418ba230c9b2e7e739940cae9fb4625e10a63f038e9c95cf1a9b7a244256ba38"; sha256 = "39a9603d3fe88b60de2903680c965cf643acf2c16fb2c6bac1d905e1042b5851";
}; };
LC_ALL = "en_US.UTF-8"; LC_ALL = "en_US.UTF-8";
@ -15480,10 +15488,10 @@ in modules // {
}; };
numpy_1_11 = self.buildNumpyPackage rec { numpy_1_11 = self.buildNumpyPackage rec {
version = "1.11.1"; version = "1.11.2";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://pypi/n/numpy/numpy-${version}.tar.gz"; url = "mirror://pypi/n/numpy/numpy-${version}.tar.gz";
sha256 = "1kbpsnqfabpbczh3ly2d4jrwq2d1gqlshlpk5dm8bk3r77284h6w"; sha256 = "04db2fbd64e2e7c68e740b14402b25af51418fc43a59d9e54172b38b906b0f69";
}; };
}; };
@ -16552,11 +16560,11 @@ in modules // {
Kajiki = buildPythonPackage rec { Kajiki = buildPythonPackage rec {
name = "Kajiki-${version}"; name = "Kajiki-${version}";
version = "0.5.2"; version = "0.5.5";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://pypi/K/Kajiki/${name}.tar.gz"; url = "mirror://pypi/K/Kajiki/${name}.tar.gz";
sha256 = "1ayhr4g5q2hhh50fd33dkb7l8z8n2hnnx3lmhivzg3paf47b3ssz"; sha256 = "effcae388e25c3358eb0bbd733448509d11a1ec500e46c69241fc673021f0517";
}; };
propagatedBuildInputs = with self; [ propagatedBuildInputs = with self; [
@ -17267,17 +17275,18 @@ in modules // {
inherit (pkgs.stdenv) isDarwin; inherit (pkgs.stdenv) isDarwin;
in buildPythonPackage rec { in buildPythonPackage rec {
name = "pandas-${version}"; name = "pandas-${version}";
version = "0.18.1"; version = "0.19.0";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://pypi/p/pandas/${name}.tar.gz"; url = "mirror://pypi/p/pandas/${name}.tar.gz";
sha256 = "1ckpxrvvjj6zxmn68icd9hib8qcpx9b35f6izxnr25br5ilq7r6j"; sha256 = "4697606cdf023c6b7fcb74e48aaf25cf282a1a00e339d2d274cf1b663748805b";
}; };
LC_ALL = "en_US.UTF-8"; LC_ALL = "en_US.UTF-8";
buildInputs = with self; [ nose pkgs.glibcLocales ] ++ optional isDarwin pkgs.libcxx; buildInputs = with self; [ nose pkgs.glibcLocales ] ++ optional isDarwin pkgs.libcxx;
propagatedBuildInputs = with self; [ propagatedBuildInputs = with self; [
cython
dateutil dateutil
scipy scipy
numexpr numexpr
@ -22269,10 +22278,10 @@ in modules // {
}; };
scipy_0_18 = self.buildScipyPackage rec { scipy_0_18 = self.buildScipyPackage rec {
version = "0.18.0"; version = "0.18.1";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://pypi/s/scipy/scipy-${version}.tar.gz"; url = "mirror://pypi/s/scipy/scipy-${version}.tar.gz";
sha256 = "f01784fb1c2bc246d4211f2482ecf4369db5abaecb9d5afb9d94f6c59663286a"; sha256 = "8ab6e9c808bf2fb3e8576cd8cf07226d9cdc18b012c06d9708429a821ac6634e";
}; };
numpy = self.numpy; numpy = self.numpy;
}; };
@ -22300,12 +22309,12 @@ in modules // {
scikitlearn = buildPythonPackage rec { scikitlearn = buildPythonPackage rec {
name = "scikit-learn-${version}"; name = "scikit-learn-${version}";
version = "0.17.1"; version = "0.18";
disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534 disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://pypi/s/scikit-learn/${name}.tar.gz"; url = "mirror://pypi/s/scikit-learn/${name}.tar.gz";
sha256 = "9f4cf58e57d81783289fc503caaed1f210bab49b7a6f680bf3c04b1e0a96e5f0"; sha256 = "240009789d6495240b332e059cbd2499f4d2981c93873983c9e1d5189f90315f";
}; };
buildInputs = with self; [ nose pillow pkgs.gfortran pkgs.glibcLocales ]; buildInputs = with self; [ nose pillow pkgs.gfortran pkgs.glibcLocales ];
@ -22912,13 +22921,13 @@ in modules // {
}; };
Theano = buildPythonPackage rec { Theano = buildPythonPackage rec {
name = "Theano-0.8.1"; name = "Theano-0.8.2";
disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3"); disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3");
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://pypi/T/Theano/${name}.tar.gz"; url = "mirror://pypi/T/Theano/${name}.tar.gz";
sha256 = "17dikk94r8bzkxg976srqlhj5c7phs9gl837iabyfdpixkbrl79g"; sha256 = "7463c8f7ed1a787bf881f36d38a38607150186697e7ce7e78bfb94b7c6af8930";
}; };
#preCheck = '' #preCheck = ''
@ -25762,6 +25771,28 @@ in modules // {
}; };
}; };
widgetsnbextension = buildPythonPackage rec {
name = "widgetsnbextension-${version}";
version = "1.2.6";
src = pkgs.fetchurl {
url = "mirror://pypi/w/widgetsnbextension/${name}.tar.gz";
sha256 = "c618cfb32978c9517caf0b4ef3aec312f8dd138577745e7b0d4abfcc7315ce51";
};
propagatedBuildInputs = with self; [ notebook ];
# No tests in archive
doCheck = false;
meta = {
description = "IPython HTML widgets for Jupyter";
homepage = http://ipython.org/;
license = self.ipywidgets.meta.license; # Build from same repo
maintainers = with maintainers; [ fridh ];
};
};
willie = buildPythonPackage rec { willie = buildPythonPackage rec {
name = "willie-${version}"; name = "willie-${version}";
version = "5.5.1"; version = "5.5.1";
@ -26720,7 +26751,7 @@ in modules // {
tornado = buildPythonPackage rec { tornado = buildPythonPackage rec {
name = "tornado-${version}"; name = "tornado-${version}";
version = "4.4.1"; version = "4.4.2";
propagatedBuildInputs = with self; [ backports_abc backports_ssl_match_hostname certifi singledispatch ]; propagatedBuildInputs = with self; [ backports_abc backports_ssl_match_hostname certifi singledispatch ];
@ -26732,7 +26763,7 @@ in modules // {
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://pypi/t/tornado/${name}.tar.gz"; url = "mirror://pypi/t/tornado/${name}.tar.gz";
sha256 = "371d0cf3d56c47accc66116a77ad558d76eebaa8458a6b677af71ca606522146"; sha256 = "1k7d90afm5pivam90a37nqiz9wlmakvnsfymp3p43kcqz29gk618";
}; };
}; };
@ -27097,6 +27128,8 @@ in modules // {
sha256 = "1xqp66knzlb01k30qic40vzwl51jmlsb8r96iv60m2ca6623abbv"; sha256 = "1xqp66knzlb01k30qic40vzwl51jmlsb8r96iv60m2ca6623abbv";
}; };
buildInputs = with self; [ pytest ];
meta = { meta = {
homepage = https://github.com/pydanny/whichcraft; homepage = https://github.com/pydanny/whichcraft;
description = "Cross-platform cross-python shutil.which functionality"; description = "Cross-platform cross-python shutil.which functionality";
@ -27685,11 +27718,6 @@ in modules // {
}; };
patches = [ ../development/python-modules/searx.patch ]; patches = [ ../development/python-modules/searx.patch ];
postPatch = ''
substituteInPlace requirements.txt \
--replace 'certifi==2015.11.20.1' 'certifi==2016.2.28' \
--replace 'pyopenssl==0.15.1' 'pyopenssl==16.0.0'
'';
propagatedBuildInputs = with self; [ propagatedBuildInputs = with self; [
pyyaml lxml_3_5 grequests flaskbabel flask requests2 pyyaml lxml_3_5 grequests flaskbabel flask requests2
@ -27941,11 +27969,11 @@ in modules // {
uncertainties = buildPythonPackage rec { uncertainties = buildPythonPackage rec {
name = "uncertainties-${version}"; name = "uncertainties-${version}";
version = "2.4.8.1"; version = "3.0.1";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "https://github.com/lebigot/uncertainties/archive/${version}.tar.gz"; url = "mirror://pypi/u/uncertainties/${name}.tar.gz";
sha256 = "1j5z0h5l3plsywsmwjpaggkr6rn5cjxw0lhkwgl6a8a25f8bz4pz"; sha256 = "de0765cac6911e5afa93ee941063a07b4a98dbd9c314c5eea4ab14bfff0054a4";
}; };
buildInputs = with self; [ nose numpy ]; buildInputs = with self; [ nose numpy ];
@ -28367,16 +28395,17 @@ in modules // {
}; };
html2text = buildPythonPackage rec { html2text = buildPythonPackage rec {
name = "html2text-2015.11.4"; name = "html2text-2016.9.19";
disabled = ! isPy27;
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://pypi/h/html2text/${name}.tar.gz"; url = "mirror://pypi/h/html2text/${name}.tar.gz";
sha256 = "021pqcshxajhdy4whkawz95v98m8njv5lknzgac0sp8jzl01qls4"; sha256 = "554ef5fd6c6cf6e3e4f725a62a3e9ec86a0e4d33cd0928136d1c79dbeb7b2d55";
}; };
meta = { meta = {
description = "Turn HTML into equivalent Markdown-structured text";
homepage = https://github.com/Alir3z4/html2text/; homepage = https://github.com/Alir3z4/html2text/;
license = licenses.gpl3;
}; };
}; };