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

Merge remote-tracking branch 'upstream/master' into jh

Browse Source
This commit is contained in:
Ji-Haeng Huh 2016-10-06 14:39:15 +02:00
commit b150da5755
126 changed files with 3983 additions and 2933 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:

3
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>";
@ -271,6 +272,7 @@
mingchuan = "Ming Chuan <ming@culpring.com>"; mingchuan = "Ming Chuan <ming@culpring.com>";
mirdhyn = "Merlin Gaillard <mirdhyn@gmail.com>"; mirdhyn = "Merlin Gaillard <mirdhyn@gmail.com>";
mirrexagon = "Andrew Abbott <mirrexagon@mirrexagon.com>"; mirrexagon = "Andrew Abbott <mirrexagon@mirrexagon.com>";
mlieberman85 = "Michael Lieberman <mlieberman85@gmail.com>";
modulistic = "Pablo Costa <modulistic@gmail.com>"; modulistic = "Pablo Costa <modulistic@gmail.com>";
mog = "Matthew O'Gorman <mog-lists@rldn.net>"; mog = "Matthew O'Gorman <mog-lists@rldn.net>";
moosingin3space = "Nathan Moos <moosingin3space@gmail.com>"; moosingin3space = "Nathan Moos <moosingin3space@gmail.com>";
@ -333,6 +335,7 @@
pmahoney = "Patrick Mahoney <pat@polycrystal.org>"; pmahoney = "Patrick Mahoney <pat@polycrystal.org>";
pmiddend = "Philipp Middendorf <pmidden@secure.mailbox.org>"; pmiddend = "Philipp Middendorf <pmidden@secure.mailbox.org>";
prikhi = "Pavan Rikhi <pavan.rikhi@gmail.com>"; prikhi = "Pavan Rikhi <pavan.rikhi@gmail.com>";
primeos = "Michael Weiss <dev.primeos@gmail.com>";
profpatsch = "Profpatsch <mail@profpatsch.de>"; profpatsch = "Profpatsch <mail@profpatsch.de>";
proglodyte = "Proglodyte <proglodyte23@gmail.com>"; proglodyte = "Proglodyte <proglodyte23@gmail.com>";
pshendry = "Paul Hendry <paul@pshendry.com>"; pshendry = "Paul Hendry <paul@pshendry.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

1
nixos/modules/module-list.nix
View File

@ -437,6 +437,7 @@
./services/networking/wakeonlan.nix ./services/networking/wakeonlan.nix
./services/networking/websockify.nix ./services/networking/websockify.nix
./services/networking/wicd.nix ./services/networking/wicd.nix
./services/networking/wireguard.nix
./services/networking/wpa_supplicant.nix ./services/networking/wpa_supplicant.nix
./services/networking/xinetd.nix ./services/networking/xinetd.nix
./services/networking/xl2tpd.nix ./services/networking/xl2tpd.nix

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>

2
nixos/modules/services/misc/nix-optimise.nix
View File

