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

Merge master into staging-next

This commit is contained in:
Frederik Rietdijk 2019-02-18 14:18:04 +01:00
parent 97c05bda52 107215c1d0
commit 815b77cbe6
118 changed files with 9944 additions and 3179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/functions.xml
View File

@ -17,4 +17,5 @@
<xi:include href="functions/shell.xml" />
<xi:include href="functions/dockertools.xml" />
<xi:include href="functions/prefer-remote-fetch.xml" />
<xi:include href="functions/nix-gitignore.xml" />
</chapter>

78
doc/functions/nix-gitignore.xml Normal file
View File

@ -0,0 +1,78 @@
<section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
xml:id="sec-pkgs-nix-gitignore">
<title>pkgs.nix-gitignore</title>
<para>
<function>pkgs.nix-gitignore</function> is a function that acts similarly to
<literal>builtins.filterSource</literal> but also allows filtering with the
help of the gitignore format.
</para>
<section xml:id="sec-pkgs-nix-gitignore-usage">
<title>Usage</title>
<para>
<literal>pkgs.nix-gitignore</literal> exports a number of functions, but
you'll most likely need either <literal>gitignoreSource</literal> or
<literal>gitignoreSourcePure</literal>. As their first argument, they both
accept either 1. a file with gitignore lines or 2. a string
with gitignore lines, or 3. a list of either of the two. They will be
concatenated into a single big string.
</para>
<programlisting><![CDATA[
{ pkgs ? import <nixpkgs> {} }:
nix-gitignore.gitignoreSource [] ./source
# Simplest version
nix-gitignore.gitignoreSource "supplemental-ignores\n" ./source
# This one reads the ./source/.gitignore and concats the auxiliary ignores
nix-gitignore.gitignoreSourcePure "ignore-this\nignore-that\n" ./source
# Use this string as gitignore, don't read ./source/.gitignore.
nix-gitignore.gitignoreSourcePure ["ignore-this\nignore-that\n", ~/.gitignore] ./source
# It also accepts a list (of strings and paths) that will be concatenated
# once the paths are turned to strings via readFile.
]]></programlisting>
<para>
These functions are derived from the <literal>Filter</literal> functions
by setting the first filter argument to <literal>(_: _: true)</literal>:
</para>
<programlisting><![CDATA[
gitignoreSourcePure = gitignoreFilterSourcePure (_: _: true);
gitignoreSource = gitignoreFilterSource (_: _: true);
]]></programlisting>
<para>
Those filter functions accept the same arguments the <literal>builtins.filterSource</literal> function would pass to its filters, thus <literal>fn: gitignoreFilterSourcePure fn ""</literal> should be extensionally equivalent to <literal>filterSource</literal>. The file is blacklisted iff it's blacklisted by either your filter or the gitignoreFilter.
</para>
<para>
If you want to make your own filter from scratch, you may use
</para>
<programlisting><![CDATA[
gitignoreFilter = ign: root: filterPattern (gitignoreToPatterns ign) root;
]]></programlisting>
</section>
<section xml:id="sec-pkgs-nix-gitignore-usage-recursive">
<title>gitignore files in subdirectories</title>
<para>
If you wish to use a filter that would search for .gitignore files in subdirectories, just like git does by default, use this function:
</para>
<programlisting><![CDATA[
gitignoreFilterRecursiveSource = filter: patterns: root:
# OR
gitignoreRecursiveSource = gitignoreFilterSourcePure (_: _: true);
]]></programlisting>
</section>
</section>

29
maintainers/maintainer-list.nix
View File

@ -401,6 +401,15 @@
github = "shados";
name = "Alexei Robyn";
};
artemist = {
email = "me@artem.ist";
github = "artemist";
name = "Artemis Tosini";
keys = [{
longkeyid = "rsa4096/0x4FDC96F161E7BA8A";
fingerprint = "3D2B B230 F9FA F0C5 1832 46DD 4FDC 96F1 61E7 BA8A";
}];
};
artuuge = {
email = "artuuge@gmail.com";
github = "artuuge";
@ -2935,6 +2944,11 @@
email = "code@klandest.in";
github = "mguentner";
name = "Maximilian Güntner";
};
mhaselsteiner = {
email = "magdalena.haselsteiner@gmx.at";
github = "mhaselsteiner";
name = "Magdalena Haselsteiner";
};
mic92 = {
email = "joerg@thalheim.io";
@ -3333,6 +3347,11 @@
github = "np";
name = "Nicolas Pouillard";
};
nphilou = {
email = "nphilou@gmail.com";
github = "nphilou";
name = "Philippe Nguyen";
};
nslqqq = {
email = "nslqqq@gmail.com";
name = "Nikita Mikhailov";
@ -3808,6 +3827,11 @@
github = "rbasso";
name = "Rafael Basso";
};
rbrewer = {
email = "rwb123@gmail.com";
github = "rbrewer123";
name = "Rob Brewer";
};
rdnetto = {
email = "rdnetto@gmail.com";
github = "rdnetto";
@ -3843,6 +3867,11 @@
github = "relrod";
name = "Ricky Elrod";
};
rembo10 = {
email = "rembo10@users.noreply.github.com";
github = "rembo10";
name = "rembo10";
};
renatoGarcia = {
email = "fgarcia.renato@gmail.com";
github = "renatoGarcia";

4
nixos/modules/misc/ids.nix
View File

@ -290,7 +290,7 @@
riak-cs = 263;
infinoted = 264;
sickbeard = 265;
# glance = 266; # unused, removed 2017-12-13
headphones = 266;
couchpotato = 267;
gogs = 268;
pdns-recursor = 269;
@ -590,7 +590,7 @@
riak-cs = 263;
infinoted = 264;
sickbeard = 265;
# glance = 266; # unused, removed 2017-12-13
headphones = 266;
couchpotato = 267;
gogs = 268;
kresd = 270;

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

@ -383,6 +383,7 @@
./services/misc/gogs.nix
./services/misc/gollum.nix
./services/misc/gpsd.nix
./services/misc/headphones.nix
./services/misc/home-assistant.nix
./services/misc/ihaskell.nix
./services/misc/irkerd.nix
@ -719,6 +720,8 @@
./services/web-apps/atlassian/jira.nix
./services/web-apps/codimd.nix
./services/web-apps/frab.nix
./services/web-apps/icingaweb2/icingaweb2.nix
./services/web-apps/icingaweb2/module-monitoring.nix
./services/web-apps/mattermost.nix
./services/web-apps/nextcloud.nix
./services/web-apps/nexus.nix

21
nixos/modules/programs/singularity.nix
View File

@ -3,18 +3,27 @@
with lib;
let
cfg = config.programs.singularity;
singularity = pkgs.singularity.overrideAttrs (attrs : {
installPhase = attrs.installPhase + ''
mv $bin/libexec/singularity/bin/starter-suid $bin/libexec/singularity/bin/starter-suid.orig
ln -s /run/wrappers/bin/singularity-suid $bin/libexec/singularity/bin/starter-suid
'';
});
in {
options.programs.singularity = {
enable = mkEnableOption "Singularity";
};
config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.singularity ];
systemd.tmpfiles.rules = [ "d /var/singularity/mnt/session 0770 root root -"
"d /var/singularity/mnt/final 0770 root root -"
"d /var/singularity/mnt/overlay 0770 root root -"
"d /var/singularity/mnt/container 0770 root root -"
"d /var/singularity/mnt/source 0770 root root -"];
environment.systemPackages = [ singularity ];
security.wrappers.singularity-suid.source = "${singularity}/libexec/singularity/bin/starter-suid.orig";
systemd.tmpfiles.rules = [
"d /var/singularity/mnt/session 0770 root root -"
"d /var/singularity/mnt/final 0770 root root -"
"d /var/singularity/mnt/overlay 0770 root root -"
"d /var/singularity/mnt/container 0770 root root -"
"d /var/singularity/mnt/source 0770 root root -"
];
};
}

87
nixos/modules/services/misc/headphones.nix Normal file
View File

@ -0,0 +1,87 @@
{ config, lib, pkgs, ... }:
with lib;
let
name = "headphones";
cfg = config.services.headphones;
in
{
###### interface
options = {
services.headphones = {
enable = mkOption {
type = types.bool;
default = false;
description = "Whether to enable the headphones server.";
};
dataDir = mkOption {
type = types.path;
default = "/var/lib/${name}";
description = "Path where to store data files.";
};
configFile = mkOption {
type = types.path;
default = "${cfg.dataDir}/config.ini";
description = "Path to config file.";
};
host = mkOption {
type = types.str;
default = "localhost";
description = "Host to listen on.";
};
port = mkOption {
type = types.ints.u16;
default = 8181;
description = "Port to bind to.";
};
user = mkOption {
type = types.str;
default = name;
description = "User to run the service as";
};
group = mkOption {
type = types.str;
default = name;
description = "Group to run the service as";
};
};
};
###### implementation
config = mkIf cfg.enable {
users.users = optionalAttrs (cfg.user == name) (singleton {
name = name;
uid = config.ids.uids.headphones;
group = cfg.group;
description = "headphones user";
home = cfg.dataDir;
createHome = true;
});
users.groups = optionalAttrs (cfg.group == name) (singleton {
name = name;
gid = config.ids.gids.headphones;
});
systemd.services.headphones = {
description = "Headphones Server";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
serviceConfig = {
User = cfg.user;
Group = cfg.group;
ExecStart = "${pkgs.headphones}/bin/headphones --datadir ${cfg.dataDir} --config ${cfg.configFile} --host ${cfg.host} --port ${toString cfg.port}";
};
};
};
}

1
nixos/modules/services/network-filesystems/diod.nix
View File

@ -153,7 +153,6 @@ in
after = [ "network.target" ];
serviceConfig = {
ExecStart = "${pkgs.diod}/sbin/diod -f -c ${diodConfig}";
CapabilityBoundingSet = "cap_net_bind_service+=ep";
};
};
};

28
nixos/modules/services/networking/quassel.nix
View File

