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

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

Browse Source
This commit is contained in:
Frederik Rietdijk 2018-02-26 10:50:18 +01:00
commit 4f08b0fbac
757 changed files with 5494 additions and 5077 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/systems/inspect.nix
View File

@ -35,6 +35,13 @@ rec {
MinGW = { kernel = kernels.windows; abi = abis.gnu; };
Musl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ];
Kexecable = map (family: { kernel = kernels.linux; cpu.family = family; })
[ "x86" "arm" "aarch64" "mips" ];
Efi = map (family: { cpu.family = family; })
[ "x86" "arm" "aarch64" ];
Seccomputable = map (family: { kernel = kernels.linux; cpu.family = family; })
[ "x86" "arm" "aarch64" "mips" ];
};
matchAnyAttrs = patterns:

46
nixos/doc/manual/release-notes/rl-1803.xml
View File

@ -244,6 +244,52 @@ following incompatible changes:</para>
<link xlink:href="http://borgbackup.readthedocs.io/en/stable/usage/upgrade.html#attic-and-borg-0-xx-to-borg-1-x">here</link>.
</para>
</listitem>
<listitem>
<para>
The Piwik analytics software was renamed to Matomo:
<itemizedlist>
<listitem>
<para>The package <literal>pkgs.piwik</literal> was renamed to <literal>pkgs.matomo</literal>.</para>
</listitem>
<listitem>
<para>The service <literal>services.piwik</literal> was renamed to <literal>services.matomo</literal>.</para>
</listitem>
<listitem>
<para>
The data directory <filename>/var/lib/piwik</filename> was renamed to <filename>/var/lib/matomo</filename>.
All files will be moved automatically on first startup, but you might need to adjust your backup scripts.
</para>
</listitem>
<listitem>
<para>
The default <option>serverName</option> for the nginx configuration changed from
<literal>piwik.${config.networking.hostName}</literal> to
<literal>matomo.${config.networking.hostName}.${config.networking.domain}</literal>
if <option>config.networking.domain</option> is set,
<literal>matomo.${config.networking.hostName}</literal> if it is not set.
If you change your <option>serverName</option>, remember you'll need to update the
<literal>trustedHosts[]</literal> array in <filename>/var/lib/matomo/config/config.ini.php</filename>
as well.
</para>
</listitem>
<listitem>
<para>
The <literal>piwik</literal> user was renamed to <literal>matomo</literal>.
The service will adjust ownership automatically for files in the data directory.
If you use unix socket authentication, remember to give the new <literal>matomo</literal> user
access to the database and to change the <literal>username</literal> to <literal>matomo</literal>
in the <literal>[database]</literal> section of <filename>/var/lib/matomo/config/config.ini.php</filename>.
</para>
</listitem>
<listitem>
<para>
If you named your database `piwik`, you might want to rename it to `matomo` to keep things clean,
but this is neither enforced nor required.
</para>
</listitem>
</itemizedlist>
</para>
</listitem>
</itemizedlist>
</section>

14
nixos/modules/config/no-x-libs.nix
View File

@ -28,13 +28,13 @@ with lib;
nixpkgs.config.packageOverrides = pkgs: {
dbus = pkgs.dbus.override { x11Support = false; };
networkmanager_fortisslvpn = pkgs.networkmanager_fortisslvpn.override { withGnome = false; };
networkmanager_l2tp = pkgs.networkmanager_l2tp.override { withGnome = false; };
networkmanager_openconnect = pkgs.networkmanager_openconnect.override { withGnome = false; };
networkmanager_openvpn = pkgs.networkmanager_openvpn.override { withGnome = false; };
networkmanager_pptp = pkgs.networkmanager_pptp.override { withGnome = false; };
networkmanager_vpnc = pkgs.networkmanager_vpnc.override { withGnome = false; };
networkmanager_iodine = pkgs.networkmanager_iodine.override { withGnome = false; };
networkmanager-fortisslvpn = pkgs.networkmanager-fortisslvpn.override { withGnome = false; };
networkmanager-l2tp = pkgs.networkmanager-l2tp.override { withGnome = false; };
networkmanager-openconnect = pkgs.networkmanager-openconnect.override { withGnome = false; };
networkmanager-openvpn = pkgs.networkmanager-openvpn.override { withGnome = false; };
networkmanager-pptp = pkgs.networkmanager-pptp.override { withGnome = false; };
networkmanager-vpnc = pkgs.networkmanager-vpnc.override { withGnome = false; };
networkmanager-iodine = pkgs.networkmanager-iodine.override { withGnome = false; };
pinentry = pkgs.pinentry_ncurses;
};
};

2
nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
View File

@ -69,7 +69,7 @@ with lib;
in ''
mkdir -p /root/Desktop
ln -sfT ${desktopFile} /root/Desktop/nixos-manual.desktop
cp ${pkgs.gnome3.gnome_terminal}/share/applications/gnome-terminal.desktop /root/Desktop/gnome-terminal.desktop
cp ${pkgs.gnome3.gnome-terminal}/share/applications/gnome-terminal.desktop /root/Desktop/gnome-terminal.desktop
chmod a+rx /root/Desktop/gnome-terminal.desktop
cp ${pkgs.gparted}/share/applications/gparted.desktop /root/Desktop/gparted.desktop
chmod a+rx /root/Desktop/gparted.desktop

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

@ -109,6 +109,7 @@
./programs/sway.nix
./programs/thefuck.nix
./programs/tmux.nix
./programs/udevil.nix
./programs/venus.nix
./programs/vim.nix
./programs/way-cooler.nix
@ -637,7 +638,7 @@
./services/web-apps/nixbot.nix
./services/web-apps/nexus.nix
./services/web-apps/pgpkeyserver-lite.nix
./services/web-apps/piwik.nix
./services/web-apps/matomo.nix
./services/web-apps/pump.io.nix
./services/web-apps/restya-board.nix
./services/web-apps/tt-rss.nix

2
nixos/modules/programs/dconf.nix
View File

@ -36,7 +36,7 @@ in
"${pkgs.gnome3.dconf.lib}/lib/gio/modules";
# https://github.com/NixOS/nixpkgs/pull/31891
#environment.variables.XDG_DATA_DIRS = optional cfg.enable
# "$(echo ${pkgs.gnome3.gsettings_desktop_schemas}/share/gsettings-schemas/gsettings-desktop-schemas-*)";
# "$(echo ${pkgs.gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas-*)";
};
}

14
nixos/modules/programs/udevil.nix Normal file
View File

@ -0,0 +1,14 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.programs.udevil;
in {
options.programs.udevil.enable = mkEnableOption "udevil";
config = mkIf cfg.enable {
security.wrappers.udevil.source = "${lib.getBin pkgs.udevil}/bin/udevil";
};
}

6
nixos/modules/rename.nix
View File

@ -148,6 +148,12 @@ with lib;
# parsoid
(mkRemovedOptionModule [ "services" "parsoid" "interwikis" ] [ "services" "parsoid" "wikis" ])
# piwik was renamed to matomo
(mkRenamedOptionModule [ "services" "piwik" "enable" ] [ "services" "matomo" "enable" ])
(mkRenamedOptionModule [ "services" "piwik" "webServerUser" ] [ "services" "matomo" "webServerUser" ])
(mkRenamedOptionModule [ "services" "piwik" "phpfpmProcessManagerConfig" ] [ "services" "matomo" "phpfpmProcessManagerConfig" ])
(mkRenamedOptionModule [ "services" "piwik" "nginx" ] [ "services" "matomo" "nginx" ])
# tarsnap
(mkRemovedOptionModule [ "services" "tarsnap" "cachedir" ] "Use services.tarsnap.archives.<name>.cachedir")

4
nixos/modules/security/pam.nix
View File

@ -311,7 +311,7 @@ let
("auth optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" +
" kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")}
${optionalString cfg.enableGnomeKeyring
("auth optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so")}
("auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so")}
${optionalString cfg.googleAuthenticator.enable
"auth required ${pkgs.googleAuthenticator}/lib/security/pam_google_authenticator.so no_increment_hotp"}
'') + ''
@ -384,7 +384,7 @@ let
("session optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" +
" kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")}
${optionalString (cfg.enableGnomeKeyring)
"session optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start"}
"session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start"}
${optionalString (config.virtualisation.lxc.lxcfs.enable)
"session optional ${pkgs.lxcfs}/lib/security/pam_cgfs.so -c freezer,memory,name=systemd,unified,cpuset"}
'');

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