@ -21,7 +21,7 @@ in
}; };
dates = mkOption { dates = mkOption {
default = "03:45"; default = ["03:45"];
type = types.listOf types.str; type = types.listOf types.str;
description = '' description = ''
Specification (in the format described by Specification (in the format described by

6
nixos/modules/services/networking/kippo.nix
View File

@ -54,7 +54,7 @@ rec {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = with pkgs.pythonPackages; [ environment.systemPackages = with pkgs.pythonPackages; [
python twisted_11 pycrypto pyasn1 ]; python pkgs.kippo.twisted pycrypto pyasn1 ];
environment.etc."kippo.cfg".text = '' environment.etc."kippo.cfg".text = ''
# Automatically generated by NixOS. # Automatically generated by NixOS.
@ -84,7 +84,7 @@ rec {
description = "Kippo Web Server"; description = "Kippo Web Server";
after = [ "network.target" ]; after = [ "network.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
environment.PYTHONPATH = "${pkgs.kippo}/src/:${pkgs.pythonPackages.pycrypto}/lib/python2.7/site-packages/:${pkgs.pythonPackages.pyasn1}/lib/python2.7/site-packages/:${pkgs.pythonPackages.python}/lib/python2.7/site-packages/:${pkgs.pythonPackages.twisted_11}/lib/python2.7/site-packages/:."; environment.PYTHONPATH = "${pkgs.kippo}/src/:${pkgs.pythonPackages.pycrypto}/lib/python2.7/site-packages/:${pkgs.pythonPackages.pyasn1}/lib/python2.7/site-packages/:${pkgs.pythonPackages.python}/lib/python2.7/site-packages/:${pkgs.kippo.twisted}/lib/python2.7/site-packages/:.";
preStart = '' preStart = ''
if [ ! -d ${cfg.varPath}/ ] ; then if [ ! -d ${cfg.varPath}/ ] ; then
mkdir -p ${cfg.logPath}/tty mkdir -p ${cfg.logPath}/tty
@ -107,7 +107,7 @@ rec {
fi fi
''; '';
serviceConfig.ExecStart = "${pkgs.pythonPackages.twisted_11}/bin/twistd -y ${pkgs.kippo}/src/kippo.tac --syslog --rundir=${cfg.varPath}/ --pidfile=${cfg.pidPath}/kippo.pid --prefix=kippo -n"; serviceConfig.ExecStart = "${pkgs.kippo.twisted}/bin/twistd -y ${pkgs.kippo}/src/kippo.tac --syslog --rundir=${cfg.varPath}/ --pidfile=${cfg.pidPath}/kippo.pid --prefix=kippo -n";
serviceConfig.PermissionsStartOnly = true; serviceConfig.PermissionsStartOnly = true;
serviceConfig.User = "kippo"; serviceConfig.User = "kippo";
serviceConfig.Group = "kippo"; serviceConfig.Group = "kippo";

225
nixos/modules/services/networking/wireguard.nix Normal file
View File

@ -0,0 +1,225 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.networking.wireguard;
kernel = config.boot.kernelPackages;
# interface options
interfaceOpts = { name, ... }: {
options = {
ips = mkOption {
example = [ "192.168.2.1/24" ];
default = [];
type = with types; listOf str;
description = "The IP addresses of the interface.";
};
privateKey = mkOption {
example = "yAnz5TF+lXXJte14tji3zlMNq+hd2rYUIgJBgB3fBmk=";
type = types.str;
description = "Base64 private key generated by wg genkey.";
};
presharedKey = mkOption {
default = null;
example = "rVXs/Ni9tu3oDBLS4hOyAUAa1qTWVA3loR8eL20os3I=";
type = with types; nullOr str;
description = ''base64 preshared key generated by wg genpsk. Optional,
and may be omitted. This option adds an additional layer of
symmetric-key cryptography to be mixed into the already existing
public-key cryptography, for post-quantum resistance.'';
};
listenPort = mkOption {
default = null;
type = with types; nullOr int;
example = 51820;
description = ''16-bit port for listening. Optional; if not specified,
automatically generated based on interface name.'';
};
preSetup = mkOption {
example = literalExample [''
${pkgs.iproute}/bin/ip netns add foo
''];
default = [];
type = with types; listOf str;
description = ''A list of commands called at the start of the interface
setup.'';
};
postSetup = mkOption {
example = literalExample [''
${pkgs.bash} -c 'printf "nameserver 10.200.100.1" | ${pkgs.openresolv}/bin/resolvconf -a wg0 -m 0'
''];
default = [];
type = with types; listOf str;
description = "A list of commands called at the end of the interface setup.";
};
postShutdown = mkOption {
example = literalExample ["${pkgs.openresolv}/bin/resolvconf -d wg0"];
default = [];
type = with types; listOf str;
description = "A list of commands called after shutting down the interface.";
};
peers = mkOption {
default = [];
description = "Peers linked to the interface.";
type = with types; listOf (submodule peerOpts);
};
};
};
# peer options
peerOpts = {
options = {
publicKey = mkOption {
example = "xTIBA5rboUvnH4htodjb6e697QjLERt1NAB4mZqp8Dg=";
type = types.str;
description = "The base64 public key the peer.";
};
allowedIPs = mkOption {
example = [ "10.192.122.3/32" "10.192.124.1/24" ];
type = with types; listOf str;
description = ''List of IP (v4 or v6) addresses with CIDR masks from
which this peer is allowed to send incoming traffic and to which
outgoing traffic for this peer is directed. The catch-all 0.0.0.0/0 may
be specified for matching all IPv4 addresses, and ::/0 may be specified
for matching all IPv6 addresses.'';
};
endpoint = mkOption {
default = null;
example = "demo.wireguard.io:12913";
type = with types; nullOr str;
description = ''Endpoint IP or hostname of the peer, followed by a colon,
and then a port number of the peer.'';
};
persistentKeepalive = mkOption {
default = null;
type = with types; nullOr int;
example = 25;
description = ''This is optional and is by default off, because most
users will not need it. It represents, in seconds, between 1 and 65535
inclusive, how often to send an authenticated empty packet to the peer,
for the purpose of keeping a stateful firewall or NAT mapping valid
persistently. For example, if the interface very rarely sends traffic,
but it might at anytime receive traffic from a peer, and it is behind
NAT, the interface might benefit from having a persistent keepalive
interval of 25 seconds; however, most users will not need this.'';
};
};
};
generateConf = name: values: pkgs.writeText "wireguard-${name}.conf" ''
[Interface]
PrivateKey = ${values.privateKey}
${optionalString (values.presharedKey != null) "PresharedKey = ${values.presharedKey}"}
${optionalString (values.listenPort != null) "ListenPort = ${toString values.listenPort}"}
${concatStringsSep "\n\n" (map (peer: ''
[Peer]
PublicKey = ${peer.publicKey}
${optionalString (peer.allowedIPs != []) "AllowedIPs = ${concatStringsSep ", " peer.allowedIPs}"}
${optionalString (peer.endpoint != null) "Endpoint = ${peer.endpoint}"}
${optionalString (peer.persistentKeepalive != null) "PersistentKeepalive = ${toString peer.persistentKeepalive}"}
'') values.peers)}
'';
ipCommand = "${pkgs.iproute}/bin/ip";
wgCommand = "${pkgs.wireguard}/bin/wg";
generateUnit = name: values:
nameValuePair "wireguard-${name}"
{
description = "WireGuard Tunnel - ${name}";
wantedBy = [ "ip-up.target" ];
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
ExecStart = lib.flatten([
values.preSetup
"-${ipCommand} link del dev ${name}"
"${ipCommand} link add dev ${name} type wireguard"
"${wgCommand} setconf ${name} ${generateConf name values}"
(map (ip:
''${ipCommand} address add ${ip} dev ${name}''
) values.ips)
"${ipCommand} link set up dev ${name}"
(flatten (map (peer: (map (ip:
"${ipCommand} route add ${ip} dev ${name}"
) peer.allowedIPs)) values.peers))
values.postSetup
]);
ExecStop = [ ''${ipCommand} link del dev "${name}"'' ] ++ values.postShutdown;
};
};
in
{
###### interface
options = {
networking.wireguard = {
interfaces = mkOption {
description = "Wireguard interfaces.";
default = {};
example = {
wg0 = {
ips = [ "192.168.20.4/24" ];
privateKey = "yAnz5TF+lXXJte14tji3zlMNq+hd2rYUIgJBgB3fBmk=";
peers = [
{ allowedIPs = [ "192.168.20.1/32" ];
publicKey = "xTIBA5rboUvnH4htodjb6e697QjLERt1NAB4mZqp8Dg=";
endpoint = "demo.wireguard.io:12913"; }
];
};
};
type = with types; attrsOf (submodule interfaceOpts);
};
};
};
###### implementation
config = mkIf (cfg.interfaces != {}) {
boot.extraModulePackages = [ kernel.wireguard ];
environment.systemPackages = [ pkgs.wireguard ];
systemd.services = mapAttrs' generateUnit cfg.interfaces;
};
}

11
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,10 +126,10 @@ 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; ExecReload = "${pkgs.coreutils}/bin/kill -USR2 $MAINPID";
}; };
}; };
}; };
} }