@ -23,6 +23,22 @@ in
'';
};
certificateFile = mkOption {
type = types.nullOr types.str;
default = null;
description = ''
Path to the certificate used for SSL connections with clients.
'';
};
requireSSL = mkOption {
type = types.bool;
default = false;
description = ''
Require SSL for connections from clients.
'';
};
package = mkOption {
type = types.package;
default = pkgs.quasselDaemon;
@ -71,6 +87,10 @@ in
###### implementation
config = mkIf cfg.enable {
assertions = [
{ assertion = cfg.requireSSL -> cfg.certificateFile != null;
message = "Quassel needs a certificate file in order to require SSL";
}];
users.users = mkIf (cfg.user == null) [
{ name = "quassel";
@ -98,7 +118,13 @@ in
serviceConfig =
{
ExecStart = "${quassel}/bin/quasselcore --listen=${concatStringsSep '','' cfg.interfaces} --port=${toString cfg.portNumber} --configdir=${cfg.dataDir}";
ExecStart = concatStringsSep " " ([
"${quassel}/bin/quasselcore"
"--listen=${concatStringsSep "," cfg.interfaces}"
"--port=${toString cfg.portNumber}"
"--configdir=${cfg.dataDir}"
] ++ optional cfg.requireSSL "--require-ssl"
++ optional (cfg.certificateFile != null) "--ssl-cert=${cfg.certificateFile}");
User = user;
PermissionsStartOnly = true;
};

626
nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix Normal file
View File

@ -0,0 +1,626 @@
{ config, lib, pkgs, ... }: with lib; let
cfg = config.services.icingaweb2;
poolName = "icingaweb2";
phpfpmSocketName = "/var/run/phpfpm/${poolName}.sock";
formatBool = b: if b then "1" else "0";
configIni = let
config = cfg.generalConfig;
in ''
[global]
show_stacktraces = "${formatBool config.showStacktraces}"
show_application_state_messages = "${formatBool config.showApplicationStateMessages}"
module_path = "${pkgs.icingaweb2}/modules${optionalString (builtins.length config.modulePath > 0) ":${concatStringsSep ":" config.modulePath}"}"
config_backend = "${config.configBackend}"
${optionalString (config.configBackend == "db") ''config_resource = "${config.configResource}"''}
[logging]
log = "${config.log}"
${optionalString (config.log != "none") ''level = "${config.logLevel}"''}
${optionalString (config.log == "php" || config.log == "syslog") ''application = "${config.logApplication}"''}
${optionalString (config.log == "syslog") ''facility = "${config.logFacility}"''}
${optionalString (config.log == "file") ''file = "${config.logFile}"''}
[themes]
default = "${config.themeDefault}"
disabled = "${formatBool config.themeDisabled}"
[authentication]
${optionalString (config.authDefaultDomain != null) ''default_domain = "${config.authDefaultDomain}"''}
'';
resourcesIni = concatStringsSep "\n" (mapAttrsToList (name: config: ''
[${name}]
type = "${config.type}"
${optionalString (config.type == "db") ''
db = "${config.db}"
host = "${config.host}"
${optionalString (config.port != null) ''port = "${toString config.port}"''}
username = "${config.username}"
password = "${config.password}"
dbname = "${config.dbname}"
${optionalString (config.charset != null) ''charset = "${config.charset}"''}
use_ssl = "${formatBool config.useSSL}"
${optionalString (config.sslCert != null) ''ssl_cert = "${config.sslCert}"''}
${optionalString (config.sslKey != null) ''ssl_cert = "${config.sslKey}"''}
${optionalString (config.sslCA != null) ''ssl_cert = "${config.sslCA}"''}
${optionalString (config.sslCApath != null) ''ssl_cert = "${config.sslCApath}"''}
${optionalString (config.sslCipher != null) ''ssl_cert = "${config.sslCipher}"''}
''}
${optionalString (config.type == "ldap") ''
hostname = "${config.host}"
${optionalString (config.port != null) ''port = "${toString config.port}"''}
root_dn = "${config.rootDN}"
bind_dn = "${config.username}"
bind_pw = "${config.password}"
encryption = "${config.ldapEncryption}"
timeout = "${toString config.ldapTimeout}"
''}
${optionalString (config.type == "ssh") ''
user = "${config.username}"
private_key = "${config.sshPrivateKey}"
''}
'') cfg.resources);
authenticationIni = concatStringsSep "\n" (mapAttrsToList (name: config: ''
[${name}]
backend = "${config.backend}"
${optionalString (config.domain != null) ''domain = "${config.domain}"''}
${optionalString (config.backend == "external" && config.externalStripRegex != null) ''strip_username_regexp = "${config.externalStripRegex}"''}
${optionalString (config.backend != "external") ''resource = "${config.resource}"''}
${optionalString (config.backend == "ldap" || config.backend == "msldap") ''
${optionalString (config.ldapUserClass != null) ''user_class = "${config.ldapUserClass}"''}
${optionalString (config.ldapUserNameAttr != null) ''user_name_attribute = "${config.ldapUserNameAttr}"''}
${optionalString (config.ldapFilter != null) ''filter = "${config.ldapFilter}"''}
''}
'') cfg.authentications);
groupsIni = concatStringsSep "\n" (mapAttrsToList (name: config: ''
[${name}]
backend = "${config.backend}"
resource = "${config.resource}"
${optionalString (config.backend != "db") ''
${optionalString (config.ldapUserClass != null) ''user_class = "${config.ldapUserClass}"''}
${optionalString (config.ldapUserNameAttr != null) ''user_name_attribute = "${config.ldapUserNameAttr}"''}
${optionalString (config.ldapGroupClass != null) ''group_class = "${config.ldapGroupClass}"''}
${optionalString (config.ldapGroupNameAttr != null) ''group_name_attribute = "${config.ldapGroupNameAttr}"''}
${optionalString (config.ldapGroupFilter != null) ''group_filter = "${config.ldapGroupFilter}"''}
''}
${optionalString (config.backend == "msldap" && config.ldapNestedSearch) ''nested_group_search = "1"''}
'') cfg.groupBackends);
rolesIni = let
optionalList = var: attribute: optionalString (builtins.length var > 0) ''${attribute} = "${concatStringsSep "," var}"'';
in concatStringsSep "\n" (mapAttrsToList (name: config: ''
[${name}]
${optionalList config.users "users"}
${optionalList config.groups "groups"}
${optionalList config.permissions "permissions"}
${optionalList config.permissions "permissions"}
${concatStringsSep "\n" (mapAttrsToList (key: value: optionalList value key) config.extraAssignments)}
'') cfg.roles);
in {
options.services.icingaweb2 = with types; {
enable = mkEnableOption "the icingaweb2 web interface";
pool = mkOption {
type = str;
default = "${poolName}";
description = ''
Name of existing PHP-FPM pool that is used to run Icingaweb2.
If not specified, a pool will automatically created with default values.
'';
};
virtualHost = mkOption {
type = nullOr str;
default = "icingaweb2";
description = ''
Name of the nginx virtualhost to use and setup. If null, no virtualhost is set up.
'';
};
timezone = mkOption {
type = str;
default = "UTC";
example = "Europe/Berlin";
description = "PHP-compliant timezone specification";
};
modules = {
doc.enable = mkEnableOption "the icingaweb2 doc module";
migrate.enable = mkEnableOption "the icingaweb2 migrate module";
setup.enable = mkEnableOption "the icingaweb2 setup module";
test.enable = mkEnableOption "the icingaweb2 test module";
translation.enable = mkEnableOption "the icingaweb2 translation module";
};
modulePackages = mkOption {
type = attrsOf package;
default = {};
example = literalExample ''
{
"snow" = pkgs.icingaweb2Modules.theme-snow;
}
'';
description = ''
Name-package attrset of Icingaweb 2 modules packages to enable.
If you enable modules manually (e.g. via the web ui), they will not be touched.
'';
};
generalConfig = {
mutable = mkOption {
type = bool;
default = false;
description = ''
Make config.ini mutable (e.g. via the web interface).
Not that you need to update module_path manually.
'';
};
showStacktraces = mkOption {
type = bool;
default = true;
description = "Enable stack traces in the Web UI";
};
showApplicationStateMessages = mkOption {
type = bool;
default = true;
description = "Enable application state messages in the Web UI";
};
modulePath = mkOption {
type = listOf str;
default = [];
description = "List of additional module search paths";
};
configBackend = mkOption {
type = enum [ "ini" "db" "none" ];
default = "db";
description = "Where to store user preferences";
};
configResource = mkOption {
type = nullOr str;
default = null;
description = "Database resource where user preferences are stored (if they are stored in a database)";
};
log = mkOption {
type = enum [ "syslog" "php" "file" "none" ];
default = "syslog";
description = "Logging target";
};
logLevel = mkOption {
type = enum [ "ERROR" "WARNING" "INFO" "DEBUG" ];
default = "ERROR";
description = "Maximum logging level to emit";
};
logApplication = mkOption {
type = str;
default = "icingaweb2";
description = "Application name to log under (syslog and php log)";
};
logFacility = mkOption {
type = enum [ "user" "local0" "local1" "local2" "local3" "local4" "local5" "local6" "local7" ];
default = "user";
description = "Syslog facility to log to";
};
logFile = mkOption {
type = str;
default = "/var/log/icingaweb2/icingaweb2.log";
description = "File to log to";
};
themeDefault = mkOption {
type = str;
default = "Icinga";
description = "Name of the default theme";
};
themeDisabled = mkOption {
type = bool;
default = false;
description = "Disallow users to change the theme";
};
authDefaultDomain = mkOption {
type = nullOr str;
default = null;
description = "Domain for users logging in without a qualified domain";
};
};
mutableResources = mkOption {
type = bool;
default = false;
description = "Make resources.ini mutable (e.g. via the web interface)";
};
resources = mkOption {
default = {};
description = "Icingaweb 2 resources to define";
type = attrsOf (submodule ({ name, ... }: {
options = {
name = mkOption {
visible = false;
default = name;
type = str;
description = "Name of this resource";
};
type = mkOption {
type = enum [ "db" "ldap" "ssh" ];
default = "db";
description = "Type of this resouce";
};
db = mkOption {
type = enum [ "mysql" "pgsql" ];
default = "mysql";
description = "Type of this database resource";
};
host = mkOption {
type = str;
description = "Host to connect to";
};
port = mkOption {
type = nullOr port;
default = null;
description = "Port to connect on";
};
username = mkOption {
type = str;
description = "Database or SSH user or LDAP bind DN to connect with";
};
password = mkOption {
type = str;
description = "Password for the database user or LDAP bind DN";
};
dbname = mkOption {
type = str;
description = "Name of the database to connect to";
};
charset = mkOption {
type = nullOr str;
default = null;
example = "utf8";
description = "Database character set to connect with";
};
useSSL = mkOption {
type = nullOr bool;
default = false;
description = "Whether to connect to the database using SSL";
};
sslCert = mkOption {
type = nullOr str;
default = null;
description = "The file path to the SSL certificate. Only available for the mysql database.";
};
sslKey = mkOption {
type = nullOr str;
default = null;
description = "The file path to the SSL key. Only available for the mysql database.";
};
sslCA = mkOption {
type = nullOr str;
default = null;
description = "The file path to the SSL certificate authority. Only available for the mysql database.";
};
sslCApath = mkOption {
type = nullOr str;
default = null;
description = "The file path to the directory that contains the trusted SSL CA certificates in PEM format. Only available for the mysql database.";
};
sslCipher = mkOption {
type = nullOr str;
default = null;
description = "A list of one or more permissible ciphers to use for SSL encryption, in a format understood by OpenSSL. Only available for the mysql database.";
};
rootDN = mkOption {
type = str;
description = "Root object of the LDAP tree";
};
ldapEncryption = mkOption {
type = enum [ "none" "starttls" "ldaps" ];
default = "none";
description = "LDAP encryption to use";
};
ldapTimeout = mkOption {
type = ints.positive;
default = 5;
description = "Connection timeout for every LDAP connection";
};
sshPrivateKey = mkOption {
type = str;
description = "The path to the private key of the user";
};
};
}));
};
mutableAuthConfig = mkOption {
type = bool;
default = true;
description = "Make authentication.ini mutable (e.g. via the web interface)";
};
authentications = mkOption {
default = {};
description = "Icingaweb 2 authentications to define";
type = attrsOf (submodule ({ name, ... }: {
options = {
name = mkOption {
visible = false;
default = name;
type = str;
description = "Name of this authentication";
};
backend = mkOption {
type = enum [ "external" "ldap" "msldap" "db" ];
default = "db";
description = "The type of this authentication backend";
};
domain = mkOption {
type = nullOr str;
default = null;
description = "Domain for domain-aware authentication";
};
externalStripRegex = mkOption {
type = nullOr str;
default = null;
description = "Regular expression to strip off specific user name parts";
};
resource = mkOption {
type = str;
description = "Name of the database/LDAP resource";
};
ldapUserClass = mkOption {
type = nullOr str;
default = null;
description = "LDAP user class";
};
ldapUserNameAttr = mkOption {
type = nullOr str;
default = null;
description = "LDAP attribute which contains the username";
};
ldapFilter = mkOption {
type = nullOr str;
default = null;
description = "LDAP search filter";
};
};
}));
};
mutableGroupsConfig = mkOption {
type = bool;
default = true;
description = "Make groups.ini mutable (e.g. via the web interface)";
};
groupBackends = mkOption {
default = {};
description = "Icingaweb 2 group backends to define";
type = attrsOf (submodule ({ name, ... }: {
options = {
name = mkOption {
visible = false;
default = name;
type = str;
description = "Name of this group backend";
};
backend = mkOption {
type = enum [ "ldap" "msldap" "db" ];
default = "db";
description = "The type of this group backend";
};
resource = mkOption {
type = str;
description = "Name of the database/LDAP resource";
};
ldapUserClass = mkOption {
type = nullOr str;
default = null;
description = "LDAP user class";
};
ldapUserNameAttr = mkOption {
type = nullOr str;
default = null;
description = "LDAP attribute which contains the username";
};
ldapGroupClass = mkOption {
type = nullOr str;
default = null;
description = "LDAP group class";
};
ldapGroupNameAttr = mkOption {
type = nullOr str;
default = null;
description = "LDAP attribute which contains the groupname";
};
ldapGroupFilter = mkOption {
type = nullOr str;
default = null;
description = "LDAP group search filter";
};
ldapNestedSearch = mkOption {
type = bool;
default = false;
description = "Enable nested group search in Active Directory based on the user";
};
};
}));
};
mutableRolesConfig = mkOption {
type = bool;
default = true;
description = "Make roles.ini mutable (e.g. via the web interface)";
};
roles = mkOption {
default = {};
description = "Icingaweb 2 roles to define";
type = attrsOf (submodule ({ name, ... }: {
options = {
name = mkOption {
visible = false;
default = name;
type = str;
description = "Name of this role";
};
users = mkOption {
type = listOf str;
default = [];
description = "List of users that are assigned to the role";
};
groups = mkOption {
type = listOf str;
default = [];
description = "List of groups that are assigned to the role";
};
permissions = mkOption {
type = listOf str;
default = [];
example = [ "application/share/navigation" "config/*" ];
description = "The permissions to grant";
};
extraAssignments = mkOption {
type = attrsOf (listOf str);
default = {};
example = { "monitoring/blacklist/properties" = [ "sla" "customer"]; };
description = "Additional assignments of this role";
};
};
}));
};
};
config = mkIf cfg.enable {
services.phpfpm.poolConfigs = mkIf (cfg.pool == "${poolName}") {
"${poolName}" = ''
listen = "${phpfpmSocketName}"
listen.owner = nginx
listen.group = nginx
listen.mode = 0600
user = icingaweb2
pm = dynamic
pm.max_children = 75
pm.start_servers = 2
pm.min_spare_servers = 2
pm.max_spare_servers = 10
'';
};
services.phpfpm.phpOptions = mkIf (cfg.pool == "${poolName}")
''
extension = ${pkgs.phpPackages.imagick}/lib/php/extensions/imagick.so
date.timezone = "${cfg.timezone}"
'';
systemd.services."phpfpm-${poolName}".serviceConfig.ReadWritePaths = [ "/etc/icingaweb2" ];
services.nginx = {
enable = true;
virtualHosts = mkIf (cfg.virtualHost != null) {
"${cfg.virtualHost}" = {
root = "${pkgs.icingaweb2}/public";
extraConfig = ''
index index.php;
try_files $1 $uri $uri/ /index.php$is_args$args;
'';
locations."~ ..*/.*.php$".extraConfig = ''
return 403;
'';
locations."~ ^/index.php(.*)$".extraConfig = ''
fastcgi_intercept_errors on;
fastcgi_index index.php;
include ${config.services.nginx.package}/conf/fastcgi.conf;
try_files $uri =404;
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass unix:${phpfpmSocketName};
fastcgi_param SCRIPT_FILENAME ${pkgs.icingaweb2}/public/index.php;
'';
};
};
};
# /etc/icingaweb2
environment.etc = let
doModule = name: optionalAttrs (cfg.modules."${name}".enable) (nameValuePair "icingaweb2/enabledModules/${name}" { source = "${pkgs.icingaweb2}/modules/${name}"; });
in {}
# Module packages
// (mapAttrs' (k: v: nameValuePair "icingaweb2/enabledModules/${k}" { source = v; }) cfg.modulePackages)
# Built-in modules
// doModule "doc"
// doModule "migrate"
// doModule "setup"
// doModule "test"
// doModule "translation"
# Configs
// optionalAttrs (!cfg.generalConfig.mutable) { "icingaweb2/config.ini".text = configIni; }
// optionalAttrs (!cfg.mutableResources) { "icingaweb2/resources.ini".text = resourcesIni; }
// optionalAttrs (!cfg.mutableAuthConfig) { "icingaweb2/authentication.ini".text = authenticationIni; }
// optionalAttrs (!cfg.mutableGroupsConfig) { "icingaweb2/groups.ini".text = groupsIni; }
// optionalAttrs (!cfg.mutableRolesConfig) { "icingaweb2/roles.ini".text = rolesIni; };
# User and group
users.groups.icingaweb2 = {};
users.users.icingaweb2 = {
description = "Icingaweb2 service user";
group = "icingaweb2";
isSystemUser = true;
};
};
}

157
nixos/modules/services/web-apps/icingaweb2/module-monitoring.nix Normal file
View File

@ -0,0 +1,157 @@
{ config, lib, pkgs, ... }: with lib; let
cfg = config.services.icingaweb2.modules.monitoring;
configIni = ''
[security]
protected_customvars = "${concatStringsSep "," cfg.generalConfig.protectedVars}"
'';
backendsIni = let
formatBool = b: if b then "1" else "0";
in concatStringsSep "\n" (mapAttrsToList (name: config: ''
[${name}]
type = "ido"
resource = "${config.resource}"
disabled = "${formatBool config.disabled}"
'') cfg.backends);
transportsIni = concatStringsSep "\n" (mapAttrsToList (name: config: ''
[${name}]
type = "${config.type}"
${optionalString (config.instance != null) ''instance = "${config.instance}"''}
${optionalString (config.type == "local" || config.type == "remote") ''path = "${config.path}"''}
${optionalString (config.type != "local") ''
host = "${config.host}"
${optionalString (config.port != null) ''port = "${toString config.port}"''}
user${optionalString (config.type == "api") "name"} = "${config.username}"
''}
${optionalString (config.type == "api") ''password = "${config.password}"''}
${optionalString (config.type == "remote") ''resource = "${config.resource}"''}
'') cfg.transports);
in {
options.services.icingaweb2.modules.monitoring = with types; {
enable = mkOption {
type = bool;
default = true;
description = "Whether to enable the icingaweb2 monitoring module.";
};
generalConfig = {
mutable = mkOption {
type = bool;
default = false;
description = "Make config.ini of the monitoring module mutable (e.g. via the web interface).";
};
protectedVars = mkOption {
type = listOf str;
default = [ "*pw*" "*pass*" "community" ];
description = "List of string patterns for custom variables which should be excluded from user’s view.";
};
};
mutableBackends = mkOption {
type = bool;
default = false;
description = "Make backends.ini of the monitoring module mutable (e.g. via the web interface).";
};
backends = mkOption {
default = { "icinga" = { resource = "icinga_ido"; }; };
description = "Monitoring backends to define";
type = attrsOf (submodule ({ name, ... }: {
options = {
name = mkOption {
visible = false;
default = name;
type = str;
description = "Name of this backend";
};
resource = mkOption {
type = str;
description = "Name of the IDO resource";
};
disabled = mkOption {
type = bool;
default = false;
description = "Disable this backend";
};
};
}));
};
mutableTransports = mkOption {
type = bool;
default = true;
description = "Make commandtransports.ini of the monitoring module mutable (e.g. via the web interface).";
};
transports = mkOption {
default = {};
description = "Command transports to define";
type = attrsOf (submodule ({ name, ... }: {
options = {
name = mkOption {
visible = false;
default = name;
type = str;
description = "Name of this transport";
};
type = mkOption {
type = enum [ "api" "local" "remote" ];
default = "api";
description = "Type of this transport";
};
instance = mkOption {
type = nullOr str;
default = null;
description = "Assign a icinga instance to this transport";
};
path = mkOption {
type = str;
description = "Path to the socket for local or remote transports";
};
host = mkOption {
type = str;
description = "Host for the api or remote transport";
};
port = mkOption {
type = nullOr str;
default = null;
description = "Port to connect to for the api or remote transport";
};
username = mkOption {
type = str;
description = "Username for the api or remote transport";
};
password = mkOption {
type = str;
description = "Password for the api transport";
};
resource = mkOption {
type = str;
description = "SSH identity resource for the remote transport";
};
};
}));
};
};
config = mkIf (config.services.icingaweb2.enable && cfg.enable) {
environment.etc = { "icingaweb2/enabledModules/monitoring" = { source = "${pkgs.icingaweb2}/modules/monitoring"; }; }
// optionalAttrs (!cfg.generalConfig.mutable) { "icingaweb2/modules/monitoring/config.ini".text = configIni; }
// optionalAttrs (!cfg.mutableBackends) { "icingaweb2/modules/monitoring/backends.ini".text = backendsIni; }
// optionalAttrs (!cfg.mutableTransports) { "icingaweb2/modules/monitoring/commandtransports.ini".text = transportsIni; };
};
}

2
nixos/modules/services/web-apps/tt-rss.nix
View File

@ -562,7 +562,7 @@ let
callSql = e:
if cfg.database.type == "pgsql" then ''
${optionalString (cfg.database.password != null) "PGPASSWORD=${cfg.database.password}"} \
${optionalString (cfg.database.passwordFile != null) "PGPASSWORD=$(cat ${cfg.database.passwordFile}"}) \
${optionalString (cfg.database.passwordFile != null) "PGPASSWORD=$(cat ${cfg.database.passwordFile})"} \
${pkgs.sudo}/bin/sudo -u ${cfg.user} ${config.services.postgresql.package}/bin/psql \
-U ${cfg.database.user} \
${optionalString (cfg.database.host != null) "-h ${cfg.database.host} --port ${toString dbPort}"} \

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

@ -376,6 +376,8 @@ let
Include ${httpd}/conf/extra/httpd-multilang-errordoc.conf
Include ${httpd}/conf/extra/httpd-languages.conf
TraceEnable off
${if enableSSL then sslConf else ""}
# Fascist default - deny access to everything.
@ -639,8 +641,8 @@ in
sslProtocols = mkOption {
type = types.str;
default = "All -SSLv2 -SSLv3";
example = "All -SSLv2 -SSLv3 -TLSv1";
default = "All -SSLv2 -SSLv3 -TLSv1";
example = "All -SSLv2 -SSLv3";
description = "Allowed SSL/TLS protocol versions.";
};
}
@ -684,6 +686,9 @@ in
''
; Needed for PHP's mail() function.
sendmail_path = sendmail -t -i
; Don't advertise PHP
expose_php = off
'' + optionalString (!isNull config.time.timeZone) ''
; Apparently PHP doesn't use $TZ.

11
pkgs/applications/altcoins/wownero.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, git
, boost, miniupnpc, openssl, unbound, cppzmq
, zeromq, pcsclite, readline, libsodium
, boost, miniupnpc_2, openssl, unbound, cppzmq
, zeromq, pcsclite, readline, libsodium, rapidjson
, CoreData, IOKit, PCSC
}:
@ -11,19 +11,18 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "wownero-${version}";
version = "0.4.0.0";
version = "0.5.0.0";
src = fetchFromGitHub {
owner = "wownero";
repo = "wownero";
fetchSubmodules = true;
rev = "v${version}";
sha256 = "1z5fpl4gwys4v8ffrymlzwrbnrbg73x553a9lxwny7ba8yg2k14p";
sha256 = "1dy9ycabva2z0896al1k2avl9xppkxvm1p2jwmg509ahjl98k3sy";
};
nativeBuildInputs = [ cmake pkgconfig git ];
buildInputs = [
boost miniupnpc openssl unbound
boost miniupnpc_2 openssl unbound rapidjson
cppzmq zeromq pcsclite readline libsodium
] ++ optionals stdenv.isDarwin [ IOKit CoreData PCSC ];

14
pkgs/applications/editors/dit/default.nix
View File

@ -1,22 +1,20 @@
{ fetchurl, stdenv, coreutils, ncurses, lua }:
{ lib, fetchurl, stdenv, libiconv, ncurses, lua }:
stdenv.mkDerivation rec {
name = "dit-${version}";
version = "0.4";
version = "0.5";
src = fetchurl {
url = "https://hisham.hm/dit/releases/${version}/${name}.tar.gz";
sha256 = "0bwczbv7annbbpg7bgbsqd5kwypn81sza4v7v99fin94wwmcn784";
sha256 = "05vhr1gl3bb5fg49v84xhmjaqdjw6djampvylw10ydvbpnpvjvjc";
};
buildInputs = [ coreutils ncurses lua ];
buildInputs = [ ncurses lua ]
++ lib.optional stdenv.isDarwin libiconv;
# fix paths
prePatch = ''
patchShebangs tools/GenHeaders
'';
# needs GNU tail for tail -r
postPatch = ''
substituteInPlace Prototypes.h --replace 'tail' "$(type -P tail)"
'';

4
pkgs/applications/editors/emacs/macport.nix
View File

@ -53,6 +53,10 @@ stdenv.mkDerivation rec {
# use newer emacs icon
cp nextstep/Cocoa/Emacs.base/Contents/Resources/Emacs.icns mac/Emacs.app/Contents/Resources/Emacs.icns
# Fix sandbox impurities.
substituteInPlace Makefile.in --replace '/bin/pwd' 'pwd'
substituteInPlace lib-src/Makefile.in --replace '/bin/pwd' 'pwd'
'';
configureFlags = [

10
pkgs/applications/editors/vscode/default.nix
View File

@ -18,16 +18,16 @@ let
}.${system};
sha256 = {
"i686-linux" = "09mgvff27iljj9z7h0xxmr6152hcxh7qqxl3i7wdc55ra1rsjq1n";
"x86_64-linux" = "1gvlvg3cjsscx6khy5gxd4wnb069kska00qdfwcq4kn7x1z04xnz";
"x86_64-darwin" = "1mf9nyjnxgmzai7rfd1rkwk0wvil0ripg3mh8icg4mld2jjz8rsy";
"i686-linux" = "04kbx1cx40lsy9irxy1arp1rixzk49ldhg34w3llmfbx63a4hchf";
"x86_64-linux" = "1plvx0mjcbizl6iffib95p5224r9frf0mn6c5xp14p3qnrp32jhm";
"x86_64-darwin" = "14h9gs6jpxydgd1h16ybq3ifw5jc7k83yg22pw3sk6vhy7hx7pxr";
}.${system};
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
in
stdenv.mkDerivation rec {
name = "vscode-${version}";
version = "1.31.0";
version = "1.31.1";
src = fetchurl {
name = "VSCode_${version}_${plat}.${archive_fmt}";
@ -126,7 +126,7 @@ in
and code refactoring. It is also customizable, so users can change the
editor's theme, keyboard shortcuts, and preferences
'';
homepage = http://code.visualstudio.com/;
homepage = https://code.visualstudio.com/;
downloadPage = https://code.visualstudio.com/Updates;
license = licenses.unfree;
maintainers = with maintainers; [ eadwu ];

13
pkgs/applications/misc/twmn/default.nix
View File

@ -1,12 +1,13 @@
{ stdenv, fetchgit, qtbase, qtx11extras, qmake, pkgconfig, boost }:
{ stdenv, fetchFromGitHub, qtbase, qtx11extras, qmake, pkgconfig, boost }:
stdenv.mkDerivation rec {
name = "twmn-git-2014-09-23";
name = "twmn-git-2018-10-01";
src = fetchgit {
url = "https://github.com/sboli/twmn.git";
rev = "9492a47e25547e602dd57efd807033677c90b150";
sha256 = "1a68gka9gyxyzhc9rn8df59rzcdwkjw90cxp1kk0rdfp6svhxhsa";
src = fetchFromGitHub {
owner = "sboli";
repo = "twmn";
rev = "80f48834ef1a07087505b82358308ee2374b6dfb";
sha256 = "0mpjvp800x07lp9i3hfcc5f4bqj1fj4w3dyr0zwaxc6wqmm0fdqz";
};
nativeBuildInputs = [ pkgconfig qmake ];

4
pkgs/applications/networking/remote/remmina/default.nix
View File

@ -13,13 +13,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "remmina";
version = "1.3.0";
version = "1.3.2";
src = fetchFromGitLab {
owner = "Remmina";
repo = "Remmina";
rev = "v${version}";
sha256 = "15b0fnv7xra4fpmn2y4k2rpzcss30sd1dhnx7yvhs2zq12z2m0wi";
sha256 = "1ld5ik2g4b95z9pynmwx8mqhblbfzr7a0v35pms89ig4ck1kvr5r";
};
nativeBuildInputs = [ cmake ninja pkgconfig wrapGAppsHook ];

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "soapui-${version}";
version = "5.4.0";
version = "5.5.0";
src = fetchurl {
url = "https://s3.amazonaws.com/downloads.eviware/soapuios/${version}/SoapUI-${version}-linux-bin.tar.gz";
sha256 = "1yqx1fsh8mr5zf36df7pi25dysb28gfscr1667jzd5s0k9jl42xd";
sha256 = "0v1wiy61jgvlxjk8qdvcnyn1gh2ysxf266zln7r4wpzwd5gc3dpw";
};
nativeBuildInputs = [ makeWrapper ];

6
pkgs/applications/science/astronomy/gildas/default.nix
View File

@ -7,8 +7,8 @@ let
in
stdenv.mkDerivation rec {
srcVersion = "jan19b";
version = "20190101_b";
srcVersion = "feb19b";
version = "20190201_b";
name = "gildas-${version}";
src = fetchurl {
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
# source code of the previous release to a different directory
urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz"
"http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.gz" ];
sha256 = "1wb4qj0j5n0k49zs5d7ndyzff8mapcb06i55jn0djzd023h0bwhp";
sha256 = "5b6da12ac869176d7a9a3d6a6620db1dbaa44a4785e2dd59dd1a8c38ea9cab87";
};
enableParallelBuilding = true;

24
pkgs/applications/science/math/caffe/default.nix
View File

@ -17,6 +17,7 @@
, cudnnSupport ? false, cudnn ? null
, ncclSupport ? false, nccl ? null
, pythonSupport ? false, python ? null, numpy ? null
, substituteAll
}:
assert leveldbSupport -> (leveldb != null && snappy != null);
@ -50,7 +51,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake doxygen ];
cmakeFlags =
[ (if pythonSupport then "-Dpython_version=${python.version}" else "-DBUILD_python=OFF")
# It's important that caffe is passed the major and minor version only because that's what
# boost_python expects
[ (if pythonSupport then "-Dpython_version=3${python.pythonVersion}" else "-DBUILD_python=OFF")
"-DBLAS=open"
] ++ (if cudaSupport then [
"-DCUDA_ARCH_NAME=All"
@ -75,16 +78,21 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "out"];
propagatedBuildOutputs = []; # otherwise propagates out -> bin cycle
patches = [ ./darwin.patch ];
patches = [
./darwin.patch
] ++ lib.optional pythonSupport (substituteAll {
src = ./python.patch;
inherit (python.sourceVersion) major minor; # Should be changed in case of PyPy
});
preConfigure = lib.optionalString (cudaSupport && lib.versionAtLeast cudatoolkit.version "9.0") ''
postPatch = lib.optionalString (cudaSupport && lib.versionAtLeast cudatoolkit.version "9.0") ''
# CUDA 9.0 doesn't support sm_20
sed -i 's,20 21(20) ,,' cmake/Cuda.cmake
'' + lib.optionalString (python.isPy3 or false) ''
sed -i \
-e 's,"python-py''${boost_py_version}",python3,g' \
-e 's,''${Boost_PYTHON-PY''${boost_py_version}_FOUND},''${Boost_PYTHON3_FOUND},g' \
cmake/Dependencies.cmake
'';
preConfigure = lib.optionalString pythonSupport ''
# We need this when building with Python bindings
export BOOST_LIBRARYDIR="${boost.out}/lib";
'';
postInstall = ''

70
pkgs/applications/science/math/caffe/python.patch Normal file
View File

@ -0,0 +1,70 @@
commit b14ca23651d390fcae4a929dedc7c33a83453a66
Author: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun Feb 17 08:41:27 2019 +0100
Find boost_pythonXX
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 08f56a33..0a04592a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,10 +99,10 @@ add_subdirectory(docs)
add_custom_target(lint COMMAND ${CMAKE_COMMAND} -P ${PROJECT_SOURCE_DIR}/cmake/lint.cmake)
# ---[ pytest target
-if(BUILD_python)
- add_custom_target(pytest COMMAND python${python_version} -m unittest discover -s caffe/test WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/python )
- add_dependencies(pytest pycaffe)
-endif()
+# if(BUILD_python)
+# add_custom_target(pytest COMMAND python${python_version} -m unittest discover -s caffe/test WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/python )
+# add_dependencies(pytest pycaffe)
+# endif()
# ---[ uninstall target
configure_file(
diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
index 4a5bac47..be026d43 100644
--- a/cmake/Dependencies.cmake
+++ b/cmake/Dependencies.cmake
@@ -141,37 +141,14 @@ if(BUILD_python)
# use python3
find_package(PythonInterp 3.0)
find_package(PythonLibs 3.0)
- find_package(NumPy 1.7.1)
- # Find the matching boost python implementation
- set(version ${PYTHONLIBS_VERSION_STRING})
-
- STRING( REGEX REPLACE "[^0-9]" "" boost_py_version ${version} )
- find_package(Boost 1.46 COMPONENTS "python-py${boost_py_version}")
- set(Boost_PYTHON_FOUND ${Boost_PYTHON-PY${boost_py_version}_FOUND})
-
- while(NOT "${version}" STREQUAL "" AND NOT Boost_PYTHON_FOUND)
- STRING( REGEX REPLACE "([0-9.]+).[0-9]+" "\\1" version ${version} )
-
- STRING( REGEX REPLACE "[^0-9]" "" boost_py_version ${version} )
- find_package(Boost 1.46 COMPONENTS "python-py${boost_py_version}")
- set(Boost_PYTHON_FOUND ${Boost_PYTHON-PY${boost_py_version}_FOUND})
-
- STRING( REGEX MATCHALL "([0-9.]+).[0-9]+" has_more_version ${version} )
- if("${has_more_version}" STREQUAL "")
- break()
- endif()
- endwhile()
- if(NOT Boost_PYTHON_FOUND)
- find_package(Boost 1.46 COMPONENTS python)
- endif()
else()
# disable Python 3 search
find_package(PythonInterp 2.7)
find_package(PythonLibs 2.7)
- find_package(NumPy 1.7.1)
- find_package(Boost 1.46 COMPONENTS python)
endif()
- if(PYTHONLIBS_FOUND AND NUMPY_FOUND AND Boost_PYTHON_FOUND)
+ find_package(NumPy 1.7.1)
+ find_package(Boost 1.46 REQUIRED COMPONENTS python@major@@minor@)
+ if(PYTHONLIBS_FOUND AND NUMPY_FOUND AND BOOST_PYTHON@major@@minor@_FOUND)
set(HAVE_PYTHON TRUE)
if(BUILD_python_layer)
list(APPEND Caffe_DEFINITIONS PRIVATE -DWITH_PYTHON_LAYER)

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

@ -5,13 +5,13 @@ let
in buildPythonApplication rec {
name = "git-cola-${version}";
version = "3.2";
version = "3.3";
src = fetchFromGitHub {
owner = "git-cola";
repo = "git-cola";
rev = "v${version}";
sha256 = "1ivaqhvdbmlp0lmrwb2pv3kjqlcpqbxbinbvjjn3g81r4avjs7yy";
sha256 = "0gfbzcmaqg6hdy2cfpshgcwh8zgj1ia1vd95i5xdrsvksgb8fq2j";
};
buildInputs = [ git gettext ];

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

@ -1,25 +1,26 @@
{ stdenv, buildGoPackage, fetchFromGitHub, ronn, ruby, groff, Security, utillinux }:
{ stdenv, buildGoPackage, fetchFromGitHub, ronn, ruby, groff, Security, utillinux, git, glibcLocales }:
buildGoPackage rec {
name = "hub-${version}";
version = "2.7.0";
pname = "hub";
version = "2.9.0";
goPackagePath = "github.com/github/hub";
# Only needed to build the man-pages
excludedPackages = [ "github.com/github/hub/md2roff-bin" ];
src = fetchFromGitHub {
owner = "github";
repo = "hub";
repo = pname;
rev = "v${version}";
sha256 = "1p90m1xp3jahs5y0lp0qfmfa7wqn7gxyygn7x45a6cbf2zzlb86l";
sha256 = "0yxpr606xx23l8823hjqj16cvjjrwb28c7z08ml1pkfvaf7w4n81";
};
nativeBuildInputs = [ groff ronn utillinux ];
nativeBuildInputs = [ groff ronn utillinux glibcLocales ];
buildInputs = [ ruby ] ++
stdenv.lib.optional stdenv.isDarwin Security;
postPatch = ''
mkdir bin
ln -s ${ronn}/bin/ronn bin/ronn
patchShebangs .
'';
@ -29,13 +30,12 @@ buildGoPackage rec {
install -D etc/hub.bash_completion.sh "$bin/share/bash-completion/completions/hub"
install -D etc/hub.fish_completion "$bin/share/fish/vendor_completions.d/hub.fish"
make man-pages
PATH=$PATH:${git}/bin LC_ALL=en_US.utf-8 make man-pages
cp -vr --parents share/man/man[1-9]/*.[1-9] $bin/
'';
meta = with stdenv.lib; {
description = "Command-line wrapper for git that makes you better at GitHub";
license = licenses.mit;
homepage = https://hub.github.com/;
maintainers = with maintainers; [ the-kenny ];

109
pkgs/applications/virtualization/singularity/default.nix
View File

@ -1,64 +1,77 @@
{ stdenv
{stdenv
, removeReferencesTo
, lib
, fetchgit
, fetchFromGitHub
, autoreconfHook
, gnutar
, which
, gnugrep
, utillinux
, openssl
, coreutils
, python
, e2fsprogs
, gawk
, go
, which
, makeWrapper
, squashfsTools
, gzip
, gnused
, curl
, utillinux
, libarchive
, file
}:
, buildGoPackage}:
stdenv.mkDerivation rec {
with lib;
buildGoPackage rec {
name = "singularity-${version}";
version = "2.6.1";
enableParallelBuilding = true;
patches = [ ./env.patch ];
preConfigure = ''
sed -i 's/-static//g' src/Makefile.am
patchShebangs .
substituteInPlace libexec/bootstrap-scripts/deffile-sections.sh \
--replace /bin/cp ${coreutils}/bin/cp
'';
configureFlags = [ "--localstatedir=/var" ];
installFlags = "CONTAINER_MOUNTDIR=dummy CONTAINER_FINALDIR=dummy CONTAINER_OVERLAY=dummy SESSIONDIR=dummy";
fixupPhase = ''
patchShebangs $out
for f in $out/libexec/singularity/helpers/help.sh $out/libexec/singularity/cli/*.exec $out/libexec/singularity/bootstrap-scripts/*.sh ; do
chmod a+x $f
sed -i 's| /sbin/| |g' $f
sed -i 's| /bin/bash| ${stdenv.shell}|g' $f
wrapProgram $f --prefix PATH : ${stdenv.lib.makeBinPath buildInputs}
done
'';
version = "3.0.1";
src = fetchFromGitHub {
owner = "singularityware";
owner = "sylabs";
repo = "singularity";
rev = version;
sha256 = "0q8qq9l3s6mv74km9h8gsn5mpd0m98dhmx8vph1jp6wnrr4xyfqf";
rev = "v${version}";
sha256 = "1wpsd0il2ipa2n5cnbj8dzs095jycdryq2rx62kikbq7ahzz4fsi";
};
nativeBuildInputs = [ autoreconfHook makeWrapper ];
buildInputs = [ coreutils gnugrep python e2fsprogs which gnutar squashfsTools gzip gnused curl utillinux libarchive file ];
goPackagePath = "github.com/sylabs/singularity";
goDeps = ./deps.nix;
buildInputs = [ openssl ];
nativeBuildInputs = [ removeReferencesTo utillinux which makeWrapper ];
propagatedBuildInputs = [ coreutils squashfsTools ];
postConfigure = ''
find . -name vendor -type d -print0 | xargs -0 rm -rf
cd go/src/github.com/sylabs/singularity
patchShebangs .
sed -i 's|defaultEnv := "/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin"|defaultEnv := "${stdenv.lib.makeBinPath propagatedBuildInputs}"|' src/cmd/singularity/cli/singularity.go
./mconfig -V ${version} -p $bin --localstatedir=/var
touch builddir/.dep-done
touch builddir/vendors-done
# Don't install SUID binaries
sed -i 's/-m 4755/-m 755/g' builddir/Makefile
# Point to base gopath
sed -i "s|^cni_vendor_GOPATH :=.*\$|cni_vendor_GOPATH := $NIX_BUILD_TOP/go/src/github.com/containernetworking/plugins/plugins|" builddir/Makefile
'';
buildPhase = ''
make -C builddir
'';
installPhase = ''
make -C builddir install LOCALSTATEDIR=$bin/var
chmod 755 $bin/libexec/singularity/bin/starter-suid
'';
postFixup = ''
find $bin/ -type f -executable -exec remove-references-to -t ${go} '{}' + || true
# These etc scripts shouldn't have their paths patched
cp etc/actions/* $bin/etc/singularity/actions/
'';
meta = with stdenv.lib; {
homepage = http://singularity.lbl.gov/;
description = "Designed around the notion of extreme mobility of compute and reproducible science, Singularity enables users to have full control of their operating system environment";
license = "BSD license with 2 modifications";
homepage = http://www.sylabs.io/;
description = "Application containers for linux";
license = licenses.bsd3;
platforms = platforms.linux;
maintainers = [ maintainers.jbedo ];
};

669
pkgs/applications/virtualization/singularity/deps.nix generated Normal file
View File

@ -0,0 +1,669 @@
# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
[
{
goPackagePath = "github.com/Microsoft/go-winio";
fetch = {
type = "git";
url = "https://github.com/Microsoft/go-winio";
rev = "7da180ee92d8bd8bb8c37fc560e673e6557c392f";
sha256 = "19gjjhmzswhm11wzj38r5alxypmflmy0z42flhc3czhmmwv7b1av";
};
}
{
goPackagePath = "github.com/alexflint/go-filemutex";
fetch = {
type = "git";
url = "https://github.com/alexflint/go-filemutex";
rev = "d358565f3c3f5334209f1e80693e4f621650c489";
sha256 = "19fzbm0x8821awsmqj9ig49dxxkd72p1yfqbijmdwwszvw2r0ggz";
};
}
{
goPackagePath = "github.com/beorn7/perks";
fetch = {
type = "git";
url = "https://github.com/beorn7/perks";
rev = "3a771d992973f24aa725d07868b467d1ddfceafb";
sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3";
};
}
{
goPackagePath = "github.com/blang/semver";
fetch = {
type = "git";
url = "https://github.com/blang/semver";
rev = "2ee87856327ba09384cabd113bc6b5d174e9ec0f";
sha256 = "13ws259bwcibkclbr82ilhk6zadm63kxklxhk12wayklj8ghhsmy";
};
}
{
goPackagePath = "github.com/containerd/cgroups";
fetch = {
type = "git";
url = "https://github.com/containerd/cgroups";
rev = "5017d4e9a9cf2d4381db99eacd9baf84b95bfb14";
sha256 = "02pvcmj91j3maa9j1v91m2z9kpa6p822h06r007b3pl7h0paiqnj";
};
}
{
goPackagePath = "github.com/containerd/continuity";
fetch = {
type = "git";
url = "https://github.com/containerd/continuity";
rev = "246e49050efdf45e8f17fbbcf1547ee376f9939e";
sha256 = "1zc1f0yixf32lprp5r77z2j9xq7fk0hijq8xzl08j4zrk0fcy8aq";
};
}
{
goPackagePath = "github.com/containernetworking/cni";
fetch = {
type = "git";
url = "https://github.com/containernetworking/cni";
rev = "a7885cb6f8ab03fba07852ded351e4f5e7a112bf";
sha256 = "00ajs2r5r2z3l0vqwxrcwhjfc9px12qbcv5vnvs2mdipvvls1y2y";
};
}
{
goPackagePath = "github.com/containernetworking/plugins";
fetch = {
type = "git";
url = "https://github.com/containernetworking/plugins";
rev = "2b8b1ac0af4568e928d96ccc5f47b075416eeabd";
sha256 = "1yl9m8pwjmqxj3hf0w9s6rykszhcww54z07yjgxzabmqf2dhchxv";
};
}
{
goPackagePath = "github.com/containers/image";
fetch = {
type = "git";
url = "https://github.com/containers/image";
rev = "2e4f799f5eba49a2498d2793cfb2a4bc823ca3f6";
sha256 = "0b9symgbkd2vgvp7mfpz1l03i2zivwbc5ycccwv78b1ikk9m6b75";
};
}
{
goPackagePath = "github.com/containers/storage";
fetch = {
type = "git";
url = "https://github.com/containers/storage";
rev = "88d80428f9b146f8f9fe7e2e8cc8688a5aae1a4e";
sha256 = "13fagjisbg55dhgjd72h0hiy6jfg8ggkcnjl5haqj13c2gkf6sam";
};
}
{
goPackagePath = "github.com/coreos/go-iptables";
fetch = {
type = "git";
url = "https://github.com/coreos/go-iptables";
rev = "b5b1876b170881a8259f036445ee89c8669db386";
sha256 = "1s1c04x47pk3168606x4vkg4avs8a7m407hpha8py1xni08cgb6m";
};
}
{
goPackagePath = "github.com/coreos/go-systemd";
fetch = {
type = "git";
url = "https://github.com/coreos/go-systemd";
rev = "39ca1b05acc7ad1220e09f133283b8859a8b71ab";
sha256 = "1kzqrrzqspa5qm7kwslxl3m16lqzns23c24rv474ajzwmj3ixmx1";
};
}
{
goPackagePath = "github.com/cpuguy83/go-md2man";
fetch = {
type = "git";
url = "https://github.com/cpuguy83/go-md2man";
rev = "20f5889cbdc3c73dbd2862796665e7c465ade7d1";
sha256 = "1w22dfdamsq63b5rvalh9k2y7rbwfkkjs7vm9vd4a13h2ql70lg2";
};
}
{
goPackagePath = "github.com/d2g/dhcp4";
fetch = {
type = "git";
url = "https://github.com/d2g/dhcp4";
rev = "a1d1b6c41b1ce8a71a5121a9cee31809c4707d9c";
sha256 = "191hzw6yqzkm042h6miyycq3g0zrhqjhhpl27f8vhwzp4wanasiz";
};
}
{
goPackagePath = "github.com/d2g/dhcp4client";
fetch = {
type = "git";
url = "https://github.com/d2g/dhcp4client";
rev = "e612998962035b93ba16cfd1ad2f3221985c1b8c";
sha256 = "1612wh99fblc9ashmm6mjc9110fhal95z0mn9qn7av3px13yd9fs";
};
}
{
goPackagePath = "github.com/docker/distribution";
fetch = {
type = "git";
url = "https://github.com/docker/distribution";
rev = "749f6afb4572201e3c37325d0ffedb6f32be8950";
sha256 = "05jn2wvikyw0pbmi74w5axr0zgxn5y3ynn9rhsq87rmwqj7raxhd";
};
}
{
goPackagePath = "github.com/docker/docker";
fetch = {
type = "git";
url = "https://github.com/docker/docker";
rev = "da99009bbb1165d1ac5688b5c81d2f589d418341";
sha256 = "02hhx7s8vm45rcl2mx9xamkncl2pb6qhsmz35mffbg4n6l5rn5x5";
};
}
{
goPackagePath = "github.com/docker/docker-credential-helpers";
fetch = {
type = "git";
url = "https://github.com/docker/docker-credential-helpers";
rev = "d68f9aeca33f5fd3f08eeae5e9d175edf4e731d1";
sha256 = "1ff829h5p1j6qiivjvnwyiybrff3dddv1ij71nz5whmgavdqgd49";
};
}
{
goPackagePath = "github.com/docker/go-connections";
fetch = {
type = "git";
url = "https://github.com/docker/go-connections";
rev = "3ede32e2033de7505e6500d6c868c2b9ed9f169d";
sha256 = "0v1pkr8apwmhyzbjfriwdrs1ihlk6pw7izm57r24mf9jdmg3fyb0";
};
}
{
goPackagePath = "github.com/docker/go-metrics";
fetch = {
type = "git";
url = "https://github.com/docker/go-metrics";
rev = "399ea8c73916000c64c2c76e8da00ca82f8387ab";
sha256 = "0najfy92fq05b330cnjk5b326yi7dnnmvzfk6g5lsa1fci78yzw4";
};
}
{
goPackagePath = "github.com/docker/go-units";
fetch = {
type = "git";
url = "https://github.com/docker/go-units";
rev = "47565b4f722fb6ceae66b95f853feed578a4a51c";
sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93";
};
}
{
goPackagePath = "github.com/docker/libtrust";
fetch = {
type = "git";
url = "https://github.com/docker/libtrust";
rev = "aabc10ec26b754e797f9028f4589c5b7bd90dc20";
sha256 = "1lwslbggzc2b0c4wxl5pn6i2nfgz5jz8f7s7vnid9mrlsk59h7s1";
};
}
{
goPackagePath = "github.com/ghodss/yaml";
fetch = {
type = "git";
url = "https://github.com/ghodss/yaml";
rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7";
sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g";
};
}
{
goPackagePath = "github.com/globalsign/mgo";
fetch = {
type = "git";
url = "https://github.com/globalsign/mgo";
rev = "113d3961e7311526535a1ef7042196563d442761";
sha256 = "0m05ay993vv2jkc46bbdnq371s5jc0an2cycsj7p3b6lmv84jk9f";
};
}
{
goPackagePath = "github.com/godbus/dbus";
fetch = {
type = "git";
url = "https://github.com/godbus/dbus";
rev = "a389bdde4dd695d414e47b755e95e72b7826432c";
sha256 = "1ckvg15zdsgmbn4mi36cazkb407ixc9mmyf7vwj8b8wi3d00rgn9";
};
}
{
goPackagePath = "github.com/gogo/protobuf";
fetch = {
type = "git";
url = "https://github.com/gogo/protobuf";
rev = "1adfc126b41513cc696b209667c8656ea7aac67c";
sha256 = "1j7azzlnihcvnd1apw5zr0bz30h7n0gyimqqkgc76vzb1n5dpi7m";
};
}
{
goPackagePath = "github.com/golang/protobuf";
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265";
sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq";
};
}
{
goPackagePath = "github.com/gorilla/context";
fetch = {
type = "git";
url = "https://github.com/gorilla/context";
rev = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42";
sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4";
};
}
{
goPackagePath = "github.com/gorilla/mux";
fetch = {
type = "git";
url = "https://github.com/gorilla/mux";
rev = "e3702bed27f0d39777b0b37b664b6280e8ef8fbf";
sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2";
};
}
{
goPackagePath = "github.com/gorilla/websocket";
fetch = {
type = "git";
url = "https://github.com/gorilla/websocket";
rev = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b";
sha256 = "1bhgs2542qs49p1dafybqxfs2qc072xv41w5nswyrknwyjxxs2a1";
};
}
{
goPackagePath = "github.com/hashicorp/errwrap";
fetch = {
type = "git";
url = "https://github.com/hashicorp/errwrap";
rev = "7554cd9344cec97297fa6649b055a8c98c2a1e55";
sha256 = "0kmv0p605di6jc8i1778qzass18m0mv9ks9vxxrfsiwcp4la82jf";
};
}
{
goPackagePath = "github.com/hashicorp/go-multierror";
fetch = {
type = "git";
url = "https://github.com/hashicorp/go-multierror";
rev = "b7773ae218740a7be65057fc60b366a49b538a44";
sha256 = "09904bk7ac6qs9dgiv23rziq9h3makb9qg4jvxr71rlydsd7psfd";
};
}
{
goPackagePath = "github.com/inconshreveable/mousetrap";
fetch = {
type = "git";
url = "https://github.com/inconshreveable/mousetrap";
rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
};
}
{
goPackagePath = "github.com/j-keck/arping";
fetch = {
type = "git";
url = "https://github.com/j-keck/arping";
rev = "2cf9dc699c5640a7e2c81403a44127bf28033600";
sha256 = "1bid8mpx3j4546ni0a6q5xyz7hb854g95qnxqmg5jzs9vrcird3c";
};
}
{
goPackagePath = "github.com/kubernetes-sigs/cri-o";
fetch = {
type = "git";
url = "https://github.com/kubernetes-sigs/cri-o";
rev = "8afc34092907d146906fcc31af112b2b46e7b5cd";
sha256 = "0ghcjvk7grdcwb1936mnj56a7rla804glfknid9kmr3kgny3yi43";
};
}
{
goPackagePath = "github.com/magiconair/properties";
fetch = {
type = "git";
url = "https://github.com/magiconair/properties";
rev = "c2353362d570a7bfa228149c62842019201cfb71";
sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
};
}
{
goPackagePath = "github.com/mattn/go-runewidth";
fetch = {
type = "git";
url = "https://github.com/mattn/go-runewidth";
rev = "9e777a8366cce605130a531d2cd6363d07ad7317";
sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb";
};
}
{
goPackagePath = "github.com/mattn/go-shellwords";
fetch = {
type = "git";
url = "https://github.com/mattn/go-shellwords";
rev = "02e3cf038dcea8290e44424da473dd12be796a8a";
sha256 = "1pg7pl25wvpl2dbpyrv9p1r7prnqimxlf6136vn0dfm54j2x4mnr";
};
}
{
goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
fetch = {
type = "git";
url = "https://github.com/matttproud/golang_protobuf_extensions";
rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c";
sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
};
}
{
goPackagePath = "github.com/mtrmac/gpgme";
fetch = {
type = "git";
url = "https://github.com/mtrmac/gpgme";
rev = "b2432428689ca58c2b8e8dea9449d3295cf96fc9";
sha256 = "0hs9gfwf3cmnvmmxb485icwlv8h8xnny3p52bj7qwv251pvwsnaf";
};
}
{
goPackagePath = "github.com/opencontainers/go-digest";
fetch = {
type = "git";
url = "https://github.com/opencontainers/go-digest";
rev = "279bed98673dd5bef374d3b6e4b09e2af76183bf";
sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9";
};
}
{
goPackagePath = "github.com/opencontainers/image-spec";
fetch = {
type = "git";
url = "https://github.com/opencontainers/image-spec";
rev = "e562b04403929d582d449ae5386ff79dd7961a11";
sha256 = "0j24nk975di8hcv6ycn2p2hhw1xdiy4bpxamr6wn12k21kadlp7s";
};
}
{
goPackagePath = "github.com/opencontainers/image-tools";
fetch = {
type = "git";
url = "https://github.com/sylabs/image-tools";
rev = "2814f498056809a9d5baaf76d1d82312180a5888";
sha256 = "0q3ljb51df5hc58rhp5xni2gsy3gkxn47d9dwyfcffnq8kpf9d8a";
};
}
{
goPackagePath = "github.com/opencontainers/runc";
fetch = {
type = "git";
url = "https://github.com/opencontainers/runc";
rev = "baf6536d6259209c3edfa2b22237af82942d3dfa";
sha256 = "09fm7f1k4lvx8v3crqb0cli1x2brlz8ka7f7qa8d2sb6ln58h7w7";
};
}
{
goPackagePath = "github.com/opencontainers/runtime-spec";
fetch = {
type = "git";
url = "https://github.com/opencontainers/runtime-spec";
rev = "5806c35637336642129d03657419829569abc5aa";
sha256 = "13vw1b3j9sx7d5fr3w3jdg137nnqcr50fqchq8z8nf6s18lkhj93";
};
}
{
goPackagePath = "github.com/opencontainers/runtime-tools";
fetch = {
type = "git";
url = "https://github.com/opencontainers/runtime-tools";
rev = "1c243a8a8eb44d491790798afc9b634c6f6a6380";
sha256 = "1ll5wrbn84yb2l7k6hpwwj06wywib7ar4z1bhh1rc5h9xajng7jq";
};
}
{
goPackagePath = "github.com/opencontainers/selinux";
fetch = {
type = "git";
url = "https://github.com/opencontainers/selinux";
rev = "ba1aefe8057f1d0cfb8e88d0ec1dc85925ef987d";
sha256 = "1n283j7rsim7gysm91x99c41d7vnsjsgfm4dy11fnzpkpzfiksq5";
};
}
{
goPackagePath = "github.com/pelletier/go-toml";
fetch = {
type = "git";
url = "https://github.com/pelletier/go-toml";
rev = "c01d1270ff3e442a8a57cddc1c92dc1138598194";
sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy";
};
}
{
goPackagePath = "github.com/pkg/errors";
fetch = {
type = "git";
url = "https://github.com/pkg/errors";
rev = "645ef00459ed84a119197bfb8d8205042c6df63d";
sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
};
}
{
goPackagePath = "github.com/pquerna/ffjson";
fetch = {
type = "git";
url = "https://github.com/pquerna/ffjson";
rev = "d49c2bc1aa135aad0c6f4fc2056623ec78f5d5ac";
sha256 = "069w276lch2hhkvz26wdla8d4s0cg842bhqmih4sa33dsinlgs8g";
};
}
{
goPackagePath = "github.com/prometheus/client_golang";
fetch = {
type = "git";
url = "https://github.com/prometheus/client_golang";
rev = "faf4ec335fe01ae5a6a0eaa34a5a9333bfbd1a30";
sha256 = "08xgqgx7vc27zc30chgi09lwrnvxr338dn624xnw4ysfm9r6lxrz";
};
}
{
goPackagePath = "github.com/prometheus/client_model";
fetch = {
type = "git";
url = "https://github.com/prometheus/client_model";
rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c";
sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998";
};
}
{
goPackagePath = "github.com/prometheus/common";
fetch = {
type = "git";
url = "https://github.com/prometheus/common";
rev = "7600349dcfe1abd18d72d3a1770870d9800a7801";
sha256 = "0lsp94dqpj35dny4m4x15kg4wgwawlm3in7cnpajkkacgyxagk5f";
};
}
{
goPackagePath = "github.com/prometheus/procfs";
fetch = {
type = "git";
url = "https://github.com/prometheus/procfs";
rev = "7d6f385de8bea29190f15ba9931442a0eaef9af7";
sha256 = "18cish8yas5r6xhgp8p8n7lg4wh3d4szzirszxra8m7rwy3swxxq";
};
}
{
goPackagePath = "github.com/russross/blackfriday";
fetch = {
type = "git";
url = "https://github.com/russross/blackfriday";
rev = "55d61fa8aa702f59229e6cff85793c22e580eaf5";
sha256 = "0qmavm5d14kj6im6sqzpqnlhpy524428vkn4hnfwknndr9rycmn0";
};
}
{
goPackagePath = "github.com/safchain/ethtool";
fetch = {
type = "git";
url = "https://github.com/safchain/ethtool";
rev = "6e3f4faa84e1d8d48afec75ed064cf3611d3f8bf";
sha256 = "15xjvny8bfhhjvvv654pimxxw5cd02q8skp1siwbfvrlw598j4lm";
};
}
{
goPackagePath = "github.com/satori/go.uuid";
fetch = {
type = "git";
url = "https://github.com/satori/go.uuid";
rev = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3";
sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb";
};
}
{
goPackagePath = "github.com/seccomp/libseccomp-golang";
fetch = {
type = "git";
url = "https://github.com/seccomp/libseccomp-golang";
rev = "e3496e3a417d1dc9ecdceca5af2513271fed37a0";
sha256 = "0z8v90nk22h8r5licav1a8cbn6k7bs47l0j1crw7bjl9hv1bmr71";
};
}
{
goPackagePath = "github.com/sirupsen/logrus";
fetch = {
type = "git";
url = "https://github.com/sirupsen/logrus";
rev = "c155da19408a8799da419ed3eeb0cb5db0ad5dbc";
sha256 = "0g5z7al7kky11ai2dhac6gkp3b5pxsvx72yj3xg4wg3265gbn7yz";
};
}
{
goPackagePath = "github.com/spf13/cobra";
fetch = {
type = "git";
url = "https://github.com/spf13/cobra";
rev = "1e58aa3361fd650121dceeedc399e7189c05674a";
sha256 = "1d6dy60dw7i2mcab10yp99wi5w28jzhzzf16w4ys6bna7ymndiin";
};
}
{
goPackagePath = "github.com/spf13/pflag";
fetch = {
type = "git";
url = "https://github.com/spf13/pflag";
rev = "583c0c0531f06d5278b7d917446061adc344b5cd";
sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5";
};
}
{
goPackagePath = "github.com/sylabs/sif";
fetch = {
type = "git";
url = "https://github.com/sylabs/sif";
rev = "177b9338f1ab9123be5b6217740be1f0ce924206";
sha256 = "1dwpml36n06hglp2km1wsfzdiw1yva6a0h00f1y2933m3i8r3k2w";
};
}
{
goPackagePath = "github.com/syndtr/gocapability";
fetch = {
type = "git";
url = "https://github.com/syndtr/gocapability";
rev = "33e07d32887e1e06b7c025f27ce52f62c7990bc0";
sha256 = "1x88c0b320b13w7samicf19dqx9rr4dnrh3yglk3cba21nwsp57i";
};
}
{
goPackagePath = "github.com/vishvananda/netlink";
fetch = {
type = "git";
url = "https://github.com/vishvananda/netlink";
rev = "a2ad57a690f3caf3015351d2d6e1c0b95c349752";
sha256 = "0hpzghf1a4cwawzhkiwdzin80h6hd09fskl77d5ppgc084yvj8x0";
};
}
{
goPackagePath = "github.com/vishvananda/netns";
fetch = {
type = "git";
url = "https://github.com/vishvananda/netns";
rev = "be1fbeda19366dea804f00efff2dd73a1642fdcc";
sha256 = "0j0xin37zp34ajmhsgfbxr8l7vrljf1lc6z3j3miidlmfwcl2s0m";
};
}
{
goPackagePath = "github.com/xeipuuv/gojsonpointer";
fetch = {
type = "git";
url = "https://github.com/xeipuuv/gojsonpointer";
rev = "4e3ac2762d5f479393488629ee9370b50873b3a6";
sha256 = "13y6iq2nzf9z4ls66bfgnnamj2m3438absmbpqry64bpwjfbsi9q";
};
}
{
goPackagePath = "github.com/xeipuuv/gojsonreference";
fetch = {
type = "git";
url = "https://github.com/xeipuuv/gojsonreference";
rev = "bd5ef7bd5415a7ac448318e64f11a24cd21e594b";
sha256 = "1xby79padc7bmyb8rfbad8wfnfdzpnh51b1n8c0kibch0kwc1db5";
};
}
{
goPackagePath = "github.com/xeipuuv/gojsonschema";
fetch = {
type = "git";
url = "https://github.com/xeipuuv/gojsonschema";
rev = "1d523034197ff1f222f6429836dd36a2457a1874";
sha256 = "1z8c6x8sfh6d1ib2lm2jps7r139qip6h3zik3fxhy1yr1380qbzp";
};
}
{
goPackagePath = "go4.org";
fetch = {
type = "git";
url = "https://github.com/go4org/go4";
rev = "9599cf28b011184741f249bd9f9330756b506cbc";
sha256 = "0hssb6jmpjxvdx2k1zx0l2dbwpx52zxcq5n2bhqivr670r4wdrkq";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://github.com/sylabs/golang-x-crypto";
rev = "4bce89e8e9a9f84a4cf02b9842c3eaff2af0a856";
sha256 = "11wi2zd055ym9m36ba007rdg4ghrwaiqxc77qyqc37ln7l7accr9";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "db08ff08e8622530d9ed3a0e8ac279f6d4c02196";
sha256 = "1f6q8kbijnrfy6wjqxrzgjf38ippckc5w34lhqsjs7kq045aar9a";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "6c888cc515d3ed83fc103cf1d84468aad274b0a7";
sha256 = "18anqrdajp4p015v3f5y641k3lmgp2jr0lfyx0pb3ia0qvn93mrp";
};
}
{
goPackagePath = "gopkg.in/cheggaaa/pb.v1";
fetch = {
type = "git";
url = "https://github.com/cheggaaa/pb";
rev = "2af8bbdea9e99e83b3ac400d8f6b6d1b8cbbf338";
sha256 = "0vxqiw6f3xyv0zy3g4lksf8za0z8i0hvfpw92hqimsy84f79j3dp";
};
}
{
goPackagePath = "gopkg.in/yaml.v2";
fetch = {
type = "git";
url = "https://github.com/go-yaml/yaml";
rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
};
}
]

21
pkgs/applications/virtualization/singularity/env.patch
View File

@ -1,21 +0,0 @@
diff --git a/libexec/functions b/libexec/functions
index bc68107..6c2211c 100644
--- a/libexec/functions
+++ b/libexec/functions
@@ -29,16 +29,6 @@ if [ -z "${SINGULARITY_MESSAGELEVEL:-}" ]; then
SINGULARITY_MESSAGELEVEL=5
fi
-if [ -z "${USER:-}" ]; then
- USER=`id -un`
- export USER
-fi
-if [ -z "${HOME:-}" ]; then
- HOME=`getent passwd "$USER" | cut -d : -f 6`
- export HOME
-fi
-
-
message() {
LEVEL="${1:-}"
MESSAGE="${2:-}"

4
pkgs/applications/window-managers/bspwm/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "bspwm-${version}";
version = "0.9.5";
version = "0.9.6";
src = fetchFromGitHub {
owner = "baskerville";
repo = "bspwm";
rev = version;
sha256 = "09h3g1rxxjyw861mk32lj774nmwkx8cwxq4wfgmf4dpbizymvhhr";
sha256 = "1ywjhqxvggfdfd3cfki0vvlsli8lhqlziwfrj5vd57c6yisc2fyy";
};
buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ];

15
pkgs/applications/window-managers/i3/status-rust.nix
View File

@ -1,21 +1,24 @@
{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, dbus }:
{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, dbus, libpulseaudio }:
rustPlatform.buildRustPackage rec {
name = "i3status-rust-${version}";
version = "0.9.0.2018-10-02";
version = "0.9.0.2019-02-15";
src = fetchFromGitHub {
owner = "greshake";
repo = "i3status-rust";
rev = "11c2a21693ffcd0b6c2e0ac919b2232918293963";
sha256 = "019m9qpw7djq6g7lzbm7gjcavlgsp93g3cd7cb408nxnfsi7i9dp";
rev = "2dc958995834b529a245c22c510b57d5c928c747";
sha256 = "091a2pqgkiwnya2xv5rw5sj730hf6lvkp2kk5midsa3wz2dfbc2j";
};
cargoSha256 = "1wnify730f7c3cb8wllqvs7pzrq54g5x81xspvz5gq0iqr0q38zc";
cargoSha256 = "06izzv86nkn1izapldysyryz9zvjxvq23c742z284bnxjfq5my6i";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ dbus ];
buildInputs = [ dbus libpulseaudio ];
# Currently no tests are implemented, so we avoid building the package twice
doCheck = false;
meta = with stdenv.lib; {
description = "Very resource-friendly and feature-rich replacement for i3status";

4
pkgs/applications/window-managers/sway/beta.nix
View File

@ -36,9 +36,9 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
mesonFlags = [
"-Dxwayland=enabled" "-Dgdk-pixbuf=enabled" "-Dman-pages=enabled"
"-Dxwayland=enabled" "-Dgdk-pixbuf=enabled"
"-Dtray=enabled"
];
] ++ stdenv.lib.optional buildDocs "-Dman-pages=enabled";
meta = with stdenv.lib; {
description = "i3-compatible window manager for Wayland";

4
pkgs/build-support/build-bazel-package/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, bazel, enableNixHacks ? true }:
{ stdenv, bazel, cacert, enableNixHacks ? true }:
args@{ name, bazelFlags ? [], bazelTarget, buildAttrs, fetchAttrs, ... }:
@ -20,6 +20,8 @@ in stdenv.mkDerivation (fBuildAttrs // {
export bazelOut="$(echo ''${NIX_BUILD_TOP}/output | sed -e 's,//,/,g')"
export bazelUserRoot="$(echo ''${NIX_BUILD_TOP}/tmp | sed -e 's,//,/,g')"
export HOME="$NIX_BUILD_TOP"
# This is needed for git_repository with https remotes
export GIT_SSL_CAINFO="${cacert}/etc/ssl/certs/ca-bundle.crt"
'';
buildPhase = fFetchAttrs.buildPhase or ''

178
pkgs/build-support/nix-gitignore/default.nix Normal file
View File

@ -0,0 +1,178 @@
# https://github.com/siers/nix-gitignore/
{ lib, runCommand }:
# An interesting bit from the gitignore(5):
# - A slash followed by two consecutive asterisks then a slash matches
# - zero or more directories. For example, "a/**/b" matches "a/b",
# - "a/x/b", "a/x/y/b" and so on.
with builtins;
let
debug = a: trace a a;
last = l: elemAt l ((length l) - 1);
throwIfOldNix = let required = "2.0"; in
if compareVersions nixVersion required == -1
then throw "nix (v${nixVersion} =< v${required}) is too old for nix-gitignore"
else true;
in rec {
# [["good/relative/source/file" true] ["bad.tmpfile" false]] -> root -> path
filterPattern = patterns: root:
(name: _type:
let
relPath = lib.removePrefix ((toString root) + "/") name;
matches = pair: (match (head pair) relPath) != null;
matched = map (pair: [(matches pair) (last pair)]) patterns;
in
last (last ([[true true]] ++ (filter head matched)))
);
# string -> [[regex bool]]
gitignoreToPatterns = gitignore:
assert throwIfOldNix;
let
# ignore -> bool
isComment = i: (match "^(#.*|$)" i) != null;
# ignore -> [ignore bool]
computeNegation = l:
let split = match "^(!?)(.*)" l;
in [(elemAt split 1) (head split == "!")];
# ignore -> regex
substWildcards =
let
special = "^$.+{}()";
escs = "\\*?";
splitString =
let recurse = str : [(substring 0 1 str)] ++
(if str == "" then [] else (recurse (substring 1 (stringLength(str)) str) ));
in str : recurse str;
chars = s: filter (c: c != "" && !isList c) (splitString s);
escape = s: map (c: "\\" + c) (chars s);
in
replaceStrings
((chars special) ++ (escape escs) ++ ["**/" "**" "*" "?"])
((escape special) ++ (escape escs) ++ ["(.*/)?" ".*" "[^/]*" "[^/]"]);
# (regex -> regex) -> regex -> regex
mapAroundCharclass = f: r: # rl = regex or list
let slightFix = replaceStrings ["\\]"] ["]"];
in
concatStringsSep ""
(map (rl: if isList rl then slightFix (elemAt rl 0) else f rl)
(split "(\\[([^\\\\]|\\\\.)+])" r));
# regex -> regex
handleSlashPrefix = l:
let
split = (match "^(/?)(.*)" l);
findSlash = l: if (match ".+/.+" l) != null then "" else l;
hasSlash = mapAroundCharclass findSlash l != l;
in
(if (elemAt split 0) == "/" || hasSlash
then "^"
else "(^|.*/)"
) + (elemAt split 1);
# regex -> regex
handleSlashSuffix = l:
let split = (match "^(.*)/$" l);
in if split != null then (elemAt split 0) + "($|/.*)" else l;
# (regex -> regex) -> [regex, bool] -> [regex, bool]
mapPat = f: l: [(f (head l)) (last l)];
in
map (l: # `l' for "line"
mapPat (l: handleSlashSuffix (handleSlashPrefix (mapAroundCharclass substWildcards l)))
(computeNegation l))
(filter (l: !isList l && !isComment l)
(split "\n" gitignore));
gitignoreFilter = ign: root: filterPattern (gitignoreToPatterns ign) root;
# string|[string|file] (→ [string|file] → [string]) -> string
gitignoreCompileIgnore = file_str_patterns: root:
let
onPath = f: a: if typeOf a == "path" then f a else a;
str_patterns = map (onPath readFile) (lib.toList file_str_patterns);
in concatStringsSep "\n" str_patterns;
gitignoreFilterPure = filter: patterns: root: name: type:
gitignoreFilter (gitignoreCompileIgnore patterns root) root name type
&& filter name type;
# This is a very hacky way of programming this!
# A better way would be to reuse existing filtering by making multiple gitignore functions per each root.
# Then for each file find the set of roots with gitignores (and functions).
# This would make gitignoreFilterSource very different from gitignoreFilterPure.
# rootPath → gitignoresConcatenated
compileRecursiveGitignore = root:
let
dirOrIgnore = file: type: baseNameOf file == ".gitignore" || type == "directory";
ignores = builtins.filterSource dirOrIgnore root;
in readFile (
runCommand "${baseNameOf root}-recursive-gitignore" {} ''
cd ${ignores}
find -type f -exec sh -c '
rel="$(realpath --relative-to=. "$(dirname "$1")")/"
if [ "$rel" = "./" ]; then rel=""; fi
awk -v prefix="$rel" -v root="$1" -v top="$(test -z "$rel" && echo 1)" "
BEGIN { print \"# \"root }
/^!?[^\\/]+\/?$/ {
match(\$0, /^!?/, negation)
sub(/^!?/, \"\")
if (top) { middle = \"\" } else { middle = \"**/\" }
print negation[0] prefix middle \$0
}
/^!?(\\/|.*\\/.+$)/ {
match(\$0, /^!?/, negation)
sub(/^!?/, \"\")
if (!top) sub(/^\//, \"\")
print negation[0] prefix \$0
}
END { print \"\" }
" "$1"
' sh {} \; > $out
'');
withGitignoreFile = patterns: root:
lib.toList patterns ++ [(root + "/.gitignore")];
withRecursiveGitignoreFile = patterns: root:
lib.toList patterns ++ [(compileRecursiveGitignore root)];
# filterSource derivatives
gitignoreFilterSourcePure = filter: patterns: root:
filterSource (gitignoreFilterPure filter patterns root) root;
gitignoreFilterSource = filter: patterns: root:
gitignoreFilterSourcePure filter (withGitignoreFile patterns root) root;
gitignoreFilterRecursiveSource = filter: patterns: root:
gitignoreFilterSourcePure filter (withRecursiveGitignoreFile patterns root) root;
# "Filter"-less alternatives
gitignoreSourcePure = gitignoreFilterSourcePure (_: _: true);
gitignoreSource = patterns: let type = typeOf patterns; in
if (type == "string" && pathExists patterns) || type == "path"
then throw
"type error in gitignoreSource(patterns -> source -> path), "
"use [] or \"\" if there are no additional patterns"
else gitignoreFilterSource (_: _: true) patterns;
gitignoreRecursiveSource = gitignoreFilterSourcePure (_: _: true);
}

17
pkgs/build-support/singularity-tools/default.nix
View File

@ -87,19 +87,14 @@ rec {
# Create runScript
ln -s ${runScriptFile} singularity
# Size calculation
cd ..
umount disk
size=$(resize2fs -P /dev/${vmTools.hd} | awk '{print $NF}')
mount /dev/${vmTools.hd} disk
cd disk
# Fill out .singularity.d
mkdir -p .singularity.d/env
touch .singularity.d/env/94-appsbase.sh
export PATH=$PATH:${e2fsprogs}/bin/
echo creating
singularity image.create -s $((1 + size * 4 / 1024 + ${toString extraSpace})) $out
echo importing
cd ..
mkdir -p /var/singularity/mnt/{container,final,overlay,session,source}
tar -c . | singularity image.import $out
echo "root:x:0:0:System administrator:/root:/bin/sh" > /etc/passwd
singularity build $out ./disk
'');
in result;

2
pkgs/development/coq-modules/mathcomp-analysis/default.nix
View File

@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
};
passthru = {
compatibleCoqVersions = v: builtins.elem v [ "8.8" ];
compatibleCoqVersions = v: builtins.elem v [ "8.8" "8.9" ];
};
}

4
pkgs/development/coq-modules/mathcomp-bigenough/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ coq ];
propagatedBuildInputs = [ mathcomp ];
installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
installFlags = "-f Makefile.coq COQLIB=$(out)/lib/coq/${coq.coq-version}/";
meta = {
description = "A small library to do epsilon - N reasonning";
@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
};
passthru = {
compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" ];
compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" ];
};
}

4
pkgs/development/coq-modules/mathcomp-finmap/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ coq ];
propagatedBuildInputs = [ mathcomp ];
installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
installFlags = "-f Makefile.coq COQLIB=$(out)/lib/coq/${coq.coq-version}/";
meta = {
description = "A finset and finmap library";
@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
};
passthru = {
compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ];
compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" ];
};
}

48
pkgs/development/coq-modules/paramcoq/default.nix Normal file
View File

@ -0,0 +1,48 @@
{ stdenv, fetchFromGitHub, coq }:
let params =
{
"8.7" = {
version = "1.1.1+coq8.7";
sha256 = "1i7b5pkx46zf9il2xikbp3rhpnh3wdfbhw5yxcf9yk28ky9s0a0l";
};
"8.8" = {
version = "1.1.1";
sha256 = "0b07zvgm9cx6j2d9631zmqjs6sf30kiqg6k15xk3km7n80d53wfh";
};
"8.9" = {
version = "1.1.1+coq8.9";
sha256 = "002xabhjlph394vydw3dx8ipv5ry2nq3py4440bk9a18ljx0w6ll";
};
};
param = params."${coq.coq-version}";
in
stdenv.mkDerivation rec {
inherit (param) version;
name = "coq${coq.coq-version}-paramcoq-${version}";
src = fetchFromGitHub {
owner = "coq-community";
repo = "paramcoq";
rev = "v${version}";
inherit (param) sha256;
};
buildInputs = [ coq ]
++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ])
;
installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
passthru = {
compatibleCoqVersions = v: builtins.hasAttr v params;
};
meta = {
description = "Coq plugin for parametricity";
inherit (src.meta) homepage;
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.vbgl ];
inherit (coq.meta) platforms;
};
}

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

@ -151,6 +151,10 @@ self: super: {
# dontCheck due to https://github.com/haskell/vector/issues/138
vector = dontCheck (if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector);
conduit-extra = if pkgs.stdenv.isDarwin
then super.conduit-extra.overrideAttrs (drv: { __darwinAllowLocalNetworking = true; })
else super.conduit-extra;
# Fix Darwin build.
halive = if pkgs.stdenv.isDarwin
then addBuildDepend super.halive pkgs.darwin.apple_sdk.frameworks.AppKit
@ -1219,4 +1223,12 @@ self: super: {
})];
});
# Use latest pandoc despite what LTS says.
# Test suite fails in both 2.5 and 2.6: https://github.com/jgm/pandoc/issues/5309.
pandoc = dontCheck super.pandoc_2_6;
pandoc-citeproc = self.pandoc-citeproc_0_16_1;
# https://github.com/qfpl/tasty-hedgehog/issues/24
tasty-hedgehog = dontCheck super.tasty-hedgehog;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

3
pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
View File

@ -95,7 +95,4 @@ self: super: {
# GHC 8.2 doesn't have semigroups included by default
ListLike = addBuildDepend super.ListLike self.semigroups;
# https://github.com/pikajude/stylish-cabal/issues/11
stylish-cabal = markBrokenVersion "0.4.1.0" super.stylish-cabal;
}

5
pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
View File

@ -71,11 +71,6 @@ self: super: {
yaml = self.yaml_0_11_0_0;
};
# https://github.com/pikajude/stylish-cabal/issues/11
stylish-cabal = generateOptparseApplicativeCompletion "stylish-cabal" (super.stylish-cabal.overrideScope (self: super: {
haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1);
}));
# cabal2nix doesn't list this because of a conditional on the GHC version.
aeson = addBuildDepend super.aeson self.contravariant;

3
pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
View File

@ -69,7 +69,4 @@ self: super: {
# Break out of "yaml >=0.10.4.0 && <0.11": https://github.com/commercialhaskell/stack/issues/4485
stack = doJailbreak super.stack;
# https://github.com/pikajude/stylish-cabal/issues/11
stylish-cabal = markBrokenVersion "0.4.1.0" super.stylish-cabal;
}

3
pkgs/development/haskell-modules/configuration-ghc-head.nix
View File

@ -78,7 +78,4 @@ self: super: {
# Fix build with ghc 8.6.x.
git-annex = appendPatch super.git-annex ./patches/git-annex-fix-ghc-8.6.x-build.patch;
# https://github.com/pikajude/stylish-cabal/issues/11
stylish-cabal = markBrokenVersion "0.4.1.0" super.stylish-cabal;
}

233
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -46,7 +46,7 @@ default-package-overrides:
# Newer versions don't work in LTS-12.x
- alsa-mixer < 0.3
- cassava-megaparsec < 2
# LTS Haskell 13.6
# LTS Haskell 13.7
- abstract-deque ==0.3
- abstract-deque-tests ==0.3
- abstract-par ==0.3.3
@ -88,96 +88,96 @@ default-package-overrides:
- alternative-vector ==0.0.0
- alternators ==1.0.0.0
- ALUT ==2.4.0.2
- amazonka ==1.6.0
- amazonka-apigateway ==1.6.0
- amazonka-application-autoscaling ==1.6.0
- amazonka-appstream ==1.6.0
- amazonka-athena ==1.6.0
- amazonka-autoscaling ==1.6.0
- amazonka-budgets ==1.6.0
- amazonka-certificatemanager ==1.6.0
- amazonka-cloudformation ==1.6.0
- amazonka-cloudfront ==1.6.0
- amazonka-cloudhsm ==1.6.0
- amazonka-cloudsearch ==1.6.0
- amazonka-cloudsearch-domains ==1.6.0
- amazonka-cloudtrail ==1.6.0
- amazonka-cloudwatch ==1.6.0
- amazonka-cloudwatch-events ==1.6.0
- amazonka-cloudwatch-logs ==1.6.0
- amazonka-codebuild ==1.6.0
- amazonka-codecommit ==1.6.0
- amazonka-codedeploy ==1.6.0
- amazonka-codepipeline ==1.6.0
- amazonka-cognito-identity ==1.6.0
- amazonka-cognito-idp ==1.6.0
- amazonka-cognito-sync ==1.6.0
- amazonka-config ==1.6.0
- amazonka-core ==1.6.0
- amazonka-datapipeline ==1.6.0
- amazonka-devicefarm ==1.6.0
- amazonka-directconnect ==1.6.0
- amazonka-discovery ==1.6.0
- amazonka-dms ==1.6.0
- amazonka-ds ==1.6.0
- amazonka-dynamodb ==1.6.0
- amazonka-dynamodb-streams ==1.6.0
- amazonka-ec2 ==1.6.0
- amazonka-ecr ==1.6.0
- amazonka-ecs ==1.6.0
- amazonka-efs ==1.6.0
- amazonka-elasticache ==1.6.0
- amazonka-elasticbeanstalk ==1.6.0
- amazonka-elasticsearch ==1.6.0
- amazonka-elastictranscoder ==1.6.0
- amazonka-elb ==1.6.0
- amazonka-elbv2 ==1.6.0
- amazonka-emr ==1.6.0
- amazonka-gamelift ==1.6.0
- amazonka-glacier ==1.6.0
- amazonka-health ==1.6.0
- amazonka-iam ==1.6.0
- amazonka-importexport ==1.6.0
- amazonka-inspector ==1.6.0
- amazonka-iot ==1.6.0
- amazonka-iot-dataplane ==1.6.0
- amazonka-kinesis ==1.6.0
- amazonka-kinesis-analytics ==1.6.0
- amazonka-kinesis-firehose ==1.6.0
- amazonka-kms ==1.6.0
- amazonka-lambda ==1.6.0
- amazonka-lightsail ==1.6.0
- amazonka-marketplace-analytics ==1.6.0
- amazonka-marketplace-metering ==1.6.0
- amazonka-ml ==1.6.0
- amazonka-opsworks ==1.6.0
- amazonka-opsworks-cm ==1.6.0
- amazonka-pinpoint ==1.6.0
- amazonka-polly ==1.6.0
- amazonka-rds ==1.6.0
- amazonka-redshift ==1.6.0
- amazonka-rekognition ==1.6.0
- amazonka-route53 ==1.6.0
- amazonka-route53-domains ==1.6.0
- amazonka-s3 ==1.6.0
- amazonka-sdb ==1.6.0
- amazonka-servicecatalog ==1.6.0
- amazonka-ses ==1.6.0
- amazonka-shield ==1.6.0
- amazonka-sms ==1.6.0
- amazonka-snowball ==1.6.0
- amazonka-sns ==1.6.0
- amazonka-sqs ==1.6.0
- amazonka-ssm ==1.6.0
- amazonka-stepfunctions ==1.6.0
- amazonka-storagegateway ==1.6.0
- amazonka-sts ==1.6.0
- amazonka-support ==1.6.0
- amazonka-swf ==1.6.0
- amazonka-test ==1.6.0
- amazonka-waf ==1.6.0
- amazonka-workspaces ==1.6.0
- amazonka-xray ==1.6.0
- amazonka ==1.6.1
- amazonka-apigateway ==1.6.1
- amazonka-application-autoscaling ==1.6.1
- amazonka-appstream ==1.6.1
- amazonka-athena ==1.6.1
- amazonka-autoscaling ==1.6.1
- amazonka-budgets ==1.6.1
- amazonka-certificatemanager ==1.6.1
- amazonka-cloudformation ==1.6.1
- amazonka-cloudfront ==1.6.1
- amazonka-cloudhsm ==1.6.1
- amazonka-cloudsearch ==1.6.1
- amazonka-cloudsearch-domains ==1.6.1
- amazonka-cloudtrail ==1.6.1
- amazonka-cloudwatch ==1.6.1
- amazonka-cloudwatch-events ==1.6.1
- amazonka-cloudwatch-logs ==1.6.1
- amazonka-codebuild ==1.6.1
- amazonka-codecommit ==1.6.1
- amazonka-codedeploy ==1.6.1
- amazonka-codepipeline ==1.6.1
- amazonka-cognito-identity ==1.6.1
- amazonka-cognito-idp ==1.6.1
- amazonka-cognito-sync ==1.6.1
- amazonka-config ==1.6.1
- amazonka-core ==1.6.1
- amazonka-datapipeline ==1.6.1
- amazonka-devicefarm ==1.6.1
- amazonka-directconnect ==1.6.1
- amazonka-discovery ==1.6.1
- amazonka-dms ==1.6.1
- amazonka-ds ==1.6.1
- amazonka-dynamodb ==1.6.1
- amazonka-dynamodb-streams ==1.6.1
- amazonka-ec2 ==1.6.1
- amazonka-ecr ==1.6.1
- amazonka-ecs ==1.6.1
- amazonka-efs ==1.6.1
- amazonka-elasticache ==1.6.1
- amazonka-elasticbeanstalk ==1.6.1
- amazonka-elasticsearch ==1.6.1
- amazonka-elastictranscoder ==1.6.1
- amazonka-elb ==1.6.1
- amazonka-elbv2 ==1.6.1
- amazonka-emr ==1.6.1
- amazonka-gamelift ==1.6.1
- amazonka-glacier ==1.6.1
- amazonka-health ==1.6.1
- amazonka-iam ==1.6.1
- amazonka-importexport ==1.6.1
- amazonka-inspector ==1.6.1
- amazonka-iot ==1.6.1
- amazonka-iot-dataplane ==1.6.1
- amazonka-kinesis ==1.6.1
- amazonka-kinesis-analytics ==1.6.1
- amazonka-kinesis-firehose ==1.6.1
- amazonka-kms ==1.6.1
- amazonka-lambda ==1.6.1
- amazonka-lightsail ==1.6.1
- amazonka-marketplace-analytics ==1.6.1
- amazonka-marketplace-metering ==1.6.1
- amazonka-ml ==1.6.1
- amazonka-opsworks ==1.6.1
- amazonka-opsworks-cm ==1.6.1
- amazonka-pinpoint ==1.6.1
- amazonka-polly ==1.6.1
- amazonka-rds ==1.6.1
- amazonka-redshift ==1.6.1
- amazonka-rekognition ==1.6.1
- amazonka-route53 ==1.6.1
- amazonka-route53-domains ==1.6.1
- amazonka-s3 ==1.6.1
- amazonka-sdb ==1.6.1
- amazonka-servicecatalog ==1.6.1
- amazonka-ses ==1.6.1
- amazonka-shield ==1.6.1
- amazonka-sms ==1.6.1
- amazonka-snowball ==1.6.1
- amazonka-sns ==1.6.1
- amazonka-sqs ==1.6.1
- amazonka-ssm ==1.6.1
- amazonka-stepfunctions ==1.6.1
- amazonka-storagegateway ==1.6.1
- amazonka-sts ==1.6.1
- amazonka-support ==1.6.1
- amazonka-swf ==1.6.1
- amazonka-test ==1.6.1
- amazonka-waf ==1.6.1
- amazonka-workspaces ==1.6.1
- amazonka-xray ==1.6.1
- amqp ==0.18.1
- annotated-wl-pprint ==0.7.0
- ansi-terminal ==0.8.2
@ -238,7 +238,7 @@ default-package-overrides:
- avers ==0.0.17.1
- avers-api ==0.1.0
- avers-server ==0.1.0.1
- avro ==0.4.1.2
- avro ==0.4.2.0
- avwx ==0.3.0.2
- axel ==0.0.9
- backprop ==0.2.6.1
@ -253,7 +253,7 @@ default-package-overrides:
- base64-string ==0.2
- base-compat ==0.10.5
- base-compat-batteries ==0.10.5
- basement ==0.0.8
- basement ==0.0.10
- base-noprelude ==4.12.0.0
- base-orphans ==0.8
- base-prelude ==1.3
@ -557,7 +557,7 @@ default-package-overrides:
- dataurl ==0.1.0.0
- DAV ==1.3.3
- dbcleaner ==0.1.3
- DBFunctor ==0.1.0.0
- DBFunctor ==0.1.1.0
- dbus ==1.2.3
- debian-build ==0.10.1.2
- debug ==0.1.1
@ -749,7 +749,7 @@ default-package-overrides:
- forma ==1.1.1
- format-numbers ==0.1.0.0
- formatting ==6.3.7
- foundation ==0.0.21
- foundation ==0.0.23
- free ==5.1
- freenect ==1.2.1
- freer-simple ==1.2.1.0
@ -776,7 +776,7 @@ default-package-overrides:
- general-games ==1.1.1
- generic-arbitrary ==0.1.0
- generic-data ==0.3.0.0
- generic-deriving ==1.12.2
- generic-deriving ==1.12.3
- generic-lens ==1.1.0.0
- GenericPretty ==1.2.2
- generic-random ==1.2.0.0
@ -880,7 +880,7 @@ default-package-overrides:
- hamilton ==0.1.0.3
- hamtsolo ==1.0.3
- HandsomeSoup ==0.4.2
- hapistrano ==0.3.9.1
- hapistrano ==0.3.9.2
- happy ==1.19.9
- hasbolt ==0.1.3.2
- hashable ==1.2.7.0
@ -917,7 +917,7 @@ default-package-overrides:
- HDBC-mysql ==0.7.1.0
- HDBC-session ==0.1.2.0
- heap ==1.0.4
- heaps ==0.3.6
- heaps ==0.3.6.1
- hebrew-time ==0.1.1
- hedgehog ==0.6.1
- hedgehog-corpus ==0.1.0
@ -951,7 +951,7 @@ default-package-overrides:
- hmatrix-morpheus ==0.1.1.2
- hmatrix-vector-sized ==0.1.1.2
- hmpfr ==0.4.4
- hoauth2 ==1.8.3
- hoauth2 ==1.8.4
- Hoed ==0.5.1
- hOpenPGP ==2.7.4.1
- hopfli ==0.2.2.1
@ -977,8 +977,8 @@ default-package-overrides:
- hsdns ==1.7.1
- hsebaysdk ==0.4.0.0
- hsemail ==2
- hset ==2.2.0
- HSet ==0.0.1
- hset ==2.2.0
- hsexif ==0.6.1.6
- hs-functors ==0.1.3.0
- hs-GeoIP ==0.3
@ -1089,7 +1089,7 @@ default-package-overrides:
- imagesize-conduit ==1.1
- Imlib ==0.1.2
- immortal ==0.3
- include-file ==0.1.0.3
- include-file ==0.1.0.4
- incremental-parser ==0.3.2.1
- indentation-core ==0.0.0.2
- indentation-parsec ==0.0.0.2
@ -1481,7 +1481,7 @@ default-package-overrides:
- parallel ==3.2.2.0
- parallel-io ==0.3.3
- paripari ==0.6.0.0
- parseargs ==0.2.0.8
- parseargs ==0.2.0.9
- parsec ==3.1.13.0
- parsec-class ==1.0.0.0
- parsec-numbers ==0.1.0
@ -1538,7 +1538,7 @@ default-package-overrides:
- pipes-fastx ==0.3.0.0
- pipes-fluid ==0.6.0.1
- pipes-group ==1.0.12
- pipes-http ==1.0.5
- pipes-http ==1.0.6
- pipes-misc ==0.5.0.0
- pipes-network ==0.6.5
- pipes-network-tls ==0.3
@ -1606,13 +1606,13 @@ default-package-overrides:
- protocol-radius ==0.0.1.1
- protocol-radius-test ==0.0.1.0
- proto-lens ==0.4.0.1
- proto-lens-arbitrary ==0.1.2.5
- proto-lens-arbitrary ==0.1.2.6
- proto-lens-combinators ==0.4.0.1
- proto-lens-optparse ==0.1.1.4
- proto-lens-optparse ==0.1.1.5
- proto-lens-protobuf-types ==0.4.0.1
- proto-lens-protoc ==0.4.0.2
- proto-lens-runtime ==0.4.0.2
- proto-lens-setup ==0.4.0.1
- proto-lens-setup ==0.4.0.2
- protolude ==0.2.3
- proxied ==0.3
- psql-helpers ==0.1.0.0
@ -1666,7 +1666,7 @@ default-package-overrides:
- read-editor ==0.1.0.2
- read-env-var ==1.0.0.0
- rebase ==1.3
- record-dot-preprocessor ==0.1.4
- record-dot-preprocessor ==0.1.5
- records-sop ==0.1.0.2
- recursion-schemes ==5.1.1
- reducers ==3.12.3
@ -1844,9 +1844,9 @@ default-package-overrides:
- skein ==1.0.9.4
- skews ==0.1.0.1
- skip-var ==0.1.1.0
- skylighting ==0.7.5
- skylighting-core ==0.7.5
- slack-web ==0.2.0.9
- skylighting ==0.7.6
- skylighting-core ==0.7.6
- slack-web ==0.2.0.10
- smallcheck ==1.1.5
- smoothie ==0.4.2.9
- smtp-mail ==0.1.4.6
@ -2024,7 +2024,7 @@ default-package-overrides:
- th-expand-syns ==0.4.4.0
- th-extras ==0.0.0.4
- th-lift ==0.7.11
- th-lift-instances ==0.1.11
- th-lift-instances ==0.1.12
- th-orphans ==0.13.6
- th-printf ==0.6.0
- thread-hierarchy ==0.3.0.1
@ -2114,7 +2114,7 @@ default-package-overrides:
- union-find ==0.2
- uniplate ==1.6.12
- uniprot-kb ==0.1.2.0
- uniq-deep ==1.1.0.0
- uniq-deep ==1.1.1
- unique ==0
- unit-constraint ==0.0.0
- universe-base ==1.0.2.1
@ -2165,7 +2165,7 @@ default-package-overrides:
- vector-algorithms ==0.8.0.1
- vector-binary-instances ==0.2.5.1
- vector-buffer ==0.4.1
- vector-builder ==0.3.6
- vector-builder ==0.3.7.2
- vector-bytes-instances ==0.1.1
- vector-instances ==3.4
- vector-mmap ==0.0.3
@ -2306,7 +2306,7 @@ default-package-overrides:
- yesod-form-bootstrap4 ==2.1.0
- yesod-gitrepo ==0.3.0
- yesod-gitrev ==0.2.0.0
- yesod-markdown ==0.12.6.0
- yesod-markdown ==0.12.6.1
- yesod-newsfeed ==1.6.1.0
- yesod-paginator ==1.1.0.1
- yesod-persistent ==1.6.0.1
@ -2362,7 +2362,6 @@ extra-packages:
- haddock-api == 2.17.* # required on GHC 8.0.x
- haddock-library == 1.2.* # required for haddock-api-2.16.x
- haddock-library == 1.4.3 # required for haddock-api-2.17.x
- haddock-library == 1.5.* # required for stylish-cabal-0.4.0.1
- happy <1.19.6 # newer versions break Agda
- haskell-gi-overloading == 0.0 # gi-* packages use this dependency to disable overloading support
- haskell-src-exts == 1.19.* # required by hindent and structured-haskell-mode
@ -2404,9 +2403,9 @@ extra-packages:
package-maintainers:
peti:
- cabal-install
- cabal2nix
- cabal2spec
- cabal-install
- distribution-nixpkgs
- funcmp
- git-annex
@ -2431,6 +2430,7 @@ package-maintainers:
- stack
- streamproc
- structured-haskell-mode
- stylish-cabal
- titlecase
- xmonad
- xmonad-contrib
@ -9144,7 +9144,6 @@ dont-distribute-packages:
stt: [ i686-linux, x86_64-linux, x86_64-darwin ]
stunts: [ i686-linux, x86_64-linux, x86_64-darwin ]
stutter: [ i686-linux, x86_64-linux, x86_64-darwin ]
stylish-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ]
stylized: [ i686-linux, x86_64-linux, x86_64-darwin ]
sub-state: [ i686-linux, x86_64-linux, x86_64-darwin ]
subhask: [ i686-linux, x86_64-linux, x86_64-darwin ]

13
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -544,6 +544,19 @@ self: super: builtins.intersectAttrs super {
'';
});
# On Darwin, git-annex mis-detects options to `cp`, so we wrap the binary to
# ensure it uses Nixpkgs' coreutils.
git-annex = with pkgs;
if (!stdenv.isLinux) then
let path = stdenv.lib.makeBinPath [ coreutils ];
in overrideCabal (addBuildTool super.git-annex makeWrapper) (_drv: {
postFixup = ''
wrapProgram $out/bin/git-annex \
--prefix PATH : "${path}"
'';
})
else super.git-annex;
# The test suite has undeclared dependencies on git.
githash = dontCheck super.githash;

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

File diff suppressed because it is too large Load Diff

2
pkgs/development/interpreters/clojurescript/lumo/package.json
View File

@ -36,7 +36,7 @@
"rollup-plugin-node-resolve": "3.4.0",
"rollup-plugin-replace": "2.1.0",
"webpack": "^4.25.1",
"webpack-cli": "^3.1.2",
"webpack-cli": "^3.2.3",
"which-promise": "^1.0.0"
}
}

