Merge staging-next into staging
This commit is contained in:
Frederik Rietdijk
commit
fd48a94b62
@ -793,6 +793,11 @@
|
||||
github = "caugner";
|
||||
name = "Claas Augner";
|
||||
};
|
||||
cbley = {
|
||||
email = "claudio.bley@gmail.com";
|
||||
github = "avdv";
|
||||
name = "Claudio Bley";
|
||||
};
|
||||
cdepillabout = {
|
||||
email = "cdep.illabout@gmail.com";
|
||||
github = "cdepillabout";
|
||||
@ -1565,6 +1570,11 @@
|
||||
github = "flokli";
|
||||
name = "Florian Klink";
|
||||
};
|
||||
FlorianFranzen = {
|
||||
email = "Florian.Franzen@gmail.com";
|
||||
github = "FlorianFranzen";
|
||||
name = "Florian Franzen";
|
||||
};
|
||||
florianjacob = {
|
||||
email = "projects+nixos@florianjacob.de";
|
||||
github = "florianjacob";
|
||||
@ -3228,6 +3238,11 @@
|
||||
github = "nequissimus";
|
||||
name = "Tim Steinbach";
|
||||
};
|
||||
netixx = {
|
||||
email = "dev.espinetfrancois@gmail.com";
|
||||
github = "netixx";
|
||||
name = "François Espinet";
|
||||
};
|
||||
nikitavoloboev = {
|
||||
email = "nikita.voloboev@gmail.com";
|
||||
github = "nikitavoloboev";
|
||||
|
||||
@ -29,7 +29,10 @@
|
||||
networks are set, it will default to using a configuration file at
|
||||
<literal>/etc/wpa_supplicant.conf</literal>. You should edit this file
|
||||
yourself to define wireless networks, WPA keys and so on (see
|
||||
wpa_supplicant.conf(5)).
|
||||
<citerefentry>
|
||||
<refentrytitle>wpa_supplicant.conf</refentrytitle>
|
||||
<manvolnum>5</manvolnum>
|
||||
</citerefentry>).
|
||||
</para>
|
||||
|
||||
<para>
|
||||
|
||||
@ -444,6 +444,23 @@
|
||||
<option>services.matomo.package</option> which determines the used
|
||||
Matomo version.
|
||||
</para>
|
||||
<para>
|
||||
The Matomo module now also comes with the systemd service <literal>matomo-archive-processing.service</literal>
|
||||
and a timer that automatically triggers archive processing every hour.
|
||||
This means that you can safely
|
||||
<link xlink:href="https://matomo.org/docs/setup-auto-archiving/#disable-browser-triggers-for-matomo-archiving-and-limit-matomo-reports-to-updating-every-hour">
|
||||
disable browser triggers for Matomo archiving
|
||||
</link> at <literal>Administration > System > General Settings</literal>.
|
||||
</para>
|
||||
<para>
|
||||
Additionally, you can enable to
|
||||
<link xlink:href="https://matomo.org/docs/privacy/#step-2-delete-old-visitors-logs">
|
||||
delete old visitor logs
|
||||
</link> at <literal>Administration > System > Privacy</literal>,
|
||||
but make sure that you run <literal>systemctl start matomo-archive-processing.service</literal>
|
||||
at least once without errors if you have already collected data before,
|
||||
so that the reports get archived before the source data gets deleted.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
|
||||
@ -205,15 +205,13 @@ in {
|
||||
|
||||
mysql = lib.mkIf cfg.database.createLocally {
|
||||
ensureDatabases = [ cfg.database.name ];
|
||||
ensureUsers = {
|
||||
ensureUsers = [{
|
||||
name = cfg.database.username;
|
||||
ensurePermissions = [
|
||||
{ "${cfg.database.name}.*" = "ALL PRIVILEGES"; }
|
||||
];
|
||||
ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; };
|
||||
initialDatabases = [
|
||||
{ inherit (cfg.database) name; schema = "${pkg}/share/zoneminder/db/zm_create.sql"; }
|
||||
];
|
||||
};
|
||||
}];
|
||||
};
|
||||
|
||||
nginx = lib.mkIf useNginx {
|
||||
|
||||
@ -73,11 +73,35 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
kubeconfig = mkOption {
|
||||
description = ''
|
||||
Path to kubeconfig to use for storing flannel config using the
|
||||
Kubernetes API
|
||||
'';
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
};
|
||||
|
||||
network = mkOption {
|
||||
description = " IPv4 network in CIDR format to use for the entire flannel network.";
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
nodeName = mkOption {
|
||||
description = ''
|
||||
Needed when running with Kubernetes as backend as this cannot be auto-detected";
|
||||
'';
|
||||
type = types.nullOr types.str;
|
||||
default = with config.networking; (hostName + optionalString (!isNull domain) ".${domain}");
|
||||
example = "node1.example.com";
|
||||
};
|
||||
|
||||
storageBackend = mkOption {
|
||||
description = "Determines where flannel stores its configuration at runtime";
|
||||
type = types.enum ["etcd" "kubernetes"];
|
||||
default = "etcd";
|
||||
};
|
||||
|
||||
subnetLen = mkOption {
|
||||
description = ''
|
||||
The size of the subnet allocated to each host. Defaults to 24 (i.e. /24)
|
||||
@ -122,17 +146,22 @@ in {
|
||||
after = [ "network.target" ];
|
||||
environment = {
|
||||
FLANNELD_PUBLIC_IP = cfg.publicIp;
|
||||
FLANNELD_IFACE = cfg.iface;
|
||||
} // optionalAttrs (cfg.storageBackend == "etcd") {
|
||||
FLANNELD_ETCD_ENDPOINTS = concatStringsSep "," cfg.etcd.endpoints;
|
||||
FLANNELD_ETCD_KEYFILE = cfg.etcd.keyFile;
|
||||
FLANNELD_ETCD_CERTFILE = cfg.etcd.certFile;
|
||||
FLANNELD_ETCD_CAFILE = cfg.etcd.caFile;
|
||||
FLANNELD_IFACE = cfg.iface;
|
||||
ETCDCTL_CERT_FILE = cfg.etcd.certFile;
|
||||
ETCDCTL_KEY_FILE = cfg.etcd.keyFile;
|
||||
ETCDCTL_CA_FILE = cfg.etcd.caFile;
|
||||
ETCDCTL_PEERS = concatStringsSep "," cfg.etcd.endpoints;
|
||||
} // optionalAttrs (cfg.storageBackend == "kubernetes") {
|
||||
FLANNELD_KUBE_SUBNET_MGR = "true";
|
||||
FLANNELD_KUBECONFIG_FILE = cfg.kubeconfig;
|
||||
NODE_NAME = cfg.nodeName;
|
||||
};
|
||||
preStart = ''
|
||||
preStart = mkIf (cfg.storageBackend == "etcd") ''
|
||||
echo "setting network configuration"
|
||||
until ${pkgs.etcdctl.bin}/bin/etcdctl set /coreos.com/network/config '${builtins.toJSON networkConfig}'
|
||||
do
|
||||
@ -149,6 +178,12 @@ in {
|
||||
serviceConfig.ExecStart = "${cfg.package}/bin/flannel";
|
||||
};
|
||||
|
||||
services.etcd.enable = mkDefault (cfg.etcd.endpoints == ["http://127.0.0.1:2379"]);
|
||||
services.etcd.enable = mkDefault (cfg.storageBackend == "etcd" && cfg.etcd.endpoints == ["http://127.0.0.1:2379"]);
|
||||
|
||||
# for some reason, flannel doesn't let you configure this path
|
||||
# see: https://github.com/coreos/flannel/blob/master/Documentation/configuration.md#configuration
|
||||
environment.etc."kube-flannel/net-conf.json" = mkIf (cfg.storageBackend == "kubernetes") {
|
||||
source = pkgs.writeText "net-conf.json" (builtins.toJSON networkConfig);
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -86,7 +86,12 @@ in {
|
||||
'';
|
||||
description = ''
|
||||
Use this option to configure advanced authentication methods like EAP.
|
||||
See wpa_supplicant.conf(5) for example configurations.
|
||||
See
|
||||
<citerefentry>
|
||||
<refentrytitle>wpa_supplicant.conf</refentrytitle>
|
||||
<manvolnum>5</manvolnum>
|
||||
</citerefentry>
|
||||
for example configurations.
|
||||
|
||||
Mutually exclusive with <varname>psk</varname> and <varname>pskRaw</varname>.
|
||||
'';
|
||||
@ -122,7 +127,12 @@ in {
|
||||
'';
|
||||
description = ''
|
||||
Extra configuration lines appended to the network block.
|
||||
See wpa_supplicant.conf(5) for available options.
|
||||
See
|
||||
<citerefentry>
|
||||
<refentrytitle>wpa_supplicant.conf</refentrytitle>
|
||||
<manvolnum>5</manvolnum>
|
||||
</citerefentry>
|
||||
for available options.
|
||||
'';
|
||||
};
|
||||
|
||||
@ -174,7 +184,12 @@ in {
|
||||
'';
|
||||
description = ''
|
||||
Extra lines appended to the configuration file.
|
||||
See wpa_supplicant.conf(5) for available options.
|
||||
See
|
||||
<citerefentry>
|
||||
<refentrytitle>wpa_supplicant.conf</refentrytitle>
|
||||
<manvolnum>5</manvolnum>
|
||||
</citerefentry>
|
||||
for available options.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
@ -316,6 +316,10 @@ in
|
||||
mkdir -m 0755 -p ${cfg.tempDir}
|
||||
|
||||
mkdir -m 0755 -p /var/lib/cups
|
||||
# While cups will automatically create self-signed certificates if accessed via TLS,
|
||||
# this directory to store the certificates needs to be created manually.
|
||||
mkdir -m 0700 -p /var/lib/cups/ssl
|
||||
|
||||
# Backwards compatibility
|
||||
if [ ! -L /etc/cups ]; then
|
||||
mv /etc/cups/* /var/lib/cups
|
||||
|
||||
@ -12,15 +12,15 @@
|
||||
An automatic setup is not suported by Matomo, so you need to configure Matomo
|
||||
itself in the browser-based Matomo setup.
|
||||
</para>
|
||||
|
||||
<section xml:id="module-services-matomo-database-setup">
|
||||
<title>Database Setup</title>
|
||||
|
||||
<para>
|
||||
You also need to configure a MariaDB or MySQL database and -user for Matomo
|
||||
yourself, and enter those credentials in your browser. You can use
|
||||
passwordless database authentication via the UNIX_SOCKET authentication
|
||||
plugin with the following SQL commands:
|
||||
<programlisting>
|
||||
<programlisting>
|
||||
# For MariaDB
|
||||
INSTALL PLUGIN unix_socket SONAME 'auth_socket';
|
||||
CREATE DATABASE matomo;
|
||||
@ -32,7 +32,7 @@
|
||||
CREATE DATABASE matomo;
|
||||
CREATE USER 'matomo'@'localhost' IDENTIFIED WITH auth_socket;
|
||||
GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost';
|
||||
</programlisting>
|
||||
</programlisting>
|
||||
Then fill in <literal>matomo</literal> as database user and database name,
|
||||
and leave the password field blank. This authentication works by allowing
|
||||
only the <literal>matomo</literal> unix user to authenticate as the
|
||||
@ -46,9 +46,30 @@
|
||||
database is not on the same host.
|
||||
</para>
|
||||
</section>
|
||||
|
||||
<section xml:id="module-services-matomo-archive-processing">
|
||||
<title>Archive Processing</title>
|
||||
<para>
|
||||
This module comes with the systemd service <literal>matomo-archive-processing.service</literal>
|
||||
and a timer that automatically triggers archive processing every hour.
|
||||
This means that you can safely
|
||||
<link xlink:href="https://matomo.org/docs/setup-auto-archiving/#disable-browser-triggers-for-matomo-archiving-and-limit-matomo-reports-to-updating-every-hour">
|
||||
disable browser triggers for Matomo archiving
|
||||
</link> at <literal>Administration > System > General Settings</literal>.
|
||||
</para>
|
||||
<para>
|
||||
With automatic archive processing, you can now also enable to
|
||||
<link xlink:href="https://matomo.org/docs/privacy/#step-2-delete-old-visitors-logs">
|
||||
delete old visitor logs
|
||||
</link> at <literal>Administration > System > Privacy</literal>,
|
||||
but make sure that you run <literal>systemctl start matomo-archive-processing.service</literal>
|
||||
at least once without errors if you have already collected data before,
|
||||
so that the reports get archived before the source data gets deleted.
|
||||
</para>
|
||||
</section>
|
||||
|
||||
<section xml:id="module-services-matomo-backups">
|
||||
<title>Backup</title>
|
||||
|
||||
<para>
|
||||
You only need to take backups of your MySQL database and the
|
||||
<filename>/var/lib/matomo/config/config.ini.php</filename> file. Use a user
|
||||
@ -57,9 +78,9 @@
|
||||
<link xlink:href="https://matomo.org/faq/how-to-install/faq_138/" />.
|
||||
</para>
|
||||
</section>
|
||||
|
||||
<section xml:id="module-services-matomo-issues">
|
||||
<title>Issues</title>
|
||||
|
||||
<itemizedlist>
|
||||
<listitem>
|
||||
<para>
|
||||
@ -76,6 +97,7 @@
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
|
||||
<section xml:id="module-services-matomo-other-web-servers">
|
||||
<title>Using other Web Servers than nginx</title>
|
||||
|
||||
|
||||
@ -23,20 +23,24 @@ in {
|
||||
options = {
|
||||
services.matomo = {
|
||||
# NixOS PR for database setup: https://github.com/NixOS/nixpkgs/pull/6963
|
||||
# matomo issue for automatic matomo setup: https://github.com/matomo-org/matomo/issues/10257
|
||||
# TODO: find a nice way to do this when more NixOS MySQL and / or matomo automatic setup stuff is implemented.
|
||||
# Matomo issue for automatic Matomo setup: https://github.com/matomo-org/matomo/issues/10257
|
||||
# TODO: find a nice way to do this when more NixOS MySQL and / or Matomo automatic setup stuff is implemented.
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Enable matomo web analytics with php-fpm backend.
|
||||
Enable Matomo web analytics with php-fpm backend.
|
||||
Either the nginx option or the webServerUser option is mandatory.
|
||||
'';
|
||||
};
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
description = "Matomo package to use";
|
||||
description = ''
|
||||
Matomo package for the service to use.
|
||||
This can be used to point to newer releases from nixos-unstable,
|
||||
as they don't get backported if they are not security-relevant.
|
||||
'';
|
||||
default = pkgs.matomo;
|
||||
defaultText = "pkgs.matomo";
|
||||
};
|
||||
@ -45,12 +49,25 @@ in {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
example = "lighttpd";
|
||||
# TODO: piwik.php might get renamed to matomo.php in future releases
|
||||
description = ''
|
||||
Name of the web server user that forwards requests to the ${phpSocket} fastcgi socket for matomo if the nginx
|
||||
Name of the web server user that forwards requests to the ${phpSocket} fastcgi socket for Matomo if the nginx
|
||||
option is not used. Either this option or the nginx option is mandatory.
|
||||
If you want to use another webserver than nginx, you need to set this to that server's user
|
||||
and pass fastcgi requests to `index.php` and `piwik.php` to this socket.
|
||||
and pass fastcgi requests to `index.php`, `matomo.php` and `piwik.php` (legacy name) to this socket.
|
||||
'';
|
||||
};
|
||||
|
||||
periodicArchiveProcessing = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Enable periodic archive processing, which generates aggregated reports from the visits.
|
||||
|
||||
This means that you can safely disable browser triggers for Matomo archiving,
|
||||
and safely enable to delete old visitor logs.
|
||||
Before deleting visitor logs,
|
||||
make sure though that you run <literal>systemctl start matomo-archive-processing.service</literal>
|
||||
at least once without errors if you have already collected data before.
|
||||
'';
|
||||
};
|
||||
|
||||
@ -69,7 +86,7 @@ in {
|
||||
catch_workers_output = yes
|
||||
'';
|
||||
description = ''
|
||||
Settings for phpfpm's process manager. You might need to change this depending on the load for matomo.
|
||||
Settings for phpfpm's process manager. You might need to change this depending on the load for Matomo.
|
||||
'';
|
||||
};
|
||||
|
||||
@ -79,7 +96,7 @@ in {
|
||||
(import ../web-servers/nginx/vhost-options.nix { inherit config lib; })
|
||||
{
|
||||
# enable encryption by default,
|
||||
# as sensitive login and matomo data should not be transmitted in clear text.
|
||||
# as sensitive login and Matomo data should not be transmitted in clear text.
|
||||
options.forceSSL.default = true;
|
||||
options.enableACME.default = true;
|
||||
}
|
||||
@ -94,7 +111,7 @@ in {
|
||||
enableACME = false;
|
||||
};
|
||||
description = ''
|
||||
With this option, you can customize an nginx virtualHost which already has sensible defaults for matomo.
|
||||
With this option, you can customize an nginx virtualHost which already has sensible defaults for Matomo.
|
||||
Either this option or the webServerUser option is mandatory.
|
||||
Set this to {} to just enable the virtualHost if you don't need any customization.
|
||||
If enabled, then by default, the <option>serverName</option> is
|
||||
@ -124,29 +141,30 @@ in {
|
||||
};
|
||||
users.groups.${user} = {};
|
||||
|
||||
systemd.services.matomo_setup_update = {
|
||||
# everything needs to set up and up to date before matomo php files are executed
|
||||
systemd.services.matomo-setup-update = {
|
||||
# everything needs to set up and up to date before Matomo php files are executed
|
||||
requiredBy = [ "${phpExecutionUnit}.service" ];
|
||||
before = [ "${phpExecutionUnit}.service" ];
|
||||
# the update part of the script can only work if the database is already up and running
|
||||
requires = [ databaseService ];
|
||||
after = [ databaseService ];
|
||||
path = [ cfg.package ];
|
||||
environment.PIWIK_USER_PATH = dataDir;
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
User = user;
|
||||
# hide especially config.ini.php from other
|
||||
UMask = "0007";
|
||||
# TODO: might get renamed to MATOMO_USER_PATH in future versions
|
||||
Environment = "PIWIK_USER_PATH=${dataDir}";
|
||||
# chown + chmod in preStart needs root
|
||||
PermissionsStartOnly = true;
|
||||
};
|
||||
|
||||
# correct ownership and permissions in case they're not correct anymore,
|
||||
# e.g. after restoring from backup or moving from another system.
|
||||
# Note that ${dataDir}/config/config.ini.php might contain the MySQL password.
|
||||
preStart = ''
|
||||
# migrate data from piwik to matomo folder
|
||||
# migrate data from piwik to Matomo folder
|
||||
if [ -d ${deprecatedDataDir} ]; then
|
||||
echo "Migrating from ${deprecatedDataDir} to ${dataDir}"
|
||||
mv -T ${deprecatedDataDir} ${dataDir}
|
||||
@ -155,7 +173,7 @@ in {
|
||||
chmod -R ug+rwX,o-rwx ${dataDir}
|
||||
'';
|
||||
script = ''
|
||||
# Use User-Private Group scheme to protect matomo data, but allow administration / backup via matomo group
|
||||
# Use User-Private Group scheme to protect Matomo data, but allow administration / backup via 'matomo' group
|
||||
# Copy config folder
|
||||
chmod g+s "${dataDir}"
|
||||
cp -r "${cfg.package}/config" "${dataDir}/"
|
||||
@ -169,8 +187,39 @@ in {
|
||||
'';
|
||||
};
|
||||
|
||||
# If this is run regularly via the timer,
|
||||
# 'Browser trigger archiving' can be disabled in Matomo UI > Settings > General Settings.
|
||||
systemd.services.matomo-archive-processing = {
|
||||
description = "Archive Matomo reports";
|
||||
# the archiving can only work if the database is already up and running
|
||||
requires = [ databaseService ];
|
||||
after = [ databaseService ];
|
||||
|
||||
# TODO: might get renamed to MATOMO_USER_PATH in future versions
|
||||
environment.PIWIK_USER_PATH = dataDir;
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
User = user;
|
||||
UMask = "0007";
|
||||
CPUSchedulingPolicy = "idle";
|
||||
IOSchedulingClass = "idle";
|
||||
ExecStart = "${cfg.package}/bin/matomo-console core:archive --url=https://${user}.${fqdn}";
|
||||
};
|
||||
};
|
||||
|
||||
systemd.timers.matomo-archive-processing = mkIf cfg.periodicArchiveProcessing {
|
||||
description = "Automatically archive Matomo reports every hour";
|
||||
|
||||
wantedBy = [ "timers.target" ];
|
||||
timerConfig = {
|
||||
OnCalendar = "hourly";
|
||||
Persistent = "yes";
|
||||
AccuracySec = "10m";
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services.${phpExecutionUnit} = {
|
||||
# stop phpfpm on package upgrade, do database upgrade via matomo_setup_update, and then restart
|
||||
# stop phpfpm on package upgrade, do database upgrade via matomo-setup-update, and then restart
|
||||
restartTriggers = [ cfg.package ];
|
||||
# stop config.ini.php from getting written with read permission for others
|
||||
serviceConfig.UMask = "0007";
|
||||
@ -200,13 +249,13 @@ in {
|
||||
# https://fralef.me/piwik-hardening-with-nginx-and-php-fpm.html
|
||||
# https://github.com/perusio/piwik-nginx
|
||||
"${user}.${fqdn}" = mkMerge [ cfg.nginx {
|
||||
# don't allow to override the root easily, as it will almost certainly break matomo.
|
||||
# don't allow to override the root easily, as it will almost certainly break Matomo.
|
||||
# disadvantage: not shown as default in docs.
|
||||
root = mkForce "${cfg.package}/share";
|
||||
|
||||
# define locations here instead of as the submodule option's default
|
||||
# so that they can easily be extended with additional locations if required
|
||||
# without needing to redefine the matomo ones.
|
||||
# without needing to redefine the Matomo ones.
|
||||
# disadvantage: not shown as default in docs.
|
||||
locations."/" = {
|
||||
index = "index.php";
|
||||
@ -215,8 +264,11 @@ in {
|
||||
locations."= /index.php".extraConfig = ''
|
||||
fastcgi_pass unix:${phpSocket};
|
||||
'';
|
||||
# TODO: might get renamed to matomo.php in future versions
|
||||
# allow piwik.php for tracking
|
||||
# allow matomo.php for tracking
|
||||
locations."= /matomo.php".extraConfig = ''
|
||||
fastcgi_pass unix:${phpSocket};
|
||||
'';
|
||||
# allow piwik.php for tracking (deprecated name)
|
||||
locations."= /piwik.php".extraConfig = ''
|
||||
fastcgi_pass unix:${phpSocket};
|
||||
'';
|
||||
@ -237,8 +289,11 @@ in {
|
||||
locations."= /robots.txt".extraConfig = ''
|
||||
return 200 "User-agent: *\nDisallow: /\n";
|
||||
'';
|
||||
# TODO: might get renamed to matomo.js in future versions
|
||||
# let browsers cache piwik.js
|
||||
# let browsers cache matomo.js
|
||||
locations."= /matomo.js".extraConfig = ''
|
||||
expires 1M;
|
||||
'';
|
||||
# let browsers cache piwik.js (deprecated name)
|
||||
locations."= /piwik.js".extraConfig = ''
|
||||
expires 1M;
|
||||
'';
|
||||
|
||||
@ -53,7 +53,17 @@ let
|
||||
define('SINGLE_USER_MODE', ${boolToString cfg.singleUserMode});
|
||||
|
||||
define('SIMPLE_UPDATE_MODE', ${boolToString cfg.simpleUpdateMode});
|
||||
define('CHECK_FOR_UPDATES', ${boolToString cfg.checkForUpdates});
|
||||
|
||||
// Never check for updates - the running version of the code should be
|
||||
// controlled entirely by the version of TT-RSS active in the current Nix
|
||||
// profile. If TT-RSS updates itself to a version requiring a database
|
||||
// schema upgrade, and then the SystemD tt-rss.service is restarted, the
|
||||
// old code copied from the Nix store will overwrite the updated version,
|
||||
// causing the code to detect the need for a schema "upgrade" (since the
|
||||
// schema version in the database is different than in the code), but the
|
||||
// update schema operation in TT-RSS will do nothing because the schema
|
||||
// version in the database is newer than that in the code.
|
||||
define('CHECK_FOR_UPDATES', false);
|
||||
|
||||
define('FORCE_ARTICLE_PURGE', ${toString cfg.forceArticlePurge});
|
||||
define('SESSION_COOKIE_LIFETIME', ${toString cfg.sessionCookieLifetime});
|
||||
@ -414,14 +424,6 @@ let
|
||||
'';
|
||||
};
|
||||
|
||||
checkForUpdates = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Check for updates automatically if running Git version
|
||||
'';
|
||||
};
|
||||
|
||||
enableGZipOutput = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
@ -489,6 +491,14 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
imports = [
|
||||
(mkRemovedOptionModule ["services" "tt-rss" "checkForUpdates"] ''
|
||||
This option was removed because setting this to true will cause TT-RSS
|
||||
to be unable to start if an automatic update of the code in
|
||||
services.tt-rss.root leads to a database schema upgrade that is not
|
||||
supported by the code active in the Nix store.
|
||||
'')
|
||||
];
|
||||
|
||||
###### implementation
|
||||
|
||||
|
||||
@ -14,11 +14,13 @@ let
|
||||
|
||||
mapPoolConfig = n: p: {
|
||||
phpPackage = cfg.phpPackage;
|
||||
phpOptions = cfg.phpOptions;
|
||||
config = p;
|
||||
};
|
||||
|
||||
mapPool = n: p: {
|
||||
phpPackage = p.phpPackage;
|
||||
phpOptions = p.phpOptions;
|
||||
config = ''
|
||||
listen = ${p.listen}
|
||||
${p.extraConfig}
|
||||
@ -35,8 +37,8 @@ let
|
||||
${conf}
|
||||
'';
|
||||
|
||||
phpIni = pkgs.runCommand "php.ini" {
|
||||
inherit (cfg) phpPackage phpOptions;
|
||||
phpIni = pool: pkgs.runCommand "php.ini" {
|
||||
inherit (pool) phpPackage phpOptions;
|
||||
nixDefaults = ''
|
||||
sendmail_path = "/run/wrappers/bin/sendmail -t -i"
|
||||
'';
|
||||
@ -156,6 +158,7 @@ in {
|
||||
'';
|
||||
serviceConfig = let
|
||||
cfgFile = fpmCfgFile pool poolConfig.config;
|
||||
iniFile = phpIni poolConfig;
|
||||
in {
|
||||
Slice = "phpfpm.slice";
|
||||
PrivateDevices = true;
|
||||
@ -164,7 +167,7 @@ in {
|
||||
# XXX: We need AF_NETLINK to make the sendmail SUID binary from postfix work
|
||||
RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6 AF_NETLINK";
|
||||
Type = "notify";
|
||||
ExecStart = "${poolConfig.phpPackage}/bin/php-fpm -y ${cfgFile} -c ${phpIni}";
|
||||
ExecStart = "${poolConfig.phpPackage}/bin/php-fpm -y ${cfgFile} -c ${iniFile}";
|
||||
ExecReload = "${pkgs.coreutils}/bin/kill -USR2 $MAINPID";
|
||||
};
|
||||
}
|
||||
|
||||
@ -25,6 +25,15 @@ with lib; {
|
||||
'';
|
||||
};
|
||||
|
||||
phpOptions = mkOption {
|
||||
type = types.lines;
|
||||
default = fpmCfg.phpOptions;
|
||||
defaultText = "config.services.phpfpm.phpOptions";
|
||||
description = ''
|
||||
"Options appended to the PHP configuration file <filename>php.ini</filename> used for this PHP-FPM pool."
|
||||
'';
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
type = types.lines;
|
||||
example = ''
|
||||
|
||||
@ -73,6 +73,7 @@ in
|
||||
ferm = handleTest ./ferm.nix {};
|
||||
firefox = handleTest ./firefox.nix {};
|
||||
firewall = handleTest ./firewall.nix {};
|
||||
flannel = handleTestOn ["x86_64-linux"] ./flannel.nix {};
|
||||
flatpak = handleTest ./flatpak.nix {};
|
||||
fsck = handleTest ./fsck.nix {};
|
||||
fwupd = handleTestOn ["x86_64-linux"] ./fwupd.nix {}; # libsmbios is unsupported on aarch64
|
||||
|
||||
@ -21,8 +21,9 @@ import ./make-test.nix ({ pkgs, ...} : rec {
|
||||
services = {
|
||||
etcd = {
|
||||
enable = true;
|
||||
listenClientUrls = ["http://etcd:2379"];
|
||||
listenPeerUrls = ["http://etcd:2380"];
|
||||
listenClientUrls = ["http://0.0.0.0:2379"]; # requires ip-address for binding
|
||||
listenPeerUrls = ["http://0.0.0.0:2380"]; # requires ip-address for binding
|
||||
advertiseClientUrls = ["http://etcd:2379"];
|
||||
initialAdvertisePeerUrls = ["http://etcd:2379"];
|
||||
initialCluster = ["etcd=http://etcd:2379"];
|
||||
};
|
||||
|
||||
@ -39,6 +39,8 @@ import ./make-test.nix ({pkgs, ... }: {
|
||||
$client->waitForUnit("cups.service");
|
||||
$client->sleep(10); # wait until cups is fully initialized
|
||||
$client->succeed("lpstat -r") =~ /scheduler is running/ or die;
|
||||
# check local encrypted connections work without error
|
||||
$client->succeed("lpstat -E -r") =~ /scheduler is running/ or die;
|
||||
# Test that UNIX socket is used for connections.
|
||||
$client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die;
|
||||
# Test that HTTP server is available too.
|
||||
|
||||
@ -18,8 +18,17 @@ import ./make-test.nix ({ pkgs, ...} : {
|
||||
testScript = {nodes, ...}: let
|
||||
originalSystem = nodes.machine.config.system.build.toplevel;
|
||||
otherSystem = nodes.other.config.system.build.toplevel;
|
||||
|
||||
# Ensures failures pass through using pipefail, otherwise failing to
|
||||
# switch-to-configuration is hidden by the success of `tee`.
|
||||
stderrRunner = pkgs.writeScript "stderr-runner" ''
|
||||
#! ${pkgs.stdenv.shell}
|
||||
set -e
|
||||
set -o pipefail
|
||||
exec env -i "$@" | tee /dev/stderr
|
||||
'';
|
||||
in ''
|
||||
$machine->succeed("env -i ${originalSystem}/bin/switch-to-configuration test | tee /dev/stderr");
|
||||
$machine->succeed("env -i ${otherSystem}/bin/switch-to-configuration test | tee /dev/stderr");
|
||||
$machine->succeed("${stderrRunner} ${originalSystem}/bin/switch-to-configuration test");
|
||||
$machine->succeed("${stderrRunner} ${otherSystem}/bin/switch-to-configuration test");
|
||||
'';
|
||||
})
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, runCommand, ncurses, pkgconfig
|
||||
{ config, stdenv, fetchFromGitHub, runCommand, ncurses, pkgconfig
|
||||
, libiconv, CoreAudio
|
||||
|
||||
, alsaSupport ? stdenv.isLinux, alsaLib ? null
|
||||
@ -7,7 +7,7 @@
|
||||
, jackSupport ? false, libjack ? null
|
||||
, samplerateSupport ? jackSupport, libsamplerate ? null
|
||||
, ossSupport ? false, alsaOss ? null
|
||||
, pulseaudioSupport ? false, libpulseaudio ? null
|
||||
, pulseaudioSupport ? config.pulseaudio or false, libpulseaudio ? null
|
||||
|
||||
# TODO: add these
|
||||
#, artsSupport
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, intltool, pkgconfig, jansson
|
||||
{ config, stdenv, fetchurl, intltool, pkgconfig, jansson
|
||||
# deadbeef can use either gtk2 or gtk3
|
||||
, gtk2Support ? false, gtk2 ? null
|
||||
, gtk3Support ? true, gtk3 ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null
|
||||
@ -20,7 +20,7 @@
|
||||
, osdSupport ? true, dbus ? null
|
||||
# output plugins
|
||||
, alsaSupport ? true, alsaLib ? null
|
||||
, pulseSupport ? true, libpulseaudio ? null
|
||||
, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null
|
||||
# effect plugins
|
||||
, resamplerSupport ? true, libsamplerate ? null
|
||||
, overloadSupport ? true, zlib ? null
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, autoreconfHook, fetchFromGitHub, pkgconfig
|
||||
{ config, stdenv, autoreconfHook, fetchFromGitHub, pkgconfig
|
||||
, alsaLib, libtool, icu
|
||||
, pulseaudioSupport ? true, libpulseaudio }:
|
||||
, pulseaudioSupport ? config.pulseaudio or false, libpulseaudio }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mimic-${version}";
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1wkpbwk88lsahzkc7pzbznmyy0lc02vsp0vkj8f1ags1gh0lc52j";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkgconfig
|
||||
];
|
||||
@ -21,15 +21,14 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
alsaLib
|
||||
libtool
|
||||
icu
|
||||
icu
|
||||
] ++ stdenv.lib.optional pulseaudioSupport libpulseaudio;
|
||||
|
||||
meta = {
|
||||
description = "Mycroft's TTS engine, based on CMU's Flite (Festival Lite)";
|
||||
homepage = https://mimic.mycroft.ai/;
|
||||
homepage = https://mimic.mycroft.ai/;
|
||||
license = stdenv.lib.licenses.free;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.noneucat ];
|
||||
maintainers = [ stdenv.lib.maintainers.noneucat ];
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -13,14 +13,14 @@ let
|
||||
sha256Hash = "0fghqkc8pkb7waxclm0qq4nlnsvmv9d3fcj5nnvgbfkjyw032q42";
|
||||
};
|
||||
betaVersion = {
|
||||
version = "3.4.0.12"; # "Android Studio 3.4 Beta 3"
|
||||
build = "183.5256591";
|
||||
sha256Hash = "1yab2sgabgk3wa3wrzv9z1dc2k7x0079v0mlwrp32jwx8r9byvcw";
|
||||
version = "3.4.0.13"; # "Android Studio 3.4 Beta 4"
|
||||
build = "183.5304277";
|
||||
sha256Hash = "01x7xba0f5js213wgw0h1vw297vwz5q7dprnilcdydfjxwqsbr8f";
|
||||
};
|
||||
latestVersion = { # canary & dev
|
||||
version = "3.5.0.2"; # "Android Studio 3.5 Canary 3"
|
||||
build = "183.5256920";
|
||||
sha256Hash = "09bd80ld21hq743xjacsq0nkxwl5xzr253p86n71n580yn4rgmlb";
|
||||
version = "3.5.0.3"; # "Android Studio 3.5 Canary 4"
|
||||
build = "183.5290690";
|
||||
sha256Hash = "0d1cl78b25pksaj0scv3hxb14bjxk3591zbc0v7dykk1gf4pvxd1";
|
||||
};
|
||||
in rec {
|
||||
# Old alias (TODO @primeos: Remove after 19.03 is branched off):
|
||||
|
||||
@ -3,14 +3,14 @@
|
||||
let
|
||||
versions = {
|
||||
atom = {
|
||||
version = "1.33.0";
|
||||
sha256 = "0f6m6zwgz94m3q11ipyiliap3s5a3zlrg3ldjwkqnxjl6gwlxc2r";
|
||||
version = "1.34.0";
|
||||
sha256 = "16hrjymrc43izg7frcrk7cwjwwrclcxzcwb5iw2llzjc6iadzlkb";
|
||||
};
|
||||
|
||||
atom-beta = {
|
||||
version = "1.34.0";
|
||||
version = "1.35.0";
|
||||
beta = 0;
|
||||
sha256 = "1xnrr4z55sj46hqr0il26sfs6s3knv60m340cw3rzzic271b3ifw";
|
||||
sha256 = "0gm5k573dq1hhnyw3719f5k1c6rsz872mhzg8q53n89y0g2r5xmw";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
let
|
||||
pname = "shotwell";
|
||||
version = "0.30.1";
|
||||
version = "0.30.2";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "01hsmig06hjv34yf9y60hv2gml593xfkza4ilq4b22gr8l4v2qip";
|
||||
sha256 = "0pam0si110vkc65kh59lrmgkv91f9zxmf1gpfm99ixjgw25rfi8r";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "qmapshack-${version}";
|
||||
version = "1.12.1";
|
||||
version = "1.12.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bitbucket.org/maproom/qmapshack/downloads/${name}.tar.gz";
|
||||
sha256 = "1d6n7xk0ksxb1fw43s5lb08vgxf6h93k3rb401cbka1inpyf2232";
|
||||
sha256 = "1yp5gw4q4gwiwr9w4dz19am0bhsla9n2l3bdlk98a7f46kxgnkrx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -6,12 +6,12 @@ let inherit (python3Packages) python buildPythonApplication fetchPypi;
|
||||
in buildPythonApplication rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "safeeyes";
|
||||
version = "2.0.8";
|
||||
version = "2.0.8.1";
|
||||
namePrefix = "";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "08acrf9sngjjmplszjxzfq3af9xg4xscga94q0lkck2l1kqckc2l";
|
||||
sha256 = "1x52ym8n4r6h38n4mcydxkvz71hhrd9wbiq4gzvwrai0xzl6qqsq";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ newScope, stdenv, llvmPackages, makeWrapper, makeDesktopItem, ed
|
||||
{ newScope, config, stdenv, llvmPackages, gcc8Stdenv, llvmPackages_7
|
||||
, makeWrapper, makeDesktopItem, ed
|
||||
, glib, gtk3, gnome3, gsettings-desktop-schemas
|
||||
|
||||
# package customization
|
||||
@ -10,12 +11,17 @@
|
||||
, enablePepperFlash ? false
|
||||
, enableWideVine ? false
|
||||
, cupsSupport ? true
|
||||
, pulseSupport ? false
|
||||
, pulseSupport ? config.pulseaudio or stdenv.isLinux
|
||||
, commandLineArgs ? ""
|
||||
}:
|
||||
|
||||
assert stdenv.cc.isClang -> (stdenv == llvmPackages.stdenv);
|
||||
let
|
||||
stdenv_ = if stdenv.isAarch64 then gcc8Stdenv else llvmPackages_7.stdenv;
|
||||
llvmPackages_ = if stdenv.isAarch64 then llvmPackages else llvmPackages_7;
|
||||
in let
|
||||
stdenv = stdenv_;
|
||||
llvmPackages = llvmPackages_;
|
||||
|
||||
callPackage = newScope chromium;
|
||||
|
||||
chromium = {
|
||||
|
||||
@ -10,10 +10,10 @@ rec {
|
||||
|
||||
firefox = common rec {
|
||||
pname = "firefox";
|
||||
ffversion = "65.0";
|
||||
ffversion = "65.0.1";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
|
||||
sha512 = "39bx76whgf53rkfqqy8gfhd44wikh89zpnqr930v4grqg3v0pfr8mbvp7xzjjlf5r7bski0wxibn9vyyy273fp99zyj1w2m5ihh9aqh";
|
||||
sha512 = "2crb46l5r0rwmzr1m8cn9f6xgajwcvansnplqg4kg91rf6x8q0zqzfnmyli9ccsbqvh7bqd31dmy14gwjskasqc4v103x9hchzshxnc";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -25,7 +25,7 @@ rec {
|
||||
meta = {
|
||||
description = "A web browser built from Firefox source tree";
|
||||
homepage = http://www.mozilla.com/en-US/firefox/;
|
||||
maintainers = with lib.maintainers; [ eelco ];
|
||||
maintainers = with lib.maintainers; [ eelco andir ];
|
||||
platforms = lib.platforms.unix;
|
||||
license = lib.licenses.mpl20;
|
||||
};
|
||||
@ -67,10 +67,10 @@ rec {
|
||||
|
||||
firefox-esr-60 = common rec {
|
||||
pname = "firefox-esr";
|
||||
ffversion = "60.5.0esr";
|
||||
ffversion = "60.5.1esr";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
|
||||
sha512 = "3n7l146gdjwhi0iq85awc0yykvi4x5m91mcylxa5mrq911bv6xgn2i92nzhgnhdilqap5218778vgvnalikzsh67irrncx1hy5f6iyx";
|
||||
sha512 = "0fvjw5zd8a9ki0a8phavi6xxfxbck21vj0k8415c5sxv48fwhqdhlnv3wx7riss4rjy9dylhr5xpa99dj9q98z735r8fxb7s3x3vrjz";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -237,16 +237,16 @@ in rec {
|
||||
};
|
||||
|
||||
tor-browser-8-0 = tbcommon rec {
|
||||
ffversion = "60.5.0esr";
|
||||
tbversion = "8.0.5";
|
||||
ffversion = "60.5.1esr";
|
||||
tbversion = "8.0.6";
|
||||
|
||||
# FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
|
||||
src = fetchFromGitHub {
|
||||
owner = "SLNOS";
|
||||
repo = "tor-browser";
|
||||
# branch "tor-browser-60.5.0esr-8.0-1-slnos"
|
||||
rev = "7f113a4ea0539bd2ea9687fe4296c880f2b006c4";
|
||||
sha256 = "11qbhwy2q9rinfw8337b9f78x0r26lnxg25581z85vxshp2jszdq";
|
||||
# branch "tor-browser-60.5.1esr-8.0-1-slnos"
|
||||
rev = "89be91fc7cbc420b7c4a3bfc36d2b0d500dd3ccf";
|
||||
sha256 = "022zjfwsdl0dkg6ck2kha4nf91xm3j9ag5n21zna98szg3x82dj1";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -89,7 +89,7 @@ let
|
||||
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
|
||||
|
||||
# Upstream source
|
||||
version = "8.0.5";
|
||||
version = "8.0.6";
|
||||
|
||||
lang = "en-US";
|
||||
|
||||
@ -99,7 +99,7 @@ let
|
||||
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
|
||||
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
|
||||
];
|
||||
sha256 = "0afrq5vy6rxj4p2dm7kaiq3d3iv4g8ivn7nfqx0z8h1wikyaf5di";
|
||||
sha256 = "14i32r8pw749ghigqblnbr5622jh5wp1ivnwi71vycbgp9pds4f7";
|
||||
};
|
||||
|
||||
"i686-linux" = fetchurl {
|
||||
@ -107,7 +107,7 @@ let
|
||||
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
||||
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
||||
];
|
||||
sha256 = "113vn2fyw9sjxz24b2m6z4kw46rqgxglrna1lg9ji6zhkfb044vv";
|
||||
sha256 = "0g9sd104b6xnbl2j3gbq1ga6j2h0x3jccays0gpbd235bxpjs39a";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "terraform-provider-libvirt-${version}";
|
||||
version = "0.4";
|
||||
version = "0.5.1";
|
||||
|
||||
goPackagePath = "github.com/dmacvicar/terraform-provider-libvirt";
|
||||
|
||||
@ -27,7 +27,7 @@ buildGoPackage rec {
|
||||
owner = "dmacvicar";
|
||||
repo = "terraform-provider-libvirt";
|
||||
rev = "v${version}";
|
||||
sha256 = "05jkjp1kis4ncryv34pkb9cz2yhzbwg62x9qmlqsqlxwz9hqny3r";
|
||||
sha256 = "0shnj5byqj3qzyqniiy1dcygd8xw1h2bx9z6mgcydw8k64fkm4bw";
|
||||
};
|
||||
|
||||
buildInputs = [ libvirt pkgconfig makeWrapper ];
|
||||
|
||||
@ -56,7 +56,6 @@ stdenv.mkDerivation rec {
|
||||
meta = with stdenv.lib; {
|
||||
description = "An extensible Twitter client";
|
||||
homepage = https://mikutter.hachune.net;
|
||||
maintainers = with maintainers; [ midchildan ];
|
||||
platforms = ruby.meta.platforms;
|
||||
license = licenses.mit;
|
||||
};
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
let configFile = writeText "riot-config.json" conf; in
|
||||
stdenv.mkDerivation rec {
|
||||
name= "riot-web-${version}";
|
||||
version = "0.17.9";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
|
||||
sha256 = "1k7664b0yxvzc7l8mnh9a0kqi8qfj6rdjblfksrd3wg8hdrb7wb1";
|
||||
sha256 = "1rnr6c8qwf8hy1d197xb40f5ajhqdm9sd65n1d9h2x036dqiic7i";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -1,20 +1,23 @@
|
||||
{stdenv, fetchurl, ocaml, lablgtk, fontschumachermisc, xset, makeWrapper, ncurses
|
||||
{stdenv, fetchFromGitHub, ocaml, lablgtk, fontschumachermisc, xset, makeWrapper, ncurses
|
||||
, enableX11 ? true}:
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
|
||||
name = "unison-2.48.4";
|
||||
src = fetchurl {
|
||||
url = "http://www.seas.upenn.edu/~bcpierce/unison/download/releases/stable/${name}.tar.gz";
|
||||
sha256 = "30aa53cd671d673580104f04be3cf81ac1e20a2e8baaf7274498739d59e99de8";
|
||||
name = "unison-${version}";
|
||||
version = "2.51.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "bcpierce00";
|
||||
repo = "unison";
|
||||
rev = "v${version}";
|
||||
sha256 = "1bykiyc0dc5pkw8x370qkg2kygq9pq7yqzsgczd3y13b6ivm4sdq";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml makeWrapper ncurses ];
|
||||
|
||||
preBuild = (if enableX11 then ''
|
||||
sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" Makefile.OCaml
|
||||
sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" src/Makefile.OCaml
|
||||
'' else "") + ''
|
||||
echo -e '\ninstall:\n\tcp $(FSMONITOR)$(EXEC_EXT) $(INSTALLDIR)' >> fsmonitor/linux/Makefile
|
||||
echo -e '\ninstall:\n\tcp $(FSMONITOR)$(EXEC_EXT) $(INSTALLDIR)' >> src/fsmonitor/linux/Makefile
|
||||
'';
|
||||
|
||||
makeFlags = "INSTALLDIR=$(out)/bin/" + (if enableX11 then " UISTYLE=gtk2" else "")
|
||||
|
||||
66
pkgs/applications/science/logic/z3/0001-fix-2131.patch
Normal file
66
pkgs/applications/science/logic/z3/0001-fix-2131.patch
Normal file
@ -0,0 +1,66 @@
|
||||
From c5df6ce96e068eceb77019e48634721c6a5bb607 Mon Sep 17 00:00:00 2001
|
||||
From: Nikolaj Bjorner <nbjorner@microsoft.com>
|
||||
Date: Sun, 10 Feb 2019 10:07:24 -0800
|
||||
Subject: [PATCH 1/1] fix #2131
|
||||
|
||||
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
||||
---
|
||||
src/api/python/README.txt | 10 +++-------
|
||||
src/api/python/setup.py | 2 +-
|
||||
src/ast/recfun_decl_plugin.h | 2 +-
|
||||
3 files changed, 5 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/src/api/python/README.txt b/src/api/python/README.txt
|
||||
index 9312b1119..561b8dedc 100644
|
||||
--- a/src/api/python/README.txt
|
||||
+++ b/src/api/python/README.txt
|
||||
@@ -1,8 +1,4 @@
|
||||
-You can learn more about Z3Py at:
|
||||
-http://rise4fun.com/Z3Py/tutorial/guide
|
||||
-
|
||||
-On Windows, you must build Z3 before using Z3Py.
|
||||
-To build Z3, you should executed the following command
|
||||
+On Windows, to build Z3, you should executed the following command
|
||||
in the Z3 root directory at the Visual Studio Command Prompt
|
||||
|
||||
msbuild /p:configuration=external
|
||||
@@ -12,8 +8,8 @@ If you are using a 64-bit Python interpreter, you should use
|
||||
msbuild /p:configuration=external /p:platform=x64
|
||||
|
||||
|
||||
-On Linux and macOS, you must install Z3Py, before trying example.py.
|
||||
-To install Z3Py on Linux and macOS, you should execute the following
|
||||
+On Linux and macOS, you must install python bindings, before trying example.py.
|
||||
+To install python on Linux and macOS, you should execute the following
|
||||
command in the Z3 root directory
|
||||
|
||||
sudo make install-z3py
|
||||
diff --git a/src/api/python/setup.py b/src/api/python/setup.py
|
||||
index 2a750fee6..063680e2b 100644
|
||||
--- a/src/api/python/setup.py
|
||||
+++ b/src/api/python/setup.py
|
||||
@@ -178,7 +178,7 @@ setup(
|
||||
name='z3-solver',
|
||||
version=_z3_version(),
|
||||
description='an efficient SMT solver library',
|
||||
- long_description='Z3 is a theorem prover from Microsoft Research with support for bitvectors, booleans, arrays, floating point numbers, strings, and other data types.\n\nFor documentation, please read http://z3prover.github.io/api/html/z3.html\n\nIn the event of technical difficulties related to configuration, compiliation, or installation, please submit issues to https://github.com/angr/angr-z3',
|
||||
+ long_description='Z3 is a theorem prover from Microsoft Research with support for bitvectors, booleans, arrays, floating point numbers, strings, and other data types.\n\nFor documentation, please read http://z3prover.github.io/api/html/z3.html\n\nIn the event of technical difficulties related to configuration, compilation, or installation, please submit issues to https://github.com/angr/angr-z3',
|
||||
author="The Z3 Theorem Prover Project",
|
||||
maintainer="Audrey Dutcher",
|
||||
maintainer_email="audrey@rhelmot.io",
|
||||
diff --git a/src/ast/recfun_decl_plugin.h b/src/ast/recfun_decl_plugin.h
|
||||
index 0247335e8..b294cdfce 100644
|
||||
--- a/src/ast/recfun_decl_plugin.h
|
||||
+++ b/src/ast/recfun_decl_plugin.h
|
||||
@@ -56,7 +56,7 @@ namespace recfun {
|
||||
friend class def;
|
||||
func_decl_ref m_pred; //<! predicate used for this case
|
||||
expr_ref_vector m_guards; //<! conjunction that is equivalent to this case
|
||||
- expr_ref m_rhs; //<! if guard is true, `f(t1…tn) = rhs` holds
|
||||
+ expr_ref m_rhs; //<! if guard is true, `f(t1...tn) = rhs` holds
|
||||
def * m_def; //<! definition this is a part of
|
||||
bool m_immediate; //<! does `rhs` contain no defined_fun/case_pred?
|
||||
|
||||
--
|
||||
2.19.2
|
||||
|
||||
@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "014igqm5vwswz0yhz0cdxsj3a6dh7i79hvhgc3jmmmz3z0xm1gyn";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001-fix-2131.patch
|
||||
];
|
||||
|
||||
buildInputs = [ python fixDarwinDylibNames ];
|
||||
propagatedBuildInputs = [ python.pkgs.setuptools ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -64,10 +64,10 @@ stdenv.mkDerivation rec {
|
||||
fetchSageDiff = { base, rev, name ? "sage-diff-${base}-${rev}.patch", ...}@args: (
|
||||
fetchpatch ({
|
||||
inherit name;
|
||||
url = "https://git.sagemath.org/sage.git/rawdiff?id2=${base}&id=${rev}";
|
||||
url = "https://git.sagemath.org/sage.git/patch?id2=${base}&id=${rev}";
|
||||
# We don't care about sage's own build system (which builds all its dependencies).
|
||||
# Exclude build system changes to avoid conflicts.
|
||||
excludes = [ "/build/*" ];
|
||||
excludes = [ "build/*" ];
|
||||
} // builtins.removeAttrs args [ "rev" "base" ])
|
||||
);
|
||||
in [
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl
|
||||
{ config, stdenv, fetchurl
|
||||
, libX11, wxGTK
|
||||
, libiconv, fontconfig, freetype
|
||||
, libGLU_combined
|
||||
@ -8,8 +8,8 @@
|
||||
, spellcheckSupport ? true, hunspell ? null
|
||||
, automationSupport ? true, lua ? null
|
||||
, openalSupport ? false, openal ? null
|
||||
, alsaSupport ? true, alsaLib ? null
|
||||
, pulseaudioSupport ? true, libpulseaudio ? null
|
||||
, alsaSupport ? stdenv.isLinux, alsaLib ? null
|
||||
, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null
|
||||
, portaudioSupport ? false, portaudio ? null }:
|
||||
|
||||
assert spellcheckSupport -> (hunspell != null);
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, perl, python, which
|
||||
{ config, stdenv, fetchFromGitHub
|
||||
, fetchpatch, pkgconfig, perl, python, which
|
||||
, libX11, libxcb, libGLU_combined
|
||||
, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake, makeWrapper
|
||||
, libchardet
|
||||
@ -15,7 +16,7 @@
|
||||
, libbluray
|
||||
, jackSupport ? false, jack ? null
|
||||
, portaudioSupport ? false, portaudio ? null
|
||||
, pulseSupport ? true, libpulseaudio ? null
|
||||
, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null
|
||||
, cddaSupport ? false, libcdda ? null
|
||||
, youtubeSupport ? true, youtube-dl ? null
|
||||
}:
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, freetype, yasm, ffmpeg
|
||||
{ config, stdenv, fetchurl, pkgconfig, freetype, yasm, ffmpeg
|
||||
, aalibSupport ? true, aalib ? null
|
||||
, fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null
|
||||
, fribidiSupport ? true, fribidi ? null
|
||||
@ -19,7 +19,7 @@
|
||||
, theoraSupport ? true, libtheora ? null
|
||||
, x264Support ? false, x264 ? null
|
||||
, jackaudioSupport ? false, libjack2 ? null
|
||||
, pulseSupport ? false, libpulseaudio ? null
|
||||
, pulseSupport ? config.pulseaudio or false, libpulseaudio ? null
|
||||
, bs2bSupport ? false, libbs2b ? null
|
||||
# For screenshots
|
||||
, libpngSupport ? true, libpng ? null
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
, bison, lzo, snappy, libaio, gnutls, nettle, curl
|
||||
, makeWrapper
|
||||
, attr, libcap, libcap_ng
|
||||
, CoreServices, Cocoa, rez, setfile
|
||||
, CoreServices, Cocoa, Hypervisor, rez, setfile
|
||||
, numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl
|
||||
, seccompSupport ? stdenv.isLinux, libseccomp
|
||||
, pulseSupport ? !stdenv.isDarwin, libpulseaudio
|
||||
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
|
||||
vde2 texinfo flex bison makeWrapper lzo snappy
|
||||
gnutls nettle curl
|
||||
]
|
||||
++ optionals stdenv.isDarwin [ CoreServices Cocoa rez setfile ]
|
||||
++ optionals stdenv.isDarwin [ CoreServices Cocoa Hypervisor rez setfile ]
|
||||
++ optionals seccompSupport [ libseccomp ]
|
||||
++ optionals numaSupport [ numactl ]
|
||||
++ optionals pulseSupport [ libpulseaudio ]
|
||||
@ -116,6 +116,7 @@ stdenv.mkDerivation rec {
|
||||
++ optional usbredirSupport "--enable-usb-redir"
|
||||
++ optional (hostCpuTargets != null) "--target-list=${stdenv.lib.concatStringsSep "," hostCpuTargets}"
|
||||
++ optional stdenv.isDarwin "--enable-cocoa"
|
||||
++ optional stdenv.isDarwin "--enable-hvf"
|
||||
++ optional stdenv.isLinux "--enable-linux-aio"
|
||||
++ optional gtkSupport "--enable-gtk"
|
||||
++ optional xenSupport "--enable-xen"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, lib, fetchpatch, iasl, dev86, pam, libxslt, libxml2
|
||||
{ config, stdenv, fetchurl, lib, fetchpatch, iasl, dev86, pam, libxslt, libxml2
|
||||
, libX11, xorgproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap
|
||||
, libpng, glib, lvm2, libXrandr, libXinerama, libopus
|
||||
, pkgconfig, which, docbook_xsl, docbook_xml_dtd_43
|
||||
@ -7,7 +7,7 @@
|
||||
, javaBindings ? false, jdk ? null
|
||||
, pythonBindings ? false, python2 ? null
|
||||
, extensionPack ? null, fakeroot ? null
|
||||
, pulseSupport ? false, libpulseaudio ? null
|
||||
, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null
|
||||
, enableHardening ? false
|
||||
, headless ? false
|
||||
, enable32bitGuests ? true
|
||||
|
||||
@ -3,12 +3,12 @@
|
||||
i3.overrideAttrs (oldAttrs : rec {
|
||||
|
||||
name = "i3-gaps-${version}";
|
||||
version = "4.16";
|
||||
releaseDate = "2018-03-13";
|
||||
version = "4.16.1";
|
||||
releaseDate = "2019-01-27";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Airblader/i3/archive/${version}.tar.gz";
|
||||
sha256 = "16d215y9g27b75rifm1cgznxg73fmg5ksigi0gbj7pfd6x6bqcy9";
|
||||
sha256 = "1jvyd8p8dfsidfy2yy7adydynzvaf72lx67x71r13hrk8w77hp0k";
|
||||
};
|
||||
|
||||
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ];
|
||||
|
||||
@ -96,7 +96,7 @@ fi
|
||||
if [ -z "$newHash" ]; then
|
||||
nix-build --no-out-link -A "$attr.src" 2>"$attr.fetchlog" >/dev/null || true
|
||||
# FIXME: use nix-build --hash here once https://github.com/NixOS/nix/issues/1172 is fixed
|
||||
newHash=$(egrep -v "killing process|dependencies couldn't be built" "$attr.fetchlog" | tail -n2 | sed "s~output path .* has .* hash ‘\(.*\)’ when .* was expected\|fixed-output derivation produced path '.*' with .* hash '\(.*\)' instead of the expected hash '.*'~\1\2~" | head -n1)
|
||||
newHash=$(egrep -v "killing process|dependencies couldn't be built|wanted: " "$attr.fetchlog" | tail -n2 | sed "s~output path .* has .* hash ‘\(.*\)’ when .* was expected\|fixed-output derivation produced path '.*' with .* hash '\(.*\)' instead of the expected hash '.*'\| got: .*:\(.*\)~\1\2\3~" | head -n1)
|
||||
fi
|
||||
|
||||
if [ -z "$newHash" ]; then
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "shades-of-gray-theme-${version}";
|
||||
version = "1.1.4";
|
||||
version = "1.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WernerFP";
|
||||
repo = "Shades-of-gray-theme";
|
||||
rev = version;
|
||||
sha256 = "1i5mra1ib3c8xqnhwjh8yzjcdnhvqdmccw5x52sfh9xq797px39l";
|
||||
sha256 = "1ql8rkbm5l94b842hg53cwf02vbw2785rlrs4cr60d4kn2c0lj2y";
|
||||
};
|
||||
|
||||
buildInputs = [ gtk_engines ];
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
, libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }:
|
||||
|
||||
let
|
||||
version = "3.30.4";
|
||||
version = "3.30.5";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "evolution-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "10dy08xpizvvj7r8xgs3lr6migm3ipr199yryqz7wgkycq6nf53b";
|
||||
sha256 = "1hhxj3rh921pp3l3c5k33bdypcas1p66krzs65k1qn82c5fpgl2h";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [ evolution-data-server ];
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "evolution-data-server-${version}";
|
||||
version = "3.30.4";
|
||||
version = "3.30.5";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "1j8lwl04zz59sg7k3hpkzp829z8xyd1isz8xavm9vzxfvw5w776y";
|
||||
sha256 = "1s952wyhgcbmq9nfgk75v15zdy1h3wy5p5rmkqibaavmc0pk3mli";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, lxqt, libconfig }:
|
||||
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, lxqt,
|
||||
libconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "compton-conf";
|
||||
version = "0.4.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1r187fx1vivzq1gcwwawax36mnlmfig5j1ba4s4wfdi3q2wcq7mw";
|
||||
sha256 = "1vxbh0vr7wknr7rbmdbmy5md1fdkw3zwlgpbv16cwdplbv9m97xi";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -24,8 +24,6 @@ stdenv.mkDerivation rec {
|
||||
libconfig
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace autostart/CMakeLists.txt \
|
||||
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \
|
||||
|
||||
@ -18,7 +18,6 @@ let
|
||||
lxqt-admin = callPackage ./lxqt-admin { };
|
||||
lxqt-config = callPackage ./lxqt-config { };
|
||||
lxqt-globalkeys = callPackage ./lxqt-globalkeys { };
|
||||
lxqt-l10n = callPackage ./lxqt-l10n { };
|
||||
lxqt-notificationd = callPackage ./lxqt-notificationd { };
|
||||
lxqt-openssh-askpass = callPackage ./lxqt-openssh-askpass { };
|
||||
lxqt-policykit = callPackage ./lxqt-policykit { };
|
||||
@ -29,8 +28,6 @@ let
|
||||
lxqt-themes = callPackage ./lxqt-themes { };
|
||||
pavucontrol-qt = libsForQt5.callPackage ./pavucontrol-qt { };
|
||||
qtermwidget = callPackage ./qtermwidget { };
|
||||
# for now keep version 0.7.1 because virt-manager-qt currently does not compile with qtermwidget-0.8.0
|
||||
qtermwidget_0_7_1 = callPackage ./qtermwidget/0.7.1.nix { };
|
||||
|
||||
### CORE 2
|
||||
lxqt-panel = callPackage ./lxqt-panel { };
|
||||
@ -70,7 +67,6 @@ let
|
||||
lxqt-admin
|
||||
lxqt-config
|
||||
lxqt-globalkeys
|
||||
lxqt-l10n
|
||||
lxqt-notificationd
|
||||
lxqt-openssh-askpass
|
||||
lxqt-policykit
|
||||
|
||||
@ -5,15 +5,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "libfm-qt";
|
||||
version = "0.13.1";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1g8j1lw74qvagqhqsx45b290fjwh3jfl3i0366m0w4la03v0rw5j";
|
||||
sha256 = "1siqqn4waglymfi7c7lrmlxkylddw8qz0qfwqxr1hnmx3dsj9c36";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -34,8 +33,6 @@ stdenv.mkDerivation rec {
|
||||
menu-cache
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Core library of PCManFM-Qt (Qt binding for libfm)";
|
||||
homepage = https://github.com/lxqt/libfm-qt;
|
||||
|
||||
@ -2,15 +2,14 @@
|
||||
qttools, qtsvg, libqtxdg, polkit-qt, kwindowsystem, xorg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "liblxqt";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1lbvnx6gg15k7fy1bnv5sjji659f603glblcl8c9psh0m1cjdbll";
|
||||
sha256 = "1cpl6sd2fifpflahm8fvrrscrv03sinfm03m7yc1k59y6nsbwi36";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -29,13 +28,14 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DPULL_TRANSLATIONS=NO"
|
||||
"-DLXQT_ETC_XDG_DIR=/run/current-system/sw/etc/xdg"
|
||||
];
|
||||
|
||||
patchPhase = ''
|
||||
postPatch = ''
|
||||
sed -i 's|set(LXQT_SHARE_DIR .*)|set(LXQT_SHARE_DIR "/run/current-system/sw/share/lxqt")|' CMakeLists.txt
|
||||
sed -i "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" CMakeLists.txt
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -1,19 +1,19 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, qt5 }:
|
||||
{ stdenv, fetchFromGitHub, cmake, qtbase, qtsvg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libqtxdg-${version}";
|
||||
version = "3.2.0";
|
||||
pname = "libqtxdg";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = "libqtxdg";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0lkmwnqk314mlr811rdb96p6i7zg67slxdvd4cdkiwakgbzzaa4m";
|
||||
sha256 = "0qgqqgy15h0d1fwk4mnbv2hirz8njjjlng64bv33rc6wwrsaa50b";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ qt5.qtbase qt5.qtsvg ];
|
||||
buildInputs = [ qtbase qtsvg ];
|
||||
|
||||
preConfigure = ''
|
||||
cmakeFlagsArray+=(
|
||||
|
||||
@ -1,19 +1,19 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, qt5, lxqt }:
|
||||
{ stdenv, fetchFromGitHub, cmake, qtbase, lxqt-build-tools }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libsysstat-${version}";
|
||||
version = "0.4.1";
|
||||
pname = "libsysstat";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = "libsysstat";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0ad5pcr5lq1hvrfijvddvz2fvsmh1phb54wb0f756av0kyiwq0gb";
|
||||
sha256 = "10h9n7km7yx8bnmzxi4nn1yqq03hizjkrx4745j0mczy7niiffsz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake lxqt.lxqt-build-tools ];
|
||||
nativeBuildInputs = [ cmake lxqt-build-tools ];
|
||||
|
||||
buildInputs = [ qt5.qtbase ];
|
||||
buildInputs = [ qtbase ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Library used to query system info and statistics";
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, xorg, lxqt-build-tools, libfm-qt, libexif }:
|
||||
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools,
|
||||
qtx11extras, qtsvg, xorg, lxqt-build-tools, libfm-qt, libexif }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "lximage-qt";
|
||||
version = "0.7.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1slmaic9cmj5lqa5kwc1qfbbycwh8840wnkg0nxc99ls0aazlpzi";
|
||||
sha256 = "0zx9903ym5a9zk4m9khr22fj5sy57mg2v8wnk177wjm11lhic5v8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -19,18 +19,16 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qt5.qtbase
|
||||
qt5.qttools
|
||||
qt5.qtx11extras
|
||||
qt5.qtsvg
|
||||
qtbase
|
||||
qttools
|
||||
qtx11extras
|
||||
qtsvg
|
||||
libfm-qt
|
||||
xorg.libpthreadstubs
|
||||
xorg.libXdmcp
|
||||
libexif
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "The image viewer and screenshot tool for lxqt";
|
||||
homepage = https://github.com/lxqt/lximage-qt;
|
||||
|
||||
@ -1,15 +1,14 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "lxqt-about";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "03f53rnn4rkd1xc2q9abnw37aq4sgvpbwhmcnckqyzc87lj6ici0";
|
||||
sha256 = "14b13v1r5ncz4ycg25ac9ppafiifc37qws8kcw078if72rp9n121";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -26,7 +25,10 @@ stdenv.mkDerivation rec {
|
||||
libqtxdg
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Dialogue window providing information about LXQt and the system it's running on";
|
||||
|
||||
@ -1,15 +1,14 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit-qt }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "lxqt-admin";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1nsf8sbgmfanvcxw67drhz1wrizkcd0p87jwr1za5rcgd50bi2yy";
|
||||
sha256 = "0sdb514hgha5yvmbzi6nm1yx1rmbkh5fam09ybidjwpdwl2l4pxx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -27,12 +26,15 @@ stdenv.mkDerivation rec {
|
||||
polkit-qt
|
||||
];
|
||||
|
||||
patchPhase = ''
|
||||
postPatch = ''
|
||||
sed "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" \
|
||||
-i lxqt-admin-user/CMakeLists.txt
|
||||
'';
|
||||
|
||||
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
|
||||
for f in lxqt-admin-{user,time}/CMakeLists.txt; do
|
||||
substituteInPlace $f \
|
||||
--replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "LXQt system administration tool";
|
||||
|
||||
@ -1,19 +1,19 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5, glib }:
|
||||
{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qtbase, glib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lxqt-build-tools-${version}";
|
||||
version = "0.5.0";
|
||||
pname = "lxqt-build-tools";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = "lxqt-build-tools";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0dcwzrijmn4sgivmy2zwz3xa4y69pwhranyw0m90g0pp55di2psz";
|
||||
sha256 = "0i7m9s4g5rsw28vclc9nh0zcapx85cqfwxkx7rrw7wa12svy7pm2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
|
||||
buildInputs = [ qt5.qtbase glib pcre ];
|
||||
buildInputs = [ qtbase glib pcre ];
|
||||
|
||||
preConfigure = ''cmakeFlags+=" -DLXQT_ETC_XDG_DIR=$out/etc/xdg"'';
|
||||
|
||||
|
||||
@ -1,15 +1,16 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, xorg }:
|
||||
{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase,
|
||||
qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt,
|
||||
libqtxdg, xorg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "lxqt-config";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0r5vwkyz0c9b9py3wni4yzkmsvgs6psk9dp1fhfzvbjbknb21bfa";
|
||||
sha256 = "1pp2pw43zh8kwi2cxk909wn6bw7kba95b6bv96l2gmzhdqpfw2a7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -32,13 +33,29 @@ stdenv.mkDerivation rec {
|
||||
xorg.libXScrnSaver
|
||||
xorg.libxcb
|
||||
xorg.libXcursor
|
||||
xorg.xf86inputlibinput
|
||||
xorg.xf86inputlibinput.dev
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/CMakeLists.txt \
|
||||
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
|
||||
|
||||
for f in \
|
||||
lxqt-config-file-associations/CMakeLists.txt \
|
||||
lxqt-config-brightness/CMakeLists.txt \
|
||||
lxqt-config-appearance/CMakeLists.txt \
|
||||
lxqt-config-locale/CMakeLists.txt \
|
||||
lxqt-config-monitor/CMakeLists.txt \
|
||||
lxqt-config-input/CMakeLists.txt \
|
||||
liblxqt-config-cursor/CMakeLists.txt \
|
||||
src/CMakeLists.txt
|
||||
do
|
||||
substituteInPlace $f \
|
||||
--replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
|
||||
done
|
||||
|
||||
sed -i "/\''${XORG_LIBINPUT_INCLUDE_DIRS}/a ${xorg.xf86inputlibinput.dev}/include/xorg" lxqt-config-input/CMakeLists.txt
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -1,15 +1,14 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "lxqt-globalkeys";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1fmi0n5chnrpbgf7zwzc3hi55r85hkxaq5jylbwaahmxhnb5hdid";
|
||||
sha256 = "14bfkh54mn3jyq8g9ipy3xmc3n9lmlqpvm26kpqig7567hbncv7n";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -27,13 +26,14 @@ stdenv.mkDerivation rec {
|
||||
libqtxdg
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
|
||||
|
||||
postPatch = ''
|
||||
for dir in autostart xdg; do
|
||||
substituteInPlace $dir/CMakeLists.txt \
|
||||
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
|
||||
done
|
||||
|
||||
substituteInPlace config/CMakeLists.txt \
|
||||
--replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, qt5, lxqt }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lxqt-l10n-${version}";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = "lxqt-l10n";
|
||||
rev = version;
|
||||
sha256 = "0q1hzj6sa4wc8sgqqqsqfldjpnvihacfq73agvc2li3q6qi5rr0k";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
qt5.qttools
|
||||
lxqt.lxqt-build-tools
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "\''${LXQT_TRANSLATIONS_DIR}" "$out"/share/lxqt/translations
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Translations of LXQt";
|
||||
homepage = https://github.com/lxqt/lxqt-l10n;
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = with platforms; unix;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
}
|
||||
@ -1,15 +1,14 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, qtx11extras }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "lxqt-notificationd";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0vjpl3ipc0hrz255snkp99h6xrlid490ml8jb588rdpfina66sp1";
|
||||
sha256 = "1nawcxy2qnrngcxvwjwmmh4fn7mhnfgy1g77rn90243jvy29wv5f";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -20,6 +19,11 @@ stdenv.mkDerivation rec {
|
||||
postPatch = ''
|
||||
substituteInPlace autostart/CMakeLists.txt \
|
||||
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
|
||||
|
||||
for f in {config,src}/CMakeLists.txt; do
|
||||
substituteInPlace $f \
|
||||
--replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
|
||||
done
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
@ -32,8 +36,6 @@ stdenv.mkDerivation rec {
|
||||
qtx11extras
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "The LXQt notification daemon";
|
||||
homepage = https://github.com/lxqt/lxqt-notificationd;
|
||||
|
||||
@ -1,15 +1,14 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "lxqt-openssh-askpass";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "19djmqwk4kj3rxs4h7a471ydcz87j5z4yv8a6pgblvqdkkn0ylk9";
|
||||
sha256 = "19xcc6i7jg35780r4dfg4vwfp9x4pz5sqzagxnpzspz61jaj5ibv";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -27,7 +26,10 @@ stdenv.mkDerivation rec {
|
||||
libqtxdg
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "GUI to query passwords on behalf of SSH agents";
|
||||
|
||||
@ -8,15 +8,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "lxqt-panel";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "056khr3smyrdi26zpclwv1qrmk0zxr9cnk65ad9c0xavzk6ya3xz";
|
||||
sha256 = "0jr7ylf6d35m0ckn884arjk4armknnw8iyph00gcphn5bqycbn8l";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -50,8 +49,6 @@ stdenv.mkDerivation rec {
|
||||
libXdamage
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
|
||||
|
||||
postPatch = ''
|
||||
for dir in autostart menu; do
|
||||
substituteInPlace $dir/CMakeLists.txt \
|
||||
@ -59,6 +56,11 @@ stdenv.mkDerivation rec {
|
||||
done
|
||||
substituteInPlace panel/CMakeLists.txt \
|
||||
--replace "DESTINATION \''${LXQT_ETC_XDG_DIR}" "DESTINATION etc/xdg"
|
||||
|
||||
for f in cmake/BuildPlugin.cmake panel/CMakeLists.txt; do
|
||||
substituteInPlace $f \
|
||||
--replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -5,15 +5,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "lxqt-policykit";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1m9v4hl1hyd8rmlh6z2zy6287qfnavsm9khl526jf8f7bjgpifvd";
|
||||
sha256 = "05k39819nsdyg2pp1vk6g2hdpxqp78h6bhb0hp5rclf9ap5fpvvc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -34,11 +33,12 @@ stdenv.mkDerivation rec {
|
||||
pcre
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace autostart/CMakeLists.txt \
|
||||
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
|
||||
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -1,15 +1,14 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, solid, kidletime, liblxqt, libqtxdg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "lxqt-powermanagement";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "04mx1nxqqqjg3wsql4ch4j1a4cbqfvpq0iwi6b9yhaf04n0dwrvn";
|
||||
sha256 = "08xdnb54lji09izzzfip8fw0gp17qkx66jm6i04zby4whx4mqniv";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -29,11 +28,14 @@ stdenv.mkDerivation rec {
|
||||
libqtxdg
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace autostart/CMakeLists.txt \
|
||||
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
|
||||
|
||||
for f in {config,src}/CMakeLists.txt; do
|
||||
substituteInPlace $f \
|
||||
--replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -5,15 +5,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "lxqt-qtplugin";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "19y5dvbj7gwyh8glc6vi6hb5snvkd3jwvss6j0sn2sy2gp9g9ryb";
|
||||
sha256 = "16n50lxnya03zcviw65sy5dyg9dsrn64k91mrqfvraf6d90md4al";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,15 +2,14 @@
|
||||
menu-cache, muparser, pcre }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "lxqt-runner";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0w6r9lby35p0lf5klasa5l2lscx6dmv16kzfhl4lc6w2qfwjb9vi";
|
||||
sha256 = "1qyacig9ksnjrhws8cpk6arlaxn7kl0z39l3c62ql3m89mibsm88";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -33,11 +32,12 @@ stdenv.mkDerivation rec {
|
||||
pcre
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace autostart/CMakeLists.txt \
|
||||
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
|
||||
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -1,15 +1,14 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg, xorg, xdg-user-dirs }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "lxqt-session";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0ngcrkmfpahii4yibsh03b8v8af93hhqm42kk1nnhczc8dg49mhs";
|
||||
sha256 = "0nla1ki23p1bwzw5hbmh9l8yg3b0f55kflgnvyfakmvpivjbz3k6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -31,13 +30,16 @@ stdenv.mkDerivation rec {
|
||||
xdg-user-dirs
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
|
||||
|
||||
postPatch = ''
|
||||
for dir in autostart config; do
|
||||
substituteInPlace $dir/CMakeLists.txt \
|
||||
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
|
||||
done
|
||||
|
||||
for f in lxqt-{config-session,leave,session}/CMakeLists.txt; do
|
||||
substituteInPlace $f \
|
||||
--replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -1,15 +1,14 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg, sudo }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "lxqt-sudo";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1gpn3dhmzabx0jrqxq63549sah03kf6bmdc9d9kmg6hyr5xg3i1h";
|
||||
sha256 = "0l8fq06kfsrmvg2fr8lqdsxr6fwxmxsa9zwaa3fs9inzaylm0jkh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -28,7 +27,10 @@ stdenv.mkDerivation rec {
|
||||
sudo
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "GUI frontend for sudo/su";
|
||||
|
||||
@ -1,20 +1,19 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, lxqt }:
|
||||
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "lxqt-themes";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "026hbblxdbq48n9691b1z1xiak99khsk3wf09vn4iaj5zi7dwhw5";
|
||||
sha256 = "09dkcgnf3lmfly8v90p6wjlj5rin83pbailvvpx2jr8a48a8zb9f";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
lxqt.lxqt-build-tools
|
||||
lxqt-build-tools
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,28 +1,28 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5, xorg, lxqt, openbox, hicolor-icon-theme }:
|
||||
{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qtbase, qttools,
|
||||
qtx11extras, xorg, lxqt-build-tools, openbox, hicolor-icon-theme }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "obconf-qt";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0mixf35p7b563f77vnikk9b1wqhbdawp723sd30rfql76gkjwjcn";
|
||||
sha256 = "00v5w8qr3vs0k91flij9lz7y1cpp2g8ivgnmmm43ymjfiz5j6l27";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkgconfig
|
||||
lxqt.lxqt-build-tools
|
||||
lxqt-build-tools
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
pcre
|
||||
qt5.qtbase
|
||||
qt5.qttools
|
||||
qt5.qtx11extras
|
||||
qtbase
|
||||
qttools
|
||||
qtx11extras
|
||||
xorg.libpthreadstubs
|
||||
xorg.libXdmcp
|
||||
xorg.libSM
|
||||
@ -30,8 +30,6 @@ stdenv.mkDerivation rec {
|
||||
hicolor-icon-theme
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "The Qt port of obconf, the Openbox configuration tool";
|
||||
homepage = https://github.com/lxqt/obconf-qt;
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt, libpulseaudio, pcre, qtbase, qttools, qtx11extras }:
|
||||
{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt, libpulseaudio,
|
||||
pcre, qtbase, qttools, qtx11extras }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "pavucontrol-qt";
|
||||
version = "0.4.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1bxqpasfvaagbq8azl7536z2zk2725xg7jkvad5xh95zq1gb4hgk";
|
||||
sha256 = "1vyjm6phgbxglk65c889bd73b0p2ffb5bsc89dmb07qzllyrjb4h";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -26,8 +26,6 @@ stdenv.mkDerivation rec {
|
||||
pcre
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A Pulseaudio mixer in Qt (port of pavucontrol)";
|
||||
homepage = https://github.com/lxqt/pavucontrol-qt;
|
||||
|
||||
@ -1,35 +1,33 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qt5, libfm-qt, menu-cache, lxmenu-data }:
|
||||
{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt, qtbase, qttools,
|
||||
qtx11extras, libfm-qt, menu-cache, lxmenu-data }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "pcmanfm-qt";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0xnhdxx45fmbi5dqic3j2f7yq01s0xysimafj5zqs0a29zw3i4m0";
|
||||
sha256 = "0hf4qyn12mpr6rrla9mf6ka5gb4y36amk7d14ayr7yka1r16p8lz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkgconfig
|
||||
lxqt-build-tools
|
||||
lxqt.lxqt-build-tools
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qt5.qtbase
|
||||
qt5.qttools
|
||||
qt5.qtx11extras
|
||||
qtbase
|
||||
qttools
|
||||
qtx11extras
|
||||
libfm-qt
|
||||
libfm-qt
|
||||
menu-cache
|
||||
lxmenu-data
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
|
||||
|
||||
postPatch = ''
|
||||
for dir in autostart config; do
|
||||
substituteInPlace $dir/CMakeLists.txt \
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, qt5 }:
|
||||
{ stdenv, fetchFromGitHub, cmake, qtbase, qttools }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ qt5.qtbase qt5.qttools ];
|
||||
buildInputs = [ qtbase qttools ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Cross-platform clipboard history applet";
|
||||
|
||||
@ -1,20 +1,20 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, qt5 }:
|
||||
{ stdenv, fetchFromGitHub, cmake, qtbase, qtx11extras, qttools,
|
||||
lxqt-build-tools }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "qps";
|
||||
version = "1.10.18";
|
||||
version = "1.10.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1cq5z4w2n119z2bq0njn508g5582jljdx2n38cv5b3cf35k91a49";
|
||||
sha256 = "1vyi1vw4z5j2sp9yhhv91wl2sbg4fh0djqslg1ssc7fww2ka6dx3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeBuildInputs = [ cmake lxqt-build-tools ];
|
||||
|
||||
buildInputs = [ qt5.qtbase qt5.qtx11extras qt5.qttools ];
|
||||
buildInputs = [ qtbase qtx11extras qttools ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "The Qt process manager";
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtermwidget, qt5 }:
|
||||
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtermwidget,
|
||||
qtbase, qttools, qtx11extras }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "qterminal";
|
||||
version = "0.9.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1z9wlyj5i192jfq3dcxjf8wzx9x332f19c9ll7zv69cq21kyy9wn";
|
||||
sha256 = "071qz248j9gcqzchnrz8xamm07g4r2xyrmnb0a2vjkjd63pk2r8f";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -18,14 +18,12 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qt5.qtbase
|
||||
qt5.qttools
|
||||
qt5.qtx11extras
|
||||
qtbase
|
||||
qttools
|
||||
qtx11extras
|
||||
qtermwidget
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A lightweight Qt-based terminal emulator";
|
||||
homepage = https://github.com/lxqt/qterminal;
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, qt5 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}_0_7_1-${version}";
|
||||
pname = "qtermwidget";
|
||||
version = "0.7.1";
|
||||
|
||||
srcs = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0awp33cnkpi9brpx01mz5hwj7j2lq1wdi8cabk3wassd99vvxdxz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ qt5.qtbase ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A terminal emulator widget for Qt 5";
|
||||
homepage = https://github.com/lxqt/qtermwidget;
|
||||
license = licenses.gpl2;
|
||||
platforms = with platforms; unix;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
}
|
||||
@ -1,22 +1,19 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, qt5, lxqt }:
|
||||
{ stdenv, fetchFromGitHub, cmake, qtbase, qttools, lxqt-build-tools }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "qtermwidget";
|
||||
version = "0.9.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "05gbdjzgmcr3ljs9ba3qvh7a3v6yn6vakwfy8avld9gy5bdd76rg";
|
||||
sha256 = "0wv8fssbc2w7kkpq9ngsa8wyjraggdhsbz36gyxyv8fy5m78jq0n";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake lxqt.lxqt-build-tools ];
|
||||
nativeBuildInputs = [ cmake lxqt-build-tools ];
|
||||
|
||||
buildInputs = [ qt5.qtbase qt5.qttools];
|
||||
|
||||
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
|
||||
buildInputs = [ qtbase qttools];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A terminal emulator widget for Qt 5";
|
||||
|
||||
@ -1,17 +1,21 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, libqtxdg, xorg }:
|
||||
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, libqtxdg, xorg, autoPatchelfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "screengrab-${version}";
|
||||
version = "1.98";
|
||||
pname = "screengrab";
|
||||
version = "1.100";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = "screengrab";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1y3r29220z6y457cajpad3pjnr883smbvh0kai8hc5hh4k4kxs6v";
|
||||
sha256 = "1iqrmf581x9ab6zzjxm2509gg6fkn7hwril4v0aki7n7dgxw1c4g";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkgconfig
|
||||
autoPatchelfHook # fix libuploader.so and libextedit.so not found
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
|
||||
@ -7,7 +7,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||
root=../../..
|
||||
export NIXPKGS_ALLOW_UNFREE=1
|
||||
|
||||
lxqt_version=0.13.0
|
||||
lxqt_version=0.14.0
|
||||
lxqtrepo=https://downloads.lxqt.org/${lxqt_version}.html
|
||||
|
||||
version() {
|
||||
@ -28,7 +28,7 @@ update_lxqt() {
|
||||
local pfile=$(EDITOR=echo nix edit -f. lxqt.$pname 2>/dev/null)
|
||||
update-source-version lxqt.$pname "$pversion"
|
||||
git add $pfile
|
||||
git commit -m "$pname: $pversionold -> $pversion"
|
||||
git commit -m "lxqt.$pname: $pversionold -> $pversion"
|
||||
)
|
||||
fi
|
||||
echo
|
||||
|
||||
@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = https://sourceforge.net/projects/open-cobol/;
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ ericsagnes the-kenny ];
|
||||
platforms = platforms.linux;
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{ stdenv, fetchurl, which, coq, ssreflect }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "coq${coq.coq-version}-coquelicot-3.0.1";
|
||||
name = "coq${coq.coq-version}-coquelicot-3.0.2";
|
||||
src = fetchurl {
|
||||
url = "https://gforge.inria.fr/frs/download.php/file/37045/coquelicot-3.0.1.tar.gz";
|
||||
sha256 = "0hsyhsy2lwqxxx2r8xgi5csmirss42lp9bkb9yy35mnya0w78c8r";
|
||||
url = "https://gforge.inria.fr/frs/download.php/file/37523/coquelicot-3.0.2.tar.gz";
|
||||
sha256 = "1biia7nfqf7vaqq5gmykl4rwjyvrcwss6r2jdf0in5pvp2rnrj2w";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ which ];
|
||||
@ -24,7 +24,7 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ];
|
||||
compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -2,9 +2,9 @@
|
||||
|
||||
let params =
|
||||
if stdenv.lib.versionAtLeast coq.coq-version "8.7" then {
|
||||
version = "3.0.0";
|
||||
uid = "37477";
|
||||
sha256 = "1h05ji5cmyqyv2i1l83xgkm7vfvcnl8r1dzvbp5yncm1jr9kf6nn";
|
||||
version = "3.1.0";
|
||||
uid = "37901";
|
||||
sha256 = "02szrgz9m0ac51la1lqpiv6i2g0zbgx9gz5rp0q1g00ajldyna5c";
|
||||
} else {
|
||||
version = "2.6.1";
|
||||
uid = "37454";
|
||||
@ -46,6 +46,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" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,12 +1,24 @@
|
||||
{ stdenv, fetchurl, which, coq, coquelicot, flocq, mathcomp
|
||||
, bignums ? null }:
|
||||
|
||||
let params =
|
||||
if stdenv.lib.versionAtLeast coq.coq-version "8.7" then {
|
||||
version = "3.4.0";
|
||||
uid = "37524";
|
||||
sha256 = "023j9sd64brqvjdidqkn5m8d7a93zd9r86ggh573z9nkjm2m7vvg";
|
||||
} else {
|
||||
version = "3.3.0";
|
||||
uid = "37077";
|
||||
sha256 = "08fdcf3hbwqphglvwprvqzgkg0qbimpyhnqsgv3gac4y1ap0f903";
|
||||
}
|
||||
; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "coq${coq.coq-version}-interval-3.3.0";
|
||||
name = "coq${coq.coq-version}-interval-${params.version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gforge.inria.fr/frs/download.php/file/37077/interval-3.3.0.tar.gz";
|
||||
sha256 = "08fdcf3hbwqphglvwprvqzgkg0qbimpyhnqsgv3gac4y1ap0f903";
|
||||
url = "https://gforge.inria.fr/frs/download.php/file/${params.uid}/interval-${params.version}.tar.gz";
|
||||
inherit (params) sha256;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ which ];
|
||||
@ -26,7 +38,7 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ];
|
||||
compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" ];
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -49,6 +49,7 @@ self: super: {
|
||||
data-clist = doJailbreak super.data-clist; # won't cope with QuickCheck 2.12.x
|
||||
dates = doJailbreak super.dates; # base >=4.9 && <4.12
|
||||
Diff = dontCheck super.Diff;
|
||||
equivalence = dontCheck super.equivalence; # test suite doesn't compile https://github.com/pa-ba/equivalence/issues/5
|
||||
HaTeX = doJailbreak super.HaTeX; # containers >=0.4 && <0.6 is too tight; https://github.com/Daniel-Diaz/HaTeX/issues/126
|
||||
hpc-coveralls = doJailbreak super.hpc-coveralls; # https://github.com/guillaume-nargeot/hpc-coveralls/issues/82
|
||||
http-api-data = doJailbreak super.http-api-data;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gexiv2";
|
||||
version = "0.10.9";
|
||||
version = "0.10.10";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1vf0zv92p9hybdhn7zx53h3ia53ph97a21xz8rfk877xlr5261l8";
|
||||
sha256 = "1qbcwq89g4r67k1dj4laqj441pj4195c8hzhxn8vc6mmg8adg6kx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ];
|
||||
|
||||
@ -4,14 +4,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.27.7";
|
||||
version = "0.27.8";
|
||||
name = "libgit2-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libgit2";
|
||||
repo = "libgit2";
|
||||
rev = "v${version}";
|
||||
sha256 = "1q3mp7xjpbmdsnk4sdzf2askbb4pgbxcmr1h7y7zk2738dndwkha";
|
||||
sha256 = "0wzx8nkyy9m7mx6cks58chjd4289vjsw97mxm9w6f1ggqsfnmbr9";
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DTHREADSAFE=ON" ];
|
||||
|
||||
@ -35,6 +35,11 @@ stdenv.mkDerivation rec {
|
||||
url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123";
|
||||
sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p";
|
||||
})
|
||||
# 3.24.3: https://gitlab.gnome.org/GNOME/gtk/merge_requests/505
|
||||
(fetchpatch {
|
||||
url = https://gitlab.gnome.org/GNOME/gtk/commit/95c0f07295fd300ab7f3416a39290ae33585ea6c.patch;
|
||||
sha256 = "0z9w7f39xcn1cbcd8jhx731vq64nvi5q6kyc86bq8r00daysjwnl";
|
||||
})
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
# X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin
|
||||
# let’s drop that dependency in similar way to how other parts of the library do it
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "intel-media-driver-${version}";
|
||||
version = "18.4.0";
|
||||
version = "18.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "media-driver";
|
||||
rev = "intel-media-${version}";
|
||||
sha256 = "0mvb1dq2014gc60lz22dag230flqw859dcqi08hdmmci30qgw88x";
|
||||
sha256 = "192rfv6dk9jagx0q92jq6n1slc1pllgcc7rm85fgachq9rjl7szh";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@ -1,36 +1,22 @@
|
||||
{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobject-introspection, cairo
|
||||
, libarchive, freetype, libjpeg, libtiff, gnome3, fetchpatch
|
||||
, libarchive, freetype, libjpeg, libtiff, gnome3, lcms2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgxps";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "412b1343bd31fee41f7204c47514d34c563ae34dafa4cc710897366bd6cd0fae";
|
||||
sha256 = "157s4c9gjjss6yd7qp7n4q6s72gz1k4ilsx4xjvp357azk49z4qs";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2018-10733-1.patch";
|
||||
url = https://gitlab.gnome.org/GNOME/libgxps/commit/b458226e162fe1ffe7acb4230c114a52ada5131b.patch;
|
||||
sha256 = "0pqg9iwkg69qknj7vkgn26c32fndy55byxivd4km0vjfhfyx69hd";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2018-10733-2.patch";
|
||||
url = https://gitlab.gnome.org/GNOME/libgxps/commit/133fe2a96e020d4ca65c6f64fb28a404050ebbfd.patch;
|
||||
sha256 = "19n01x8zs05wf801mkz4mypvapph7h941md3hr3rj0ry6r88pkir";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ];
|
||||
buildInputs = [ glib cairo freetype libjpeg libtiff ];
|
||||
buildInputs = [ glib cairo freetype libjpeg libtiff lcms2 ];
|
||||
propagatedBuildInputs = [ libarchive ];
|
||||
|
||||
mesonFlags = [
|
||||
"-Denable-test=false"
|
||||
"-Dwith-liblcms2=false"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -22,6 +22,10 @@ stdenv.mkDerivation rec {
|
||||
"-Dgtkdoc=true"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export XDG_DATA_DIRS=$XDG_DATA_DIRS:${shared-mime-info}/share
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ stdenv, lib, fetchFromGitHub, autoconf, automake, which, libtool, pkgconfig,
|
||||
alsaLib, portaudio,
|
||||
pulseaudioSupport ? true, libpulseaudio }:
|
||||
{ config, stdenv, lib, fetchFromGitHub
|
||||
, autoconf, automake, which, libtool, pkgconfig
|
||||
, portaudio, alsaLib
|
||||
, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pcaudiolib-${version}";
|
||||
|
||||
@ -1,23 +1,29 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, python }:
|
||||
{ stdenv, fetchFromGitHub, cmake, catch, python, eigen }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pybind-${version}";
|
||||
version = "2.2.2";
|
||||
version = "2.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pybind";
|
||||
repo = "pybind11";
|
||||
rev = "v${version}";
|
||||
sha256 = "0x71i1n5d02hjbdcnkscrwxs9pb8kplmdpqddhsimabfp84fip48";
|
||||
sha256 = "0pa79ymcasv8br5ifbx7878id5py2jpjac3i20cqxr6gs9l6ivlv";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
checkInputs = with python.pkgs; [ catch eigen pytest numpy scipy ];
|
||||
|
||||
# disable tests as some tests (test_embed/test_interpreter) are failing at the moment
|
||||
cmakeFlags = [
|
||||
"-DPYTHON_EXECUTABLE=${python.interpreter}"
|
||||
"-DPYBIND11_TEST=0"
|
||||
# Disable test_cmake_build test, as it fails in sandbox
|
||||
# https://github.com/pybind/pybind11/issues/1355
|
||||
patches = [ ./no_test_cmake_build.patch ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DPYTHON_EXECUTABLE=${python.interpreter}"
|
||||
"-DPYBIND11_TEST=${if doCheck then "ON" else "OFF"}"
|
||||
];
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
homepage = https://github.com/pybind/pybind11;
|
||||
@ -31,5 +37,4 @@ stdenv.mkDerivation rec {
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
maintainers = with stdenv.lib.maintainers; [ yuriaisaka ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -0,0 +1,7 @@
|
||||
--- a/tests/CMakeLists.txt 2019-01-28 14:13:55.822119328 +0100
|
||||
+++ b/tests/CMakeLists.txt 2019-01-28 14:14:06.741161928 +0100
|
||||
@@ -233,4 +233,3 @@
|
||||
add_subdirectory(test_embed)
|
||||
|
||||
# Test CMake build using functions and targets from subdirectory or installed location
|
||||
-add_subdirectory(test_cmake_build)
|
||||
@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix_pointer_initialization2.patch";
|
||||
url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/sympow-datafiles.patch?h=packages/sympow";
|
||||
url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/sympow-datafiles.patch?h=packages/sympow&id=5088e641a45b23d0385d8e63be65315129b4cf58";
|
||||
sha256 = "1m0vz048layb47r1jjf7fplw650ccc9x0w3l322iqmppzmv3022a";
|
||||
})
|
||||
];
|
||||
|
||||
@ -36,5 +36,5 @@ let
|
||||
in {
|
||||
# xapian-ruby needs 1.2.22 as of 2017-05-06
|
||||
xapian_1_2_22 = generic "1.2.22" "0zsji22n0s7cdnbgj0kpil05a6bgm5cfv0mvx12d8ydg7z58g6r6";
|
||||
xapian_1_4 = generic "1.4.9" "1k7m7m9jld96k16ansfw2w3c354pvd8ibhnrb6dw012g06fw7sfd";
|
||||
xapian_1_4 = generic "1.4.10" "1f4vf1w1yvsn9mn462q6snc8wkmfpifp8wrlzs4aqi45w0kr6rk8";
|
||||
}
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
{ stdenv, fetchFromGitHub, buildDunePackage, result }:
|
||||
{ stdenv, fetchFromGitHub, buildDunePackage, result, ppx_derivers }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "ocaml-migrate-parsetree";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocaml-ppx";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1d2n349d1cqm3dr09mwy5m9rfd4bkkqvri5i94wknpsrr35vnrr1";
|
||||
sha256 = "16kas19iwm4afijv3yxd250s08absabmdcb4yj57wc8r4fmzv5dm";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ result ];
|
||||
propagatedBuildInputs = [ ppx_derivers result ];
|
||||
|
||||
meta = {
|
||||
description = "Convert OCaml parsetrees between different major versions";
|
||||
|
||||
31
pkgs/development/python-modules/aiolifx-effects/default.nix
Normal file
31
pkgs/development/python-modules/aiolifx-effects/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ lib
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, isPy3k
|
||||
, aiolifx
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiolifx-effects";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "aiolifx_effects";
|
||||
sha256 = "cb4ac52deeb220783fc6449251cf40833fcffa28648270be64b1b3e83e06b503";
|
||||
};
|
||||
|
||||
# tests are not implemented
|
||||
doCheck = false;
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
propagatedBuildInputs = [ aiolifx ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = https://github.com/amelchio/aiolifx_effects;
|
||||
license = licenses.mit;
|
||||
description = "Light effects (pulse, colorloop ...) for LIFX lights running on aiolifx";
|
||||
maintainers = with maintainers; [ netixx ];
|
||||
};
|
||||
}
|
||||
31
pkgs/development/python-modules/aiolifx/default.nix
Normal file
31
pkgs/development/python-modules/aiolifx/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ lib
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, isPy3k
|
||||
, ifaddr
|
||||
, bitstring
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiolifx";
|
||||
version = "0.6.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "cf53c9faea6eee25a466e73eef1753b82a75c7497648149c19c15342df2678f2";
|
||||
};
|
||||
|
||||
# tests are not implemented
|
||||
doCheck = false;
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
propagatedBuildInputs = [ bitstring ifaddr ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = http://github.com/frawau/aiolifx;
|
||||
license = licenses.mit;
|
||||
description = "API for local communication with LIFX devices over a LAN with asyncio";
|
||||
maintainers = with maintainers; [ netixx ];
|
||||
};
|
||||
}
|
||||
@ -20,14 +20,26 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cassandra-driver";
|
||||
version = "3.15.1";
|
||||
version = "3.16.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1xcirbvlj00id8269akhk8gy2sv0mlnbgy3nagi32648jwsrcadg";
|
||||
sha256 = "1gjs2lqy0ba6zhh13a1dhirk59i7lc4zcbl7h50619hdm5kv3g22";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgs.libev cython ];
|
||||
buildInputs = [
|
||||
pkgs.libev
|
||||
# NOTE: next version will work with cython 0.29
|
||||
# Requires 'Cython!=0.25,<0.29,>=0.20'
|
||||
(cython.overridePythonAttrs(old: rec {
|
||||
pname = "Cython";
|
||||
version = "0.28.3";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1aae6d6e9858888144cea147eb5e677830f45faaff3d305d77378c3cba55f526";
|
||||
};
|
||||
}))
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ six ]
|
||||
++ stdenv.lib.optionals (pythonOlder "3.4") [ futures ];
|
||||
|
||||
@ -4,12 +4,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llfuse";
|
||||
version = "1.3.5";
|
||||
version = "1.3.6";
|
||||
name = pname + "-" + version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/l/llfuse/${name}.tar.bz2";
|
||||
sha256 = "6e412a3d9be69162d49b8a4d6fb3c343d1c1fba847f4535d229e0ece2548ead8";
|
||||
sha256 = "1j9fzxpgmb4rxxyl9jcf84zvznhgi3hnh4hg5vb0qaslxkvng8ii";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Python bindings for the low-level FUSE API";
|
||||
homepage = https://code.google.com/p/python-llfuse/;
|
||||
homepage = https://github.com/python-llfuse/python-llfuse;
|
||||
license = licenses.lgpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ bjornfor ];
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mail-parser";
|
||||
version = "3.4.1";
|
||||
version = "3.9.2";
|
||||
|
||||
# no tests in PyPI tarball
|
||||
src = fetchFromGitHub {
|
||||
owner = "SpamScope";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0nxilshq4gwpicdklja9p275yf8l5kr1lk620c3cx9w4qai4cmbv";
|
||||
sha256 = "0f515a8r3qz3i2cm4lvs5aw59193jl9mk7bmaj9545n4miyar4nr";
|
||||
};
|
||||
|
||||
LC_ALL = "en_US.utf-8";
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rasterio";
|
||||
version = "1.0.15";
|
||||
version = "1.0.18";
|
||||
|
||||
# Pypi doesn't ship the tests, so we fetch directly from GitHub
|
||||
src = fetchFromGitHub {
|
||||
owner = "mapbox";
|
||||
repo = "rasterio";
|
||||
rev = version;
|
||||
sha256 = "0waxkqdkaxxmqnkpj397niq193l2bg8s9isal4c7q12jbm6mf7f7";
|
||||
sha256 = "05miivbn2c5slc5nn7fpdn1da42qwzg4z046i71f4r70bc49vsj9";
|
||||
};
|
||||
|
||||
checkInputs = [ boto3 pytest pytestcov packaging hypothesis ];
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user