2
nixos/modules/services/x11/display-managers/sddm.nix
View File

@ -14,7 +14,7 @@ let
xserverWrapper = pkgs.writeScript "xserver-wrapper" '' xserverWrapper = pkgs.writeScript "xserver-wrapper" ''
#!/bin/sh #!/bin/sh
${concatMapStrings (n: "export ${n}=\"${getAttr n xEnv}\"\n") (attrNames xEnv)} ${concatMapStrings (n: "export ${n}=\"${getAttr n xEnv}\"\n") (attrNames xEnv)}
exec ${dmcfg.xserverBin} ${dmcfg.xserverArgs} "$@" exec systemd-cat ${dmcfg.xserverBin} ${dmcfg.xserverArgs} "$@"
''; '';
Xsetup = pkgs.writeScript "Xsetup" '' Xsetup = pkgs.writeScript "Xsetup" ''

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 = ''

39
pkgs/applications/misc/octoprint/default.nix
View File

@ -1,6 +1,41 @@
{ stdenv, fetchFromGitHub, pythonPackages }: { stdenv, fetchFromGitHub, pythonPackages, fetchurl }:
pythonPackages.buildPythonApplication rec { let
tornado_4_0_1 = pythonPackages.buildPythonPackage rec {
name = "tornado-${version}";
version = "4.0.1";
propagatedBuildInputs = with pythonPackages; [ backports_ssl_match_hostname_3_4_0_2 certifi ];
src = fetchurl {
url = "mirror://pypi/t/tornado/${name}.tar.gz";
sha256 = "00crp5vnasxg7qyjv89qgssb69vd7qr13jfghdryrcbnn9l8c1df";
};
};
sockjs-tornado = pythonPackages.buildPythonPackage rec {
name = "sockjs-tornado-${version}";
version = "1.0.2";
src = fetchurl {
url = "mirror://pypi/s/sockjs-tornado/${name}.tar.gz";
sha256 = "15lcy40h2cm0l8aknbrk48p2sni5wzybsqjx1hxwpk9lfa1xryyv";
};
# This is needed for compatibility with OctoPrint
propagatedBuildInputs = [ tornado_4_0_1 ];
meta = with stdenv.lib; {
description = "SockJS python server implementation on top of Tornado framework";
homepage = http://github.com/mrjoes/sockjs-tornado/;
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ abbradar ];
};
};
in pythonPackages.buildPythonApplication rec {
name = "OctoPrint-${version}"; name = "OctoPrint-${version}";
version = "1.2.15"; version = "1.2.15";

18
pkgs/applications/networking/browsers/chromium/upstream-info.nix
View File

@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory. # This file is autogenerated from update.sh in the same directory.
{ {
beta = { beta = {
sha256 = "1wpcl6cgiv02s3zgxvgsmrws454g81lnvyfjmhhcdckkwyljcv5l"; sha256 = "1lix5wzcwf666vsdbdzz071rynswlxg5414k3nsrmlxwxhyh6qi4";
sha256bin64 = "0snr5rd2r5jfjqhqwkxcw26j53fivmf60g3qfnp5xz5b6nlsab9g"; sha256bin64 = "02cv9vc1l2nlwa4a0lc7cj9c9czrwp1jd8d024bq16a5fvmhl01l";
version = "54.0.2840.34"; version = "54.0.2840.50";
}; };
dev = { dev = {
sha256 = "1lbpj1wm35l2qf4fxfivd9drwwdrylv3knh8db889dyz5hrh3j5y"; sha256 = "06kcymwi0wfir7w10g8viayk2h0b5a66dav76mlia4lm30p502kz";
sha256bin64 = "0rkvrrcr1j9662v00kf7x7qmdps1pd4hq818x7crkilczybd05pr"; sha256bin64 = "0mgamiffnnkaw8c68b5kyna84x7hlhrzmqfc36kzf434fmm8v5d6";
version = "55.0.2868.3"; version = "55.0.2873.0";
}; };
stable = { stable = {
sha256 = "0qk0y457l91yzxradpinayzw3947s5s4axd75h968vrl0jan51vs"; sha256 = "1hyw0z7dsfaxyy8b4mvnfjy5yj0160hzz9m0wj3vn9zvkfvmhan5";
sha256bin64 = "0sz4dfwxvkffcj4rrqh3vn2xxp2vvjzdjsy0s9wcvam01igmy261"; sha256bin64 = "0n0px7yi94gdxq7p6pjqfdz04bnh3mcvbaccjaglj6h5p0jc8abq";
version = "53.0.2785.116"; version = "53.0.2785.143";
}; };
} }

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}";