10
pkgs/development/libraries/fcppt/default.nix
View File

@ -1,20 +1,20 @@
{ stdenv, fetchFromGitHub, cmake, boost, brigand }:
{ stdenv, fetchFromGitHub, cmake, boost, brigand, catch2 }:
stdenv.mkDerivation rec {
name = "fcppt-${version}";
version = "2.9.0";
version = "3.0.0";
src = fetchFromGitHub {
owner = "freundlich";
repo = "fcppt";
rev = version;
sha256 = "0zyqgmi1shjbwin1lx428v7vbi6jnywb1d47dascdn89r5gz6klv";
sha256 = "0l78fjhy9nl3afrf0da9da4wzp1sx3kcyc2j6b71i60kvk44v4in";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ boost ];
buildInputs = [ boost catch2 ];
cmakeFlags = [ "-DENABLE_EXAMPLES=false" "-DENABLE_TEST=false" "-DBrigand_INCLUDE_DIR=${brigand}/include" ];
cmakeFlags = [ "-DENABLE_EXAMPLES=false" "-DENABLE_CATCH=true" "-DENABLE_TEST=true" "-DBrigand_INCLUDE_DIR=${brigand}/include" ];
enableParallelBuilding = true;

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "librealsense-${version}";
version = "2.17.1";
version = "2.18.0";
src = fetchFromGitHub {
owner = "IntelRealSense";
repo = "librealsense";
rev = "v${version}";
sha256 = "0nxb1vyq7gimv61w0gba2ilbnnmnjac94bk1ikcmdgkymdfwn6zj";
sha256 = "09s0rhjpvaa89767m58wk1bqcmdkjk7brwj32k083f2wsdbbzb11";
};
buildInputs = [

42
pkgs/development/libraries/opencascade-occt/default.nix Normal file
View File

@ -0,0 +1,42 @@
{ stdenv
, fetchurl
, cmake
, tcl
, tk
, vtk
, mesa_glu
, libXext
, libXmu
, libXi
, doxygen
}:
let version = "7.3.0p2";
commit = "V${builtins.replaceStrings ["."] ["_"] version}";
in stdenv.mkDerivation {
name = "opencascade-occt-${version}";
src = fetchurl {
name = "occt-${commit}.tar.gz";
url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${commit};sf=tgz";
sha256 = "0nc9k1nqpj0n99pr7qkva79irmqhh007dffwghiyzs031zhd7i6w";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ tcl tk vtk mesa_glu libXext libXmu libXi doxygen ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation";
homepage = "https://www.opencascade.org/";
license = licenses.lgpl21; # essentially...
# The special exception defined in the file OCCT_LGPL_EXCEPTION.txt
# are basically about making the license a little less share-alike.
maintainers = with maintainers; [ amiloradovsky ];
platforms = platforms.all;
};
}

10
pkgs/development/libraries/science/math/openblas/default.nix
View File

@ -74,6 +74,14 @@ let
if blas64_ != null
then blas64_
else hasPrefix "x86_64" stdenv.hostPlatform.system;
# Convert flag values to format OpenBLAS's build expects.
# `toString` is almost what we need other than bools,
# which we need to map {true -> 1, false -> 0}
# (`toString` produces empty string `""` for false instead of `0`)
mkMakeFlagValue = val:
if !builtins.isBool val then toString val
else if val then "1" else "0";
mkMakeFlagsFromConfig = mapAttrsToList (var: val: "${var}=${mkMakeFlagValue val}");
in
stdenv.mkDerivation rec {
name = "openblas-${version}";
@ -109,7 +117,7 @@ stdenv.mkDerivation rec {
buildPackages.stdenv.cc
];
makeFlags = mapAttrsToList (var: val: "${var}=${toString val}") (config // {
makeFlags = mkMakeFlagsFromConfig (config // {
FC = "${stdenv.cc.targetPrefix}gfortran";
CC = "${stdenv.cc.targetPrefix}${if stdenv.cc.isClang then "clang" else "cc"}";
PREFIX = placeholder "out";

3
pkgs/development/node-packages/node-packages-v10.json
View File

@ -1,5 +1,6 @@
[
"asar"
"@angular/cli"
, "asar"
, "azure-functions-core-tools"
, "bower"
, "bower2nix"

3077
pkgs/development/node-packages/node-packages-v10.nix
View File

File diff suppressed because it is too large Load Diff

20
pkgs/development/node-packages/node-packages-v6.nix
View File

@ -1174,22 +1174,22 @@ let
sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==";
};
};
"mime-db-1.37.0" = {
"mime-db-1.38.0" = {
name = "mime-db";
packageName = "mime-db";
version = "1.37.0";
version = "1.38.0";
src = fetchurl {
url = "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz";
sha512 = "R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==";
url = "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz";
sha512 = "bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==";
};
};
"mime-types-2.1.21" = {
"mime-types-2.1.22" = {
name = "mime-types";
packageName = "mime-types";
version = "2.1.21";
version = "2.1.22";
src = fetchurl {
url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz";
sha512 = "3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==";
url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz";
sha512 = "aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==";
};
};
"minimatch-3.0.4" = {
@ -2442,8 +2442,8 @@ in
sources."json-schema-traverse-0.4.1"
sources."json-stringify-safe-5.0.1"
sources."jsprim-1.4.1"
sources."mime-db-1.37.0"
sources."mime-types-2.1.21"
sources."mime-db-1.38.0"
sources."mime-types-2.1.22"
sources."minimatch-3.0.4"
sources."minimist-0.0.8"
sources."mkdirp-0.5.1"

171
pkgs/development/node-packages/node-packages-v8.nix
View File

@ -40,22 +40,13 @@ let
sha1 = "468c4bb3ebbd96b1270669f4b9cba4e0065ea485";
};
};
"adm-zip-0.4.11" = {
"adm-zip-0.4.13" = {
name = "adm-zip";
packageName = "adm-zip";
version = "0.4.11";
version = "0.4.13";
src = fetchurl {
url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.11.tgz";
sha512 = "L8vcjDTCOIJk7wFvmlEUN7AsSb8T+2JrdP7KINBjzr24TJ5Mwj590sLu3BC7zNZowvJWa/JtPmD8eJCzdtDWjA==";
};
};
"ajv-5.5.2" = {
name = "ajv";
packageName = "ajv";
version = "5.5.2";
src = fetchurl {
url = "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz";
sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965";
url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.13.tgz";
sha512 = "fERNJX8sOXfel6qCBCMPvZLzENBEhZTzKqg6vrOW5pvoEaQuJhRU4ndTAh6lHOxn1I6jnz2NHra56ZODM751uw==";
};
};
"ajv-6.9.1" = {
@ -994,15 +985,6 @@ let
sha1 = "da309cc263df15994c688ca902179ca3c7cd7c7e";
};
};
"co-4.6.0" = {
name = "co";
packageName = "co";
version = "4.6.0";
src = fetchurl {
url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz";
sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184";
};
};
"code-point-at-1.1.0" = {
name = "code-point-at";
packageName = "code-point-at";
@ -1048,15 +1030,6 @@ let
sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63";
};
};
"colors-1.3.0" = {
name = "colors";
packageName = "colors";
version = "1.3.0";
src = fetchurl {
url = "https://registry.npmjs.org/colors/-/colors-1.3.0.tgz";
sha512 = "EDpX3a7wHMWFA7PUHWPHNWqOxIIRSJetuwl0AS5Oi/5FMV8kWm69RTlgm00GKjBO1xFHMtBbL49yRtMMdticBw==";
};
};
"colors-1.3.3" = {
name = "colors";
packageName = "colors";
@ -1165,13 +1138,13 @@ let
sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d";
};
};
"core-js-2.6.4" = {
"core-js-2.6.5" = {
name = "core-js";
packageName = "core-js";
version = "2.6.4";
version = "2.6.5";
src = fetchurl {
url = "https://registry.npmjs.org/core-js/-/core-js-2.6.4.tgz";
sha512 = "05qQ5hXShcqGkPZpXEFLIpxayZscVD2kuMBZewxiIPPEagukO4mqgPA9CWhUvFBJfy3ODdK2p9xyHh7FTU9/7A==";
url = "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz";
sha512 = "klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==";
};
};
"core-util-is-1.0.2" = {
@ -1525,15 +1498,6 @@ let
sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0";
};
};
"fast-deep-equal-1.1.0" = {
name = "fast-deep-equal";
packageName = "fast-deep-equal";
version = "1.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz";
sha1 = "c053477817c86b51daa853c81e059b733d023614";
};
};
"fast-deep-equal-2.0.1" = {
name = "fast-deep-equal";
packageName = "fast-deep-equal";
@ -1885,15 +1849,6 @@ let
sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d";
};
};
"har-validator-5.0.3" = {
name = "har-validator";
packageName = "har-validator";
version = "5.0.3";
src = fetchurl {
url = "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz";
sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd";
};
};
"har-validator-5.1.3" = {
name = "har-validator";
packageName = "har-validator";
@ -2470,15 +2425,6 @@ let
sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13";
};
};
"json-schema-traverse-0.3.1" = {
name = "json-schema-traverse";
packageName = "json-schema-traverse";
version = "0.3.1";
src = fetchurl {
url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz";
sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340";
};
};
"json-schema-traverse-0.4.1" = {
name = "json-schema-traverse";
packageName = "json-schema-traverse";
@ -2758,22 +2704,22 @@ let
sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==";
};
};
"mime-db-1.37.0" = {
"mime-db-1.38.0" = {
name = "mime-db";
packageName = "mime-db";
version = "1.37.0";
version = "1.38.0";
src = fetchurl {
url = "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz";
sha512 = "R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==";
url = "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz";
sha512 = "bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==";
};
};
"mime-types-2.1.21" = {
"mime-types-2.1.22" = {
name = "mime-types";
packageName = "mime-types";
version = "2.1.21";
version = "2.1.22";
src = fetchurl {
url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz";
sha512 = "3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==";
url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz";
sha512 = "aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==";
};
};
"minimatch-3.0.4" = {
@ -3523,15 +3469,6 @@ let
sha1 = "7693ca768bbb0ea5c8ce08c084a45efa05b892ab";
};
};
"request-2.87.0" = {
name = "request";
packageName = "request";
version = "2.87.0";
src = fetchurl {
url = "https://registry.npmjs.org/request/-/request-2.87.0.tgz";
sha512 = "fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==";
};
};
"request-2.88.0" = {
name = "request";
packageName = "request";
@ -3667,13 +3604,13 @@ let
sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f";
};
};
"semver-5.5.0" = {
"semver-5.5.1" = {
name = "semver";
packageName = "semver";
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz";
sha512 = "4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==";
url = "https://registry.npmjs.org/semver/-/semver-5.5.1.tgz";
sha512 = "PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==";
};
};
"semver-5.6.0" = {
@ -4036,6 +3973,15 @@ let
sha1 = "e0c6bc4d26b903124410e4fed81103014dfc1f59";
};
};
"temp-0.9.0" = {
name = "temp";
packageName = "temp";
version = "0.9.0";
src = fetchurl {
url = "https://registry.npmjs.org/temp/-/temp-0.9.0.tgz";
sha512 = "YfUhPQCJoNQE5N+FJQcdPz63O3x3sdT4Xju69Gj4iZe0lBKOtnAMi0SLj9xKhGkcGhsxThvTJ/usxtFPo438zQ==";
};
};
"then-request-2.2.0" = {
name = "then-request";
packageName = "then-request";
@ -4584,7 +4530,7 @@ in
sources."commander-2.19.0"
sources."concat-map-0.0.1"
sources."convert-source-map-1.6.0"
sources."core-js-2.6.4"
sources."core-js-2.6.5"
sources."debug-2.6.9"
sources."detect-indent-4.0.0"
sources."ejs-2.5.7"
@ -4924,8 +4870,8 @@ in
sources."lodash-4.17.11"
sources."map-stream-0.1.0"
sources."md5.js-1.3.4"
sources."mime-db-1.37.0"
sources."mime-types-2.1.21"
sources."mime-db-1.38.0"
sources."mime-types-2.1.22"
sources."minimatch-3.0.4"
sources."minimist-0.0.8"
sources."mkdirp-0.5.1"
@ -5445,8 +5391,8 @@ in
sources."json-schema-traverse-0.4.1"
sources."json-stringify-safe-5.0.1"
sources."jsprim-1.4.1"
sources."mime-db-1.37.0"
sources."mime-types-2.1.21"
sources."mime-db-1.38.0"
sources."mime-types-2.1.22"
sources."minimatch-3.0.4"
sources."minimist-0.0.8"
sources."mkdirp-0.5.1"
@ -5626,13 +5572,13 @@ in
titanium = nodeEnv.buildNodePackage {
name = "titanium";
packageName = "titanium";
version = "5.2.0";
version = "5.2.1";
src = fetchurl {
url = "https://registry.npmjs.org/titanium/-/titanium-5.2.0.tgz";
sha512 = "kB3n4rOfcUznvAA+8yXjuExczfq2ILEp6tUlY2H3YVYRcV5W5tsVsvRJLHeB3sZzijxZY+5DTBuV3txiWevSHA==";
url = "https://registry.npmjs.org/titanium/-/titanium-5.2.1.tgz";
sha512 = "tltnQ41NBjItM+ELsGL2jpaEnsMMeziZe0sGKtUxhwM1tndh7GFMfu2lpDqAFdMLwj+ZplRmlK0kKP4++68rrA==";
};
dependencies = [
sources."adm-zip-0.4.11"
sources."adm-zip-0.4.13"
sources."ajv-6.9.1"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
@ -5640,13 +5586,15 @@ in
sources."asynckit-0.4.0"
sources."aws-sign2-0.7.0"
sources."aws4-1.8.0"
sources."balanced-match-1.0.0"
sources."bcrypt-pbkdf-1.0.2"
sources."brace-expansion-1.1.11"
sources."buffer-from-1.1.1"
sources."caseless-0.12.0"
sources."co-4.6.0"
sources."colors-1.3.0"
sources."colors-1.3.3"
sources."combined-stream-1.0.7"
sources."commander-2.17.1"
sources."concat-map-0.0.1"
sources."core-util-is-1.0.2"
sources."cycle-1.0.3"
sources."dashdash-1.14.1"
@ -5666,12 +5614,16 @@ in
sources."forever-agent-0.6.1"
sources."form-data-2.3.3"
sources."fs-extra-7.0.1"
sources."fs.realpath-1.0.0"
sources."getpass-0.1.7"
sources."glob-7.1.3"
sources."graceful-fs-4.1.15"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."http-signature-1.2.0"
sources."humanize-0.0.9"
sources."inflight-1.0.6"
sources."inherits-2.0.3"
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."jsbn-0.1.1"
@ -5683,44 +5635,42 @@ in
sources."keypress-0.2.1"
sources."lodash-4.17.11"
sources."longjohn-0.2.12"
sources."mime-db-1.37.0"
sources."mime-types-2.1.21"
sources."mime-db-1.38.0"
sources."mime-types-2.1.22"
sources."minimatch-3.0.4"
sources."minimist-0.0.10"
sources."moment-2.22.2"
(sources."node-appc-0.2.49" // {
dependencies = [
sources."request-2.88.0"
sources."semver-5.5.1"
sources."temp-0.8.3"
];
})
sources."oauth-sign-0.9.0"
sources."once-1.4.0"
sources."optimist-0.6.1"
sources."os-tmpdir-1.0.2"
sources."path-is-absolute-1.0.1"
sources."performance-now-2.1.0"
sources."pkginfo-0.3.1"
sources."psl-1.1.31"
sources."punycode-2.1.1"
sources."qs-6.5.2"
(sources."request-2.87.0" // {
dependencies = [
sources."ajv-5.5.2"
sources."fast-deep-equal-1.1.0"
sources."har-validator-5.0.3"
sources."json-schema-traverse-0.3.1"
sources."oauth-sign-0.8.2"
sources."punycode-1.4.1"
sources."tough-cookie-2.3.4"
];
})
sources."request-2.88.0"
sources."rimraf-2.2.8"
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
sources."semver-5.5.0"
sources."semver-5.6.0"
sources."source-map-0.6.1"
sources."source-map-support-0.5.10"
sources."sprintf-0.1.5"
sources."sshpk-1.16.1"
sources."stack-trace-0.0.10"
sources."temp-0.8.3"
(sources."temp-0.9.0" // {
dependencies = [
sources."rimraf-2.6.3"
];
})
(sources."tough-cookie-2.4.3" // {
dependencies = [
sources."punycode-1.4.1"
@ -5740,6 +5690,7 @@ in
];
})
sources."wordwrap-0.0.3"
sources."wrappy-1.0.2"
sources."xmldom-0.1.27"
];
buildInputs = globalBuildInputs;

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