@ -133,7 +133,7 @@ in
'';
example = [
"nextcloud"
"piwik"
"matomo"
];
};
@ -289,10 +289,10 @@ in
# Create initial databases
if ! test -e "${cfg.dataDir}/${database.name}"; then
echo "Creating initial database: ${database.name}"
( echo "create database `${database.name}`;"
( echo 'create database `${database.name}`;'
${optionalString (database ? "schema") ''
echo "use `${database.name}`;"
echo 'use `${database.name}`;'
if [ -f "${database.schema}" ]
then

6
nixos/modules/services/desktops/gnome3/at-spi2-core.nix
View File

@ -30,9 +30,9 @@ with lib;
config = mkMerge [
(mkIf config.services.gnome3.at-spi2-core.enable {
environment.systemPackages = [ pkgs.at_spi2_core ];
services.dbus.packages = [ pkgs.at_spi2_core ];
systemd.packages = [ pkgs.at_spi2_core ];
environment.systemPackages = [ pkgs.at-spi2-core ];
services.dbus.packages = [ pkgs.at-spi2-core ];
systemd.packages = [ pkgs.at-spi2-core ];
})
(mkIf (!config.services.gnome3.at-spi2-core.enable) {

6
nixos/modules/services/desktops/gnome3/evolution-data-server.nix
View File

@ -30,11 +30,11 @@ with lib;
config = mkIf config.services.gnome3.evolution-data-server.enable {
environment.systemPackages = [ pkgs.gnome3.evolution_data_server ];
environment.systemPackages = [ pkgs.gnome3.evolution-data-server ];
services.dbus.packages = [ pkgs.gnome3.evolution_data_server ];
services.dbus.packages = [ pkgs.gnome3.evolution-data-server ];
systemd.packages = [ pkgs.gnome3.evolution_data_server ];
systemd.packages = [ pkgs.gnome3.evolution-data-server ];
};

4
nixos/modules/services/desktops/gnome3/gnome-keyring.nix
View File

@ -31,9 +31,9 @@ with lib;
config = mkIf config.services.gnome3.gnome-keyring.enable {
environment.systemPackages = [ pkgs.gnome3.gnome_keyring ];
environment.systemPackages = [ pkgs.gnome3.gnome-keyring ];
services.dbus.packages = [ pkgs.gnome3.gnome_keyring pkgs.gnome3.gcr ];
services.dbus.packages = [ pkgs.gnome3.gnome-keyring pkgs.gnome3.gcr ];
};

4
nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix
View File

@ -30,9 +30,9 @@ with lib;
config = mkIf config.services.gnome3.gnome-online-accounts.enable {
environment.systemPackages = [ pkgs.gnome3.gnome_online_accounts ];
environment.systemPackages = [ pkgs.gnome3.gnome-online-accounts ];
services.dbus.packages = [ pkgs.gnome3.gnome_online_accounts ];
services.dbus.packages = [ pkgs.gnome3.gnome-online-accounts ];
};

6
nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix
View File

@ -30,11 +30,11 @@ with lib;
config = mkIf config.services.gnome3.gnome-terminal-server.enable {
environment.systemPackages = [ pkgs.gnome3.gnome_terminal ];
environment.systemPackages = [ pkgs.gnome3.gnome-terminal ];
services.dbus.packages = [ pkgs.gnome3.gnome_terminal ];
services.dbus.packages = [ pkgs.gnome3.gnome-terminal ];
systemd.packages = [ pkgs.gnome3.gnome_terminal ];
systemd.packages = [ pkgs.gnome3.gnome-terminal ];
};

4
nixos/modules/services/desktops/telepathy.nix
View File

@ -30,9 +30,9 @@ with lib;
config = mkIf config.services.telepathy.enable {
environment.systemPackages = [ pkgs.telepathy_mission_control ];
environment.systemPackages = [ pkgs.telepathy-mission-control ];
services.dbus.packages = [ pkgs.telepathy_mission_control ];
services.dbus.packages = [ pkgs.telepathy-mission-control ];
};

22
nixos/modules/services/networking/networkmanager.nix
View File

@ -133,10 +133,10 @@ in {
basePackages = mkOption {
type = types.attrsOf types.package;
default = { inherit networkmanager modemmanager wpa_supplicant
networkmanager_openvpn networkmanager_vpnc
networkmanager_openconnect networkmanager_fortisslvpn
networkmanager_pptp networkmanager_l2tp
networkmanager_iodine; };
networkmanager-openvpn networkmanager-vpnc
networkmanager-openconnect networkmanager-fortisslvpn
networkmanager-pptp networkmanager-l2tp
networkmanager-iodine; };
internal = true;
};
@ -273,28 +273,28 @@ in {
{ source = configFile;
target = "NetworkManager/NetworkManager.conf";
}
{ source = "${networkmanager_openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name";
{ source = "${networkmanager-openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name";
target = "NetworkManager/VPN/nm-openvpn-service.name";
}
{ source = "${networkmanager_vpnc}/etc/NetworkManager/VPN/nm-vpnc-service.name";
{ source = "${networkmanager-vpnc}/etc/NetworkManager/VPN/nm-vpnc-service.name";
target = "NetworkManager/VPN/nm-vpnc-service.name";
}
{ source = "${networkmanager_openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name";
{ source = "${networkmanager-openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name";
target = "NetworkManager/VPN/nm-openconnect-service.name";
}
{ source = "${networkmanager_fortisslvpn}/etc/NetworkManager/VPN/nm-fortisslvpn-service.name";
{ source = "${networkmanager-fortisslvpn}/etc/NetworkManager/VPN/nm-fortisslvpn-service.name";
target = "NetworkManager/VPN/nm-fortisslvpn-service.name";
}
{ source = "${networkmanager_pptp}/etc/NetworkManager/VPN/nm-pptp-service.name";
{ source = "${networkmanager-pptp}/etc/NetworkManager/VPN/nm-pptp-service.name";
target = "NetworkManager/VPN/nm-pptp-service.name";
}
{ source = "${networkmanager_l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name";
{ source = "${networkmanager-l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name";
target = "NetworkManager/VPN/nm-l2tp-service.name";
}
{ source = "${networkmanager_strongswan}/etc/NetworkManager/VPN/nm-strongswan-service.name";
target = "NetworkManager/VPN/nm-strongswan-service.name";
}
{ source = "${networkmanager_iodine}/etc/NetworkManager/VPN/nm-iodine-service.name";
{ source = "${networkmanager-iodine}/etc/NetworkManager/VPN/nm-iodine-service.name";
target = "NetworkManager/VPN/nm-iodine-service.name";
}
] ++ optional (cfg.appendNameservers == [] || cfg.insertNameservers == [])

30
nixos/modules/services/networking/syncthing.nix
View File

@ -16,12 +16,6 @@ in {
available on http://127.0.0.1:8384/.
'';
useInotify = mkOption {
type = types.bool;
default = false;
description = "Provide syncthing-inotify as a service.";
};
systemService = mkOption {
type = types.bool;
default = true;
@ -90,6 +84,12 @@ in {
};
};
imports = [
(mkRemovedOptionModule ["services" "syncthing" "useInotify"] ''
This option was removed because syncthing now has the inotify functionality included under the name "fswatcher".
It can be enabled on a per-folder basis through the webinterface.
'')
];
###### implementation
@ -100,8 +100,7 @@ in {
allowedUDPPorts = [ 21027 ];
};
systemd.packages = [ pkgs.syncthing ]
++ lib.optional cfg.useInotify pkgs.syncthing-inotify;
systemd.packages = [ pkgs.syncthing ];
users = mkIf (cfg.user == defaultUser) {
extraUsers."${defaultUser}" =
@ -125,7 +124,6 @@ in {
STNOUPGRADE = "yes";
inherit (cfg) all_proxy;
} // config.networking.proxy.envVars;
wants = mkIf cfg.useInotify [ "syncthing-inotify.service" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
Restart = "on-failure";
@ -141,20 +139,6 @@ in {
syncthing-resume = {
wantedBy = [ "suspend.target" ];
};
syncthing-inotify = mkIf (cfg.systemService && cfg.useInotify) {
description = "Syncthing Inotify File Watcher service";
after = [ "network.target" "syncthing.service" ];
requires = [ "syncthing.service" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
SuccessExitStatus = "2";
RestartForceExitStatus = "3";
Restart = "on-failure";
User = cfg.user;
ExecStart = "${pkgs.syncthing-inotify.bin}/bin/syncthing-inotify -home=${cfg.dataDir} -logflags=0";
};
};
};
};
}

42
nixos/modules/services/web-apps/piwik-doc.xml → nixos/modules/services/web-apps/matomo-doc.xml
View File

@ -2,16 +2,16 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="module-services-piwik">
xml:id="module-services-matomo">
<title>Piwik</title>
<title>Matomo</title>
<para>
Piwik is a real-time web analytics application.
This module configures php-fpm as backend for piwik, optionally configuring an nginx vhost as well.
Matomo is a real-time web analytics application.
This module configures php-fpm as backend for Matomo, optionally configuring an nginx vhost as well.
</para>
<para>
An automatic setup is not suported by piwik, so you need to configure piwik itself in the browser-based piwik setup.
An automatic setup is not suported by Matomo, so you need to configure Matomo itself in the browser-based Matomo setup.
</para>
@ -19,7 +19,7 @@
<title>Database Setup</title>
<para>
You also need to configure a MariaDB or MySQL database and -user for piwik yourself,
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:
@ -27,20 +27,20 @@
<programlisting>
# For MariaDB
INSTALL PLUGIN unix_socket SONAME 'auth_socket';
CREATE DATABASE piwik;
CREATE USER 'piwik'@'localhost' IDENTIFIED WITH unix_socket;
GRANT ALL PRIVILEGES ON piwik.* TO 'piwik'@'localhost';
CREATE DATABASE matomo;
CREATE USER 'matomo'@'localhost' IDENTIFIED WITH unix_socket;
GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost';
# For MySQL
INSTALL PLUGIN auth_socket SONAME 'auth_socket.so';
CREATE DATABASE piwik;
CREATE USER 'piwik'@'localhost' IDENTIFIED WITH auth_socket;
GRANT ALL PRIVILEGES ON piwik.* TO 'piwik'@'localhost';
CREATE DATABASE matomo;
CREATE USER 'matomo'@'localhost' IDENTIFIED WITH auth_socket;
GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost';
</programlisting>
Then fill in <literal>piwik</literal> as database user and database name, and leave the password field blank.
This authentication works by allowing only the <literal>piwik</literal> unix user to authenticate as the
<literal>piwik</literal> database user (without needing a password), but no other users.
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
<literal>matomo</literal> database user (without needing a password), but no other users.
For more information on passwordless login, see
<link xlink:href="https://mariadb.com/kb/en/mariadb/unix_socket-authentication-plugin/" />.
</para>
@ -55,9 +55,9 @@
<title>Backup</title>
<para>
You only need to take backups of your MySQL database and the
<filename>/var/lib/piwik/config/config.ini.php</filename> file.
Use a user in the <literal>piwik</literal> group or root to access the file.
For more information, see <link xlink:href="https://piwik.org/faq/how-to-install/faq_138/" />.
<filename>/var/lib/matomo/config/config.ini.php</filename> file.
Use a user in the <literal>matomo</literal> group or root to access the file.
For more information, see <link xlink:href="https://matomo.org/faq/how-to-install/faq_138/" />.
</para>
</section>
@ -67,14 +67,14 @@
<itemizedlist>
<listitem>
<para>
Piwik's file integrity check will warn you.
Matomo's file integrity check will warn you.
This is due to the patches necessary for NixOS, you can safely ignore this.
</para>
</listitem>
<listitem>
<para>
Piwik will warn you that the JavaScript tracker is not writable.
Matomo will warn you that the JavaScript tracker is not writable.
This is because it's located in the read-only nix store.
You can safely ignore this, unless you need a plugin that needs JavaScript tracker access.
</para>
@ -88,7 +88,7 @@
<para>
You can use other web servers by forwarding calls for <filename>index.php</filename> and
<filename>piwik.php</filename> to the <literal>/run/phpfpm-piwik.sock</literal> fastcgi unix socket.
<filename>piwik.php</filename> to the <literal>/run/phpfpm-matomo.sock</literal> fastcgi unix socket.
You can use the nginx configuration in the module code as a reference to what else should be configured.
</para>
</section>

75
nixos/modules/services/web-apps/piwik.nix → nixos/modules/services/web-apps/matomo.nix
View File

@ -1,10 +1,11 @@
{ config, lib, pkgs, services, ... }:
with lib;
let
cfg = config.services.piwik;
cfg = config.services.matomo;
user = "piwik";
user = "matomo";
dataDir = "/var/lib/${user}";
deprecatedDataDir = "/var/lib/piwik";
pool = user;
# it's not possible to use /run/phpfpm/${pool}.sock because /run/phpfpm/ is root:root 0770,
@ -13,17 +14,22 @@ let
phpExecutionUnit = "phpfpm-${pool}";
databaseService = "mysql.service";
fqdn =
let
join = hostName: domain: hostName + optionalString (domain != null) ".${domain}";
in join config.networking.hostName config.networking.domain;
in {
options = {
services.piwik = {
services.matomo = {
# NixOS PR for database setup: https://github.com/NixOS/nixpkgs/pull/6963
# piwik issue for automatic piwik setup: https://github.com/piwik/piwik/issues/10257
# TODO: find a nice way to do this when more NixOS MySQL and / or piwik 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 piwik web analytics with php-fpm backend.
Enable matomo web analytics with php-fpm backend.
Either the nginx option or the webServerUser option is mandatory.
'';
};
@ -32,8 +38,9 @@ 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 piwik 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.
@ -55,7 +62,7 @@ in {
catch_workers_output = yes
'';
description = ''
Settings for phpfpm's process manager. You might need to change this depending on the load for piwik.
Settings for phpfpm's process manager. You might need to change this depending on the load for matomo.
'';
};
@ -65,7 +72,7 @@ in {
(import ../web-servers/nginx/vhost-options.nix { inherit config lib; })
{
# enable encryption by default,
# as sensitive login and piwik 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;
}
@ -73,15 +80,19 @@ in {
);
default = null;
example = {
serverName = "stats.$\{config.networking.hostName\}";
serverAliases = [
"matomo.$\{config.networking.domain\}"
"stats.$\{config.networking.domain\}"
];
enableACME = false;
};
description = ''
With this option, you can customize an nginx virtualHost which already has sensible defaults for piwik.
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 serverName is piwik.$\{config.networking.hostName\}, SSL is active,
and certificates are acquired via ACME.
If enabled, then by default, the <option>serverName</option> is
<literal>${user}.$\{config.networking.hostName\}.$\{config.networking.domain\}</literal>,
SSL is active, and certificates are acquired via ACME.
If this is set to null (the default), no nginx virtualHost will be configured.
'';
};
@ -90,12 +101,12 @@ in {
config = mkIf cfg.enable {
warnings = mkIf (cfg.nginx != null && cfg.webServerUser != null) [
"If services.piwik.nginx is set, services.piwik.nginx.webServerUser is ignored and should be removed."
"If services.matomo.nginx is set, services.matomo.nginx.webServerUser is ignored and should be removed."
];
assertions = [ {
assertion = cfg.nginx != null || cfg.webServerUser != null;
message = "Either services.piwik.nginx or services.piwik.nginx.webServerUser is mandatory";
message = "Either services.matomo.nginx or services.matomo.nginx.webServerUser is mandatory";
}];
users.extraUsers.${user} = {
@ -106,19 +117,20 @@ in {
};
users.extraGroups.${user} = {};
systemd.services.piwik_setup_update = {
# everything needs to set up and up to date before piwik 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 = [ pkgs.piwik ];
path = [ pkgs.matomo ];
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;
@ -127,27 +139,32 @@ in {
# 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
if [ -d ${deprecatedDataDir} ]; then
echo "Migrating from ${deprecatedDataDir} to ${dataDir}"
mv -T ${deprecatedDataDir} ${dataDir}
fi
chown -R ${user}:${user} ${dataDir}
chmod -R ug+rwX,o-rwx ${dataDir}
'';
script = ''
# Use User-Private Group scheme to protect piwik data, but allow administration / backup via piwik 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 "${pkgs.piwik}/config" "${dataDir}/"
cp -r "${pkgs.matomo}/config" "${dataDir}/"
chmod -R u+rwX,g+rwX,o-rwx "${dataDir}"
# check whether user setup has already been done
if test -f "${dataDir}/config/config.ini.php"; then
# then execute possibly pending database upgrade
piwik-console core:update --yes
matomo-console core:update --yes
fi
'';
};
systemd.services.${phpExecutionUnit} = {
# stop phpfpm on package upgrade, do database upgrade via piwik_setup_update, and then restart
restartTriggers = [ pkgs.piwik ];
# stop phpfpm on package upgrade, do database upgrade via matomo_setup_update, and then restart
restartTriggers = [ pkgs.matomo ];
# stop config.ini.php from getting written with read permission for others
serviceConfig.UMask = "0007";
};
@ -175,14 +192,14 @@ in {
# References:
# https://fralef.me/piwik-hardening-with-nginx-and-php-fpm.html
# https://github.com/perusio/piwik-nginx
"${user}.${config.networking.hostName}" = mkMerge [ cfg.nginx {
# don't allow to override the root easily, as it will almost certainly break piwik.
"${user}.${fqdn}" = mkMerge [ cfg.nginx {
# don't allow to override the root easily, as it will almost certainly break matomo.
# disadvantage: not shown as default in docs.
root = mkForce "${pkgs.piwik}/share";
root = mkForce "${pkgs.matomo}/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 piwik ones.
# without needing to redefine the matomo ones.
# disadvantage: not shown as default in docs.
locations."/" = {
index = "index.php";
@ -191,6 +208,7 @@ in {
locations."= /index.php".extraConfig = ''
fastcgi_pass unix:${phpSocket};
'';
# TODO: might get renamed to matomo.php in future versions
# allow piwik.php for tracking
locations."= /piwik.php".extraConfig = ''
fastcgi_pass unix:${phpSocket};
@ -212,6 +230,7 @@ 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
locations."= /piwik.js".extraConfig = ''
expires 1M;
@ -221,7 +240,7 @@ in {
};
meta = {
doc = ./piwik-doc.xml;
doc = ./matomo-doc.xml;
maintainers = with stdenv.lib.maintainers; [ florianjacob ];
};
}

2
nixos/modules/services/x11/desktop-managers/enlightenment.nix
View File

@ -33,7 +33,7 @@ in
pkgs.xorg.xauth # used by kdesu
pkgs.gtk2 # To get GTK+'s themes.
pkgs.tango-icon-theme
pkgs.shared_mime_info
pkgs.shared-mime-info
pkgs.gnome2.gnomeicontheme
pkgs.xorg.xcursorthemes
];

18
nixos/modules/services/x11/desktop-managers/gnome3.nix
View File

@ -27,7 +27,7 @@ let
nixos-gsettings-desktop-schemas = pkgs.runCommand "nixos-gsettings-desktop-schemas" {}
''
mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
cp -rf ${pkgs.gnome3.gsettings_desktop_schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
cp -rf ${pkgs.gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
${concatMapStrings (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") cfg.extraGSettingsOverridePackages}
@ -60,7 +60,7 @@ in {
example = literalExample "[ pkgs.gnome3.gpaste ]";
description = "Additional list of packages to be added to the session search path.
Useful for gnome shell extensions or gsettings-conditionated autostart.";
apply = list: list ++ [ pkgs.gnome3.gnome_shell pkgs.gnome3.gnome-shell-extensions ];
apply = list: list ++ [ pkgs.gnome3.gnome-shell pkgs.gnome3.gnome-shell-extensions ];
};
extraGSettingsOverrides = mkOption {
@ -118,7 +118,7 @@ in {
services.packagekit.enable = mkDefault true;
hardware.bluetooth.enable = mkDefault true;
services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center
services.udev.packages = [ pkgs.gnome3.gnome_settings_daemon ];
services.udev.packages = [ pkgs.gnome3.gnome-settings-daemon ];
systemd.packages = [ pkgs.gnome3.vino ];
# If gnome3 is installed, build vim for gtk3 too.
@ -164,7 +164,7 @@ in {
# Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update
${pkgs.gnome3.gnome_session}/bin/gnome-session ${optionalString cfg.debug "--debug"} &
${pkgs.gnome3.gnome-session}/bin/gnome-session ${optionalString cfg.debug "--debug"} &
waitPID=$!
'';
};
@ -172,7 +172,7 @@ in {
services.xserver.updateDbusEnvironment = true;
environment.variables.GIO_EXTRA_MODULES = [ "${lib.getLib pkgs.gnome3.dconf}/lib/gio/modules"
"${pkgs.gnome3.glib_networking.out}/lib/gio/modules"
"${pkgs.gnome3.glib-networking.out}/lib/gio/modules"
"${pkgs.gnome3.gvfs}/lib/gio/modules" ];
environment.systemPackages = pkgs.gnome3.corePackages ++ cfg.sessionPath
++ (removePackagesByName pkgs.gnome3.optionalPackages config.environment.gnome3.excludePackages);
@ -180,10 +180,10 @@ in {
# Use the correct gnome3 packageSet
networking.networkmanager.basePackages =
{ inherit (pkgs) networkmanager modemmanager wpa_supplicant;
inherit (pkgs.gnome3) networkmanager_openvpn networkmanager_vpnc
networkmanager_openconnect networkmanager_fortisslvpn
networkmanager_pptp networkmanager_iodine
networkmanager_l2tp; };
inherit (pkgs.gnome3) networkmanager-openvpn networkmanager-vpnc
networkmanager-openconnect networkmanager-fortisslvpn
networkmanager-pptp networkmanager-iodine
networkmanager-l2tp; };
# Needed for themes and backgrounds
environment.pathsToLink = [ "/share" ];

2
nixos/modules/services/x11/desktop-managers/mate.nix
View File

@ -102,7 +102,7 @@ in
services.dbus.packages = [
pkgs.gnome3.dconf
pkgs.at_spi2_core
pkgs.at-spi2-core
];
services.gnome3.gnome-keyring.enable = true;

2
nixos/modules/services/x11/desktop-managers/plasma5.nix
View File

@ -154,7 +154,7 @@ in
print-manager
breeze-icons
pkgs.hicolor_icon_theme
pkgs.hicolor-icon-theme
kde-gtk-config breeze-gtk

6
nixos/modules/services/x11/desktop-managers/xfce.nix
View File

@ -61,12 +61,12 @@ in
# utilities-terminal, accessories-text-editor
gnome3.defaultIconTheme
hicolor_icon_theme
hicolor-icon-theme
tango-icon-theme
xfce4-icon-theme
desktop_file_utils
shared_mime_info
desktop-file-utils
shared-mime-info
# Needed by Xfce's xinitrc script
# TODO: replace with command -v

10
nixos/modules/services/x11/display-managers/gdm.nix
View File

@ -133,7 +133,7 @@ in
StandardError = "inherit";
};
systemd.services.display-manager.path = [ pkgs.gnome3.gnome_session ];
systemd.services.display-manager.path = [ pkgs.gnome3.gnome-session ];
services.dbus.packages = [ gdm ];
@ -193,7 +193,7 @@ in
auth required pam_env.so envfile=${config.system.build.pamEnvironment}
auth required pam_succeed_if.so uid >= 1000 quiet
auth optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so
auth ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so nullok likeauth
${optionalString config.security.pam.enableEcryptfs
"auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"}
@ -213,7 +213,7 @@ in
"session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"}
session required pam_loginuid.so
session optional ${pkgs.systemd}/lib/security/pam_systemd.so
session optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start
session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start
'';
gdm-password.text = ''
@ -221,7 +221,7 @@ in
auth required pam_env.so envfile=${config.system.build.pamEnvironment}
auth required pam_succeed_if.so uid >= 1000 quiet
auth optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so
auth ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so nullok likeauth
${optionalString config.security.pam.enableEcryptfs
"auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"}
@ -240,7 +240,7 @@ in
"session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"}
session required pam_loginuid.so
session optional ${pkgs.systemd}/lib/security/pam_systemd.so
session optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start
session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start
'';
gdm-autologin.text = ''

4
nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
View File

@ -68,8 +68,8 @@ in
package = mkOption {
type = types.package;
default = pkgs.gnome3.gnome_themes_standard;
defaultText = "pkgs.gnome3.gnome_themes_standard";
default = pkgs.gnome3.gnome-themes-standard;
defaultText = "pkgs.gnome3.gnome-themes-standard";
description = ''
The package path that contains the theme given in the name option.
'';

10
nixos/modules/system/boot/loader/grub/grub.nix
View File

@ -110,7 +110,7 @@ in
device = mkOption {
default = "";
example = "/dev/hda";
example = "/dev/disk/by-id/wwn-0x500001234567890a";
type = types.str;
description = ''
The device on which the GRUB boot loader will be installed.
@ -123,7 +123,7 @@ in
devices = mkOption {
default = [];
example = [ "/dev/hda" ];
example = [ "/dev/disk/by-id/wwn-0x500001234567890a" ];
type = types.listOf types.str;
description = ''
The devices on which the boot loader, GRUB, will be
@ -135,8 +135,8 @@ in
mirroredBoots = mkOption {
default = [ ];
example = [
{ path = "/boot1"; devices = [ "/dev/sda" ]; }
{ path = "/boot2"; devices = [ "/dev/sdb" ]; }
{ path = "/boot1"; devices = [ "/dev/disk/by-id/wwn-0x500001234567890a" ]; }
{ path = "/boot2"; devices = [ "/dev/disk/by-id/wwn-0x500009876543210a" ]; }
];
description = ''
Mirror the boot configuration to multiple partitions and install grub
@ -178,7 +178,7 @@ in
devices = mkOption {
default = [ ];
example = [ "/dev/sda" "/dev/sdb" ];
example = [ "/dev/disk/by-id/wwn-0x500001234567890a" "/dev/disk/by-id/wwn-0x500009876543210a" ];
type = types.listOf types.str;
description = ''
The path to the devices which will have the GRUB MBR written.

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gettext, gtk2, expat, intltool, libgcrypt,
libunique, gnutls, libxml2, curl, mpd_clientlib, dbus_glib, libnotify,
libunique, gnutls, libxml2, curl, mpd_clientlib, dbus-glib, libnotify,
libsoup, avahi, taglib
}:
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
gettext gtk2 expat intltool libgcrypt libunique gnutls
libxml2 curl mpd_clientlib dbus_glib libnotify libsoup avahi taglib
libxml2 curl mpd_clientlib dbus-glib libnotify libsoup avahi taglib
];
meta = {

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

@ -12,11 +12,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
version = "2.8";
version = "2.9.2";
name = "asunder-${version}";
src = fetchurl {
url = "http://littlesvr.ca/asunder/releases/${name}.tar.bz2";
sha256 = "1nq9kd4rd4k2kibf57gdbm0zw2gxa234vvvdhxkm8g5bhx5h3iyq";
sha256 = "0vjbxrrjih4c673sc39wj5whp81xp9kmnwqxwzfnmhkky970rg5r";
};
nativeBuildInputs = [ pkgconfig ];

8
pkgs/applications/audio/audacious/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, gettext, glib, gtk3
, libmowgli, dbus_glib, libxml2, xorg, gnome3, alsaLib
, libmowgli, dbus-glib, libxml2, xorg, gnome3, alsaLib
, libpulseaudio, libjack2, fluidsynth, libmad, libogg, libvorbis
, libcdio082, libcddb, flac, ffmpeg, mpg123, libcue, libmms, libbs2b
, libcdio, libcddb, flac, ffmpeg, mpg123, libcue, libmms, libbs2b
, libsndfile, libmodplug, libsamplerate, soxr, lirc, curl, wavpack
, neon, faad2, lame, libnotify, libsidplayfp
}:
@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
];
buildInputs = [
gettext glib gtk3 libmowgli dbus_glib libxml2
gettext glib gtk3 libmowgli dbus-glib libxml2
xorg.libXcomposite gnome3.defaultIconTheme alsaLib libjack2
libpulseaudio fluidsynth libmad libogg libvorbis libcdio082
libpulseaudio fluidsynth libmad libogg libvorbis libcdio
libcddb flac ffmpeg mpg123 libcue libmms libbs2b libsndfile
libmodplug libsamplerate soxr lirc curl wavpack neon faad2
lame libnotify libsidplayfp

4
pkgs/applications/audio/audacious/qt-5.nix
View File

@ -3,7 +3,7 @@
gettext, pkgconfig,
qtbase,
alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk_pixbuf, lame, libbs2b,
libcddb, libcdio082, libcue, libjack2, libmad, libmms, libmodplug,
libcddb, libcdio, libcue, libjack2, libmad, libmms, libmodplug,
libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp,
libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr,
wavpack
@ -46,7 +46,7 @@ mkDerivation {
# Plugin dependencies
alsaLib curl faad2 ffmpeg flac fluidsynth gdk_pixbuf lame libbs2b libcddb
libcdio082 libcue libjack2 libmad libmms libmodplug libmowgli
libcdio libcue libjack2 libmad libmms libmodplug libmowgli
libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile
libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack
];

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

@ -7,12 +7,12 @@
with stdenv.lib;
stdenv.mkDerivation rec {
version = "2.2.1";
version = "2.2.2";
name = "audacity-${version}";
src = fetchurl {
url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz";
sha256 = "1n05r8b4rnf9fas0py0is8cm97s3h65dgvqkk040aym5d1x6wd7z";
sha256 = "18q7i77ynihx7xp45lz2lv0k0wrh6736pcrivlpwrxjgbvyqx7km";
};
preConfigure = /* we prefer system-wide libs */ ''

6
pkgs/applications/audio/deadbeef/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, intltool, pkgconfig, fetchpatch, jansson
# deadbeef can use either gtk2 or gtk3
, gtk2Support ? false, gtk2 ? null
, gtk3Support ? true, gtk3 ? null, gsettings_desktop_schemas ? null, wrapGAppsHook ? null
, gtk3Support ? true, gtk3 ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null
# input plugins
, vorbisSupport ? true, libvorbis ? null
, mp123Support ? true, libmad ? null
@ -30,7 +30,7 @@
assert gtk2Support || gtk3Support;
assert gtk2Support -> gtk2 != null;
assert gtk3Support -> gtk3 != null && gsettings_desktop_schemas != null && wrapGAppsHook != null;
assert gtk3Support -> gtk3 != null && gsettings-desktop-schemas != null && wrapGAppsHook != null;
assert vorbisSupport -> libvorbis != null;
assert mp123Support -> libmad != null;
assert flacSupport -> flac != null;
@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
buildInputs = with stdenv.lib; [ jansson ]
++ optional gtk2Support gtk2
++ optionals gtk3Support [ gtk3 gsettings_desktop_schemas ]
++ optionals gtk3Support [ gtk3 gsettings-desktop-schemas ]
++ optional vorbisSupport libvorbis
++ optional mp123Support libmad
++ optional flacSupport flac

31
pkgs/applications/audio/deadbeef/plugins/opus.nix Normal file
View File

@ -0,0 +1,31 @@
{ stdenv, fetchFromBitbucket, opusfile, libopus, libogg, openssl, deadbeef }:
stdenv.mkDerivation rec {
name = "deadbeef-opus-plugin-${version}";
version = "0.8";
src = fetchFromBitbucket {
owner = "Lithopsian";
repo = "deadbeef-opus";
rev = "v${version}";
sha256 = "057rgsw4563gs63k05s7zsdc0n4djxwlbyqabf7c88f23z35ryyi";
};
makeFlags = [
"PREFIX=$(out)"
];
NIX_CFLAGS_COMPILE = [
"-I${opusfile}/include/opus"
];
buildInputs = [ deadbeef opusfile libopus libogg openssl ];
meta = with stdenv.lib; {
description = "Ogg Opus decoder plugin for the DeaDBeeF music player";
homepage = https://bitbucket.org/Lithopsian/deadbeef-opus;
license = licenses.gpl2; # There are three files, each licensed under different license: zlib, gpl2Plus and lgpl2
maintainers = [ maintainers.jtojnar ];
platforms = platforms.linux;
};
}

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "drumkv1-${version}";
version = "0.8.5";
version = "0.8.6";
src = fetchurl {
url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
sha256 = "06xqqm1ylmpp2s7xk7xav325gc50kxlvh9vf1343b0n3i8xkgjfg";
sha256 = "0fwxrfyp15a4m77mzz4mwj36mhdrj646whlrkvcys33p2w75f8cq";
};
buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ];

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libid3tag, id3lib, taglib
, libvorbis, libogg, flac, itstool, libxml2, gsettings_desktop_schemas
, libvorbis, libogg, flac, itstool, libxml2, gsettings-desktop-schemas
, makeWrapper, gnome3
}:
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper pkgconfig intltool ];
buildInputs = [
gtk3 glib libid3tag id3lib taglib libvorbis libogg flac
itstool libxml2 gsettings_desktop_schemas gnome3.defaultIconTheme (stdenv.lib.getLib gnome3.dconf)
itstool libxml2 gsettings-desktop-schemas gnome3.defaultIconTheme (stdenv.lib.getLib gnome3.dconf)
];
meta = with stdenv.lib; {

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

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "fluidsynth-${version}";
version = "1.1.8";
version = "1.1.9";
src = fetchFromGitHub {
owner = "FluidSynth";
repo = "fluidsynth";
rev = "v${version}";
sha256 = "12q7hv0zvgylsdj1ipssv5zr7ap2y410dxsd63dz22y05fa2hwwd";
sha256 = "0krvmb1idnf95l2ydzfcb08ayyx3n4m71hf9fgwv3srzaikvpf3q";
};
nativeBuildInputs = [ pkgconfig cmake ];

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus_glib, audacious, gtk2, gsl
{ stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus-glib, audacious, gtk2, gsl
, libaudclient }:
stdenv.mkDerivation {
@ -11,7 +11,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ mpd_clientlib dbus_glib audacious gtk2 gsl libaudclient ];
buildInputs = [ mpd_clientlib dbus-glib audacious gtk2 gsl libaudclient ];
hardeningDisable = [ "format" ];

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, libtool, intltool, pkgconfig, glib
, gtk2, curl, mpd_clientlib, libsoup, gob2, vala, libunique
, libSM, libICE, sqlite, hicolor_icon_theme, wrapGAppsHook
, libSM, libICE, sqlite, hicolor-icon-theme, wrapGAppsHook
}:
stdenv.mkDerivation rec {
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig libtool intltool gob2 vala wrapGAppsHook ];
buildInputs = [
glib gtk2 curl mpd_clientlib libsoup
libunique libmpd libSM libICE sqlite hicolor_icon_theme
libunique libmpd libSM libICE sqlite hicolor-icon-theme
];
meta = with stdenv.lib; {

12
pkgs/applications/audio/gradio/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, pkgconfig
, gcc
, python3
, gsettings_desktop_schemas
, desktop_file_utils
, gsettings-desktop-schemas
, desktop-file-utils
, glib
, gtk3
, intltool
, libsoup
, json_glib
, json-glib
, wrapGAppsHook
, meson
, ninja
@ -44,15 +44,15 @@ in stdenv.mkDerivation rec {
glib
intltool
libsoup
json_glib
json-glib
gtk3
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
wrapGAppsHook
desktop_file_utils
gsettings_desktop_schemas
desktop-file-utils
gsettings-desktop-schemas
] ++ gst_plugins;
enableParallelBuilding = true;

8
pkgs/applications/audio/gtkpod/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, makeWrapper, intltool, libgpod, curl, flac,
gnome, gtk3, glib, gettext, perl, perlXMLParser, flex, libglade, libid3tag,
libvorbis, hicolor_icon_theme, gdk_pixbuf }:
libvorbis, hicolor-icon-theme, gdk_pixbuf }:
stdenv.mkDerivation rec {
version = "2.1.5";
@ -11,13 +11,13 @@ stdenv.mkDerivation rec {
sha256 = "0xisrpx069f7bjkyc8vqxb4k0480jmx1wscqxr6cpq1qj6pchzd5";
};
propagatedUserEnvPkgs = [ gnome.gnome_themes_standard ];
propagatedUserEnvPkgs = [ gnome.gnome-themes-standard ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ makeWrapper intltool curl gettext perl perlXMLParser
flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf libglade gnome.anjuta
gnome.gdl gnome.defaultIconTheme
hicolor_icon_theme ];
hicolor-icon-theme ];
patchPhase = ''
sed -i 's/which/type -P/' scripts/*.sh
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
preFixup = ''
wrapProgram "$out/bin/gtkpod" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome.gnome-themes-standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
'';
enableParallelBuilding = true;

8
pkgs/applications/audio/guitarix/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, gettext, intltool, pkgconfig, python2
, avahi, bluez, boost, eigen, fftw, glib, glib_networking
, glibmm, gsettings_desktop_schemas, gtkmm2, libjack2
, avahi, bluez, boost, eigen, fftw, glib, glib-networking
, glibmm, gsettings-desktop-schemas, gtkmm2, libjack2
, ladspaH, libav, librdf, libsndfile, lilv, lv2, serd, sord, sratom
, wrapGAppsHook, zita-convolver, zita-resampler
, optimizationSupport ? false # Enable support for native CPU extensions
@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 ];
buildInputs = [
avahi bluez boost eigen fftw glib glibmm glib_networking.out
gsettings_desktop_schemas gtkmm2 libjack2 ladspaH libav librdf
avahi bluez boost eigen fftw glib glibmm glib-networking.out
gsettings-desktop-schemas gtkmm2 libjack2 ladspaH libav librdf
libsndfile lilv lv2 serd sord sratom zita-convolver
zita-resampler
];

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

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pythonPackages, wrapGAppsHook
, gst_all_1, glib_networking, gobjectIntrospection
, gst_all_1, glib-networking, gobjectIntrospection
}:
pythonPackages.buildPythonApplication rec {
@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec {
buildInputs = with gst_all_1; [
gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad
glib_networking gobjectIntrospection
glib-networking gobjectIntrospection
];
propagatedBuildInputs = with pythonPackages; [

12
pkgs/applications/audio/pamix/default.nix
View File

@ -1,19 +1,23 @@
{ stdenv, fetchFromGitHub
, autoreconfHook, autoconf-archive, pkgconfig
, pkgconfig, cmake
, libpulseaudio, ncurses }:
stdenv.mkDerivation rec {
name = "pamix-${version}";
version = "1.5";
version = "1.6";
src = fetchFromGitHub {
owner = "patroclos";
repo = "pamix";
rev = version;
sha256 = "1d6b0iv8p73bwq88kdaanm4igvmp9rkq082vyaxpc67mz398yjbp";
sha256 = "1d44ggnwkf2gff62959pj45v3a2k091q8v154wc5pmzamam458wp";
};
nativeBuildInputs = [ autoreconfHook autoconf-archive pkgconfig ];
preConfigure = ''
substituteInPlace CMakeLists.txt --replace "/etc" "$out/etc/xdg"
'';
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ libpulseaudio ncurses ];
meta = with stdenv.lib; {

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

@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, pulseaudioFull, gtkmm2, libglademm
, dbus_glib, GConf, gconfmm, intltool }:
, dbus-glib, GConf, gconfmm, intltool }:
stdenv.mkDerivation rec {
name = "paprefs-0.9.10";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1c5b3sb881szavly220q31g7rvpn94wr7ywlk00hqb9zaikml716";
};
buildInputs = [ pulseaudioFull gtkmm2 libglademm dbus_glib gconfmm ];
buildInputs = [ pulseaudioFull gtkmm2 libglademm dbus-glib gconfmm ];
nativeBuildInputs = [ pkgconfig intltool ];

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

@ -1,4 +1,4 @@
{ stdenv, alsaLib, boost, dbus_glib, fetchsvn, ganv, glibmm
{ stdenv, alsaLib, boost, dbus-glib, fetchsvn, ganv, glibmm
, gtkmm2, libjack2, pkgconfig, python2
}:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
alsaLib boost dbus_glib ganv glibmm gtkmm2 libjack2
alsaLib boost dbus-glib ganv glibmm gtkmm2 libjack2
pkgconfig python2
];

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

@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, intltool, libpulseaudio, gtkmm3
, libcanberra_gtk3, makeWrapper, gnome3 }:
, libcanberra-gtk3, makeWrapper, gnome3 }:
stdenv.mkDerivation rec {
name = "pavucontrol-3.0";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
'';
buildInputs = [ libpulseaudio gtkmm3 libcanberra_gtk3 makeWrapper
buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3 makeWrapper
gnome3.defaultIconTheme ];
nativeBuildInputs = [ pkgconfig intltool ];

4
pkgs/applications/audio/radiotray-ng/default.nix
View File

@ -11,7 +11,7 @@
, dbus
, glibmm
, gnome3
, hicolor_icon_theme
, hicolor-icon-theme
, libappindicator-gtk3
, libnotify
, libxdg_basedir
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
buildInputs = [
curl
boost jsoncpp libbsd pcre
glibmm hicolor_icon_theme gnome3.gsettings_desktop_schemas libappindicator-gtk3 libnotify
glibmm hicolor-icon-theme gnome3.gsettings-desktop-schemas libappindicator-gtk3 libnotify
libxdg_basedir
lsb-release
wxGTK

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

@ -7,7 +7,7 @@
, libsoup
, gnome3
, tdb
, json_glib
, json-glib
, itstool
, wrapGAppsHook
, gst_all_1
@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
intltool
libsoup
tdb
json_glib
json-glib
itstool
gtk3

6
pkgs/applications/audio/sonata/default.nix
View File

@ -19,8 +19,8 @@ in buildPythonApplication rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
intltool wrapGAppsHook
gnome3.gnome_themes_standard gnome3.defaultIconTheme
gnome3.gsettings_desktop_schemas
gnome3.gnome-themes-standard gnome3.defaultIconTheme
gnome3.gsettings-desktop-schemas
];
postPatch = ''
@ -28,7 +28,7 @@ in buildPythonApplication rec {
sed -i '/localmpd/d' sonata/consts.py
'';
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
propagatedBuildInputs = [
gobjectIntrospection gtk3 pygobject3

8
pkgs/applications/audio/sound-juicer/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk3, intltool, itstool, libxml2, brasero
, libcanberra_gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes
, libcanberra-gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes
, makeWrapper }:
let
@ -16,8 +16,8 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk3 intltool itstool libxml2 brasero libcanberra_gtk3
gnome3.gsettings_desktop_schemas libmusicbrainz5 libdiscid isocodes
buildInputs = [ gtk3 intltool itstool libxml2 brasero libcanberra-gtk3
gnome3.gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes
makeWrapper (stdenv.lib.getLib gnome3.dconf)
gst_all_1.gstreamer gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
preFixup = ''
for f in $out/bin/* $out/libexec/*; do
wrapProgram "$f" \
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
--prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"
done

6
pkgs/applications/audio/tomahawk/default.nix
View File

@ -4,12 +4,12 @@
, enableXMPP ? true, libjreen ? null
, enableKDE ? false, kdelibs4 ? null
, enableTelepathy ? false, telepathy_qt ? null
, enableTelepathy ? false, telepathy-qt ? null
}:
assert enableXMPP -> libjreen != null;
assert enableKDE -> kdelibs4 != null;
assert enableTelepathy -> telepathy_qt != null;
assert enableTelepathy -> telepathy-qt != null;
stdenv.mkDerivation rec {
name = "tomahawk-${version}";
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
makeWrapper
] ++ stdenv.lib.optional enableXMPP libjreen
++ stdenv.lib.optional enableKDE kdelibs4
++ stdenv.lib.optional enableTelepathy telepathy_qt;
++ stdenv.lib.optional enableTelepathy telepathy-qt;
postInstall = let
pluginPath = stdenv.lib.concatStringsSep ":" [

8
pkgs/applications/backup/deja-dup/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, vala_0_38, gettext
, gnome3, libnotify, intltool, itstool, glib, gtk3, libxml2
, coreutils, libsecret, pcre, libxkbcommon, wrapGAppsHook
, libpthreadstubs, libXdmcp, epoxy, at_spi2_core, dbus, libgpgerror
, appstream-glib, desktop_file_utils, duplicity
, libpthreadstubs, libXdmcp, epoxy, at-spi2-core, dbus, libgpgerror
, appstream-glib, desktop-file-utils, duplicity
}:
stdenv.mkDerivation rec {
@ -29,13 +29,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
meson ninja pkgconfig vala_0_38 gettext intltool itstool
appstream-glib desktop_file_utils libxml2 wrapGAppsHook
appstream-glib desktop-file-utils libxml2 wrapGAppsHook
];
buildInputs = [
libnotify gnome3.libpeas glib gtk3 libsecret
pcre libxkbcommon libpthreadstubs libXdmcp epoxy gnome3.nautilus
at_spi2_core dbus gnome3.gnome_online_accounts libgpgerror
at-spi2-core dbus gnome3.gnome-online-accounts libgpgerror
];
propagatedUserEnvPkgs = [ duplicity ];

4
pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, lightdm, pkgconfig, intltool
, hicolor_icon_theme, makeWrapper
, hicolor-icon-theme, makeWrapper
, useGTK2 ? false, gtk2, gtk3 # gtk3 seems better supported
, exo
}:
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \
--replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter"
wrapProgram "$out/sbin/lightdm-gtk-greeter" \
--prefix XDG_DATA_DIRS ":" "${hicolor_icon_theme}/share"
--prefix XDG_DATA_DIRS ":" "${hicolor-icon-theme}/share"
'';
meta = with stdenv.lib; {

4
pkgs/applications/editors/atom/env.nix
View File

@ -1,11 +1,11 @@
{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig
, libgnome_keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr
, libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr
, gconf, nss, xorg, libcap, systemd, libnotify, libsecret
}:
let
packages = [
stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3
stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr

4
pkgs/applications/editors/eclipse/build-eclipse.nix
View File

@ -1,5 +1,5 @@
{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender
, zlib, jdk, glib, gtk2, libXtst, gsettings_desktop_schemas, webkitgtk24x-gtk2
, zlib, jdk, glib, gtk2, libXtst, gsettings-desktop-schemas, webkitgtk24x-gtk2
, makeWrapper, ... }:
{ name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }:
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
fontconfig freetype glib gsettings_desktop_schemas gtk2 jdk libX11
fontconfig freetype glib gsettings-desktop-schemas gtk2 jdk libX11
libXrender libXtst makeWrapper zlib
] ++ stdenv.lib.optional (webkitgtk24x-gtk2 != null) webkitgtk24x-gtk2;

4
pkgs/applications/editors/eclipse/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, makeDesktopItem, makeWrapper
, freetype, fontconfig, libX11, libXext, libXrender, zlib
, glib, gtk2, libXtst, jdk, gsettings_desktop_schemas
, glib, gtk2, libXtst, jdk, gsettings-desktop-schemas
, webkitgtk24x-gtk2 ? null # for internal web browser
, buildEnv, writeText, runCommand
, callPackage
@ -15,7 +15,7 @@ rec {
buildEclipse = import ./build-eclipse.nix {
inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib
jdk glib gtk2 libXtst gsettings_desktop_schemas webkitgtk24x-gtk2
jdk glib gtk2 libXtst gsettings-desktop-schemas webkitgtk24x-gtk2
makeWrapper;
};

8
pkgs/applications/editors/emacs/default.nix
View File

@ -4,8 +4,8 @@
, alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO
, withX ? !stdenv.isDarwin
, withGTK2 ? false, gtk2 ? null
, withGTK3 ? true, gtk3 ? null, gsettings_desktop_schemas ? null
, withXwidgets ? false, webkitgtk24x-gtk3 ? null, wrapGAppsHook ? null, glib_networking ? null
, withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null
, withXwidgets ? false, webkitgtk24x-gtk3 ? null, wrapGAppsHook ? null, glib-networking ? null
, withCsrc ? true
, srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null
}:
@ -61,9 +61,9 @@ stdenv.mkDerivation rec {
[ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft
imagemagick gconf ]
++ lib.optional (withX && withGTK2) gtk2
++ lib.optionals (withX && withGTK3) [ gtk3 gsettings_desktop_schemas ]
++ lib.optionals (withX && withGTK3) [ gtk3 gsettings-desktop-schemas ]
++ lib.optional (stdenv.isDarwin && withX) cairo
++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib_networking ];
++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib-networking ];
propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ];

4
pkgs/applications/editors/geany/default.nix
View File

@ -3,7 +3,7 @@
with stdenv.lib;
let
version = "1.32";
version = "1.33";
in
stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://download.geany.org/${name}.tar.bz2";
sha256 = "8b7be10b95d0614eb07f845ba2280f7c026eacd5739d8fac4d5d26606f8c3c2d";
sha256 = "66baaff43f12caebcf0efec9a5533044dc52837f799c73a1fd7312caa86099c2";
};
NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;

4
pkgs/applications/editors/jucipp/default.nix
View File

@ -1,4 +1,4 @@
{ config, stdenv, fetchgit, makeWrapper, gnome3, at_spi2_core, libcxx,
{ config, stdenv, fetchgit, makeWrapper, gnome3, at-spi2-core, libcxx,
boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre,
libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts,
coreutils, glibc, dbus_libs, openssl, libxml2, gnumake, ctags }:
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
openssl
libxml2
gnome3.gtksourceview
at_spi2_core
at-spi2-core
pcre
epoxy
boost

4
pkgs/applications/editors/kdevelop5/kdevelop.nix
View File

@ -3,7 +3,7 @@
, kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews
, kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor
, threadweaver, kxmlgui, kwindowsystem, grantlee, kcrash, karchive, kguiaddons
, plasma-framework, krunner, kdevplatform, kdevelop-pg-qt, shared_mime_info
, plasma-framework, krunner, kdevplatform, kdevelop-pg-qt, shared-mime-info
, libksysguard, konsole, llvmPackages, makeWrapper
}:
@ -34,7 +34,7 @@ mkDerivation rec {
kconfig kdeclarative kdoctools kiconthemes ki18n kitemmodels kitemviews
kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor
threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner
kdevplatform shared_mime_info libksysguard konsole kcrash karchive kguiaddons
kdevplatform shared-mime-info libksysguard konsole kcrash karchive kguiaddons
];
postInstall = ''

4
pkgs/applications/editors/lighttable/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, zlib, glib, alsaLib, makeDesktopItem
, dbus, gtk2, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf
, dbus, gtk2, atk, pango, freetype, fontconfig, libgnome-keyring3, gdk_pixbuf
, cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, systemd, libnotify
}:
let
libPath = stdenv.lib.makeLibraryPath [
stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3 nss
stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 nss
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
xorg.libXcomposite xorg.libXi xorg.libXfixes libnotify xorg.libXrandr

4
pkgs/applications/editors/monodevelop/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchgit, fetchNuGet
, autoconf, automake, pkgconfig, shared_mime_info, intltool
, autoconf, automake, pkgconfig, shared-mime-info, intltool
, glib, mono, gtk-sharp-2_0, gnome2, gnome-sharp, unzip
, dotnetPackages
}:
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
autoconf automake shared_mime_info intltool
autoconf automake shared-mime-info intltool
mono gtk-sharp-2_0 gnome-sharp unzip
dotnetPackages.NUnit
dotnetPackages.NUnitRunners

8
pkgs/applications/graphics/darktable/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, libsoup, graphicsmagick, json_glib, wrapGAppsHook
, cairo, cmake, ninja, curl, perl, llvm, desktop_file_utils, exiv2, glib
{ stdenv, fetchurl, libsoup, graphicsmagick, json-glib, wrapGAppsHook
, cairo, cmake, ninja, curl, perl, llvm, desktop-file-utils, exiv2, glib
, ilmbase, gtk3, intltool, lcms2, lensfun, libX11, libexif, libgphoto2, libjpeg
, libpng, librsvg, libtiff, openexr, osm-gps-map, pkgconfig, sqlite, libxslt
, openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome3
@ -14,12 +14,12 @@ stdenv.mkDerivation rec {
sha256 = "014pq80i5k1kdvvrl7xrgaaq3i4fzv09h7a3pwzlp2ahkczwcm32";
};
nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop_file_utils wrapGAppsHook ];
nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ];
buildInputs = [
cairo curl exiv2 glib gtk3 ilmbase lcms2 lensfun libX11 libexif
libgphoto2 libjpeg libpng librsvg libtiff openexr sqlite libxslt
libsoup graphicsmagick json_glib openjpeg lua pugixml
libsoup graphicsmagick json-glib openjpeg lua pugixml
colord colord-gtk libwebp libsecret gnome3.adwaita-icon-theme
osm-gps-map
];

4
pkgs/applications/graphics/feh/default.nix
View File

@ -6,11 +6,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "feh-${version}";
version = "2.23";
version = "2.23.2";
src = fetchurl {
url = "https://feh.finalrewind.org/${name}.tar.bz2";
sha256 = "18922zv8ckm82r1ap1yn7plbk6djpj02za2ahng58sjj2fw3rpqn";
sha256 = "1hw9xhhmm404ircmd7aw9n51n23wzjxzmav272ldk1pxb2jk3hcn";
};
outputs = [ "out" "man" "doc" ];

4
pkgs/applications/graphics/gcolor3/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, gnome3, libtool, intltool, pkgconfig, gtk3, hicolor_icon_theme, wrapGAppsHook } :
{ stdenv, fetchFromGitHub, gnome3, libtool, intltool, pkgconfig, gtk3, hicolor-icon-theme, wrapGAppsHook } :
let
version = "2.2";
@ -12,7 +12,7 @@ in stdenv.mkDerivation {
sha256 = "1rbahsi33pfggpj5cigy6wy5333g3rpm8v2q0b35c6m7pwhmf2gr";
};
nativeBuildInputs = [ gnome3.gnome_common libtool intltool pkgconfig hicolor_icon_theme wrapGAppsHook ];
nativeBuildInputs = [ gnome3.gnome-common libtool intltool pkgconfig hicolor-icon-theme wrapGAppsHook ];
buildInputs = [ gtk3 ];

21
pkgs/applications/graphics/geeqie/default.nix
View File

@ -1,23 +1,24 @@
{ stdenv, fetchurl, pkgconfig, autoconf, automake, gtk2, libpng, exiv2
, lcms, intltool, gettext, fbida
{ stdenv, fetchurl, pkgconfig, autoconf, automake, gettext, intltool
, gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida
}:
stdenv.mkDerivation rec {
name = "geeqie-${version}";
version = "1.3";
version = "1.4";
src = fetchurl {
url = "http://geeqie.org/${name}.tar.xz";
sha256 = "0gzc82sy66pbsmq7lnmq4y37zqad1zfwfls3ik3dmfm8s5nmcvsb";
sha256 = "0ciygvcxb78pqg59r6p061mkbpvkgv2rv3r79j3kgv3kalb3ln2w";
};
# Do not build the changelog as this requires markdown.
patches = [ ./geeqie-no-changelog.patch ];
preConfigure = "./autogen.sh";
configureFlags = [ "--enable-gps" ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig autoconf automake gettext intltool ];
buildInputs = [
autoconf automake gtk2 libpng exiv2 lcms intltool gettext
gtk3 lcms2 exiv2 libchamplain clutter-gtk ffmpegthumbnailer fbida
];
postInstall = ''
@ -27,6 +28,8 @@ stdenv.mkDerivation rec {
-e '1 a export PATH=${stdenv.lib.makeBinPath [ exiv2 fbida ]}:$PATH'
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Lightweight GTK+ based image viewer";
@ -45,7 +48,7 @@ stdenv.mkDerivation rec {
homepage = http://geeqie.sourceforge.net;
maintainers = with maintainers; [ pSub ];
maintainers = with maintainers; [ jfrankenau pSub ];
platforms = platforms.gnu;
};
}

14
pkgs/applications/graphics/geeqie/geeqie-no-changelog.patch Normal file
View File

@ -0,0 +1,14 @@
--- geeqie-1.4.orig/Makefile.am 2017-12-31 07:31:21.000000000 -0500
+++ geeqie-1.4/Makefile.am 2018-01-01 15:05:58.742068166 -0500
@@ -10,9 +10,9 @@
readmedir = @readmedir@
if HAVE_MARKDOWN
-readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS README.html ChangeLog.html
+readme_DATA = README.md COPYING TODO README.lirc AUTHORS README.html
else
-readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS ChangeLog.html
+readme_DATA = README.md COPYING TODO README.lirc AUTHORS
endif
desktopdir = $(datadir)/applications

4
pkgs/applications/graphics/giv/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, gdk_pixbuf, scons, pkgconfig, gtk2, glib,
pcre, cfitsio, perl, gob2, vala, libtiff, json_glib }:
pcre, cfitsio, perl, gob2, vala, libtiff, json-glib }:
stdenv.mkDerivation rec {
name = "giv-${version}";
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
installPhase = "scons install";
nativeBuildInputs = [ scons pkgconfig vala perl gob2 ];
buildInputs = [ gdk_pixbuf gtk2 glib pcre cfitsio libtiff json_glib ];
buildInputs = [ gdk_pixbuf gtk2 glib pcre cfitsio libtiff json-glib ];
meta = with stdenv.lib; {
description = "Cross platform image and hierarchical vector viewer based";

6
pkgs/applications/graphics/glabels/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, barcode, gnome3, autoreconfHook
, gtk3, gtk_doc, libxml2, librsvg , libtool, libe-book
, gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book
, intltool, itstool, makeWrapper, pkgconfig, which
}:
@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper intltool ];
buildInputs = [
barcode gtk3 gtk_doc gnome3.yelp_tools
gnome3.gnome_common gnome3.gsettings_desktop_schemas
barcode gtk3 gtk-doc gnome3.yelp-tools
gnome3.gnome-common gnome3.gsettings-desktop-schemas
itstool libxml2 librsvg libe-book libtool
];

12
pkgs/applications/graphics/gthumb/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, gnome3, itstool, libxml2, pkgconfig, intltool,
exiv2, libjpeg, libtiff, gstreamer, libraw, libsoup, libsecret,
libchamplain, librsvg, libwebp, json_glib, webkit, lcms2, bison,
flex, hicolor_icon_theme, wrapGAppsHook }:
libchamplain, librsvg, libwebp, json-glib, webkit, lcms2, bison,
flex, hicolor-icon-theme, wrapGAppsHook, shared-mime-info }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@ -17,12 +17,16 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = with gnome3;
[ itstool libxml2 intltool glib gtk gsettings_desktop_schemas dconf
[ itstool libxml2 intltool glib gtk gsettings-desktop-schemas dconf
exiv2 libjpeg libtiff gstreamer libraw libsoup libsecret libchamplain
librsvg libwebp json_glib webkit lcms2 bison flex hicolor_icon_theme defaultIconTheme ];
librsvg libwebp json-glib webkit lcms2 bison flex hicolor-icon-theme defaultIconTheme ];
enableParallelBuilding = true;
preFixup = ''
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share")
'';
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/gthumb;
description = "Image browser and viewer for GNOME";

4
pkgs/applications/graphics/nomacs/default.nix
View File

@ -4,7 +4,7 @@
, makeWrapper
, pkgconfig
, wrapGAppsHook
, gsettings_desktop_schemas
, gsettings-desktop-schemas
, qtbase
, qttools
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
libraw
libtiff
quazip
gsettings_desktop_schemas];
gsettings-desktop-schemas];
cmakeFlags = ["-DENABLE_OPENCV=ON"
"-DENABLE_RAW=ON"

4
pkgs/applications/graphics/rawtherapee/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm3, libXau
, libXdmcp, lcms2, libiptcdata, libcanberra_gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook
, libXdmcp, lcms2, libiptcdata, libcanberra-gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook
, lensfun
}:
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [
pixman libpthreadstubs gtkmm3 libXau libXdmcp
lcms2 libiptcdata libcanberra_gtk3 fftw expat pcre libsigcxx lensfun
lcms2 libiptcdata libcanberra-gtk3 fftw expat pcre libsigcxx lensfun
];
cmakeFlags = [

10
pkgs/applications/graphics/shotwell/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl, stdenv, meson, ninja, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite
, webkitgtk, pkgconfig, gnome3, gst_all_1, libgudev, libraw, glib, json_glib
, gettext, desktop_file_utils, gdk_pixbuf, librsvg, wrapGAppsHook
, webkitgtk, pkgconfig, gnome3, gst_all_1, libgudev, libraw, glib, json-glib
, gettext, desktop-file-utils, gdk_pixbuf, librsvg, wrapGAppsHook
, itstool, libgdata }:
# for dependencies see https://wiki.gnome.org/Apps/Shotwell/BuildingAndInstalling
@ -17,14 +17,14 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
meson ninja pkgconfig itstool gettext desktop_file_utils wrapGAppsHook
meson ninja pkgconfig itstool gettext desktop-file-utils wrapGAppsHook
];
buildInputs = [
gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkitgtk
gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee
libgudev gnome3.gexiv2 gnome3.gsettings_desktop_schemas
libraw json_glib glib gdk_pixbuf librsvg gnome3.rest
libgudev gnome3.gexiv2 gnome3.gsettings-desktop-schemas
libraw json-glib glib gdk_pixbuf librsvg gnome3.rest
gnome3.gcr gnome3.defaultIconTheme libgdata
];

4
pkgs/applications/graphics/viewnior/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk2, libpng, exiv2, lcms
, intltool, gettext, shared_mime_info, glib, gdk_pixbuf, perl}:
, intltool, gettext, shared-mime-info, glib, gdk_pixbuf, perl}:
stdenv.mkDerivation rec {
name = "viewnior-${version}";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ];
buildInputs =
[ pkgconfig gtk2 libpng exiv2 lcms intltool gettext
shared_mime_info glib gdk_pixbuf perl
shared-mime-info glib gdk_pixbuf perl
];
preFixup = ''

4
pkgs/applications/graphics/vimiv/default.nix
View File

@ -1,5 +1,5 @@
{ lib, python3Packages, fetchFromGitHub, imagemagick, librsvg, gtk3, jhead
, hicolor_icon_theme, defaultIconTheme
, hicolor-icon-theme, defaultIconTheme
# Test requirements
, dbus, xvfb_run, xdotool
@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec {
'';
checkInputs = [ python3Packages.nose dbus.daemon xvfb_run xdotool ];
buildInputs = [ hicolor_icon_theme defaultIconTheme librsvg ];
buildInputs = [ hicolor-icon-theme defaultIconTheme librsvg ];
propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ];
makeWrapperArgs = [

4
pkgs/applications/kde/akonadi-mime.nix
View File

@ -1,6 +1,6 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, shared_mime_info,
extra-cmake-modules, shared-mime-info,
akonadi, kdbusaddons, ki18n, kio, kitemmodels, kmime
}:
@ -10,7 +10,7 @@ mkDerivation {
license = with lib.licenses; [ gpl2 lgpl21 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules shared_mime_info ];
nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
buildInputs = [ akonadi kdbusaddons ki18n kio kitemmodels kmime ];
outputs = [ "out" "dev" ];
}

4
pkgs/applications/kde/akonadi/default.nix
View File

@ -1,6 +1,6 @@
{
mkDerivation, copyPathsToStore, lib, kdepimTeam,
extra-cmake-modules, shared_mime_info,
extra-cmake-modules, shared-mime-info,
boost, kcompletion, kconfigwidgets, kcrash, kdbusaddons, kdesignerplugin,
ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools,
}:
@ -12,7 +12,7 @@ mkDerivation {
maintainers = kdepimTeam;
};
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
nativeBuildInputs = [ extra-cmake-modules shared_mime_info ];
nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
buildInputs = [
kcompletion kconfigwidgets kcrash kdbusaddons kdesignerplugin ki18n
kiconthemes kio kwindowsystem qttools

4
pkgs/applications/kde/k3b.nix
View File

@ -1,5 +1,5 @@
{ mkDerivation, lib
, extra-cmake-modules, kdoctools, makeWrapper, shared_mime_info
, extra-cmake-modules, kdoctools, makeWrapper, shared-mime-info
, qtwebkit
, libkcddb, karchive, kcmutils, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui
, flac, lame, libmad, libmpcdec, libvorbis
@ -28,7 +28,7 @@ mkDerivation {
# cd/dvd
cdparanoia libdvdcss libdvdread
# others
ffmpeg libmusicbrainz3 shared_mime_info
ffmpeg libmusicbrainz3 shared-mime-info
];
propagatedUserEnvPkgs = [ (lib.getBin kinit) ];
postFixup =

4
pkgs/applications/kde/kdenlive.nix
View File

@ -21,7 +21,7 @@
, kplotting
, ktextwidgets
, mlt
, shared_mime_info
, shared-mime-info
, libv4l
, kfilemetadata
, ffmpeg
@ -62,7 +62,7 @@ mkDerivation {
qtquickcontrols
qtscript
qtwebkit
shared_mime_info
shared-mime-info
libv4l
ffmpeg
];

4
pkgs/applications/kde/kdepim-runtime.nix
View File

@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
shared_mime_info,
shared-mime-info,
akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes,
kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement,
kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig,
@ -14,7 +14,7 @@ mkDerivation {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ];
nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ];
buildInputs = [
akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes
kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap

4
pkgs/applications/kde/kio-extras.nix
View File

@ -1,5 +1,5 @@
{
mkDerivation, lib, extra-cmake-modules, kdoctools, shared_mime_info,
mkDerivation, lib, extra-cmake-modules, kdoctools, shared-mime-info,
exiv2, kactivities, karchive, kbookmarks, kconfig, kconfigwidgets,
kcoreaddons, kdbusaddons, kguiaddons, kdnssd, kiconthemes, ki18n, kio, khtml,
kdelibs4support, kpty, libmtp, libssh, openexr, ilmbase, openslp, phonon,
@ -12,7 +12,7 @@ mkDerivation {
license = with lib.licenses; [ gpl2 lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ];
nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ];
buildInputs = [
exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons
kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support

4
pkgs/applications/kde/kmail-account-wizard.nix
View File

@ -1,6 +1,6 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools, shared_mime_info,
extra-cmake-modules, kdoctools, shared-mime-info,
akonadi, kcmutils, kcrash, kdbusaddons, kidentitymanagement, kldap,
kmailtransport, knewstuff, knotifications, knotifyconfig, kparts, kross, ktexteditor,
kwallet, libkdepim, libkleo, pimcommon, qttools,
@ -12,7 +12,7 @@ mkDerivation {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ];
nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ];
buildInputs = [
akonadi kcmutils kcrash kdbusaddons kidentitymanagement kldap kmailtransport
knewstuff knotifications knotifyconfig kparts kross ktexteditor kwallet libkdepim

4
pkgs/applications/kde/marble.nix
View File

@ -1,7 +1,7 @@
{ mkDerivation, lib
, extra-cmake-modules, kdoctools
, qtscript, qtsvg, qtquickcontrols, qtwebkit
, krunner, shared_mime_info, kparts, knewstuff
, krunner, shared-mime-info, kparts, knewstuff
, gpsd, perl
}:
@ -10,7 +10,7 @@ mkDerivation {
meta.license = with lib.licenses; [ lgpl21 gpl3 ];
nativeBuildInputs = [ extra-cmake-modules kdoctools perl ];
propagatedBuildInputs = [
qtscript qtsvg qtquickcontrols qtwebkit shared_mime_info krunner kparts
qtscript qtsvg qtquickcontrols qtwebkit shared-mime-info krunner kparts
knewstuff gpsd
];
}

4
pkgs/applications/kde/okteta.nix
View File

@ -3,7 +3,7 @@
extra-cmake-modules, kdoctools,
qtscript, kconfig, kinit, karchive, kcrash,
kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5,
shared_mime_info
shared-mime-info
}:
mkDerivation {
@ -13,7 +13,7 @@ mkDerivation {
maintainers = with lib.maintainers; [ peterhoeg ];
};
nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ];
buildInputs = [ shared_mime_info ];
buildInputs = [ shared-mime-info ];
propagatedBuildInputs = [
kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5
karchive kcrash

4
pkgs/applications/misc/artha/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, dbus_glib, gtk2, pkgconfig, wordnet }:
{ stdenv, fetchurl, dbus-glib, gtk2, pkgconfig, wordnet }:
stdenv.mkDerivation rec {
name = "artha-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ dbus_glib gtk2 wordnet ];
buildInputs = [ dbus-glib gtk2 wordnet ];
meta = with stdenv.lib; {
description = "An offline thesaurus based on WordNet";

4
pkgs/applications/misc/clipit/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, intltool, pkgconfig, gtk2, xdotool, hicolor_icon_theme }:
{ fetchurl, stdenv, intltool, pkgconfig, gtk2, xdotool, hicolor-icon-theme }:
stdenv.mkDerivation rec {
name = "clipit-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool gtk2 xdotool hicolor_icon_theme ];
buildInputs = [ intltool gtk2 xdotool hicolor-icon-theme ];
meta = with stdenv.lib; {
description = "Lightweight GTK+ Clipboard Manager";

6
pkgs/applications/misc/cura/default.nix
View File

@ -2,13 +2,13 @@
mkDerivation rec {
name = "cura-${version}";
version = "3.1.0";
version = "3.2.1";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "Cura";
rev = version;
sha256 = "1x732bzxdxnz1av8jlv5kzs08jpmsg6bz9i88jr63kw32d901xsm";
sha256 = "0yaya0ww92qjm7g31q85m5f95nwdapldjx1kdf1ar4yzwh4r15rp";
};
buildInputs = [ qtbase qtquickcontrols ];
@ -28,7 +28,7 @@ mkDerivation rec {
meta = with lib; {
description = "3D printer / slicing GUI built on top of the Uranium framework";
homepage = "https://github.com/Ultimaker/Cura";
homepage = https://github.com/Ultimaker/Cura;
license = licenses.agpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ];

6
pkgs/applications/misc/curaengine/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "curaengine-${version}";
version = "3.0.3";
version = "3.2.1";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "CuraEngine";
rev = version;
sha256 = "0x1ss3hppw6062rmmxh0dpnm5cg6r2mp01k0nxyw5riiljj59ydy";
sha256 = "1yqpp6qhixzni3ik11vbk5kcdrhlz2j4ylzmh8f6c86r4d73a0cp";
};
nativeBuildInputs = [ cmake ];
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction";
homepage = "https://github.com/Ultimaker/CuraEngine";
homepage = https://github.com/Ultimaker/CuraEngine;
license = licenses.agpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ];

4
pkgs/applications/misc/deepin-terminal/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, json_glib, gobjectIntrospection }:
{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, json-glib, gobjectIntrospection }:
stdenv.mkDerivation rec {
name = "deepin-terminal-${version}";
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
# For setup hook
gobjectIntrospection
];
buildInputs = [ gtk3 vte libgee wnck librsvg libsecret json_glib ];
buildInputs = [ gtk3 vte libgee wnck librsvg libsecret json-glib ];
meta = with stdenv.lib; {
description = "The default terminal emulation for Deepin";

4
pkgs/applications/misc/devilspie2/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "devilspie2-${version}";
version = "0.42";
version = "0.43";
src = fetchurl {
url = "http://download.savannah.gnu.org/releases/devilspie2/devilspie2_${version}-src.tar.gz";
sha256 = "119zb9x5i3y4cp30h4113psqxb5d7zxiyijpq02g8kds1wqvrx8i";
sha256 = "0a7qjl2qd4099kkkbwa1y2fk48s21jlr409lf9mij7mlc9yc3zzc";
};
nativeBuildInputs = [ intltool pkgconfig ];

8
pkgs/applications/misc/finalterm/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper
, pkgconfig, cmake, libxml2, vala_0_26, intltool, libmx, gnome3, gtk3, gtk_doc
, keybinder3, clutter_gtk, libnotify
, pkgconfig, cmake, libxml2, vala_0_26, intltool, libmx, gnome3, gtk3, gtk-doc
, keybinder3, clutter-gtk, libnotify
, libxkbcommon, xorg, udev
, bashInteractive
}:
@ -19,8 +19,8 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig cmake intltool makeWrapper ];
buildInputs = [
vala_0_26 gtk3 gnome3.gnome_common gnome3.libgee
gtk_doc clutter_gtk libmx keybinder3 libxml2 libnotify
vala_0_26 gtk3 gnome3.gnome-common gnome3.libgee
gtk-doc clutter-gtk libmx keybinder3 libxml2 libnotify
xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence
libxkbcommon
] ++ optionals stdenv.isLinux [ udev ];

6
pkgs/applications/misc/font-manager/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, automake, autoconf, libtool,
pkgconfig, file, intltool, libxml2, json_glib , sqlite, itstool,
pkgconfig, file, intltool, libxml2, json-glib , sqlite, itstool,
librsvg, vala_0_34, gnome3, wrapGAppsHook, gobjectIntrospection
}:
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
file
intltool
vala_0_34
gnome3.yelp_tools
gnome3.yelp-tools
wrapGAppsHook
# For setup hook
gobjectIntrospection
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libxml2
json_glib
json-glib
sqlite
itstool
librsvg

6
pkgs/applications/misc/gksu/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk2, gnome3, libgksu,
intltool, libstartup_notification, gtk_doc, wrapGAppsHook
intltool, libstartup_notification, gtk-doc, wrapGAppsHook
}:
stdenv.mkDerivation rec {
@ -13,11 +13,11 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
pkgconfig intltool gtk_doc wrapGAppsHook
pkgconfig intltool gtk-doc wrapGAppsHook
];
buildInputs = [
gtk2 gnome3.gconf libstartup_notification gnome3.libgnome_keyring
gtk2 gnome3.gconf libstartup_notification gnome3.libgnome-keyring
];
propagatedBuildInputs = [

4
pkgs/applications/misc/gmtp/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, libmtp, libid3tag, flac, libvorbis, gtk3
, gsettings_desktop_schemas, wrapGAppsHook
, gsettings-desktop-schemas, wrapGAppsHook
}:
let version = "1.3.10"; in
@ -13,7 +13,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = [ libmtp libid3tag flac libvorbis gtk3 gsettings_desktop_schemas ];
buildInputs = [ libmtp libid3tag flac libvorbis gtk3 gsettings-desktop-schemas ];
enableParallelBuilding = true;

6
pkgs/applications/misc/gpx-viewer/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, intltool, pkgconfig, gnome3, shared_mime_info, desktop_file_utils, wrapGAppsHook }:
{ stdenv, fetchurl, intltool, pkgconfig, gnome3, shared-mime-info, desktop-file-utils, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "gpx-viewer-${version}";
@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
intltool pkgconfig
shared_mime_info # For update-mime-database
desktop_file_utils # For update-desktop-database
shared-mime-info # For update-mime-database
desktop-file-utils # For update-desktop-database
wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system
];
buildInputs = with gnome3; [ gdl libchamplain defaultIconTheme ];

2
pkgs/applications/misc/gramps/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool,
pango, gsettings_desktop_schemas,
pango, gsettings-desktop-schemas,
# Optional packages:
enableOSM ? true, osm-gps-map
}:

2
pkgs/applications/misc/guake/default.nix
View File

@ -17,7 +17,7 @@ with lib;
let
inherit (python2Packages) python;
inputs = [ dbus gtk2 gconf python libutempter vte keybinder gnome3.gnome_common ];
inputs = [ dbus gtk2 gconf python libutempter vte keybinder gnome3.gnome-common ];
pyPath = makeSearchPathOutput "lib" python.sitePackages (attrVals [ "dbus-python" "notify" "pyGtkGlade" "pyxdg" ] python2Packages ++ [ gnome2.gnome_python ]);
in stdenv.mkDerivation rec {
name = "guake-${version}";

8
pkgs/applications/misc/hamster-time-tracker/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchzip, pythonPackages, docbook2x, libxslt, gnome_doc_utils
, intltool, dbus_glib, gnome_python, dbus
, hicolor_icon_theme
{ stdenv, fetchzip, pythonPackages, docbook2x, libxslt, gnome-doc-utils
, intltool, dbus-glib, gnome_python, dbus
, hicolor-icon-theme
}:
# TODO: Add optional dependency 'wnck', for "workspace tracking" support. Fixes
@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec {
};
buildInputs = [
docbook2x libxslt gnome_doc_utils intltool dbus_glib hicolor_icon_theme
docbook2x libxslt gnome-doc-utils intltool dbus-glib hicolor-icon-theme
];
propagatedBuildInputs = with pythonPackages; [ pygobject2 pygtk pyxdg gnome_python dbus-python ];

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