6
pkgs/applications/networking/instant-messengers/mcabber/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mcabber-${version}"; name = "mcabber-${version}";
version = "1.0.2"; version = "1.0.3";
src = fetchurl { src = fetchurl {
url = "http://mcabber.com/files/mcabber-${version}.tar.bz2"; url = "http://mcabber.com/files/mcabber-${version}.tar.bz2";
sha256 = "1phzfsl6cfzaga140dm8bb8q678j0qsw29cc03rw4vkcxa8kh577"; sha256 = "16hkb7v1sqp1gqj94darwwrv23alqaiqdhqjq8gjd6f3l05bprj4";
}; };
buildInputs = [ openssl ncurses pkgconfig glib loudmouth libotr gpgme ]; buildInputs = [ openssl ncurses pkgconfig glib loudmouth libotr gpgme ];
@ -23,5 +23,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl2; license = licenses.gpl2;
maintainers = with maintainers; [ pSub ]; maintainers = with maintainers; [ pSub ];
platforms = with platforms; linux; platforms = with platforms; linux;
updateWalker = true;
downloadURLRegexp = "mcabber-[0-9.]+[.]tar[.][a-z0-9]+$";
}; };
} }

12
pkgs/applications/networking/irc/irssi/otr/default.nix
View File

@ -1,5 +1,11 @@
{ stdenv, fetchFromGitHub, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }: { stdenv, fetchurl, fetchFromGitHub, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }:
let
versionFix = fetchurl {
url = https://patch-diff.githubusercontent.com/raw/cryptodotis/irssi-otr/pull/60.patch;
sha256 = "18fk9nbzf3fvhvvvkrxv5l004hhimapqb6ra09m83268kbl4q3jy";
};
in
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "irssi-otr-${version}"; name = "irssi-otr-${version}";
@ -12,12 +18,14 @@ stdenv.mkDerivation rec {
sha256 = "1hm1whx1wzlx4fh4xf2y68rx9x6whi8bsbrhd6hqjhskg5msssrg"; sha256 = "1hm1whx1wzlx4fh4xf2y68rx9x6whi8bsbrhd6hqjhskg5msssrg";
}; };
patchPhase = '' prePatch = ''
sed -i 's,/usr/include/irssi,${irssi}/include/irssi,' src/Makefile.am sed -i 's,/usr/include/irssi,${irssi}/include/irssi,' src/Makefile.am
sed -i "s,/usr/lib/irssi,$out/lib/irssi," configure.ac sed -i "s,/usr/lib/irssi,$out/lib/irssi," configure.ac
sed -i "s,/usr/share/irssi,$out/share/irssi," help/Makefile.am sed -i "s,/usr/share/irssi,$out/share/irssi," help/Makefile.am
''; '';
patches = [ versionFix ];
preConfigure = "sh ./bootstrap"; preConfigure = "sh ./bootstrap";
buildInputs = [ libotr automake autoconf libtool glib pkgconfig irssi ]; buildInputs = [ libotr automake autoconf libtool glib pkgconfig irssi ];

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

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, go }: { stdenv, fetchFromGitHub, go }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.14.7"; version = "0.14.8";
name = "syncthing-${version}"; name = "syncthing-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "syncthing"; owner = "syncthing";
repo = "syncthing"; repo = "syncthing";
rev = "v${version}"; rev = "v${version}";
sha256 = "1mcn2vmv3hvp0ni9jxbjj3qp0l6ls07qmq33amhvjhpfafqzn279"; sha256 = "0zhxgl6pgf60x99cappdfzk7h23g37hlanh72bwypx7pwbvhc91l";
}; };
buildInputs = [ go ]; buildInputs = [ go ];

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;