@ -2,13 +2,13 @@
buildDunePackage rec {
pname = "hex";
version = "1.2.0";
version = "1.3.0";
minimumOCamlVersion = "4.02";
src = fetchurl {
url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/hex-${version}.tbz";
sha256 = "17hqf7z5afp2z2c55fk5myxkm7cm74259rqm94hcxkqlpdaqhm8h";
url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/hex-v${version}.tbz";
sha256 = "193567pn58df3b824vmfanncdfgf9cxzl7q3rq39zl9szvzhvkja";
};
propagatedBuildInputs = [ cstruct ];

2
pkgs/development/python-modules/httpretty/default.nix
View File

@ -30,6 +30,8 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [ six ];
__darwinAllowLocalNetworking = true;
meta = with stdenv.lib; {
homepage = "https://falcao.it/HTTPretty/";
description = "HTTP client request mocking tool";

41
pkgs/development/python-modules/wrf-python/default.nix Normal file
View File

@ -0,0 +1,41 @@
{lib, fetchFromGitHub, python, pythonOlder, buildPythonPackage, gfortran, mock, xarray, wrapt, numpy, netcdf4}:
buildPythonPackage rec {
pname = "wrf-python";
version = "1.3.1.1";
src = fetchFromGitHub {
owner = "NCAR";
repo = "wrf-python";
rev = version;
sha256 = "12mm7x1r5md6x28vmwyh6k655pgsv6knj8ycmjbxxk8bk7qsj74h";
};
propagatedBuildInputs = [
wrapt
numpy
xarray
];
buildInputs = [
gfortran
] ++ lib.optional (pythonOlder "3.3") mock;
checkInputs = [
netcdf4
];
doCheck = true;
checkPhase = ''
runHook preCheck
cd ./test/ci_tests
python utests.py
runHook postCheck
'';
meta = {
description = "WRF postprocessing library for Python";
homepage = http://wrf-python.rtfd.org;
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ mhaselsteiner ];
};
}

3
pkgs/development/tools/bazel-watcher/default.nix
View File

@ -29,9 +29,6 @@ buildBazelPackage rec {
# tell rules_go to use the Go binary found in the PATH
sed -e 's:go_register_toolchains():go_register_toolchains(go_version = "host"):g' -i WORKSPACE
# tell rules_go to invoke GIT with custom CAINFO path
export GIT_SSL_CAINFO="${cacert}/etc/ssl/certs/ca-bundle.crt"
'';
preInstall = ''

8
pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix
View File

@ -2,7 +2,7 @@
buildBazelPackage rec {
name = "bazel-deps-${version}";
version = "2018-11-01";
version = "2019-02-01";
meta = with stdenv.lib; {
homepage = "https://github.com/johnynek/bazel-deps";
@ -15,8 +15,8 @@ buildBazelPackage rec {
src = fetchFromGitHub {
owner = "johnynek";
repo = "bazel-deps";
rev = "1af8921d52f053fad575f26762533a3823b4a847";
sha256 = "0srz0sbz4bq9n7cp4g1n3kd3j6rcjqfi25sq8aa64l27yqzbk53x";
rev = "6585033409e09028852403ec15ec0c77851234be";
sha256 = "0hypf7mcbpx2djqm92k82vn1k6pbnv564xbnazx8nw60f6ns0x87";
};
bazelTarget = "//src/scala/com/github/johnynek/bazel_deps:parseproject_deploy.jar";
@ -66,7 +66,7 @@ buildBazelPackage rec {
find . -type d -empty -delete
'';
sha256 = "1gvl4a9z8p4ch2gmcj3lpp0imrkrvy8wng949p3wlkibi14hc6ww";
sha256 = "1yirrzhhrsmbgd27fg709plhrhyi8pzwqv84yg72sd3799kswh9m";
};
buildAttrs = {

1
pkgs/development/tools/build-managers/bazel/default.nix
View File

@ -245,6 +245,7 @@ stdenv.mkDerivation rec {
scripts/generate_bash_completion.sh \
--bazel=./output/bazel \
--output=output/bazel-complete.bash \
--prepend=scripts/bazel-complete-header.bash \
--prepend=scripts/bazel-complete-template.bash
'';

9
pkgs/development/tools/build-managers/leiningen/default.nix
View File

@ -3,18 +3,18 @@
stdenv.mkDerivation rec {
pname = "leiningen";
version = "2.8.3";
version = "2.9.0";
name = "${pname}-${version}";
src = fetchurl {
url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg";
sha256 = "1jbrm4vdvwskbi9sxvn6i7h2ih9c3nfld63nx58nblghvlcb9vwx";
sha256 = "18wwcc956w1ii6zf8zjndgvmc614s18nxz3dary2iigbfq4y0asc";
};
jarsrc = fetchurl {
# NOTE: This is actually a .jar, Github has issues
url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.zip";
sha256 = "07kb7d84llp24l959gndnfmislnnvgpsxghmgfdy8chy7g4sy2kz";
sha256 = "07pw852w57w3lj3fddlxfzjsln90q52dwxvxpz9qbprw8p2xfrim";
};
JARNAME = "${name}-standalone.jar";
@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin $out/share
cp -v $src $out/bin/lein
cp -v $jarsrc $out/share/$JARNAME
'';
@ -37,10 +36,8 @@ stdenv.mkDerivation rec {
fixupPhase = ''
chmod +x $out/bin/lein
patchShebangs $out/bin/lein
substituteInPlace $out/bin/lein \
--replace 'LEIN_JAR=/usr/share/java/leiningen-$LEIN_VERSION-standalone.jar' "LEIN_JAR=$out/share/$JARNAME"
wrapProgram $out/bin/lein \
--prefix PATH ":" "${stdenv.lib.makeBinPath [ rlwrap coreutils ]}" \
--set LEIN_GPG ${gnupg1compat}/bin/gpg \

23
pkgs/development/tools/documentation/mdsh/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
name = "mdsh-${version}";
version = "0.1.2";
src = fetchFromGitHub {
owner = "zimbatm";
repo = "mdsh";
rev = "v${version}";
sha256 = "0sggclzghm54g4wnbab00qw4ry49min4zyw3hjwi0v741aa51xb2";
};
cargoSha256 = "1hsnz4sj8kff9azcbw9pkr2ipxlymz4zcm4vhfwydfkdlvdncpxm";
meta = with stdenv.lib; {
description = "Markdown shell pre-processor";
homepage = https://github.com/zimbatm/mdsh;
license = with licenses; [ mit ];
maintainers = with maintainers; [ zimbatm ];
platforms = platforms.all;
};
}

6
pkgs/development/tools/gometalinter/default.nix
View File

@ -40,7 +40,7 @@ let
in buildGoPackage rec {
name = "gometalinter-${version}";
version = "2.0.11";
version = "3.0.0";
goPackagePath = "github.com/alecthomas/gometalinter";
excludedPackages = "\\(regressiontests\\)";
@ -49,7 +49,7 @@ in buildGoPackage rec {
owner = "alecthomas";
repo = "gometalinter";
rev = "v${version}";
sha256 = "08p7bwvhpgizif8qi59m8mm3mcny70x9msbk8m8vjpphsq55wha4";
sha256 = "06dd60531qp0hxfwnxnyi36d6div1j781jvcb99ykhgrg0kwmzq9";
};
postInstall = ''
@ -64,7 +64,7 @@ in buildGoPackage rec {
description = "Concurrently run Go lint tools and normalise their output";
homepage = https://github.com/alecthomas/gometalinter;
license = licenses.mit;
maintainers = with maintainers; [ kalbasit ];
maintainers = with maintainers; [ kalbasit rvolosatovs ];
platforms = platforms.linux ++ platforms.darwin;
};
}

6
pkgs/development/tools/gotools/default.nix
View File

@ -2,8 +2,8 @@
buildGoPackage rec {
name = "gotools-unstable-${version}";
version = "2018-09-11";
rev = "677d2ff680c188ddb7dcd2bfa6bc7d3f2f2f75b2";
version = "2019-02-11";
rev = "44bee7e801e4a70b5fc9a91ff23830ab4df55d5e";
goPackagePath = "golang.org/x/tools";
goPackageAliases = [ "code.google.com/p/go.tools" ];
@ -11,7 +11,7 @@ buildGoPackage rec {
src = fetchgit {
inherit rev;
url = "https://go.googlesource.com/tools";
sha256 = "0vp1w1haqcjd82dxd6x9xrllbfwvm957rxwkpji96cgvhsli2bq5";
sha256 = "1y0k6a6vphd01l2mzdm14aqax4qyslgcbyzl6zkbilj55hfp97y4";
};
goDeps = ./deps.nix;

4
pkgs/development/tools/gotools/deps.nix generated
View File

@ -4,8 +4,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "0ed95abb35c445290478a5348a7b38bb154135fd";
sha256 = "1v7yhcgqj0fy7rsliijw2iwmvyd85hqshrhh2n083x62kw9n9nsl";
rev = "65e2d4e15006aab9813ff8769e768bbf4bb667a0";
sha256 = "0aqcmh0sp723d6hwgrv7pnrs4crns2ngr4x43jd4v985cbn455x7";
};
}
]

38
pkgs/development/tools/ktlint/default.nix Normal file
View File

@ -0,0 +1,38 @@
{ stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec {
name = "ktlint-${version}";
version = "0.30.0";
src = fetchurl {
url = "https://github.com/shyiko/ktlint/releases/download/${version}/ktlint";
sha256 = "0l3h3q4qc7ij3sr9ij1mrhir18xic7qbzgb621fv16zgdk6rjghn";
};
nativeBuildInputs = [ makeWrapper ];
propagatedBuildInputs = [ jre ];
unpackCmd = ''
mkdir -p ${name}
cp $curSrc ${name}/ktlint
'';
installPhase = ''
mkdir -p $out/bin
mv ktlint $out/bin/ktlint
chmod +x $out/bin/ktlint
'';
postFixup = ''
wrapProgram $out/bin/ktlint --prefix PATH : "${jre}/bin"
'';
meta = with stdenv.lib; {
description = "An anti-bikeshedding Kotlin linter with built-in formatter";
homepage = https://ktlint.github.io/;
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ tadfisher ];
};
}

2
pkgs/development/tools/misc/one_gadget/Gemfile Normal file
View File

@ -0,0 +1,2 @@
source 'https://rubygems.org'
gem 'one_gadget'

17
pkgs/development/tools/misc/one_gadget/Gemfile.lock Normal file
View File

@ -0,0 +1,17 @@
GEM
remote: https://rubygems.org/
specs:
bindata (2.4.4)
elftools (1.0.2)
bindata (~> 2)
one_gadget (1.6.2)
elftools (~> 1.0.2)
PLATFORMS
ruby
DEPENDENCIES
one_gadget
BUNDLED WITH
1.17.2

15
pkgs/development/tools/misc/one_gadget/default.nix Normal file
View File

@ -0,0 +1,15 @@
{ lib, bundlerApp }:
bundlerApp {
pname = "one_gadget";
gemdir = ./.;
exes = [ "one_gadget" ];
meta = with lib; {
description = "The best tool for finding one gadget RCE in libc.so.6";
homepage = https://github.com/david942j/one_gadget;
license = licenses.mit;
maintainers = [ maintainers.artemist ];
platforms = platforms.unix;
};
}

34
pkgs/development/tools/misc/one_gadget/gemset.nix Normal file
View File

@ -0,0 +1,34 @@
{
bindata = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kz42nvxnk1j9cj0i8lcnhprcgdqsqska92g6l19ziadydfk2gqy";
type = "gem";
};
version = "2.4.4";
};
elftools = {
dependencies = ["bindata"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ajymn59fr9117dkwf5xl8vmr737h6xmrcf1033zjlj2l5qkxn4a";
type = "gem";
};
version = "1.0.2";
};
one_gadget = {
dependencies = ["elftools"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0wacvysd7ddnbx2jl1vhzbkb28y974riyns7bpx889518zaa09z0";
type = "gem";
};
version = "1.6.2";
};
}

283
pkgs/development/tools/rust/svd2rust/cargo-lock.patch Normal file
View File

@ -0,0 +1,283 @@
diff --git a/Cargo.lock b/Cargo.lock
new file mode 100644
--- /dev/null
+++ b/Cargo.lock
@@ -0,0 +1,278 @@
+[[package]]
+name = "ansi_term"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "atty"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
+ "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "autocfg"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "backtrace"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "backtrace-sys"
+version = "0.1.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "bitflags"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "bitflags"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "cast"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "cc"
+version = "1.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "cfg-if"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "clap"
+version = "2.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "either"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "error-chain"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "inflections"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "libc"
+version = "0.2.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "quote"
+version = "0.3.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "redox_syscall"
+version = "0.1.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "redox_termios"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "strsim"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "svd-parser"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "xmltree 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "svd2rust"
+version = "0.14.0"
+dependencies = [
+ "cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "inflections 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "svd-parser 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "syn"
+version = "0.11.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "synom"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "termion"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "textwrap"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "unicode-width"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "unicode-xid"
+version = "0.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "vec_map"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "xml-rs"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "xmltree"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "xml-rs 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[metadata]
+"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
+"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"
+"checksum autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4e5f34df7a019573fb8bdc7e24a2bfebe51a2a1d6bfdbaeccedb3c41fc574727"
+"checksum backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b5b493b66e03090ebc4343eb02f94ff944e0cbc9ac6571491d170ba026741eb5"
+"checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6"
+"checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
+"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
+"checksum cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "926013f2860c46252efceabb19f4a6b308197505082c609025aa6706c011d427"
+"checksum cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749"
+"checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
+"checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e"
+"checksum either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3be565ca5c557d7f59e7cfcf1844f9e3033650c929c6566f511e8005f205c1d0"
+"checksum error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3"
+"checksum inflections 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a257582fdcde896fd96463bf2d40eefea0580021c0712a0e2b028b60b47a837a"
+"checksum libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)" = "023a4cd09b2ff695f9734c1934145a315594b7986398496841c7031a5a1bbdbd"
+"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
+"checksum redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)" = "52ee9a534dc1301776eff45b4fa92d2c39b1d8c3d3357e6eb593e0d795506fc2"
+"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
+"checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619"
+"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
+"checksum svd-parser 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f22b4579485b26262f36086d6b74903befc043a57f8377dfcf05bcf5335cb251"
+"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
+"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
+"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
+"checksum textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6"
+"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526"
+"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
+"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
+"checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0"
+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+"checksum xml-rs 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7ec6c39eaa68382c8e31e35239402c0a9489d4141a8ceb0c716099a0b515b562"
+"checksum xmltree 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "472a9d37c7c53ab2391161df5b89b1f3bf76dab6ab150d7941ecbdd832282082"

28
pkgs/development/tools/rust/svd2rust/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
with rustPlatform;
buildRustPackage rec {
name = "svd2rust-${version}";
version = "0.14.0";
src = fetchFromGitHub {
owner = "rust-embedded";
repo = "svd2rust";
rev = "v${version}";
sha256 = "1a0ldmjkhyv5c52gcq8p8avkj0cgj1b367w6hm85bxdf5j4y8rra";
};
cargoPatches = [ ./cargo-lock.patch ];
cargoSha256 = "0wsiaa6q9hr9x1cbg6sc8ajg846jjci5qwhdga4d408fmqav72ih";
# doc tests fail due to missing dependency
doCheck = false;
meta = with stdenv.lib; {
description = "Generate Rust register maps (`struct`s) from SVD files";
homepage = https://github.com/rust-embedded/svd2rust;
license = with licenses; [ mit asl20 ];
platforms = platforms.all;
};
}

4
pkgs/development/web/postman/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "postman-${version}";
version = "6.7.1";
version = "6.7.3";
src = fetchurl {
url = "https://dl.pstmn.io/download/version/${version}/linux64";
sha256 = "1x8jj0xs67wi0qj6x22h54crndml6fl8a128s57v058fyxji6brx";
sha256 = "04gfdb2pk2y8yv9ixq4ac5pk0rdfspd0810izij3hjnyqlv32hfg";
name = "${name}.tar.gz";
};

71
pkgs/misc/drivers/epson-201106w/default.nix Normal file
View File

@ -0,0 +1,71 @@
{ stdenv, fetchurl, rpmextract, autoreconfHook, file, libjpeg, cups }:
let
version = "1.0.1";
filterVersion = "1.0.0";
in
stdenv.mkDerivation {
name = "epson-201106w-${version}";
src = fetchurl {
url = "https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201106w-${version}-1lsb3.2.src.rpm";
sha256 = "1yig1xrh1ikblbp7sx706n5nnc237wy4mbch23ymy6akbgqg4aig";
};
nativeBuildInputs = [ rpmextract autoreconfHook file ];
buildInputs = [ libjpeg cups ];
unpackPhase = ''
rpmextract $src
tar -zxf epson-inkjet-printer-201106w-${version}.tar.gz
tar -zxf epson-inkjet-printer-filter-${filterVersion}.tar.gz
for ppd in epson-inkjet-printer-201106w-${version}/ppds/*; do
substituteInPlace $ppd --replace "/opt/epson-inkjet-printer-201106w" "$out"
substituteInPlace $ppd --replace "/cups/lib" "/lib/cups"
done
cd epson-inkjet-printer-filter-${filterVersion}
'';
preConfigure = ''
chmod +x configure
export LDFLAGS="$LDFLAGS -Wl,--no-as-needed"
'';
postInstall = ''
cd ../epson-inkjet-printer-201106w-${version}
cp -a lib64 resource watermark $out
mkdir -p $out/share/cups/model/epson-inkjet-printer-201106w
cp -a ppds $out/share/cups/model/epson-inkjet-printer-201106w/
cp -a Manual.txt $out/doc/
cp -a README $out/doc/README.driver
'';
meta = with stdenv.lib; {
homepage = https://www.openprinting.org/driver/epson-201106w;
description = "Epson printer driver (BX535WD, BX630FW, BX635FWD, ME940FW, NX530, NX635, NX635, SX535WD, WorkForce 545, WorkForce 645";
longDescription = ''
This software is a filter program used with the Common UNIX Printing
System (CUPS) under Linux. It supplies high quality printing with
Seiko Epson Color Ink Jet Printers.
List of printers supported by this package:
Epson BX535WD Series
Epson BX630FW Series
Epson BX635FWD Series
Epson ME940FW Series
Epson NX530 Series
Epson SX535WD Series
Epson WorkForce 545 Series
Epson WorkForce 645 Series
To use the driver adjust your configuration.nix file:
services.printing = {
enable = true;
drivers = [ pkgs.epson-201106w ];
};
'';
license = with licenses; [ lgpl21 epson ];
platforms = platforms.linux;
maintainers = [ maintainers.nphilou ];
};
}

18
pkgs/misc/emulators/wine/sources.nix
View File

@ -13,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}:
in rec {
stable = fetchurl rec {
version = "3.0.4";
url = "https://dl.winehq.org/wine/source/3.0/wine-${version}.tar.xz";
sha256 = "037vlrk80lagy362w7500i2ldwvdwsadrknajzi67cvxpvnqhnnl";
version = "4.0";
url = "https://dl.winehq.org/wine/source/4.0/wine-${version}.tar.xz";
sha256 = "0k8d90mgjzv8vjspmnxzr3i5mbccxnbr9hf03q1bpf5jjppcsdk7";
## see http://wiki.winehq.org/Gecko
gecko32 = fetchurl rec {
@ -31,24 +31,24 @@ in rec {
## see http://wiki.winehq.org/Mono
mono = fetchurl rec {
version = "4.7.3";
version = "4.7.5";
url = "http://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}.msi";
sha256 = "0fkd22v2vm3ml76x1ngg42byvmry24xb92vpl4j84zhw6wbq0jnj";
sha256 = "0gsb03dc97hqdkw8kpl5ky53bygfnpxkgn2ry5bfzvfdfva6hk8m";
};
};
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
version = "4.0-rc5";
url = "https://dl.winehq.org/wine/source/4.0/wine-${version}.tar.xz";
sha256 = "0nx5ahahfnmimd2b7zh2wx36b877vad10i2kr2zib9m9b2w8wyfd";
version = "4.2";
url = "https://dl.winehq.org/wine/source/4.x/wine-${version}.tar.xz";
sha256 = "1ysvq2jyvh7r27iwpsrlrwzj672jnrihry91bx3m3fysz3sl3ld1";
inherit (stable) mono gecko32 gecko64;
};
staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version;
sha256 = "0smp6ngs77vk1yg0saavhhn7kmi9ri8y8gc3vcgg837ycwg5i5qb";
sha256 = "1dhv6y60g64bj3kgfknbfzxfzmy686dh7svxlvi4lfis2faikxmk";
owner = "wine-staging";
repo = "wine-staging";
rev = "v${version}";

6
pkgs/misc/lguf-brightness/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "lguf-brightness";
version = "unstable-2018-02-07";
version = "unstable-2018-02-11";
src = fetchFromGitHub {
owner = "periklis";
repo = pname;
rev = "d194272b7a0374b27f036cbc1a9be7f231d40cbb";
sha256 = "0zj81bqchms9m7rik1jxp6zylh9dxqzr7krlj9947v0phr4qgah4";
rev = "fcb2bc1738d55c83b6395c24edc27267a520a725";
sha256 = "0cf7cn2kpmlvz00qxqj1m5zxmh7i2x75djbj4wqk7if7a0nlrd5m";
};
nativeBuildInputs = [ cmake ];

282
pkgs/misc/vim-plugins/generated.nix
View File

@ -61,12 +61,12 @@ let
ale = buildVimPluginFrom2Nix {
pname = "ale";
version = "2019-02-01";
version = "2019-02-15";
src = fetchFromGitHub {
owner = "w0rp";
repo = "ale";
rev = "4d426bf2873c6e1cd2c71e478c756903307628d3";
sha256 = "044nzg672rmbamvzmc41i6klgs7qwdv1a3gl2l18cbli8jr4q8c2";
rev = "c3d4e0983b4b08e61692cdd88990a79525a78707";
sha256 = "1sb79rkqhq6w4c2mm53dc1lrff2m3ipxqrjipacnv9imiznfaysa";
};
};
@ -127,12 +127,12 @@ let
awesome-vim-colorschemes = buildVimPluginFrom2Nix {
pname = "awesome-vim-colorschemes";
version = "2019-01-12";
version = "2019-02-16";
src = fetchFromGitHub {
owner = "rafi";
repo = "awesome-vim-colorschemes";
rev = "24df42761d3653aa8ea2c6f88938c8016b3d11df";
sha256 = "03kmmy4na9cxnaf6z34pf9i91sgncxh06xwqmvhg5v8541dsglyq";
rev = "88d883cc89b2d13b3bae60aa294cef57067e17e2";
sha256 = "0f6xa50r9fv9qhw8slfqq0g0p8y2zc08bpg09f2g0lp69gidi7rg";
};
};
@ -160,12 +160,12 @@ let
bufexplorer = buildVimPluginFrom2Nix {
pname = "bufexplorer";
version = "2018-12-10";
version = "2019-02-13";
src = fetchFromGitHub {
owner = "jlanzarotta";
repo = "bufexplorer";
rev = "be69e397e502803db7d7f0a0e0491282ab2197a5";
sha256 = "0brhbkj34yxyq5gvjkqakq0m9zwa981rv6ksca07qhw3nzpxhlkd";
rev = "162f6031ada3b2d1ad171e02e93f417ee1689176";
sha256 = "0ws8yw1s77pb0gm5wvj5w5symx8fqqzcdizds8cg47cfmw97zz1h";
};
};
@ -370,12 +370,12 @@ let
ctrlp-vim = buildVimPluginFrom2Nix {
pname = "ctrlp-vim";
version = "2019-01-28";
version = "2019-02-08";
src = fetchFromGitHub {
owner = "ctrlpvim";
repo = "ctrlp.vim";
rev = "879c40da6b7c65fa01f17a083efee6cdc8bf9d09";
sha256 = "10bzxd99swqq8hmjp7yza2majkqsgza3yqjg9mncm2draka90mz1";
rev = "2e773fd8c7548526853fff6ee2e642eafbbe3d04";
sha256 = "0jvl4ydxmqnbcrzw71jf64vqlnc91970b25r6xl08a0lfb9xi3vd";
};
};
@ -403,12 +403,12 @@ let
denite-nvim = buildVimPluginFrom2Nix {
pname = "denite-nvim";
version = "2019-02-02";
version = "2019-02-11";
src = fetchFromGitHub {
owner = "Shougo";
repo = "denite.nvim";
rev = "334fce21f798a3c4c7b33a37b107df28069e2bd7";
sha256 = "01nbbsp62jqff7pm85lbi3kmwgq83cpm87p3bn8nbb7iw8ivkiva";
rev = "c779cc48d1b390b455fb19e4a439ca9cd605cc6e";
sha256 = "06y5dljnvflay03r8dr8lgycqgwj62gyvf3v33w9ysdksyap44qr";
};
};
@ -449,12 +449,12 @@ let
deoplete-jedi = buildVimPluginFrom2Nix {
pname = "deoplete-jedi";
version = "2019-01-27";
version = "2019-02-06";
src = fetchFromGitHub {
owner = "zchee";
repo = "deoplete-jedi";
rev = "5b273e7ec3832748f0231d7f5a38150ae2bcfd30";
sha256 = "09bsrpd86lwfak4sljzxslznkwx6qbb0jddvgvigsm7vpxa2x9ih";
rev = "b953291d3f776b5b730f22720fa2b15bc4300922";
sha256 = "0p9m3g318fcn0zbiak7xf4gczwn4f21zff8xwlki7l7rlmqh66k4";
fetchSubmodules = true;
};
};
@ -494,12 +494,12 @@ let
deoplete-nvim = buildVimPluginFrom2Nix {
pname = "deoplete-nvim";
version = "2019-02-03";
version = "2019-02-14";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete.nvim";
rev = "1d577d43feae8eae88176c7909e7891297acc8de";
sha256 = "1hbwz2mkxzq213bpgvrnpf784f193s9bk479nhysrv6704dpqb4v";
rev = "a588aee169f3b52a0382dc0289e883710f8f7f48";
sha256 = "1m9hqbs9nbhd8zr791pvinl14wl5gmj8fj1yl18nqq1f6475jhka";
};
};
@ -527,12 +527,12 @@ let
echodoc-vim = buildVimPluginFrom2Nix {
pname = "echodoc-vim";
version = "2018-12-09";
version = "2019-02-15";
src = fetchFromGitHub {
owner = "Shougo";
repo = "echodoc.vim";
rev = "2ca26d0a63210d8936ee86b82d409bd98e1b6bf7";
sha256 = "19cmggxrgbj429fflcz0gamg1779577qm0mykq6kycx0j7zyclbf";
rev = "6a544ef131b1d851f94dd1cc24d0c9c7315d54e7";
sha256 = "0jc3h37knh6wfmxfl8b82b1nc9i6r75plk364if3i3hk0fys7af1";
};
};
@ -561,12 +561,12 @@ let
emmet-vim = buildVimPluginFrom2Nix {
pname = "emmet-vim";
version = "2019-01-28";
version = "2019-02-10";
src = fetchFromGitHub {
owner = "mattn";
repo = "emmet-vim";
rev = "19f2821b7b457a2db7f7e4c25ade0b947b560fb0";
sha256 = "1brf5r1sprnqbp7hszk9ygz4l2mk7493l5zsl60y1rx2yhfw78c9";
rev = "d698f1658770ca5fa58c87e80421c8d65bbe9065";
sha256 = "12dk21ddjw9dz87bw8hq37v1nd4q7q452sn5pa4sa289b9v0ik8q";
fetchSubmodules = true;
};
};
@ -849,12 +849,12 @@ let
jedi-vim = buildVimPluginFrom2Nix {
pname = "jedi-vim";
version = "2019-01-25";
version = "2019-02-12";
src = fetchFromGitHub {
owner = "davidhalter";
repo = "jedi-vim";
rev = "f36749776d78eee1c7e19ed18380bd66180453de";
sha256 = "1r16fyi1grbqi9a8z7pg87msh3621cspvapqdi9zmfzjj9gvz2cv";
rev = "d02a72e79254feb42401d49d7c28e90b45e4d823";
sha256 = "148qyk27pmbzxz7dn9wpandqrxs8lblrn6zky9nlwcnlnxlv6c5i";
fetchSubmodules = true;
};
};
@ -1103,12 +1103,12 @@ let
neoformat = buildVimPluginFrom2Nix {
pname = "neoformat";
version = "2019-02-01";
version = "2019-02-09";
src = fetchFromGitHub {
owner = "sbdchd";
repo = "neoformat";
rev = "e57ec7889bfb4371c5a4241183204d0bd1f8aea8";
sha256 = "0ynln0wn0kg5s6n3v31bijwkr0cghv5jzlkawaj4ihxnx44lf839";
rev = "47f7313ca6b1f490e3b72ea64f362bd8df5b9654";
sha256 = "1dy7r54sncswkf259rn38dydvlp1fvfw0dabnwl9gx51wzj6ibjn";
};
};
@ -1125,12 +1125,12 @@ let
neomake = buildVimPluginFrom2Nix {
pname = "neomake";
version = "2019-02-01";
version = "2019-02-15";
src = fetchFromGitHub {
owner = "benekastah";
repo = "neomake";
rev = "5fc1f982a5172705038e0a65adf587d9e43c160e";
sha256 = "1r8mfn95s9kmswbkqsk03n2y2zzi8msqfkl9nzy2l9af9hvf9gwr";
rev = "d365cd5ecf5b1cefa60e50660c2c60266bf64dfb";
sha256 = "1d29ri74kya45srdkmx8kkni3xyx9d4m3jll9wd9vdbqvd4fsjd9";
};
};
@ -1158,12 +1158,12 @@ let
neosnippet-vim = buildVimPluginFrom2Nix {
pname = "neosnippet-vim";
version = "2019-01-29";
version = "2019-02-13";
src = fetchFromGitHub {
owner = "Shougo";
repo = "neosnippet.vim";
rev = "c9b41fe9b8cca4b6a11cc0cbe71eecb94fa8a30f";
sha256 = "1dn09s5jyi0k521llbi4qg5kpmza55i6bxxfvaizkdzdcimnmwxq";
rev = "4903cf61966f824b4e603780c9e3871b28f77ba9";
sha256 = "0wl3vmiph6nxkagr1ly5xjyh575s0rl836wymdj230my31wnm3ij";
};
};
@ -1202,23 +1202,23 @@ let
nerdcommenter = buildVimPluginFrom2Nix {
pname = "nerdcommenter";
version = "2019-02-04";
version = "2019-02-14";
src = fetchFromGitHub {
owner = "scrooloose";
repo = "nerdcommenter";
rev = "3427b2f4ef5f28c9886b7fed54eb9b1cd417fbdf";
sha256 = "1mfb34z37bl5rqs5q0jmgjqmiqkjl7fw7plik8qfnwgbaspxhfv3";
rev = "5100f47542cb9cab120f172816471e6c3e242278";
sha256 = "0d8n5cq50jyykqij3jazzl0cn53p1jf9gv05a13s2gs88gx1w67a";
};
};
nerdtree = buildVimPluginFrom2Nix {
pname = "nerdtree";
version = "2019-02-01";
version = "2019-02-15";
src = fetchFromGitHub {
owner = "scrooloose";
repo = "nerdtree";
rev = "8cc154d4b0cf28f73815050b9782e6ac5a4d733d";
sha256 = "0cfasf1g4xns1pasriy14k16w6v2j7cb2zbxh62d6cra0jra70i0";
rev = "c05615fd80141c3ab04459e75a42d2ed6f030e18";
sha256 = "08488ff2m7hn95afa2g1a8znajd7ikhd5fnv4a6kzlgv9gyz3qji";
};
};
@ -1290,12 +1290,12 @@ let
onehalf = buildVimPluginFrom2Nix {
pname = "onehalf";
version = "2019-01-31";
version = "2019-02-12";
src = fetchFromGitHub {
owner = "sonph";
repo = "onehalf";
rev = "5d489606484decb862d4c943d845595be3fe7a0f";
sha256 = "1qsr470h772xvfxs8bfimb58g77015n0h0ggqjsr3hmm43qj8mal";
rev = "c0f08a297e69bc2826f748949e7ce4f0532797ee";
sha256 = "0lg5bn5wa5mi7ldghnfwgkiprzs11is2pgsxc9a79wd7skr00smp";
};
};
@ -1444,12 +1444,12 @@ let
ranger-vim = buildVimPluginFrom2Nix {
pname = "ranger-vim";
version = "2018-12-21";
version = "2019-02-08";
src = fetchFromGitHub {
owner = "rafaqz";
repo = "ranger.vim";
rev = "0bd9e8122f79655f58142389c595513b855cf05d";
sha256 = "0vpfdn01vy065hpc9ii56dsx35cxpmw2k6cidjdl0czy30vyjy94";
rev = "6def86f4293d170480ce62cc41f15448075d7835";
sha256 = "0890rbmdw3p25cww6vsji7xrndcxsisfyv5przahpclk9fc9sxs8";
};
};
@ -1488,12 +1488,12 @@ let
riv-vim = buildVimPluginFrom2Nix {
pname = "riv-vim";
version = "2018-10-17";
version = "2019-02-09";
src = fetchFromGitHub {
owner = "Rykka";
repo = "riv.vim";
rev = "09ae81f1fcf43d77a36705a7b9201f8cc1c85e23";
sha256 = "0a3zzyxz2djy8dwmqjvhfqsingll28dnmnqdw0yii8r4xqxg6a8v";
rev = "2e9201219217fdcc5b90104c4cdac05c4bc33e62";
sha256 = "1is92786gvrwbp3kr6n1pckwp1kzvnd9znhapnxnlg9sy3zmd2x2";
};
};
@ -1565,12 +1565,12 @@ let
Spacegray-vim = buildVimPluginFrom2Nix {
pname = "Spacegray-vim";
version = "2018-12-27";
version = "2019-02-15";
src = fetchFromGitHub {
owner = "ajh17";
repo = "Spacegray.vim";
rev = "63c9e2f75a084ba1fc136973d5d6e1f00fffad88";
sha256 = "0djjabb2qp5d0sszdy1pacw4j4h9r03208pzxn5kwg6i660gajak";
rev = "d2e346ec3196e9b619b133eabfd4fc5b45210f81";
sha256 = "1qgrsmimii33fqc8b6i1mzxh96bv303grybnykshjy46g1ka0rg4";
};
};
@ -1785,12 +1785,12 @@ let
tsuquyomi = buildVimPluginFrom2Nix {
pname = "tsuquyomi";
version = "2019-01-16";
version = "2019-02-08";
src = fetchFromGitHub {
owner = "Quramy";
repo = "tsuquyomi";
rev = "db073bb2dc872d29e26da355b5f49269aab6b0d0";
sha256 = "113fgcpw8r2cfy5d7n0mxmr9jfyxhy4pgdl6jifz25ximryv3i4z";
rev = "a386d98189a4afe63f23a9174115467c6792aac6";
sha256 = "1xlwxi6x1b3q65flcpwnlg2xnzfl5m49d5m35cq4iy35bx5b5jxn";
};
};
@ -1851,12 +1851,12 @@ let
vim = buildVimPluginFrom2Nix {
pname = "vim";
version = "2019-01-11";
version = "2019-02-05";
src = fetchFromGitHub {
owner = "dracula";
repo = "vim";
rev = "a70e2c06b220c1a66244d113665baf0bdc9677ee";
sha256 = "01nph2lpvci1538c65a94jjnillaasiab85m4fq8nvqsfbn10d40";
rev = "662fa188559f4e586bd481203eef7a7a12f3ba34";
sha256 = "04w1gmbmvcch1p4w747hckvxp90i0zwz6lv0cbywnmgvwz71g8zi";
};
};
@ -1928,12 +1928,12 @@ let
vim-addon-errorformats = buildVimPluginFrom2Nix {
pname = "vim-addon-errorformats";
version = "2019-01-14";
version = "2019-02-09";
src = fetchFromGitHub {
owner = "MarcWeber";
repo = "vim-addon-errorformats";
rev = "691fb923df24edb9bdff4af997b1e7b21a9865cf";
sha256 = "00ys9aip9lcjkngz4s7gsvv0am151h0rircqqsyk8dj5q4mgq0v5";
rev = "a95199208700cb8e274c03c711e35411d6ecbe60";
sha256 = "1676s0m2xg3i8hmxi353iw39v3fh0gf787z09vi17nsqf8i6fdi8";
};
};
@ -2082,12 +2082,12 @@ let
vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline";
version = "2019-02-04";
version = "2019-02-12";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
rev = "40786883051429053d22ad0da4e04b52e900aaba";
sha256 = "09igzw2wg2m55bq9l343wgxdgjmhjg62sz3fr2wjgmr5ji4kpkn4";
rev = "448aa43ec4bb49dfb3f75c3e52aad41eec9ee2ce";
sha256 = "0fyh6a0rycff1jx5si6zzfc0844ay2p0gbr684z95jp21ic5phrq";
};
};
@ -2192,12 +2192,12 @@ let
vim-closetag = buildVimPluginFrom2Nix {
pname = "vim-closetag";
version = "2018-12-08";
version = "2019-02-14";
src = fetchFromGitHub {
owner = "alvan";
repo = "vim-closetag";
rev = "fbcd62bf30e3322894e03ccc2f17cef96ca535ac";
sha256 = "097jqajbpzm8cl5a5bci75sjwb34c998z9kkx3s0dd2xyw3la8jq";
rev = "9f13011738e11d6f926a641d774635fa415f1b6e";
sha256 = "0fm9h1i5jfyq3hkl41jsr2hvcskwh7hhg5m0yxbl57bnigapcz3p";
};
};
@ -2313,12 +2313,12 @@ let
vim-devicons = buildVimPluginFrom2Nix {
pname = "vim-devicons";
version = "2019-02-04";
version = "2019-02-15";
src = fetchFromGitHub {
owner = "ryanoasis";
repo = "vim-devicons";
rev = "7cbdd2b68ff9bc6d4da74e9872b12adf32b1bc2f";
sha256 = "00g6cy2ly26fmzjdjga987k2apkkhpy1jkndj6d1hg35kwv7bihv";
rev = "52543de8e627ae7c6102b4e52ebd52f02420e8a1";
sha256 = "10g396yq0l1ywgyin65r4s65kciliqcv8pz3b22va3cmg31fgm6b";
};
};
@ -2423,12 +2423,12 @@ let
vim-elixir = buildVimPluginFrom2Nix {
pname = "vim-elixir";
version = "2018-12-31";
version = "2019-02-14";
src = fetchFromGitHub {
owner = "elixir-lang";
repo = "vim-elixir";
rev = "e2be90dd910db0890edcfb08c0837e9da8e37439";
sha256 = "0r5fj6jl53adkllx9alpmah6f1qqkhy589n0l9sphsadr6rx8hr1";
rev = "b6990d99ac207b7abf0e2b18485d14c9d4aa8e0b";
sha256 = "14j65wxxs60zdh5v5mhldy9zghjf5dynxv0hh32q0qqn89jz9q8z";
};
};
@ -2511,12 +2511,12 @@ let
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
version = "2019-02-03";
version = "2019-02-14";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
rev = "ed07f9a503e53ec3ca4d5e255acb078675f2ff0e";
sha256 = "0ykzawd9axa68109mwl3c7177si8sxy6b5x0xwf4z80c1xnc8czx";
rev = "a489c6e1d3fc265242fabfd171021b0ea02dacf8";
sha256 = "1pincpv0xhr49m31j6j7snil8x9f03i3xqw6vv1ly7q0m42397nn";
};
};
@ -2577,12 +2577,12 @@ let
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
version = "2019-01-14";
version = "2019-02-11";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
rev = "a61545f09cad6df2e7a4918cbd6981811f612ae9";
sha256 = "0kkh32hpkg225a2y21k1hda5vadc6c3phwaqn85icr3kcbbwwy9s";
rev = "c6537a3fd3dfe26e32ea154d74b7a16c2a63b79f";
sha256 = "149fxlak6c0xcp9iq7vhfxg6irq1bmj6qjv77b2sahzj59lyq1v7";
};
};
@ -2775,12 +2775,12 @@ let
vim-jade = buildVimPluginFrom2Nix {
pname = "vim-jade";
version = "2019-02-01";
version = "2019-02-12";
src = fetchFromGitHub {
owner = "digitaltoad";
repo = "vim-jade";
rev = "0b4f42ac1ae491adac2b99b81eddd2bfd79337ee";
sha256 = "0xr54p19fr8z6ywaw2mlmw0c92dlc7xjsnif19bafjxrlz3l0aq9";
rev = "ce65804775f77efad3f97d69e44093d1466051de";
sha256 = "0s2dryi4n21wf11czajq6g7yhh4jwdl449cq6bjj7rkjqb9rbx8r";
};
};
@ -2797,23 +2797,23 @@ let
vim-javacomplete2 = buildVimPluginFrom2Nix {
pname = "vim-javacomplete2";
version = "2019-01-22";
version = "2019-02-07";
src = fetchFromGitHub {
owner = "artur-shaik";
repo = "vim-javacomplete2";
rev = "2ac13090e96d28e3bec2141625f9007723010091";
sha256 = "04kbkjph57yz78wfv6w8zhrh7c1x6j9fpxfmnysm9nnn4539zdl8";
rev = "29fee1cb4554eef3e5a30984ac7a389766ee4da4";
sha256 = "1kzx80hz9n2bawrx9lgsfqmjkljbgc1lpl8abnhfzkyy9ax9svk3";
};
};
vim-javascript = buildVimPluginFrom2Nix {
pname = "vim-javascript";
version = "2018-12-23";
version = "2019-02-08";
src = fetchFromGitHub {
owner = "pangloss";
repo = "vim-javascript";
rev = "50c135735611946707d04757fdc0cde5537659ae";
sha256 = "175w6a5x8wcssd5ix32gmyc4s4v7l4nmhhzvs28n3lwias8cm2q9";
rev = "7b978de215d864cf6138275e237a5c1d055556a1";
sha256 = "03r8bg0d29myrqysci1aziibjs1526idj79ya824pr165189w42f";
};
};
@ -2842,12 +2842,12 @@ let
vim-jsdoc = buildVimPluginFrom2Nix {
pname = "vim-jsdoc";
version = "2018-05-05";
version = "2019-02-08";
src = fetchFromGitHub {
owner = "heavenshell";
repo = "vim-jsdoc";
rev = "5ef086789f5ac431d1d5aab53e771f00f1c25503";
sha256 = "0f0dbcvbmha2nfadvf27crxkkxc1ps1inss5n66vy1p5bffv0bpm";
rev = "b23073449d1df98ecfe73828079115e0d1d7573b";
sha256 = "0r91lr3gpjbaalqln7k8kv4q88w9rclfyji87yzmnr3apjaazyjj";
};
};
@ -2952,12 +2952,12 @@ let
vim-lsc = buildVimPluginFrom2Nix {
pname = "vim-lsc";
version = "2019-01-28";
version = "2019-02-14";
src = fetchFromGitHub {
owner = "natebosch";
repo = "vim-lsc";
rev = "20a3545fb0b6551349ecd55c8fd0402bcebc3ab5";
sha256 = "1p0fkbg64fp1i4i0aq0bjg3pkf5xc99449nv7l7csf5ql93y17dx";
rev = "797779acaa5f9c5eda7e3d6cbe759b4d2f23ee37";
sha256 = "1fhpx4vnsx0g7xc1r5c6m78sr6ynyi5q0j69g2h4i45ph4q8xsp4";
};
};
@ -3128,12 +3128,12 @@ let
vim-pandoc = buildVimPluginFrom2Nix {
pname = "vim-pandoc";
version = "2018-10-07";
version = "2019-02-12";
src = fetchFromGitHub {
owner = "vim-pandoc";
repo = "vim-pandoc";
rev = "6be5e23d8ab5df9be20e324fffdc2f978cac2077";
sha256 = "07f91w4z49xgrachra78hnfs9jl2hqx15amhcr4phnpb9f3hmjbg";
rev = "660f556d1fdcede2900b12a09e1452fc5414ee82";
sha256 = "1vafc1c1sh7gd5pg8vlmjjzlvywij5li0rjn7z40wn0r578qzx3k";
};
};
@ -3249,12 +3249,12 @@ let
vim-projectionist = buildVimPluginFrom2Nix {
pname = "vim-projectionist";
version = "2018-10-21";
version = "2019-02-10";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-projectionist";
rev = "ea1347bc475bb58a3c6aa8da37e5a4a019efbf17";
sha256 = "1sw4vnb0w78vjaxgx3w4gx6j8jdcb1146fnf7wv497wa2grmi9n9";
rev = "12f3fac55f99952abecac01bebfc83adab98d6da";
sha256 = "0cxdsa1h9h35gpc7fyyks4xwv277lr6rhwspyzp07zd1ik67jm61";
};
};
@ -3304,12 +3304,12 @@ let
vim-racer = buildVimPluginFrom2Nix {
pname = "vim-racer";
version = "2018-08-26";
version = "2019-02-07";
src = fetchFromGitHub {
owner = "racer-rust";
repo = "vim-racer";
rev = "9c0a05e8b97700ee5d3e742fab889cf40e9e7b88";
sha256 = "1gywh4xqbc7z15nvqr0v3h0n51fpaik8z1is0pxvpmj0fwzds0b3";
rev = "f0860564baad29f6dd32343749a10bb071ce55a9";
sha256 = "0d0fb4dyszn2dkb3xsm2cbbc279x09chfvammv9m2lyfh60lf1hl";
};
};
@ -3337,12 +3337,12 @@ let
vim-ruby = buildVimPluginFrom2Nix {
pname = "vim-ruby";
version = "2019-01-29";
version = "2019-02-14";
src = fetchFromGitHub {
owner = "vim-ruby";
repo = "vim-ruby";
rev = "4f640daecbb1d0b4f6c02675bfc0fa958102f5be";
sha256 = "1rja2kc3i364d7bfq8d1z5yck6sjzyjxrciv5cb4ww1v6njp4ay5";
rev = "0293102cc904b83c6567ef9c4b2a88b54fc75037";
sha256 = "0hmfvgk3fmr27i73913mc8gsxhykdq4nls1maqikxdlldvqddrxq";
};
};
@ -3392,12 +3392,12 @@ let
vim-sensible = buildVimPluginFrom2Nix {
pname = "vim-sensible";
version = "2018-10-27";
version = "2019-02-14";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-sensible";
rev = "7f46e82fc7e343be84df6c06bec63dd6494b6712";
sha256 = "1xizcrxn34fbpdcbs0ydc1s9kma9cmk1llz0xbmrdgdf2yaz2558";
rev = "8db5a732eff08c796de188a52e7af66b99a8b9f2";
sha256 = "1ns3qc9h1allivpsk50f9p65n3mqi4cxk96dqf1111pm89cc0xzv";
};
};
@ -3414,12 +3414,12 @@ let
vim-signify = buildVimPluginFrom2Nix {
pname = "vim-signify";
version = "2019-02-04";
version = "2019-02-10";
src = fetchFromGitHub {
owner = "mhinz";
repo = "vim-signify";
rev = "768f52319212b6e2964e4f11d1baf7092066d504";
sha256 = "14b9s7plj9h55n1ddqvjy13mfciviq2ngmjs3x22vrpwgsga2zik";
rev = "b8a1b656c65bc703cf9878bcfccb761c9849df0f";
sha256 = "08ndg66msqqdrphq271451lnhc1w5dfrm599anpnbafx59d9sg2y";
};
};
@ -3436,12 +3436,12 @@ let
vim-slime = buildVimPluginFrom2Nix {
pname = "vim-slime";
version = "2019-01-29";
version = "2019-02-08";
src = fetchFromGitHub {
owner = "jpalardy";
repo = "vim-slime";
rev = "8717c21b270cfd7396de54a256c7be3a30e70cc1";
sha256 = "01yl8pl59yksdz9z6ry70m441w847cjwx92z0qf3ipv5038dsngs";
rev = "1ff17cc7e8eeaf660daa5efee9e66ef83e00e686";
sha256 = "1mrgpkyarc6igd7anzlwpbis6cwsy759ssxapfxmj1q69hyvmdl6";
};
};
@ -3513,12 +3513,12 @@ let
vim-startify = buildVimPluginFrom2Nix {
pname = "vim-startify";
version = "2019-01-30";
version = "2019-02-15";
src = fetchFromGitHub {
owner = "mhinz";
repo = "vim-startify";
rev = "69e835d1f779140f7c0a27f6fd30ae4d1f9dac77";
sha256 = "0s4938xrmn6ivm4dvkhpqc5gdx42hk2m206fkhayxagvwnxsfiwb";
rev = "9c5680cd0b94bea9245f79463f52c7c9c6595ffd";
sha256 = "1pykpbl1awk79v0r89blqpqwj2nqbhwfh15ljwipgfrprjy1nqd3";
};
};
@ -3601,12 +3601,12 @@ let
vim-terraform = buildVimPluginFrom2Nix {
pname = "vim-terraform";
version = "2019-01-23";
version = "2019-02-08";
src = fetchFromGitHub {
owner = "hashivim";
repo = "vim-terraform";
rev = "dde8e028ccba76bd199c46b0bb64c520cc874731";
sha256 = "183zxr40nczqacr7s41v5n2a1hx57r8ihadvpp65j6m2kjq19amn";
rev = "6d830bb087dfb27a0e911286678de33b78c3e25d";
sha256 = "0s982977bn18qbmbd1yihq76fpzkk14ajgi689h21gjm4cq8ycyk";
};
};
@ -3656,12 +3656,12 @@ let
vim-toml = buildVimPluginFrom2Nix {
pname = "vim-toml";
version = "2018-11-27";
version = "2019-02-13";
src = fetchFromGitHub {
owner = "cespare";
repo = "vim-toml";
rev = "06f6c1346be834c7c971d6d1d4f876e5699119bf";
sha256 = "12sp45p2ixkvrs9sdyx0m8bc6yn1c2qr0vqbr04c5ac94km1rdar";
rev = "5dede56eea3e7a8a40059e8ff748da835d99821a";
sha256 = "0fdz83861j4i5r2a95d6akss3kcg0krddlavaj3dqzbjidv620hl";
};
};
@ -3821,12 +3821,12 @@ let
vimpreviewpandoc = buildVimPluginFrom2Nix {
pname = "vimpreviewpandoc";
version = "2019-02-02";
version = "2019-02-10";
src = fetchFromGitHub {
owner = "tex";
repo = "vimpreviewpandoc";
rev = "90e39ff676c78bc6f3dde2a76b56fe86aa38d39c";
sha256 = "0xaaq565wfd2bx64wm1cy0k18jrm6l9snwkvmgbp7p10zjxnqfhs";
rev = "3b0a589140abf6cc5d19ad678a7f01822bbee34e";
sha256 = "15yjr01wfnhaqw1k8bgxk04vvh76y13zfms66irpihw79f9yzxi9";
};
};
@ -3854,12 +3854,12 @@ let
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
version = "2019-02-01";
version = "2019-02-10";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
rev = "97b02bb024b23501302f50c068e89b058faace6b";
sha256 = "1yd6xl7a2gbazgr6fs9n00b9msz1w7szl42h0pn80nmgp0pmjmcp";
rev = "40fa6720797011e0901618cb14cd02ba684747b3";
sha256 = "0p1mr3572bnw278s7y1axizgwgj64nf4ki0plbbg036x800gi9bd";
};
};
@ -3998,12 +3998,12 @@ let
youcompleteme = buildVimPluginFrom2Nix {
pname = "youcompleteme";
version = "2019-01-28";
version = "2019-02-16";
src = fetchFromGitHub {
owner = "valloric";
repo = "youcompleteme";
rev = "c25e449f4e72667aca3d18d8bfccd7b289b2e9a1";
sha256 = "0zfrlql7q7rdalfh7iglqkrwvbl8642plm816kc4907mixq4hikg";
rev = "032281307dddeabdb0173b5fcd54b283e950d4ce";
sha256 = "0iyxs53j49mbqva97y1k2nvz1j6sqm934vr0q61a5cg3hi6flvsd";
fetchSubmodules = true;
};
};
@ -4043,12 +4043,12 @@ let
zig-vim = buildVimPluginFrom2Nix {
pname = "zig-vim";
version = "2019-01-31";
version = "2019-02-05";
src = fetchFromGitHub {
owner = "zig-lang";
repo = "zig.vim";
rev = "09e0bceb7be1488318df9441a5499f1dde644e72";
sha256 = "1g1s0176s3cz0ynyrx5a3r0jnbmqgln318v7hw5qvgalf3k99c5c";
rev = "9ed8a3152eb4dac88bb29bf0f248af86eb66cdbe";
sha256 = "0kdf9gcyg28hgdsxq48isavvd2q1qwwc6nq11cac57wlbsgs3shf";
};
};

14
pkgs/misc/vim-plugins/overrides.nix
View File

@ -1,6 +1,7 @@
{ lib, stdenv
, python, cmake, vim, ruby
, which, fetchgit, llvmPackages, rustPlatform
, which, fetchgit, fetchurl
, llvmPackages, rustPlatform
, xkb-switch, fzf, skim
, python3, boost, icu, ncurses
, ycmd, rake
@ -39,16 +40,15 @@ self: super: {
};
LanguageClient-neovim = let
LanguageClient-neovim-src = fetchgit {
url = "https://github.com/autozimu/LanguageClient-neovim";
rev = "59f0299e8f7d7edd0653b5fc005eec74c4bf4aba";
sha256 = "0x6729w7v3bxlpvm8jz1ybn23qa0zqfgxl88q2j0bbs6rvp0w1jq";
LanguageClient-neovim-src = fetchurl {
url = "https://github.com/autozimu/LanguageClient-neovim/archive/0.1.140.tar.gz";
sha256 = "0cixwm9wnn6vlam6mp57j436n92c4bvj5rs6j2qcv7qip8d2ggyw";
};
LanguageClient-neovim-bin = rustPlatform.buildRustPackage {
name = "LanguageClient-neovim-bin";
src = LanguageClient-neovim-src;
cargoSha256 = "1afmz14j7ma2nrsx0njcqbh2wa430dr10hds78c031286ppgwjls";
cargoSha256 = "0f591zv4f7spks2hx22nkq78sj42259gi7flnnpr1nfs40d7n13n";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
# FIXME: Use impure version of CoreFoundation because of missing symbols.
@ -59,7 +59,7 @@ self: super: {
};
in buildVimPluginFrom2Nix {
pname = "LanguageClient-neovim";
version = "2018-09-07";
version = "0.1.140";
src = LanguageClient-neovim-src;
propogatedBuildInputs = [ LanguageClient-neovim-bin ];

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, substituteAll, autoreconfHook, pkgconfig, libusb1, hwdata }:
{ stdenv, fetchurl, substituteAll, autoreconfHook, pkgconfig, libusb1, hwdata , python3 }:
stdenv.mkDerivation rec {
name = "usbutils-010";
@ -16,7 +16,12 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libusb1 ];
buildInputs = [ libusb1 python3 ];
outputs = [ "out" "man" "python" ];
postInstall = ''
moveToOutput "bin/lsusb.py" "$python"
'';
meta = with stdenv.lib; {
homepage = http://www.linux-usb.org/;

2
pkgs/servers/dict/default.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
patchPhase = "patch -p0 < ${./buildfix.diff}";
configureFlags = [
"--enable-dictorg"
"--datadir=/run/current-systems/sw/share/dictd"
"--datadir=/run/current-system/sw/share/dictd"
];
meta = with stdenv.lib; {

16
pkgs/servers/diod/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, fetchurl, munge, lua, libcap, perl, ncurses }:
{ stdenv, fetchurl, munge, lua,
libcap, perl, ncurses
}:
stdenv.mkDerivation rec {
name = "diod-${version}";
@ -9,12 +11,16 @@ stdenv.mkDerivation rec {
sha256 = "17wckwfsqj61yixz53nwkc35z66arb1x3napahpi64m7q68jn7gl";
};
postPatch = ''
substituteInPlace diod/xattr.c --replace attr/xattr.h sys/xattr.h
'';
buildInputs = [ munge lua libcap perl ncurses ];
meta = {
meta = with stdenv.lib; {
description = "An I/O forwarding server that implements a variant of the 9P protocol";
maintainers = [ stdenv.lib.maintainers.rickynils];
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.gpl2Plus;
maintainers = with maintainers; [ rnhmjoj rickynils ];
platforms = platforms.linux;
license = licenses.gpl2Plus;
};
}

33
pkgs/servers/headphones/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ stdenv, fetchFromGitHub, python2, makeWrapper }:
python2.pkgs.buildPythonApplication rec {
name = "headphones-${version}";
version = "0.5.19";
src = fetchFromGitHub {
owner = "rembo10";
repo = "headphones";
rev = "v${version}";
sha256 = "0z39gyan3ksdhnjxxs7byamrzmrk8cn15g300iqigzvgidff1lq0";
};
dontBuild = true;
doCheck = false;
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ python2 ];
installPhase = ''
mkdir -p $out/bin
cp -R {data,headphones,lib,Headphones.py} $out/
makeWrapper $out/Headphones.py $out/bin/headphones
'';
meta = with stdenv.lib; {
description = "Automatic music downloader for SABnzbd";
license = licenses.gpl3;
homepage = https:/github.com/rembo10/headphones;
maintainers = with stdenv.lib.maintainers; [ rembo10 ];
};
}

33
pkgs/servers/icingaweb2/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, php }: with lib; stdenv.mkDerivation rec {
name = "icingaweb2-${version}";
version = "2.6.2";
src = fetchFromGitHub {
owner = "Icinga";
repo = "icingaweb2";
rev = "v${version}";
sha256 = "1gf28nm94bq6r7i8yds5y9s59559i2zvj0swzb28zll6xbyprib0";
};
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/share
cp -ra application bin etc library modules public $out
cp -ra doc $out/share
wrapProgram $out/bin/icingacli --prefix PATH : "${makeBinPath [ php ]}"
'';
meta = {
description = "Webinterface for Icinga 2";
longDescription = ''
A lightweight and extensible web interface to keep an eye on your environment.
Analyse problems and act on them.
'';
homepage = "https://www.icinga.com/products/icinga-web-2/";
license = licenses.gpl2;
platforms = platforms.all;
maintainers = with maintainers; [ das_j ];
};
}

24
pkgs/servers/icingaweb2/theme-april/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv, lib, fetchFromGitHub }: with lib; stdenv.mkDerivation rec {
name = "icingaweb2-theme-april";
version = "1.0.4";
src = fetchFromGitHub {
owner = "Mikesch-mp";
repo = name;
rev = "v${version}";
sha256 = "0i1js2k47llzgmc77q9frvcmr02mqlhg0qhswx1486fvm6myxg0g";
};
installPhase = ''
mkdir -p "$out"
cp -r * "$out"
'';
meta = {
description = "Icingaweb2 theme for april fools";
homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-april";
license = licenses.publicDomain;
platforms = platforms.all;
maintainers = with maintainers; [ das_j ];
};
}

24
pkgs/servers/icingaweb2/theme-lsd/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv, lib, fetchFromGitHub }: with lib; stdenv.mkDerivation rec {
name = "icingaweb2-theme-lsd";
version = "1.0.3";
src = fetchFromGitHub {
owner = "Mikesch-mp";
repo = name;
rev = "v${version}";
sha256 = "172y08sar4nbyv5pfq5chw8xa3b7fg1dacmsg778zky5zf49qz2w";
};
installPhase = ''
mkdir -p "$out"
cp -r * "$out"
'';
meta = {
description = "Psychadelic theme for IcingaWeb 2";
homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-lsd";
license = licenses.publicDomain;
platforms = platforms.all;
maintainers = with maintainers; [ das_j ];
};
}

24
pkgs/servers/icingaweb2/theme-particles/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv, lib, fetchFromGitHub }: with lib; stdenv.mkDerivation rec {
name = "icingaweb2-theme-particles";
version = "1.0.0";
src = fetchFromGitHub {
owner = "Mikesch-mp";
repo = name;
rev = "v${version}";
sha256 = "0m6bbz191686k4djqbk8v0zcdm4cyi159jb3zwz7q295xbpi2vfy";
};
installPhase = ''
mkdir -p "$out"
cp -r * "$out"
'';
meta = {
description = "This theme adds a nice particle effect to the login screen of Icingaweb 2";
homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-particles";
license = licenses.publicDomain;
platforms = platforms.all;
maintainers = with maintainers; [ das_j ];
};
}

30
pkgs/servers/icingaweb2/theme-snow/default.nix Normal file
View File

@ -0,0 +1,30 @@
{ stdenv, lib, fetchFromGitHub, gawk }: with lib; stdenv.mkDerivation rec {
name = "icingaweb2-theme-snow";
version = "1.0.0";
src = fetchFromGitHub {
owner = "Mikesch-mp";
repo = name;
rev = "v${version}";
sha256 = "1c974v85mbsis52y2knwzh33996q8sza7pqrcs6ydx033s0rxjrp";
};
patchPhase = ''
# Module info contains some fancy ascii art which breaks the module list
awk -i inplace 'BEGIN {empty=0;write=1;}{if ($0 == ""){empty++;};if(empty==2){write=0};if (write==1){print $0}}' module.info
'';
installPhase = ''
mkdir -p "$out"
cp -r * "$out"
'';
meta = {
description = "Snow theme for Icingaweb 2";
homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-snow";
license = licenses.publicDomain;
platforms = platforms.all;
maintainers = with maintainers; [ das_j ];
};
}

24
pkgs/servers/icingaweb2/theme-spring/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv, lib, fetchFromGitHub }: with lib; stdenv.mkDerivation rec {
name = "icingaweb2-theme-spring";
version = "1.0.0";
src = fetchFromGitHub {
owner = "Mikesch-mp";
repo = name;
rev = "v${version}";
sha256 = "09v4871pndarhm2spxm9fdab58l5wj8m40kh53wvk1xc3g7pqki9";
};
installPhase = ''
mkdir -p "$out"
cp -r * "$out"
'';
meta = {
description = "Theme with some soft colors and nice background images loaded from unsplash.com";
homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-spring";
license = licenses.publicDomain;
platforms = platforms.all;
maintainers = with maintainers; [ das_j ];
};
}

45
pkgs/servers/icingaweb2/theme-unicorn/default.nix Normal file
View File

@ -0,0 +1,45 @@
{ stdenv, lib, fetchurl, fetchFromGitHub }: with lib; stdenv.mkDerivation rec {
name = "icingaweb2-theme-unicorn";
version = "1.0.2";
srcs = [
(fetchFromGitHub {
owner = "Mikesch-mp";
repo = name;
rev = "v${version}";
sha256 = "1qmcajdf0g70vp2avqa50lfrfigq22k91kggbgn5ablwyg9dki05";
})
(fetchurl {
url = "http://i.imgur.com/SCfMd.png";
sha256 = "1y6wqm1z6mn0a6jankd7pzqgi7zm5320kk6knvbv3qhzx2b74ypp";
})
];
unpackPhase = ''
for src in $srcs; do
case $src in
*.png)
cp $src unicorn.png
;;
*)
cp -r $src/* .
;;
esac
done
'';
installPhase = ''
mkdir -p "$out"
cp -r * "$out"
chmod 755 $out/public/img
cp unicorn.png "$out/public/img/unicorn.png"
'';
meta = {
description = "Unicorn theme for IcingaWeb 2";
homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-unicorn";
license = licenses.publicDomain;
platforms = platforms.all;
maintainers = with maintainers; [ das_j ];
};
}

4
pkgs/servers/mail/exim/default.nix
View File

@ -6,11 +6,11 @@
}:
stdenv.mkDerivation rec {
name = "exim-4.91";
name = "exim-4.92";
src = fetchurl {
url = "https://ftp.exim.org/pub/exim/exim4/${name}.tar.xz";
sha256 = "066ip7a5lqfn9rcr14j4nm0kqysw6mzvbbb0ip50lmfm0fqsqmzc";
sha256 = "0qhxxwl0nhzgp0w3pjkhx9z9lqfpk8id25q5ghf9ay2f90mydjba";
};
nativeBuildInputs = [ pkgconfig ];

4
pkgs/servers/sabnzbd/default.nix
View File

@ -4,7 +4,7 @@ let
pythonEnv = python2.withPackages(ps: with ps; [ cryptography cheetah yenc sabyenc ]);
path = stdenv.lib.makeBinPath [ par2cmdline unrar unzip p7zip ];
in stdenv.mkDerivation rec {
version = "2.3.3";
version = "2.3.7";
pname = "sabnzbd";
name = "${pname}-${version}";
@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
owner = pname;
repo = pname;
rev = version;
sha256 = "0za4xjc4x44f7i30r86bbza3zppid333ifwzp5h526w3zak1lal8";
sha256 = "08bk2ignm50ki2bqwwl0q9pia7v91cixr5b1yibz6qxsyfprk0mj";
};
buildInputs = [ pythonEnv makeWrapper ];

4
pkgs/servers/sickbeard/default.nix
View File

@ -2,8 +2,8 @@
let
pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]);
in python2.pkgs.buildPythonApplication rec {
name = "sickbeard-${version}";
in stdenv.mkDerivation rec {
pname = "sickbeard";
version = "2016-03-21";
src = fetchFromGitHub {

4
pkgs/servers/sickbeard/sickgear.nix
View File

@ -4,13 +4,13 @@ let
pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]);
in stdenv.mkDerivation rec {
pname = "sickgear";
version = "0.17.5";
version = "0.18.14";
src = fetchFromGitHub {
owner = "SickGear";
repo = "SickGear";
rev = "release_${version}";
sha256 = "1lx060klgxz8gjanfjvya6p6kd8842qbpp1qhhiw49a25r8gyxpk";
sha256 = "0sw436zbsaxwy58lfkgw6gb6hapxxxl4wipkpzd80dgaz7bvd7c3";
};
dontBuild = true;

99
pkgs/servers/sip/freeswitch/default.nix
View File

@ -1,19 +1,96 @@
let
# the default list from v1.8.5, except with applications/mod_signalwire also disabled
defaultModules = mods: with mods; [
applications.commands
applications.conference
applications.db
applications.dptools
applications.enum
applications.esf
applications.expr
applications.fifo
applications.fsv
applications.hash
applications.httapi
applications.sms
applications.spandsp
applications.valet_parking
applications.voicemail
applications.curl
codecs.amr
codecs.b64
codecs.g723_1
codecs.g729
codecs.h26x
codecs.opus
dialplans.asterisk
dialplans.xml
endpoints.loopback
endpoints.rtc
endpoints.skinny
endpoints.sofia
endpoints.verto
event_handlers.cdr_csv
event_handlers.cdr_sqlite
event_handlers.event_socket
formats.local_stream
formats.native_file
formats.png
formats.sndfile
formats.tone_stream
languages.lua
loggers.console
loggers.logfile
loggers.syslog
say.en
xml_int.cdr
xml_int.rpc
xml_int.scgi
];
in
{ fetchurl, stdenv, lib, ncurses, curl, pkgconfig, gnutls, readline
, openssl, perl, sqlite, libjpeg, speex, pcre
, ldns, libedit, yasm, which, lua, libopus, libsndfile
, ldns, libedit, yasm, which, lua, libopus, libsndfile, libtiff
, modules ? defaultModules
, postgresql
, enablePostgres ? true
, SystemConfiguration
}:
let
availableModules = import ./modules.nix { inherit curl lua libopus; };
enabledModules = modules availableModules;
modulesConf = let
lst = builtins.map (mod: mod.path) enabledModules;
str = lib.strings.concatStringsSep "\n" lst;
in builtins.toFile "modules.conf" str;
in
stdenv.mkDerivation rec {
name = "freeswitch-1.6.20";
name = "freeswitch-1.8.5";
src = fetchurl {
url = "https://files.freeswitch.org/freeswitch-releases/${name}.tar.bz2";
sha256 = "0hqz68abs5x5vzf1mndcvdi35nrhmnklzdrnrk8dyvzvz67hp2ah";
sha256 = "00xdrx84pw2v5pw1r5gfbb77nmvlfj275pmd48yfrc9g8c91j1sr";
};
postPatch = ''
patchShebangs libs/libvpx/build/make/rtcd.pl
@ -23,10 +100,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
openssl ncurses curl gnutls readline perl libjpeg
sqlite pcre speex ldns libedit yasm which lua libopus
libsndfile
openssl ncurses gnutls readline perl libjpeg
sqlite pcre speex ldns libedit yasm which
libsndfile libtiff
]
++ lib.unique (lib.concatMap (mod: mod.inputs) enabledModules)
++ lib.optionals enablePostgres [ postgresql ]
++ lib.optionals stdenv.isDarwin [ SystemConfiguration ];
@ -36,6 +114,15 @@ stdenv.mkDerivation rec {
configureFlags = lib.optionals enablePostgres [ "--enable-core-pgsql-support" ];
preConfigure = ''
cp "${modulesConf}" modules.conf
'';
postInstall = ''
# helper for compiling modules... not generally useful; also pulls in perl dependency
rm "$out"/bin/fsxs
'';
meta = {
description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch";
homepage = https://freeswitch.org/;

223
pkgs/servers/sip/freeswitch/modules.nix Normal file
View File

@ -0,0 +1,223 @@
{ libopus
, lua
, curl
}:
let
mk = path: inputs: { inherit path inputs; };
in
# TODO: many of these are untested and missing required inputs
{
applications = {
abstraction = mk "applications/mod_abstraction" [];
av = mk "applications/mod_av" [];
avmd = mk "applications/mod_avmd" [];
bert = mk "applications/mod_bert" [];
blacklist = mk "applications/mod_blacklist" [];
callcenter = mk "applications/mod_callcenter" [];
cidlookup = mk "applications/mod_cidlookup" [];
cluechoo = mk "applications/mod_cluechoo" [];
commands = mk "applications/mod_commands" [];
conference = mk "applications/mod_conference" [];
curl = mk "applications/mod_curl" [ curl ];
cv = mk "applications/mod_cv" [];
db = mk "applications/mod_db" [];
directory = mk "applications/mod_directory" [];
distributor = mk "applications/mod_distributor" [];
dptools = mk "applications/mod_dptools" [];
easyroute = mk "applications/mod_easyroute" [];
enum = mk "applications/mod_enum" [];
esf = mk "applications/mod_esf" [];
esl = mk "applications/mod_esl" [];
expr = mk "applications/mod_expr" [];
fifo = mk "applications/mod_fifo" [];
fsk = mk "applications/mod_fsk" [];
fsv = mk "applications/mod_fsv" [];
hash = mk "applications/mod_hash" [];
hiredis = mk "applications/mod_hiredis" [];
httapi = mk "applications/mod_httapi" [];
http_cache = mk "applications/mod_http_cache" [];
ladspa = mk "applications/mod_ladspa" [];
lcr = mk "applications/mod_lcr" [];
memcache = mk "applications/mod_memcache" [];
mongo = mk "applications/mod_mongo" [];
mp4 = mk "applications/mod_mp4" [];
mp4v2 = mk "applications/mod_mp4v2" [];
nibblebill = mk "applications/mod_nibblebill" [];
oreka = mk "applications/mod_oreka" [];
osp = mk "applications/mod_osp" [];
prefix = mk "applications/mod_prefix" [];
rad_auth = mk "applications/mod_rad_auth" [];
redis = mk "applications/mod_redis" [];
rss = mk "applications/mod_rss" [];
signalwire = mk "applications/mod_signalwire" [];
sms = mk "applications/mod_sms" [];
sms_flowroute = mk "applications/mod_sms_flowroute" [];
snapshot = mk "applications/mod_snapshot" [];
snom = mk "applications/mod_snom" [];
sonar = mk "applications/mod_sonar" [];
soundtouch = mk "applications/mod_soundtouch" [];
spandsp = mk "applications/mod_spandsp" [];
spy = mk "applications/mod_spy" [];
stress = mk "applications/mod_stress" [];
translate = mk "applications/mod_translate" [];
valet_parking = mk "applications/mod_valet_parking" [];
video_filter = mk "applications/mod_video_filter" [];
vmd = mk "applications/mod_vmd" [];
voicemail = mk "applications/mod_voicemail" [];
voicemail_ivr = mk "applications/mod_voicemail_ivr" [];
};
ast_tts = {
cepstral = mk "ast_tts/mod_cepstral" [];
flite = mk "ast_tts/mod_flite" [];
pocketsphinx = mk "ast_tts/mod_pocketsphinx" [];
tts_commandline = mk "ast_tts/mod_tts_commandline" [];
unimrcp = mk "ast_tts/mod_unimrcp" [];
};
codecs = {
amr = mk "codecs/mod_amr" [];
amrwb = mk "codecs/mod_amrwb" [];
b64 = mk "codecs/mod_b64" [];
bv = mk "codecs/mod_bv" [];
clearmode = mk "codecs/mod_clearmode" [];
codec2 = mk "codecs/mod_codec2" [];
com_g729 = mk "codecs/mod_com_g729" [];
dahdi_codec = mk "codecs/mod_dahdi_codec" [];
g723_1 = mk "codecs/mod_g723_1" [];
g729 = mk "codecs/mod_g729" [];
h26x = mk "codecs/mod_h26x" [];
ilbc = mk "codecs/mod_ilbc" [];
isac = mk "codecs/mod_isac" [];
mp4v = mk "codecs/mod_mp4v" [];
opus = mk "codecs/mod_opus" [ libopus ];
sangoma_codec = mk "codecs/mod_sangoma_codec" [];
silk = mk "codecs/mod_silk" [];
siren = mk "codecs/mod_siren" [];
theora = mk "codecs/mod_theora" [];
};
dialplans = {
asterisk = mk "dialplans/mod_dialplan_asterisk" [];
directory = mk "dialplans/mod_dialplan_directory" [];
xml = mk "dialplans/mod_dialplan_xml" [];
};
directories = {
ldap = mk "directories/mod_ldap" [];
};
endpoints = {
alsa = mk "endpoints/mod_alsa" [];
dingaling = mk "endpoints/mod_dingaling" [];
gsmopen = mk "endpoints/mod_gsmopen" [];
h323 = mk "endpoints/mod_h323" [];
khomp = mk "endpoints/mod_khomp" [];
loopback = mk "endpoints/mod_loopback" [];
opal = mk "endpoints/mod_opal" [];
portaudio = mk "endpoints/mod_portaudio" [];
rtc = mk "endpoints/mod_rtc" [];
rtmp = mk "endpoints/mod_rtmp" [];
skinny = mk "endpoints/mod_skinny" [];
sofia = mk "endpoints/mod_sofia" [];
verto = mk "endpoints/mod_verto" [];
};
event_handlers = {
amqp = mk "event_handlers/mod_amqp" [];
cdr_csv = mk "event_handlers/mod_cdr_csv" [];
cdr_mongodb = mk "event_handlers/mod_cdr_mongodb" [];
cdr_pg_csv = mk "event_handlers/mod_cdr_pg_csv" [];
cdr_sqlite = mk "event_handlers/mod_cdr_sqlite" [];
erlang_event = mk "event_handlers/mod_erlang_event" [];
event_multicast = mk "event_handlers/mod_event_multicast" [];
event_socket = mk "event_handlers/mod_event_socket" [];
fail2ban = mk "event_handlers/mod_fail2ban" [];
format_cdr = mk "event_handlers/mod_format_cdr" [];
json_cdr = mk "event_handlers/mod_json_cdr" [];
radius_cdr = mk "event_handlers/mod_radius_cdr" [];
odbc_cdr = mk "event_handlers/mod_odbc_cdr" [];
kazoo = mk "event_handlers/mod_kazoo" [];
rayo = mk "event_handlers/mod_rayo" [];
smpp = mk "event_handlers/mod_smpp" [];
snmp = mk "event_handlers/mod_snmp" [];
event_zmq = mk "event_handlers/mod_event_zmq" [];
};
formats = {
imagick = mk "formats/mod_imagick" [];
local_stream = mk "formats/mod_local_stream" [];
native_file = mk "formats/mod_native_file" [];
png = mk "formats/mod_png" [];
portaudio_stream = mk "formats/mod_portaudio_stream" [];
shell_stream = mk "formats/mod_shell_stream" [];
shout = mk "formats/mod_shout" [];
sndfile = mk "formats/mod_sndfile" [];
ssml = mk "formats/mod_ssml" [];
tone_stream = mk "formats/mod_tone_stream" [];
vlc = mk "formats/mod_vlc" [];
};
languages = {
basic = mk "languages/mod_basic" [];
java = mk "languages/mod_java" [];
lua = mk "languages/mod_lua" [ lua ];
managed = mk "languages/mod_managed" [];
perl = mk "languages/mod_perl" [];
python = mk "languages/mod_python" [];
v8 = mk "languages/mod_v8" [];
yaml = mk "languages/mod_yaml" [];
};
loggers = {
console = mk "loggers/mod_console" [];
graylog2 = mk "loggers/mod_graylog2" [];
logfile = mk "loggers/mod_logfile" [];
syslog = mk "loggers/mod_syslog" [];
raven = mk "loggers/mod_raven" [];
};
say = {
de = mk "say/mod_say_de" [];
en = mk "say/mod_say_en" [];
es = mk "say/mod_say_es" [];
es_ar = mk "say/mod_say_es_ar" [];
fa = mk "say/mod_say_fa" [];
fr = mk "say/mod_say_fr" [];
he = mk "say/mod_say_he" [];
hr = mk "say/mod_say_hr" [];
hu = mk "say/mod_say_hu" [];
it = mk "say/mod_say_it" [];
ja = mk "say/mod_say_ja" [];
nl = mk "say/mod_say_nl" [];
pl = mk "say/mod_say_pl" [];
pt = mk "say/mod_say_pt" [];
ru = mk "say/mod_say_ru" [];
sv = mk "say/mod_say_sv" [];
th = mk "say/mod_say_th" [];
zh = mk "say/mod_say_zh" [];
};
timers = {
posix_timer = mk "timers/mod_posix_timer" [];
timerfd = mk "timers/mod_timerfd" [];
};
xml_int = {
cdr = mk "xml_int/mod_xml_cdr" [];
curl = mk "xml_int/mod_xml_curl" [ curl ];
ldap = mk "xml_int/mod_xml_ldap" [];
radius = mk "xml_int/mod_xml_radius" [];
rpc = mk "xml_int/mod_xml_rpc" [];
scgi = mk "xml_int/mod_xml_scgi" [];
# experimental
odbc = mk "../../contrib/mod/xml_int/mod_xml_odbc" [];
};
freetdm = mk "../../libs/freetdm/mod_freetdm" [];
}

6
pkgs/servers/sql/postgresql/default.nix
View File

@ -188,9 +188,9 @@ in self: {
};
postgresql_11 = self.callPackage generic {
version = "11.1";
psqlSchema = "11.1";
sha256 = "026v0sicsh7avzi45waf8shcbhivyxmi7qgn9fd1x0vl520mx0ch";
version = "11.2";
psqlSchema = "11.2";
sha256 = "01clq2lw0v83zh5dc89xdr3mmap0jr37kdkh401ph6f2177bjxi6";
this = self.postgresql_11;
inherit self;
};

2
pkgs/servers/tt-rss/plugin-auth-ldap/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Plugin for TT-RSS to authenticate users via ldap";
license = licenses.gpl3;
license = licenses.asl20;
homepage = https://github.com/hydrian/TTRSS-Auth-LDAP;
maintainers = with maintainers; [ mic92 ];
platforms = platforms.all;

30
pkgs/servers/tt-rss/plugin-ff-instagram/default.nix Normal file
View File

@ -0,0 +1,30 @@
{ stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
name = "tt-rss-plugin-ff-instagram-${version}";
version = "git-2019-01-10"; # No release, see https://github.com/wltb/ff_instagram/issues/6
src = fetchFromGitHub {
owner = "wltb";
repo = "ff_instagram";
rev = "0366ffb18c4d490c8fbfba2f5f3367a5af23cfe8";
sha256 = "0vvzl6wi6jmrqknsfddvckjgsgfizz1d923d1nyrpzjfn6bda1vk";
};
installPhase = ''
mkdir -p $out/ff_instagram
cp *.php $out/ff_instagram
'';
meta = with stdenv.lib; {
description = "Plugin for Tiny Tiny RSS that allows to fetch posts from Instagram user sites";
longDescription = ''
Plugin for Tiny Tiny RSS that allows to fetch posts from Instagram user sites.
The name of the plugin in TT-RSS is 'ff_instagram'.
'';
license = licenses.agpl3;
homepage = "https://github.com/wltb/ff_instagram";
maintainers = with maintainers; [ das_j ];
platforms = platforms.all;
};
}

4
pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
name = "tt-rss-plugin-tumblr-gdpr-${version}";
version = "1.2";
version = "2.1";
src = fetchFromGitHub {
owner = "GregThib";
repo = "ttrss-tumblr-gdpr";
rev = "v${version}";
sha256 = "1qqnzysg1d0b169kr9fbgi50yjnvw7lrvgrl2zjx6px6z61jhv4j";
sha256 = "09cbghi5b6ww4i5677i39qc9rhpq70xmygp0d7x30239r3i23rpq";
};
installPhase = ''

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