2
pkgs/data/documentation/stdman/default.nix
View File

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
formatting for easy readability."; formatting for easy readability.";
homepage = https://github.com/jeaye/stdman; homepage = https://github.com/jeaye/stdman;
license = licenses.mit; license = licenses.mit;
platforms = platforms.linux; platforms = platforms.unix;
maintainers = [ maintainers.twey ]; maintainers = [ maintainers.twey ];
}; };
} }

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";

21
pkgs/development/compilers/pakcs/adjust-buildsystem.patch Normal file
View File

@ -0,0 +1,21 @@
diff -Naur pakcs-1.11.4-upstream/scripts/pakcs.sh pakcs-1.11.4/scripts/pakcs.sh
--- pakcs-1.11.4-upstream/scripts/pakcs.sh 2014-10-24 05:06:07.000000000 -0430
+++ pakcs-1.11.4/scripts/pakcs.sh 2015-01-05 16:26:15.697982791 -0430
@@ -16,7 +16,7 @@
# use readline wrapper rlwrap if it is installed and we have tty as stdin:
USERLWRAP=no
if tty -s ; then
- RLWRAP=`which rlwrap`
+ RLWRAP=`type -P rlwrap`
if [ -x "$RLWRAP" ] ; then
USERLWRAP=yes
fi
@@ -29,7 +29,7 @@
done
if [ $USERLWRAP = yes ] ; then
- exec rlwrap -c -f "$PAKCSHOME/tools/rlwrap" "$REPL" ${1+"$@"}
+ exec rlwrap -a -c -f "$PAKCSHOME/tools/rlwrap" "$REPL" ${1+"$@"}
else
exec "$REPL" ${1+"$@"}
fi

156
pkgs/development/compilers/pakcs/default.nix Normal file
View File

@ -0,0 +1,156 @@
{ stdenv, fetchurl, swiProlog, haskellPackages
, glibcLocales, makeWrapper, rlwrap, tk, which }:
let
fname = "pakcs-1.14.0";
fsrc = fetchurl {
url = "http://www.informatik.uni-kiel.de/~pakcs/download/${fname}-src.tar.gz";
sha256 = "1651ssh4ql79x8asd7kp4yis2n5rhn3lml4s26y03b0cgbfhs78s";
};
swiPrologLocked = stdenv.lib.overrideDerivation swiProlog (oldAttrs: rec {
version = "6.6.6";
name = "swi-prolog-${version}";
src = fetchurl {
url = "http://www.swi-prolog.org/download/stable/src/pl-${version}.tar.gz";
sha256 = "0vcrfskm2hyhv30lxr6v261myb815jc3bgmcn1lgsc9g9qkvp04z";
};
});
in
stdenv.mkDerivation rec {
name = fname;
curryBase = haskellPackages.callPackage (
{ mkDerivation, base, Cabal, containers, directory, either
, filepath, mtl, pretty, stdenv, syb, time
}:
mkDerivation {
pname = "curry-base";
version = "0.4.1";
src = fsrc;
libraryHaskellDepends = [
base containers directory either filepath mtl pretty syb time
];
testHaskellDepends = [ base Cabal filepath mtl ];
homepage = "http://curry-language.org";
description = "Functions for manipulating Curry programs";
license = "unknown";
postUnpack = ''
mv ${name} ${name}.orig
ln -s ${name}.orig/frontend/curry-base ${name}
'';
doCheck = false;
}
) {};
curryFront = haskellPackages.callPackage (
{ mkDerivation, base, Cabal, containers, directory
, filepath, mtl, network-uri, process, stdenv, syb, transformers
}:
mkDerivation {
pname = "curry-frontend";
version = "0.4.1";
src = fsrc;
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base containers curryBase directory filepath mtl network-uri
process syb transformers
];
executableHaskellDepends = [
base containers curryBase directory filepath mtl network-uri
process syb transformers
];
testHaskellDepends = [ base Cabal curryBase filepath ];
homepage = "http://curry-language.org";
description = "Compile the functional logic language Curry to several intermediate formats";
license = "unknown";
postUnpack = ''
mv ${name} ${name}.orig
ln -s ${name}.orig/frontend/curry-frontend ${name}
'';
doCheck = false;
}
) {};
src = fsrc;
buildInputs = [ swiPrologLocked makeWrapper glibcLocales rlwrap tk which ];
patches = [ ./adjust-buildsystem.patch ];
configurePhase = ''
# Phony HOME.
mkdir phony-home
export HOME=$(pwd)/phony-home
# SWI Prolog
sed -i 's@SWIPROLOG=@SWIPROLOG='${swiPrologLocked}/bin/swipl'@' scripts/pakcsinitrc.sh
'';
buildPhase = ''
# Some comments in files are in UTF-8, so include the locale needed by GHC runtime.
export LC_ALL=en_US.UTF-8
# PAKCS must be build in place due to embedded filesystem references placed by swi.
# Prepare PAKCSHOME directory.
mkdir -p $out/pakcs/bin
# Set up link to cymake, which has been built already.
ln -s ${curryFront}/bin/cymake $out/pakcs/bin/
rm -r frontend
# Prevent embedding the derivation build directory as temp.
export TEMP=/tmp
# Copy to in place build location and run the build.
cp -r * $out/pakcs
(cd $out/pakcs ; make)
'';
installPhase = ''
# Install bin.
mkdir -p $out/bin
for b in $(ls $out/pakcs/bin) ; do
ln -s $out/pakcs/bin/$b $out/bin/ ;
done
# Place emacs lisp files in expected locations.
mkdir -p $out/share/emacs/site-lisp/curry-pakcs
for e in "$out/pakcs/tools/emacs/"*.el ; do
cp $e $out/share/emacs/site-lisp/curry-pakcs/ ;
done
# Wrap for rlwrap and tk support.
wrapProgram $out/pakcs/bin/pakcs \
--prefix PATH ":" "${rlwrap}/bin" \
--prefix PATH ":" "${tk}/bin" \
'';
meta = {
homepage = "http://www.informatik.uni-kiel.de/~pakcs/";
description = "An implementation of the multi-paradigm declarative language Curry";
license = stdenv.lib.licenses.bsd3;
longDescription = ''
PAKCS is an implementation of the multi-paradigm declarative language
Curry jointly developed by the Portland State University, the Aachen
University of Technology, and the University of Kiel. Although this is
not a highly optimized implementation but based on a high-level
compilation of Curry programs into Prolog programs, it is not a toy
implementation but has been used for a variety of applications (e.g.,
graphical programming environments, an object-oriented front-end for
Curry, partial evaluators, database applications, HTML programming
with dynamic web pages, prototyping embedded systems).
'';
maintainers = [ stdenv.lib.maintainers.gnidorah ];
platforms = stdenv.lib.platforms.linux;
};
}

7
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -275,6 +275,7 @@ self: super: {
xmlgen = dontCheck super.xmlgen; xmlgen = dontCheck super.xmlgen;
hapistrano = dontCheck super.hapistrano; hapistrano = dontCheck super.hapistrano;
HerbiePlugin = dontCheck super.HerbiePlugin; HerbiePlugin = dontCheck super.HerbiePlugin;
wai-cors = dontCheck super.wai-cors;
# These packages try to access the network. # These packages try to access the network.
amqp = dontCheck super.amqp; amqp = dontCheck super.amqp;
@ -1019,4 +1020,10 @@ self: super: {
# https://github.com/fpco/store/issues/77 # https://github.com/fpco/store/issues/77
store = dontCheck super.store; store = dontCheck super.store;
# https://github.com/bmillwood/applicative-quoters/issues/6
applicative-quoters = doJailbreak super.applicative-quoters;
# https://github.com/vshabanov/HsOpenSSL/issues/11
HsOpenSSL = doJailbreak super.HsOpenSSL;
} }

6
pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
View File

@ -179,9 +179,6 @@ self: super: {
vector-algorithms = addBuildDepends (dontCheck super.vector-algorithms) vector-algorithms = addBuildDepends (dontCheck super.vector-algorithms)
[ self.mtl self.mwc-random ]; [ self.mtl self.mwc-random ];
# Trigger rebuild to mitigate broken packaes on Hydra.
amazonka-core = triggerRebuild super.amazonka-core 1;
# https://github.com/thoughtpolice/hs-ed25519/issues/13 # https://github.com/thoughtpolice/hs-ed25519/issues/13
ed25519 = dontCheck super.ed25519; ed25519 = dontCheck super.ed25519;
@ -190,6 +187,7 @@ self: super: {
hackage-security = dontHaddock (dontCheck super.hackage-security); hackage-security = dontHaddock (dontCheck super.hackage-security);
# GHC versions prior to 8.x require additional build inputs. # GHC versions prior to 8.x require additional build inputs.
attoparsec = addBuildDepends super.attoparsec (with self; [semigroups fail]);
Glob = addBuildDepends super.Glob (with self; [semigroups]); Glob = addBuildDepends super.Glob (with self; [semigroups]);
Glob_0_7_10 = addBuildDepends super.Glob_0_7_10 (with self; [semigroups]); Glob_0_7_10 = addBuildDepends super.Glob_0_7_10 (with self; [semigroups]);
aeson = disableCabalFlag (addBuildDepend super.aeson self.semigroups) "old-locale"; aeson = disableCabalFlag (addBuildDepend super.aeson self.semigroups) "old-locale";
@ -212,6 +210,6 @@ self: super: {
# Moved out from common as no longer the case for GHC8 # Moved out from common as no longer the case for GHC8
ghc-mod = super.ghc-mod.override { cabal-helper = self.cabal-helper_0_6_3_1; }; ghc-mod = super.ghc-mod.override { cabal-helper = self.cabal-helper_0_6_3_1; };
generic-deriving = self.generic-deriving_1_10_5;
} }

11
pkgs/development/haskell-modules/default.nix
View File

@ -6,11 +6,12 @@
let let
allCabalFiles = pkgs.fetchFromGitHub { allCabalFiles = stdenv.mkDerivation {
owner = "commercialhaskell"; name = "all-cabal-hashes-0";
repo = "all-cabal-hashes"; buildCommand = ''
rev = "72f1318540eff69544eb8c14a16f630d0c5448b8"; mkdir -p $out
sha256 = "1czi1rajk2726mqrw3qp7a43h26acbjw54ll3ns063yzg9hg469m"; tar -C $out --strip-components=1 -x -f ${builtins.fetchurl "https://github.com/commercialhaskell/all-cabal-hashes/archive/hackage.tar.gz"}
'';
}; };
inherit (stdenv.lib) fix' extends; inherit (stdenv.lib) fix' extends;

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 = {

27
pkgs/development/libraries/accountsservice/Add-nixbld-to-user-blacklist.patch
View File

@ -1,27 +0,0 @@
From e069102365a9ff03822667f435e662f938e8d768 Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Wed, 1 Jun 2016 12:49:48 +0200
Subject: [PATCH] Add nixbld* to user blacklist
---
src/user-classify.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/user-classify.c b/src/user-classify.c
index 69e6809..0e152b6 100644
--- a/src/user-classify.c
+++ b/src/user-classify.c
@@ -75,6 +75,10 @@ user_classify_is_blacklisted (const char *username)
return TRUE;
}
+ if (g_str_has_prefix (username, "nixbld")) {
+ return TRUE;
+ }
+
return FALSE;
}
--
2.7.4

5
pkgs/development/libraries/accountsservice/default.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "accountsservice-${version}"; name = "accountsservice-${version}";
version = "0.6.42"; version = "0.6.43";
src = fetchurl { src = fetchurl {
url = "http://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz"; url = "http://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz";
sha256 = "0zh0kjpdc631qh36plcgpwvnmh9wj8l5cki3aw5r09w6y7198r75"; sha256 = "1k6n9079001sgcwlkq0bz6mkn4m8y4dwf6hs1qm85swcld5ajfzd";
}; };
buildInputs = [ pkgconfig glib intltool libtool makeWrapper buildInputs = [ pkgconfig glib intltool libtool makeWrapper
@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
patches = [ patches = [
./no-create-dirs.patch ./no-create-dirs.patch
./Add-nixbld-to-user-blacklist.patch
./Disable-methods-that-change-files-in-etc.patch ./Disable-methods-that-change-files-in-etc.patch
]; ];

4
pkgs/development/libraries/c-ares/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl }: { stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "c-ares-1.10.0"; name = "c-ares-1.12.0";
src = fetchurl { src = fetchurl {
url = "http://c-ares.haxx.se/download/${name}.tar.gz"; url = "http://c-ares.haxx.se/download/${name}.tar.gz";
sha256 = "1nyka87yf2jfd0y6sspll0yxwb8zi7kyvajrdbjmh4axc5s1cw1x"; sha256 = "1yv5ygkd813glz8hbagykgp1hlb6450chig061hr7pyw7i0gk4l6";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

32
pkgs/development/libraries/jasper/default.nix
View File

@ -1,37 +1,17 @@
{ stdenv, fetchurl, fetchpatch, unzip, libjpeg, autoreconfHook }: { stdenv, fetchurl, fetchpatch, libjpeg, autoreconfHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "jasper-1.900.1"; name = "jasper-1.900.2";
src = fetchurl { src = fetchurl {
url = "http://www.ece.uvic.ca/~mdadams/jasper/software/${name}.zip"; url = "http://www.ece.uvic.ca/~mdadams/jasper/software/${name}.tar.gz";
sha256 = "154l7zk7yh3v8l2l6zm5s2alvd2fzkp6c9i18iajfbna5af5m43b"; sha256 = "0bkibjhq3js2ldxa2f9pss84lcx4f5d3v0qis3ifi11ciy7a6c9a";
}; };
patches = [ patches = [
./jasper-CVE-2016-1867.diff
./jasper-CVE-2014-8137-variant2.diff ./jasper-CVE-2014-8137-variant2.diff
./jasper-CVE-2014-8137-noabort.diff ./jasper-CVE-2014-8137-noabort.diff
./jasper-CVE-2014-8138.diff
./jasper-CVE-2014-8157.diff
./jasper-CVE-2014-8158.diff
./jasper-CVE-2014-9029.diff
(fetchpatch { # CVE-2016-2116
url = "https://github.com/mdadams/jasper/commit/142245b9bbb33274a7c620aa7a8f85bc00b2d68e.patch";
sha256 = "06dkplqfb3swmdfqb9i2m6r13q0ivn538xfvinxz0agandxyc9yr";
})
(fetchpatch { # CVE-2016-1577
url = "https://github.com/mdadams/jasper/commit/74ea22a7a4fe186e0a0124df25e19739b77c4a29.patch";
sha256 = "1xgvhfhv8r77z0a07ick2w3217mypnkaqjwzxbk1g1ym8lsy5r13";
})
(fetchpatch { # CVE-2015-5221
url = "https://github.com/mdadams/jasper/commit/df5d2867e8004e51e18b89865bc4aa69229227b3.patch";
sha256 = "0qsiymm59dkj843dbi43ijqdyy3rrzf193ndm9ynj3cfhqghi10l";
})
(fetchpatch { # CVE-2008-3522
url = "https://github.com/mdadams/jasper/commit/d678ccd27b8a062e3bfd4c80d8ce2676a8166a27.patch";
sha256 = "0dapf8h4s3zijbgd8vmap3blpnc78h7jqm5ydv8j0krrs5dv5672";
})
(fetchpatch { # CVE-2016-2089 (fetchpatch { # CVE-2016-2089
url = "https://github.com/mdadams/jasper/commit/aa6d9c2bbae9155f8e1466295373a68fa97291c3.patch"; url = "https://github.com/mdadams/jasper/commit/aa6d9c2bbae9155f8e1466295373a68fa97291c3.patch";
sha256 = "1pxnm86zmbq6brfwsm5wx3iv7s92n4xilc52lzp61q266jmlggrf"; sha256 = "1pxnm86zmbq6brfwsm5wx3iv7s92n4xilc52lzp61q266jmlggrf";
@ -43,7 +23,7 @@ stdenv.mkDerivation rec {
]; ];
# newer reconf to recognize a multiout flag # newer reconf to recognize a multiout flag
nativeBuildInputs = [ unzip autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];
propagatedBuildInputs = [ libjpeg ]; propagatedBuildInputs = [ libjpeg ];
configureFlags = "--enable-shared"; configureFlags = "--enable-shared";

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 = [

17
pkgs/development/libraries/loudmouth/default.nix
View File

@ -1,21 +1,15 @@
{ stdenv, fetchurl, openssl, libidn, glib, pkgconfig, zlib }: { stdenv, fetchurl, openssl, libidn, glib, pkgconfig, zlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "loudmouth-1.4.3"; version = "1.5.3";
name = "loudmouth-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/loudmouth/1.4/${name}.tar.bz2"; url = "http://mcabber.com/files/loudmouth/${name}.tar.bz2";
sha256 = "1qr9z73i33y49pbpq6zy7q537g0iyc8sm56rjf0ylwcv01fkzacm"; sha256 = "0b6kd5gpndl9nzis3n6hcl0ldz74bnbiypqgqa1vgb0vrcar8cjl";
}; };
patches = [ patches = [
./glib-2.32.patch
(fetchurl rec {
name = "01-fix-sasl-md5-digest-uri.patch";
url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/"
+ "${name}?h=packages/loudmouth";
sha256 = "0y79vbklscgp8248iirllwmgk4q0wwyl3gmxz7l9frc2384xvanm";
})
]; ];
configureFlags = "--with-ssl=openssl"; configureFlags = "--with-ssl=openssl";
@ -27,5 +21,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "A lightweight C library for the Jabber protocol"; description = "A lightweight C library for the Jabber protocol";
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
downloadPage = "http://mcabber.com/files/loudmouth/";
downloadURLRegexp = "loudmouth-[0-9.]+[.]tar[.]bz2$";
updateWalker = true;
}; };
} }

6
pkgs/development/libraries/openjpeg/2.1.nix
View File

@ -1,8 +1,8 @@
{ callPackage, ... } @ args: { callPackage, ... } @ args:
callPackage ./generic.nix (args // rec { callPackage ./generic.nix (args // rec {
version = "2.1.1"; version = "2.1.2";
branch = "2.1"; branch = "2.1";
revision = "v2.1.1"; revision = "v2.1.2";
sha256 = "1hrn10byrlw7hb7hwv2zvff89rxy3bsbn0im5ki4kdk63jw5p601"; sha256 = "0kdcl9sqjz0vagli4ad6bxq1r8ma086m0prpkm5x3dxp37hpjp8h";
}) })

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 {

Some files were not shown because too many files have changed in this diff Show More