diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index 7b9cfbd4df6a..c0e7a00d7578 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -155,6 +155,14 @@
You should now use the different build tools coming with the languages with sandbox mode disabled.
+
+
+ There is now only one Xfce package-set and module. This means attributes, xfce4-14
+ xfce4-12, and xfceUnstable all now point to the latest Xfce 4.14
+ packages. And in future NixOS releases will be the latest released version of Xfce available at the
+ time during the releases development (if viable).
+
+
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index a4db2c9d1d87..f8b188e7b1c6 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -11,6 +11,9 @@
{ lib, ... }:
+let
+ inherit (lib) types;
+in
{
options = {
@@ -19,6 +22,7 @@
description = ''
The user IDs used in NixOS.
'';
+ type = types.attrsOf types.int;
};
ids.gids = lib.mkOption {
@@ -26,6 +30,7 @@
description = ''
The group IDs used in NixOS.
'';
+ type = types.attrsOf types.int;
};
};
diff --git a/nixos/modules/services/desktops/tumbler.nix b/nixos/modules/services/desktops/tumbler.nix
index d18088d4634b..a833e99ff8c6 100644
--- a/nixos/modules/services/desktops/tumbler.nix
+++ b/nixos/modules/services/desktops/tumbler.nix
@@ -7,12 +7,17 @@ with lib;
let
cfg = config.services.tumbler;
- tumbler = cfg.package;
in
{
+ imports = [
+ (mkRemovedOptionModule
+ [ "services" "tumbler" "package" ]
+ "")
+ ];
+
###### interface
options = {
@@ -21,13 +26,6 @@ in
enable = mkEnableOption "Tumbler, A D-Bus thumbnailer service";
- package = mkOption {
- type = types.package;
- default = pkgs.xfce4-14.tumbler;
- description = "Which tumbler package to use";
- example = pkgs.xfce4-12.tumbler;
- };
-
};
};
@@ -37,11 +35,11 @@ in
config = mkIf cfg.enable {
- environment.systemPackages = [
+ environment.systemPackages = with pkgs.xfce; [
tumbler
];
- services.dbus.packages = [
+ services.dbus.packages = with pkgs.xfce; [
tumbler
];
diff --git a/nixos/modules/services/hardware/fwupd.nix b/nixos/modules/services/hardware/fwupd.nix
index 6c341bcbf240..51877970a8bc 100644
--- a/nixos/modules/services/hardware/fwupd.nix
+++ b/nixos/modules/services/hardware/fwupd.nix
@@ -74,7 +74,7 @@ in {
default = false;
description = ''
Whether to enable test remote. This is used by
- installed tests.
+ installed tests.
'';
};
@@ -115,10 +115,6 @@ in {
services.udev.packages = [ cfg.package ];
systemd.packages = [ cfg.package ];
-
- systemd.tmpfiles.rules = [
- "d /var/lib/fwupd 0755 root root -"
- ];
};
meta = {
diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix
index 4f8af7978286..adc1881a525d 100644
--- a/nixos/modules/services/hardware/tlp.nix
+++ b/nixos/modules/services/hardware/tlp.nix
@@ -37,7 +37,7 @@ in
enable = mkOption {
type = types.bool;
default = false;
- description = "Whether to enable the TLP daemon.";
+ description = "Whether to enable the TLP power management daemon.";
};
extraConfig = mkOption {
diff --git a/nixos/modules/services/mail/mailcatcher.nix b/nixos/modules/services/mail/mailcatcher.nix
index f5b4508b335c..84f06ed199dc 100644
--- a/nixos/modules/services/mail/mailcatcher.nix
+++ b/nixos/modules/services/mail/mailcatcher.nix
@@ -25,6 +25,13 @@ in
description = "The port address of the http server.";
};
+ http.path = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ description = "Prefix to all HTTP paths.";
+ example = "/mailcatcher";
+ };
+
smtp.ip = mkOption {
type = types.str;
default = "127.0.0.1";
@@ -53,7 +60,7 @@ in
serviceConfig = {
DynamicUser = true;
Restart = "always";
- ExecStart = "${pkgs.mailcatcher}/bin/mailcatcher --foreground --no-quit --http-ip ${cfg.http.ip} --http-port ${toString cfg.http.port} --smtp-ip ${cfg.smtp.ip} --smtp-port ${toString cfg.smtp.port}";
+ ExecStart = "${pkgs.mailcatcher}/bin/mailcatcher --foreground --no-quit --http-ip ${cfg.http.ip} --http-port ${toString cfg.http.port} --smtp-ip ${cfg.smtp.ip} --smtp-port ${toString cfg.smtp.port}" + optionalString (cfg.http.path != null) " --http-path ${cfg.http.path}";
AmbientCapabilities = optionalString (cfg.http.port < 1024 || cfg.smtp.port < 1024) "cap_net_bind_service";
};
};
diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix
index bdedfa1bb701..36dda619ad06 100644
--- a/nixos/modules/services/mail/roundcube.nix
+++ b/nixos/modules/services/mail/roundcube.nix
@@ -160,7 +160,7 @@ in
${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create role ${cfg.database.username} with login password '${cfg.database.password}'";
${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create database ${cfg.database.dbname} with owner ${cfg.database.username}";
fi
- PGPASSWORD=${cfg.database.password} ${pkgs.postgresql}/bin/psql -U ${cfg.database.username} \
+ PGPASSWORD="${cfg.database.password}" ${pkgs.postgresql}/bin/psql -U ${cfg.database.username} \
-f ${cfg.package}/SQL/postgres.initial.sql \
-h ${cfg.database.host} ${cfg.database.dbname}
touch /var/lib/roundcube/db-created
diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix
index 4db35d9e89ab..7ef23ad17262 100644
--- a/nixos/modules/services/mail/rspamd.nix
+++ b/nixos/modules/services/mail/rspamd.nix
@@ -60,7 +60,7 @@ let
};
type = mkOption {
type = types.nullOr (types.enum [
- "normal" "controller" "fuzzy_storage" "rspamd_proxy" "lua" "proxy"
+ "normal" "controller" "fuzzy" "rspamd_proxy" "lua" "proxy"
]);
description = ''
The type of this worker. The type proxy is
diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix
index 06af4dbcca4e..d09c6735e123 100644
--- a/nixos/modules/services/networking/bind.nix
+++ b/nixos/modules/services/networking/bind.nix
@@ -78,7 +78,11 @@ in
cacheNetworks = mkOption {
default = ["127.0.0.0/24"];
description = "
- What networks are allowed to use us as a resolver.
+ What networks are allowed to use us as a resolver. Note
+ that this is for recursive queries -- all networks are
+ allowed to query zones configured with the `zones` option.
+ It is recommended that you limit cacheNetworks to avoid your
+ server being used for DNS amplification attacks.
";
};
diff --git a/nixos/modules/services/networking/bitcoind.nix b/nixos/modules/services/networking/bitcoind.nix
index 90f1291c0198..4e00a8865474 100644
--- a/nixos/modules/services/networking/bitcoind.nix
+++ b/nixos/modules/services/networking/bitcoind.nix
@@ -177,9 +177,6 @@ in {
NoNewPrivileges = "true";
PrivateDevices = "true";
MemoryDenyWriteExecute = "true";
-
- # Permission for preStart
- PermissionsStartOnly = "true";
};
};
users.users.${cfg.user} = {
diff --git a/nixos/modules/services/networking/eternal-terminal.nix b/nixos/modules/services/networking/eternal-terminal.nix
index be7337ece7e4..a2e5b30dc0f0 100644
--- a/nixos/modules/services/networking/eternal-terminal.nix
+++ b/nixos/modules/services/networking/eternal-terminal.nix
@@ -23,6 +23,8 @@ in
type = types.int;
description = ''
The port the server should listen on. Will use the server's default (2022) if not specified.
+
+ Make sure to open this port in the firewall if necessary.
'';
};
@@ -86,4 +88,8 @@ in
};
};
};
+
+ meta = {
+ maintainers = with lib.maintainers; [ pingiun ];
+ };
}
diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index 165fd5970cf8..b3f2af5b1794 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -18,6 +18,7 @@ let
fsWatcherEnabled = folder.watch;
fsWatcherDelayS = folder.watchDelay;
ignorePerms = folder.ignorePerms;
+ versioning = folder.versioning;
}) (filterAttrs (
_: folder:
folder.enable
@@ -220,6 +221,69 @@ in {
'';
};
+ versioning = mkOption {
+ default = null;
+ description = ''
+ How to keep changed/deleted files with syncthing.
+ There are 4 different types of versioning with different parameters.
+ See https://docs.syncthing.net/users/versioning.html
+ '';
+ example = [
+ {
+ versioning = {
+ type = "simple";
+ params.keep = "10";
+ };
+ }
+ {
+ versioning = {
+ type = "trashcan";
+ params.cleanoutDays = "1000";
+ };
+ }
+ {
+ versioning = {
+ type = "staggered";
+ params = {
+ cleanInterval = "3600";
+ maxAge = "31536000";
+ versionsPath = "/syncthing/backup";
+ };
+ };
+ }
+ {
+ versioning = {
+ type = "external";
+ params.versionsPath = pkgs.writers.writeBash "backup" ''
+ folderpath="$1"
+ filepath="$2"
+ rm -rf "$folderpath/$filepath"
+ '';
+ };
+ }
+ ];
+ type = with types; nullOr (submodule {
+ options = {
+ type = mkOption {
+ type = enum [ "external" "simple" "staggered" "trashcan" ];
+ description = ''
+ Type of versioning.
+ See https://docs.syncthing.net/users/versioning.html
+ '';
+ };
+ params = mkOption {
+ type = attrsOf (either str path);
+ description = ''
+ Parameters for versioning. Structure depends on versioning.type.
+ See https://docs.syncthing.net/users/versioning.html
+ '';
+ };
+ };
+ });
+ };
+
+
+
rescanInterval = mkOption {
type = types.int;
default = 3600;
diff --git a/nixos/modules/services/web-servers/nginx/location-options.nix b/nixos/modules/services/web-servers/nginx/location-options.nix
index aeb9b1dd79ef..2b3749d8a744 100644
--- a/nixos/modules/services/web-servers/nginx/location-options.nix
+++ b/nixos/modules/services/web-servers/nginx/location-options.nix
@@ -1,4 +1,4 @@
-# This file defines the options that can be used both for the Apache
+# This file defines the options that can be used both for the Nginx
# main server configuration, and for the virtual hosts. (The latter
# has additional options that affect the web server as a whole, like
# the user/group to run under.)
@@ -92,4 +92,3 @@ with lib;
};
};
}
-
diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix
index 15b933c984a6..7e488f33a419 100644
--- a/nixos/modules/services/web-servers/nginx/vhost-options.nix
+++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix
@@ -1,4 +1,4 @@
-# This file defines the options that can be used both for the Apache
+# This file defines the options that can be used both for the Nginx
# main server configuration, and for the virtual hosts. (The latter
# has additional options that affect the web server as a whole, like
# the user/group to run under.)
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index dfb84113e130..671a959cdde1 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -18,7 +18,7 @@ in
# determines the default: later modules (if enabled) are preferred.
# E.g., if Plasma 5 is enabled, it supersedes xterm.
imports = [
- ./none.nix ./xterm.nix ./xfce.nix ./xfce4-14.nix ./plasma5.nix ./lumina.nix
+ ./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix
./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix ./maxx.nix
./mate.nix ./pantheon.nix ./surf-display.nix
];
diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index 6965c6d26467..0b70ad5f29c8 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -7,6 +7,32 @@ let
in
{
+
+ imports = [
+ # added 2019-08-18
+ # needed to preserve some semblance of UI familarity
+ # with original XFCE module
+ (mkRenamedOptionModule
+ [ "services" "xserver" "desktopManager" "xfce4-14" "extraSessionCommands" ]
+ [ "services" "xserver" "displayManager" "sessionCommands" ])
+
+ # added 2019-11-04
+ # xfce4-14 module removed and promoted to xfce.
+ # Needed for configs that used xfce4-14 module to migrate to this one.
+ (mkRenamedOptionModule
+ [ "services" "xserver" "desktopManager" "xfce4-14" "enable" ]
+ [ "services" "xserver" "desktopManager" "xfce" "enable" ])
+ (mkRenamedOptionModule
+ [ "services" "xserver" "desktopManager" "xfce4-14" "noDesktop" ]
+ [ "services" "xserver" "desktopManager" "xfce" "noDesktop" ])
+ (mkRenamedOptionModule
+ [ "services" "xserver" "desktopManager" "xfce4-14" "enableXfwm" ]
+ [ "services" "xserver" "desktopManager" "xfce" "enableXfwm" ])
+ (mkRenamedOptionModule
+ [ "services" "xserver" "desktopManager" "xfce" "extraSessionCommands" ]
+ [ "services" "xserver" "displayManager" "sessionCommands" ])
+ ];
+
options = {
services.xserver.desktopManager.xfce = {
enable = mkOption {
@@ -30,14 +56,6 @@ in
description = "Don't install XFCE desktop components (xfdesktop, panel and notification daemon).";
};
- extraSessionCommands = mkOption {
- default = "";
- type = types.lines;
- description = ''
- Shell commands executed just before XFCE is started.
- '';
- };
-
enableXfwm = mkOption {
type = types.bool;
default = true;
@@ -48,76 +66,101 @@ in
config = mkIf cfg.enable {
environment.systemPackages = with pkgs.xfce // pkgs; [
- # Get GTK themes and gtk-update-icon-cache
- gtk2.out
+ glib # for gsettings
+ gtk3.out # gtk-update-icon-cache
- # Supplies some abstract icons such as:
- # utilities-terminal, accessories-text-editor
+ gnome3.gnome-themes-extra
gnome3.adwaita-icon-theme
-
hicolor-icon-theme
tango-icon-theme
xfce4-icon-theme
+ desktop-file-utils
+ shared-mime-info # for update-mime-database
+
+ # For a polkit authentication agent
+ polkit_gnome
+
# Needed by Xfce's xinitrc script
- # TODO: replace with command -v
- which
+ xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
exo
garcon
- gtk-xfce-engine
libxfce4ui
- tumbler
xfconf
mousepad
+ parole
ristretto
xfce4-appfinder
xfce4-screenshooter
xfce4-session
xfce4-settings
+ xfce4-taskmanager
xfce4-terminal
(thunar.override { thunarPlugins = cfg.thunarPlugins; })
- thunar-volman # TODO: drop
- ] ++ (if config.hardware.pulseaudio.enable
- then [ xfce4-mixer-pulse xfce4-volumed-pulse ]
- else [ xfce4-mixer xfce4-volumed ])
- # TODO: NetworkManager doesn't belong here
- ++ optionals config.networking.networkmanager.enable [ networkmanagerapplet ]
- ++ optionals config.powerManagement.enable [ xfce4-power-manager ]
- ++ optionals cfg.enableXfwm [ xfwm4 ]
- ++ optionals (!cfg.noDesktop) [
- xfce4-panel
+ ] # TODO: NetworkManager doesn't belong here
+ ++ optional config.networking.networkmanager.enable networkmanagerapplet
+ ++ optional config.powerManagement.enable xfce4-power-manager
+ ++ optionals config.hardware.pulseaudio.enable [
+ pavucontrol
+ # volume up/down keys support:
+ # xfce4-pulseaudio-plugin includes all the functionalities of xfce4-volumed-pulse
+ # but can only be used with xfce4-panel, so for no-desktop usage we still include
+ # xfce4-volumed-pulse
+ (if cfg.noDesktop then xfce4-volumed-pulse else xfce4-pulseaudio-plugin)
+ ] ++ optionals cfg.enableXfwm [
+ xfwm4
+ xfwm4-themes
+ ] ++ optionals (!cfg.noDesktop) [
xfce4-notifyd
+ xfce4-panel
xfdesktop
];
environment.pathsToLink = [
"/share/xfce4"
- "/share/themes"
- "/share/gtksourceview-2.0"
+ "/lib/xfce4"
+ "/share/gtksourceview-3.0"
+ "/share/gtksourceview-4.0"
];
- services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
-
services.xserver.desktopManager.session = [{
name = "xfce";
bgSupport = true;
start = ''
- ${cfg.extraSessionCommands}
-
- ${pkgs.runtimeShell} ${pkgs.xfce.xinitrc} &
+ ${pkgs.runtimeShell} ${pkgs.xfce.xfce4-session.xinitrc} &
waitPID=$!
'';
}];
services.xserver.updateDbusEnvironment = true;
+ services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
# Enable helpful DBus services.
services.udisks2.enable = true;
+ security.polkit.enable = true;
+ services.accounts-daemon.enable = true;
services.upower.enable = config.powerManagement.enable;
+ services.gnome3.glib-networking.enable = true;
services.gvfs.enable = true;
services.gvfs.package = pkgs.xfce.gvfs;
+ services.tumbler.enable = true;
+ services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
+ services.xserver.libinput.enable = mkDefault true; # used in xfce4-settings-manager
+
+ # Enable default programs
+ programs.dconf.enable = true;
+
+ # Shell integration for VTE terminals
+ programs.bash.vteIntegration = mkDefault true;
+ programs.zsh.vteIntegration = mkDefault true;
+
+ # Systemd services
+ systemd.packages = with pkgs.xfce; [
+ (thunar.override { thunarPlugins = cfg.thunarPlugins; })
+ ] ++ optional (!cfg.noDesktop) xfce4-notifyd;
+
};
}
diff --git a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
deleted file mode 100644
index ffc99172e795..000000000000
--- a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
+++ /dev/null
@@ -1,152 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
- cfg = config.services.xserver.desktopManager.xfce4-14;
-in
-
-{
- # added 2019-08-18
- # needed to preserve some semblance of UI familarity
- # with original XFCE module
- imports = [
- (mkRenamedOptionModule
- [ "services" "xserver" "desktopManager" "xfce4-14" "extraSessionCommands" ]
- [ "services" "xserver" "displayManager" "sessionCommands" ])
- ];
-
- options = {
- services.xserver.desktopManager.xfce4-14 = {
- enable = mkOption {
- type = types.bool;
- default = false;
- description = "Enable the Xfce desktop environment.";
- };
-
- # TODO: support thunar plugins
- # thunarPlugins = mkOption {
- # default = [];
- # type = types.listOf types.package;
- # example = literalExample "[ pkgs.xfce4-14.thunar-archive-plugin ]";
- # description = ''
- # A list of plugin that should be installed with Thunar.
- # '';
- # };
-
- noDesktop = mkOption {
- type = types.bool;
- default = false;
- description = "Don't install XFCE desktop components (xfdesktop, panel and notification daemon).";
- };
-
- enableXfwm = mkOption {
- type = types.bool;
- default = true;
- description = "Enable the XFWM (default) window manager.";
- };
- };
- };
-
- config = mkIf cfg.enable {
- environment.systemPackages = with pkgs.xfce4-14 // pkgs; [
- glib # for gsettings
- gtk3.out # gtk-update-icon-cache
-
- gnome3.gnome-themes-extra
- gnome3.adwaita-icon-theme
- hicolor-icon-theme
- tango-icon-theme
- xfce4-icon-theme
-
- desktop-file-utils
- shared-mime-info # for update-mime-database
-
- # For a polkit authentication agent
- polkit_gnome
-
- # Needed by Xfce's xinitrc script
- xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
-
- exo
- garcon
- libxfce4ui
- xfconf
-
- mousepad
- parole
- ristretto
- xfce4-appfinder
- xfce4-screenshooter
- xfce4-session
- xfce4-settings
- xfce4-taskmanager
- xfce4-terminal
-
- # TODO: resync patch for plugins
- #(thunar.override { thunarPlugins = cfg.thunarPlugins; })
- thunar
- ] # TODO: NetworkManager doesn't belong here
- ++ optional config.networking.networkmanager.enable networkmanagerapplet
- ++ optional config.powerManagement.enable xfce4-power-manager
- ++ optionals config.hardware.pulseaudio.enable [
- pavucontrol
- # volume up/down keys support:
- # xfce4-pulseaudio-plugin includes all the functionalities of xfce4-volumed-pulse
- # but can only be used with xfce4-panel, so for no-desktop usage we still include
- # xfce4-volumed-pulse
- (if cfg.noDesktop then xfce4-volumed-pulse else xfce4-pulseaudio-plugin)
- ] ++ optionals cfg.enableXfwm [
- xfwm4
- xfwm4-themes
- ] ++ optionals (!cfg.noDesktop) [
- xfce4-notifyd
- xfce4-panel
- xfdesktop
- ];
-
- environment.pathsToLink = [
- "/share/xfce4"
- "/lib/xfce4"
- "/share/gtksourceview-3.0"
- "/share/gtksourceview-4.0"
- ];
-
- services.xserver.desktopManager.session = [{
- name = "xfce4-14";
- bgSupport = true;
- start = ''
- ${pkgs.runtimeShell} ${pkgs.xfce4-14.xinitrc} &
- waitPID=$!
- '';
- }];
-
- services.xserver.updateDbusEnvironment = true;
- services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
-
- # Enable helpful DBus services.
- services.udisks2.enable = true;
- security.polkit.enable = true;
- services.accounts-daemon.enable = true;
- services.upower.enable = config.powerManagement.enable;
- services.gnome3.glib-networking.enable = true;
- services.gvfs.enable = true;
- services.gvfs.package = pkgs.xfce.gvfs;
- services.tumbler.enable = true;
- services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
- services.xserver.libinput.enable = mkDefault true; # used in xfce4-settings-manager
-
- # Enable default programs
- programs.dconf.enable = true;
-
- # Shell integration for VTE terminals
- programs.bash.vteIntegration = mkDefault true;
- programs.zsh.vteIntegration = mkDefault true;
-
- # Systemd services
- systemd.packages = with pkgs.xfce4-14; [
- thunar
- ] ++ optional (!cfg.noDesktop) xfce4-notifyd;
-
- };
-}
diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix
index 4a25232383d3..71065dfc26bb 100644
--- a/nixos/modules/services/x11/hardware/libinput.nix
+++ b/nixos/modules/services/x11/hardware/libinput.nix
@@ -209,12 +209,12 @@ in {
services.xserver.config =
''
- # Automatically enable the libinput driver for all touchpads.
+ # General libinput configuration.
+ # See CONFIGURATION DETAILS section of man:libinput(4).
Section "InputClass"
Identifier "libinputConfiguration"
- MatchIsTouchpad "on"
+ MatchDriver "libinput"
${optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''}
- Driver "libinput"
Option "AccelProfile" "${cfg.accelProfile}"
${optionalString (cfg.accelSpeed != null) ''Option "AccelSpeed" "${cfg.accelSpeed}"''}
${optionalString (cfg.buttonMapping != null) ''Option "ButtonMapping" "${cfg.buttonMapping}"''}
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index 85a106527fe0..c091d8630349 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -10,7 +10,7 @@ let
checkLink = checkUnitConfig "Link" [
(assertOnlyFields [
- "Description" "Alias" "MACAddressPolicy" "MACAddress" "NamePolicy" "OriginalName"
+ "Description" "Alias" "MACAddressPolicy" "MACAddress" "NamePolicy" "Name" "OriginalName"
"MTUBytes" "BitsPerSecond" "Duplex" "AutoNegotiation" "WakeOnLan" "Port"
"TCPSegmentationOffload" "TCP6SegmentationOffload" "GenericSegmentationOffload"
"GenericReceiveOffload" "LargeReceiveOffload" "RxChannels" "TxChannels"
diff --git a/nixos/modules/system/boot/timesyncd.nix b/nixos/modules/system/boot/timesyncd.nix
index 8282cdd6f3aa..0b1d0ff6c22b 100644
--- a/nixos/modules/system/boot/timesyncd.nix
+++ b/nixos/modules/system/boot/timesyncd.nix
@@ -20,6 +20,18 @@ with lib;
The set of NTP servers from which to synchronise.
'';
};
+ extraConfig = mkOption {
+ default = "";
+ type = types.lines;
+ example = ''
+ PollIntervalMaxSec=180
+ '';
+ description = ''
+ Extra config options for systemd-timesyncd. See
+
+ timesyncd.conf(5) for available options.
+ '';
+ };
};
};
@@ -35,6 +47,7 @@ with lib;
environment.etc."systemd/timesyncd.conf".text = ''
[Time]
NTP=${concatStringsSep " " config.services.timesyncd.servers}
+ ${config.services.timesyncd.extraConfig}
'';
users.users.systemd-timesync.uid = config.ids.uids.systemd-timesync;
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 1bcab5cab098..689f881cbea9 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -136,7 +136,6 @@ in rec {
(all nixos.tests.switchTest)
(all nixos.tests.udisks2)
(all nixos.tests.xfce)
- (all nixos.tests.xfce4-14)
nixpkgs.tarball
(all allSupportedNixpkgs.emacs)
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index a827f06731e8..a2129ef7076e 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -285,7 +285,6 @@ in
wordpress = handleTest ./wordpress.nix {};
xautolock = handleTest ./xautolock.nix {};
xfce = handleTest ./xfce.nix {};
- xfce4-14 = handleTest ./xfce4-14.nix {};
xmonad = handleTest ./xmonad.nix {};
xrdp = handleTest ./xrdp.nix {};
xss-lock = handleTest ./xss-lock.nix {};
diff --git a/nixos/tests/roundcube.nix b/nixos/tests/roundcube.nix
index 3206144ce806..4dccb411ff4c 100644
--- a/nixos/tests/roundcube.nix
+++ b/nixos/tests/roundcube.nix
@@ -9,7 +9,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
services.roundcube = {
enable = true;
hostName = "roundcube";
- database.password = "notproduction";
+ database.password = "not production";
package = pkgs.roundcube.withPlugins (plugins: [ plugins.persistent_login ]);
plugins = [ "persistent_login" ];
};
@@ -21,10 +21,11 @@ import ./make-test-python.nix ({ pkgs, ...} : {
};
testScript = ''
- roundcube.start
- roundcube.wait_for_unit("postgresql.service")
- roundcube.wait_for_unit("phpfpm-roundcube.service")
- roundcube.wait_for_unit("nginx.service")
- roundcube.succeed("curl -sSL http://roundcube/ | grep 'Keep me logged in'")
+ $roundcube->start;
+ $roundcube->waitForUnit("postgresql.service");
+ $roundcube->waitForUnit("roundcube-setup.service");
+ $roundcube->waitForUnit("phpfpm-roundcube.service");
+ $roundcube->waitForUnit("nginx.service");
+ $roundcube->succeed("curl -sSfL http://roundcube/ | grep 'Keep me logged in'");
'';
})
diff --git a/nixos/tests/xfce.nix b/nixos/tests/xfce.nix
index 7ff623062d93..3ea96b383631 100644
--- a/nixos/tests/xfce.nix
+++ b/nixos/tests/xfce.nix
@@ -1,8 +1,5 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "xfce";
- meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ eelco shlevy ];
- };
machine =
{ pkgs, ... }:
@@ -16,31 +13,26 @@ import ./make-test.nix ({ pkgs, ...} : {
services.xserver.desktopManager.xfce.enable = true;
- environment.systemPackages = [ pkgs.xorg.xmessage ];
-
hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then
virtualisation.memorySize = 1024;
};
- testScript =
- ''
- $machine->waitForX;
- $machine->waitForFile("/home/alice/.Xauthority");
- $machine->succeed("xauth merge ~alice/.Xauthority");
- $machine->waitForWindow(qr/xfce4-panel/);
- $machine->sleep(10);
+ testScript = { nodes, ... }: let
+ user = nodes.machine.config.users.users.alice;
+ in ''
+ machine.wait_for_x()
+ machine.wait_for_file("${user.home}/.Xauthority")
+ machine.succeed("xauth merge ${user.home}/.Xauthority")
+ machine.wait_for_window("xfce4-panel")
+ machine.sleep(10)
# Check that logging in has given the user ownership of devices.
- $machine->succeed("getfacl -p /dev/snd/timer | grep -q alice");
+ machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
- $machine->succeed("su - alice -c 'DISPLAY=:0.0 xfce4-terminal &'");
- $machine->waitForWindow(qr/Terminal/);
- $machine->sleep(10);
- $machine->screenshot("screen");
-
- # Ensure that the X server does proper access control.
- $machine->mustFail("su - bob -c 'DISPLAY=:0.0 xmessage Foo'");
- $machine->mustFail("su - bob -c 'DISPLAY=:0 xmessage Foo'");
+ machine.succeed("su - ${user.name} -c 'DISPLAY=:0.0 xfce4-terminal &'")
+ machine.wait_for_window("Terminal")
+ machine.sleep(10)
+ machine.screenshot("screen")
'';
})
diff --git a/nixos/tests/xfce4-14.nix b/nixos/tests/xfce4-14.nix
deleted file mode 100644
index d9b87b084376..000000000000
--- a/nixos/tests/xfce4-14.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-import ./make-test.nix ({ pkgs, ...} : {
- name = "xfce4-14";
-
- machine =
- { pkgs, ... }:
-
- { imports = [ ./common/user-account.nix ];
-
- services.xserver.enable = true;
-
- services.xserver.displayManager.auto.enable = true;
- services.xserver.displayManager.auto.user = "alice";
-
- services.xserver.desktopManager.xfce4-14.enable = true;
-
- hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then
-
- virtualisation.memorySize = 1024;
- };
-
- testScript =
- ''
- $machine->waitForX;
- $machine->waitForFile("/home/alice/.Xauthority");
- $machine->succeed("xauth merge ~alice/.Xauthority");
- $machine->waitForWindow(qr/xfce4-panel/);
- $machine->sleep(10);
-
- # Check that logging in has given the user ownership of devices.
- $machine->succeed("getfacl -p /dev/snd/timer | grep -q alice");
-
- $machine->succeed("su - alice -c 'DISPLAY=:0.0 xfce4-terminal &'");
- $machine->waitForWindow(qr/Terminal/);
- $machine->sleep(10);
- $machine->screenshot("screen");
- '';
-})
diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix
index 1beb68a3af30..c0bbd6e71db3 100644
--- a/pkgs/applications/audio/vcv-rack/default.nix
+++ b/pkgs/applications/audio/vcv-rack/default.nix
@@ -3,17 +3,10 @@
, libzip, rtaudio, rtmidi, speex, libsamplerate }:
let
- glfw-git = glfw.overrideAttrs (oldAttrs: rec {
- name = "glfw-git-${version}";
- version = "2019-06-30";
- src = fetchFromGitHub {
- owner = "glfw";
- repo = "glfw";
- rev = "d25248343e248337284dfbe5ecd1eddbd37ae66d";
- sha256 = "0gbz353bfmqbpm0af2nqf5draz3k4f3lqwiqj68s8nwn7878aqm3";
- };
- buildInputs = oldAttrs.buildInputs ++ [ libXext libXi ];
- });
+ # The package repo vendors some of the package dependencies as submodules.
+ # Others are downloaded with `make deps`. Due to previous issues with the
+ # `glfw` submodule (see above) and because we can not access the network when
+ # building in a sandbox, we fetch the dependency source manually.
pfft-source = fetchFromBitbucket {
owner = "jpommier";
repo = "pffft";
@@ -47,24 +40,22 @@ let
in
with stdenv.lib; stdenv.mkDerivation rec {
pname = "VCV-Rack";
- version = "1.1.5";
+ version = "1.1.6";
src = fetchFromGitHub {
owner = "VCVRack";
repo = "Rack";
rev = "v${version}";
- sha256 = "1g3mkghgiycbxyvzjhanc1b10jynkfkw03bpnha06qgd6gd9wv7k";
+ sha256 = "0ji64prr74qzxf5bx1sw022kbslx9nzll16lmk5in78hbl137b3i";
};
patches = [
./rack-minimize-vendoring.patch
- # We patch out a call to a custom function, that is not needed on Linux.
- # This avoids needing a patched version of glfw. The version we previously used disappeared
- # on GitHub. See https://github.com/NixOS/nixpkgs/issues/71189
- ./remove-custom-glfw-function.patch
];
prePatch = ''
+ # As we can't use `make dep` to set up the dependencies (as explained
+ # above), we do it here manually
mkdir -p dep/include
cp -r ${pfft-source} dep/jpommier-pffft-source
@@ -86,7 +77,7 @@ with stdenv.lib; stdenv.mkDerivation rec {
enableParallelBuilding = true;
nativeBuildInputs = [ makeWrapper pkgconfig ];
- buildInputs = [ glfw-git alsaLib curl glew gtk2-x11 jansson libjack2 libzip rtaudio rtmidi speex libsamplerate ];
+ buildInputs = [ alsaLib curl glew glfw gtk2-x11 jansson libjack2 libsamplerate libzip rtaudio rtmidi speex ];
buildFlags = "Rack";
diff --git a/pkgs/applications/audio/vcv-rack/remove-custom-glfw-function.patch b/pkgs/applications/audio/vcv-rack/remove-custom-glfw-function.patch
deleted file mode 100644
index ceb273b81af0..000000000000
--- a/pkgs/applications/audio/vcv-rack/remove-custom-glfw-function.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/main.cpp b/src/main.cpp
-index 0954ae6..a8299f7 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -162,11 +162,6 @@ int main(int argc, char* argv[]) {
- INFO("Initializing app");
- appInit();
-
-- const char* openedFilename = glfwGetOpenedFilename();
-- if (openedFilename) {
-- patchPath = openedFilename;
-- }
--
- if (!settings::headless) {
- APP->patch->init(patchPath);
- }
diff --git a/pkgs/applications/editors/kdevelop5/kdev-php.nix b/pkgs/applications/editors/kdevelop5/kdev-php.nix
index 7805234a70c0..94db57d593ef 100644
--- a/pkgs/applications/editors/kdevelop5/kdev-php.nix
+++ b/pkgs/applications/editors/kdevelop5/kdev-php.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "kdev-php";
- version = "5.4.3";
+ version = "5.4.4";
src = fetchurl {
url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz";
- sha256 = "0nf9nlykdq40yxdda0as16pd0c5rahwba1fbwni8g19w8mf2y3h5";
+ sha256 = "1q80vh2b4bmpa3sh94b6jsa5ymqr6hcn76mr2lyw30h2ppy5hm5l";
};
nativeBuildInputs = [ cmake extra-cmake-modules ];
diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/pkgs/applications/editors/kdevelop5/kdev-python.nix
index 50740e24acad..3cd81f4c1a1b 100644
--- a/pkgs/applications/editors/kdevelop5/kdev-python.nix
+++ b/pkgs/applications/editors/kdevelop5/kdev-python.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "kdev-python";
- version = "5.4.3";
+ version = "5.4.4";
src = fetchurl {
url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz";
- sha256 = "16928a0p5m5mm38j39sxzfqy6rx9pv01aihk2kscdd93z7001b81";
+ sha256 = "04ig8vmn85z15mlngha4ybynjlmv9g9dn48y58wqrkif2ssliq7m";
};
cmakeFlags = [
diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix
index 1f28c2a4af2a..d1c4c80d6b56 100644
--- a/pkgs/applications/editors/kdevelop5/kdevelop.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix
@@ -10,11 +10,11 @@
mkDerivation rec {
pname = "kdevelop";
- version = "5.4.3";
+ version = "5.4.4";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
- sha256 = "0h07gdmg24d517im40b9kl1kzkkzwc9ig4crbl3y9iy0mbpm0hv8";
+ sha256 = "1cangz3ghz39sxxggp2p7kqy2ncgs0r3i19c341b5xbkcxw2y20h";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix
index a6179452f4d5..e1c939c93c93 100644
--- a/pkgs/applications/editors/thonny/default.nix
+++ b/pkgs/applications/editors/thonny/default.nix
@@ -4,13 +4,13 @@ with python3.pkgs;
buildPythonApplication rec {
pname = "thonny";
- version = "3.2.0b7";
+ version = "3.2.3";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "0p0hi5rj873cszx9rpbjjq51vs6xys3rlq9v1rya710i3fnw0hqh";
+ sha256 = "0wgjwjh6296vs8awl4rylb5nshj9q9kzxv7j4vlmiabll06mx6gi";
};
propagatedBuildInputs = with python3.pkgs; [
@@ -22,6 +22,7 @@ buildPythonApplication rec {
mypy
pyperclip
asttokens
+ send2trash
];
preInstall = ''
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index d21d0ad5ee00..bb3d571e6f86 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -145,7 +145,12 @@ in stdenv.mkDerivation rec {
cp ${vimPlugins.vim-nix.src}/syntax/nix.vim runtime/syntax/nix.vim
'';
+ preInstall = ''
+ mkdir -p $out/share/applications $out/share/icons/{hicolor,locolor}/{16x16,32x32,48x48}/apps
+ '';
+
postInstall = ''
+ ln -s $out/bin/vim $out/bin/vi
'' + stdenv.lib.optionalString stdenv.isLinux ''
patchelf --set-rpath \
"$(patchelf --print-rpath $out/bin/vim):${stdenv.lib.makeLibraryPath buildInputs}" \
@@ -177,9 +182,5 @@ in stdenv.mkDerivation rec {
rewrap gvimdiff -gd
'';
- preInstall = ''
- mkdir -p $out/share/applications $out/share/icons/{hicolor,locolor}/{16x16,32x32,48x48}/apps
- '';
-
- dontStrip = 1;
+ dontStrip = true;
}
diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index c6ea333b3a31..f914c90dd79d 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -11,13 +11,13 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
- x86_64-linux = "1jxjf1yg17l61n8qmnh4916426da8asp8p36lfyawxif8m9sx8ag";
- x86_64-darwin = "1yxxvqpk849dzbzhdqz0j16f50z4slcx51bkv2svfb36nxdaahl1";
+ x86_64-linux = "1zxj1vav7swjmvvgcn1y61figjhqrczf8d16rk6yayja1pfjgvs5";
+ x86_64-darwin = "0f6ck40rkngzcm5xih1rbwpz905r533n2z08maycgf4iajgwrn43";
}.${system};
in
callPackage ./generic.nix rec {
- version = "1.40.0";
+ version = "1.40.1";
pname = "vscode";
executableName = "code" + lib.optionalString isInsiders "-insiders";
diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index e2386bc11189..b8010cab181a 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -11,8 +11,8 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
- x86_64-linux = "013jhmc29angqh9qb8jj0jqk4whqb59id61njm8gwz977sdgpf9l";
- x86_64-darwin = "09jfii132cib1kn3bghwchdlvi4cfjqz5hvw6j5gr53h7j35k37j";
+ x86_64-linux = "0yi1ghliivhb50153dvv9q5gbbgh2dd1m3xrl1i097b3phrzb0j4";
+ x86_64-darwin = "1slf4h8yhhzlr6cm839y3zx7k831zl24xasi88z6xvib32rh9qxs";
}.${system};
sourceRoot = {
@@ -23,7 +23,7 @@ in
callPackage ./generic.nix rec {
inherit sourceRoot;
- version = "1.39.2";
+ version = "1.40.0";
pname = "vscodium";
executableName = "codium";
@@ -50,7 +50,7 @@ in
homepage = https://github.com/VSCodium/vscodium;
downloadPage = https://github.com/VSCodium/vscodium/releases;
license = licenses.mit;
- maintainers = with maintainers; [];
+ maintainers = with maintainers; [ synthetica ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
};
}
diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix
index cba9c1d4227b..29700774219e 100644
--- a/pkgs/applications/misc/cointop/default.nix
+++ b/pkgs/applications/misc/cointop/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "cointop";
- version = "1.3.6";
+ version = "1.4.1";
src = fetchFromGitHub {
owner = "miguelmota";
repo = pname;
rev = version;
- sha256 = "0xm616yjqf6qq98yjbdj6lihib2p4fh6jd91dcb59arkbs2l1nbg";
+ sha256 = "067jsn66xs30d5yz9z8cvpxbvh8a95kllkb2wk134c43bfxy2m34";
};
goPackagePath = "github.com/miguelmota/cointop";
diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/applications/misc/geoipupdate/default.nix
new file mode 100644
index 000000000000..57060179473f
--- /dev/null
+++ b/pkgs/applications/misc/geoipupdate/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "geoipupdate";
+ version = "4.1.5";
+
+ src = fetchFromGitHub {
+ owner = "maxmind";
+ repo = "geoipupdate";
+ rev = "v${version}";
+ sha256 = "1k0bmsqgw35sdmaafinlr4qd5910fi598i8irxrz11394d3c8giv";
+ };
+
+ modSha256 = "0mk6zp6byq3jc6wipx53bg5igry114klq5w8isc0z6r63zjsk6f6";
+
+ meta = with stdenv.lib; {
+ description = "Automatic GeoIP database updater";
+ homepage = "https://github.com/maxmind/geoipupdate";
+ license = with licenses; [ asl20 ];
+ platforms = platforms.all;
+ maintainers = with maintainers; [ das_j ];
+ };
+}
diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix
index bf7bec38afb5..07918d3d599d 100644
--- a/pkgs/applications/misc/gpscorrelate/default.nix
+++ b/pkgs/applications/misc/gpscorrelate/default.nix
@@ -3,17 +3,15 @@
stdenv.mkDerivation rec {
pname = "gpscorrelate";
- version = "unstable-2019-09-03";
+ version = "2.0";
src = fetchFromGitHub {
owner = "dfandrich";
repo = pname;
- rev = "e1dd44a34f67b1ab7201440e60a840258ee448d2";
- sha256 = "0gjwwdqh9dprzylmmnk3gm41khka9arkij3i9amd8y7d49pm9rlv";
+ rev = version;
+ sha256 = "1wkpb0nqnm0ik46hp2sibf96h2gxi6n951zm8c72scgmh4ciq4fl";
};
- patches = [ ./fix-localedir.diff ];
-
nativeBuildInputs = [
desktop-file-utils
docbook_xml_dtd_42
@@ -30,7 +28,6 @@ stdenv.mkDerivation rec {
makeFlags = [
"prefix=${placeholder "out"}"
- "GTK=3"
"CC=cc"
"CXX=c++"
"CFLAGS=-DENABLE_NLS"
@@ -60,7 +57,7 @@ stdenv.mkDerivation rec {
'';
license = licenses.gpl2Plus;
- homepage = "https://github.com/dfandrich/gpscorrelate";
+ homepage = "https://dfandrich.github.io/gpscorrelate/";
platforms = platforms.linux;
maintainers = with maintainers; [ sikmir ];
};
diff --git a/pkgs/applications/misc/gpscorrelate/fix-localedir.diff b/pkgs/applications/misc/gpscorrelate/fix-localedir.diff
deleted file mode 100644
index 5f9cb296ecd5..000000000000
--- a/pkgs/applications/misc/gpscorrelate/fix-localedir.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git i/Makefile w/Makefile
-index 47919ca..408fd68 100644
---- i/Makefile
-+++ w/Makefile
-@@ -33,8 +33,9 @@ datadir = $(prefix)/share
- mandir = $(datadir)/man
- docdir = $(datadir)/doc/gpscorrelate
- applicationsdir = $(datadir)/applications
-+localedir = ${datadir}/locale
-
--DEFS = -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\"
-+DEFS = -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" -DPACKAGE_LOCALE_DIR=\"$(localedir)\"
-
- TARGETS = gpscorrelate-gui$(EXEEXT) gpscorrelate$(EXEEXT) doc/gpscorrelate.1 doc/gpscorrelate.html
-
-diff --git i/main-gui.c w/main-gui.c
-index fdace6f..8a6197b 100644
---- i/main-gui.c
-+++ w/main-gui.c
-@@ -40,6 +40,7 @@
- int main(int argc, char* argv[])
- {
- /* Initialize gettext (gtk_init initializes the locale) */
-+ (void) bindtextdomain(TEXTDOMAIN, PACKAGE_LOCALE_DIR);
- (void) textdomain(TEXTDOMAIN);
- (void) bind_textdomain_codeset(TEXTDOMAIN, "UTF-8");
-
diff --git a/pkgs/development/python-modules/cerberus11/default.nix b/pkgs/applications/misc/pyditz/cerberus.nix
similarity index 80%
rename from pkgs/development/python-modules/cerberus11/default.nix
rename to pkgs/applications/misc/pyditz/cerberus.nix
index 81f6ef1e8371..614e3ca81350 100644
--- a/pkgs/development/python-modules/cerberus11/default.nix
+++ b/pkgs/applications/misc/pyditz/cerberus.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "Cerberus";
- version = "1.3.1";
+ version = "1.1";
src = fetchPypi {
inherit pname version;
- sha256 = "0be48fc0dc84f83202a5309c0aa17cd5393e70731a1698a50d118b762fbe6875";
+ sha256 = "1pxzr8sfm2hc5s96m9k044i44nwkva70n0ypr6a35v73zn891cx5";
};
checkInputs = [ pytestrunner pytest ];
diff --git a/pkgs/applications/misc/pyditz/default.nix b/pkgs/applications/misc/pyditz/default.nix
index 0f4e743aba4e..60de2f9abdc9 100644
--- a/pkgs/applications/misc/pyditz/default.nix
+++ b/pkgs/applications/misc/pyditz/default.nix
@@ -1,18 +1,22 @@
{ stdenv, pythonPackages }:
-pythonPackages.buildPythonApplication rec {
+with pythonPackages;
+
+let
+ cerberus_1_1 = callPackage ./cerberus.nix { };
+in buildPythonApplication rec {
pname = "pyditz";
version = "0.10.3";
- src = pythonPackages.fetchPypi {
+ src = fetchPypi {
inherit pname version;
sha256 = "0hxxz7kxv9gsrr86ccsc31g7bc2agw1ihbxhd659c2m6nrqq5qaf";
};
- nativeBuildInputs = [ pythonPackages.setuptools_scm ];
- propagatedBuildInputs = with pythonPackages; [ pyyaml six jinja2 cerberus11 ];
+ nativeBuildInputs = [ setuptools_scm ];
+ propagatedBuildInputs = [ pyyaml six jinja2 cerberus_1_1 ];
checkPhase = ''
- ${pythonPackages.python.interpreter} -m unittest discover
+ ${python.interpreter} -m unittest discover
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index b751560b301a..e9862041f4a8 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -11,82 +11,108 @@
, withGeoclue ? withGeolocation && stdenv.isLinux, geoclue
}:
-stdenv.mkDerivation rec {
- pname = "redshift";
- version = "1.12";
+let
+ mkRedshift =
+ { pname, version, src, meta }:
+ stdenv.mkDerivation rec {
+ inherit pname version src meta;
- src = fetchFromGitHub {
- owner = "jonls";
- repo = "redshift";
- rev = "v${version}";
- sha256 = "12cb4gaqkybp4bkkns8pam378izr2mwhr2iy04wkprs2v92j7bz6";
+ patches = [
+ # https://github.com/jonls/redshift/pull/575
+ ./575.patch
+ ];
+
+ nativeBuildInputs = [
+ autoconf
+ automake
+ gettext
+ intltool
+ libtool
+ pkgconfig
+ wrapGAppsHook
+ wrapPython
+ ];
+
+ configureFlags = [
+ "--enable-randr=${if withRandr then "yes" else "no"}"
+ "--enable-geoclue2=${if withGeoclue then "yes" else "no"}"
+ "--enable-drm=${if withDrm then "yes" else "no"}"
+ "--enable-quartz=${if withQuartz then "yes" else "no"}"
+ "--enable-corelocation=${if withCoreLocation then "yes" else "no"}"
+ ];
+
+ buildInputs = [
+ gobject-introspection
+ gtk3
+ python
+ ] ++ stdenv.lib.optional withRandr libxcb
+ ++ stdenv.lib.optional withGeoclue geoclue
+ ++ stdenv.lib.optional withDrm libdrm
+ ++ stdenv.lib.optional withQuartz ApplicationServices
+ ++ stdenv.lib.optionals withCoreLocation [ CoreLocation Foundation Cocoa ]
+ ;
+
+ pythonPath = [ pygobject3 pyxdg ];
+
+ preConfigure = "./bootstrap";
+
+ postFixup = "wrapPythonPrograms";
+
+ # the geoclue agent may inspect these paths and expect them to be
+ # valid without having the correct $PATH set
+ postInstall = ''
+ substituteInPlace $out/share/applications/redshift.desktop \
+ --replace 'Exec=redshift' "Exec=$out/bin/redshift"
+ substituteInPlace $out/share/applications/redshift.desktop \
+ --replace 'Exec=redshift-gtk' "Exec=$out/bin/redshift-gtk"
+ '';
+
+ enableParallelBuilding = true;
+ };
+in
+rec {
+ redshift = mkRedshift rec {
+ pname = "redshift";
+ version = "1.12";
+
+ src = fetchFromGitHub {
+ owner = "jonls";
+ repo = "redshift";
+ rev = "v${version}";
+ sha256 = "12cb4gaqkybp4bkkns8pam378izr2mwhr2iy04wkprs2v92j7bz6";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Screen color temperature manager";
+ longDescription = ''
+ Redshift adjusts the color temperature according to the position
+ of the sun. A different color temperature is set during night and
+ daytime. During twilight and early morning, the color temperature
+ transitions smoothly from night to daytime temperature to allow
+ your eyes to slowly adapt. At night the color temperature should
+ be set to match the lamps in your room.
+ '';
+ license = licenses.gpl3Plus;
+ homepage = http://jonls.dk/redshift;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ yegortimoshenko globin ];
+ };
};
- patches = [
- # https://github.com/jonls/redshift/pull/575
- ./575.patch
- ];
+ redshift-wlr = mkRedshift {
+ pname = "redshift-wlr";
+ version = "2019-04-17";
- nativeBuildInputs = [
- autoconf
- automake
- gettext
- intltool
- libtool
- pkgconfig
- wrapGAppsHook
- wrapPython
- ];
+ src = fetchFromGitHub {
+ owner = "minus7";
+ repo = "redshift";
+ rev = "eecbfedac48f827e96ad5e151de8f41f6cd3af66";
+ sha256 = "0rs9bxxrw4wscf4a8yl776a8g880m5gcm75q06yx2cn3lw2b7v22";
+ };
- configureFlags = [
- "--enable-randr=${if withRandr then "yes" else "no"}"
- "--enable-geoclue2=${if withGeoclue then "yes" else "no"}"
- "--enable-drm=${if withDrm then "yes" else "no"}"
- "--enable-quartz=${if withQuartz then "yes" else "no"}"
- "--enable-corelocation=${if withCoreLocation then "yes" else "no"}"
- ];
-
- buildInputs = [
- gobject-introspection
- gtk3
- python
- ] ++ stdenv.lib.optional withRandr libxcb
- ++ stdenv.lib.optional withGeoclue geoclue
- ++ stdenv.lib.optional withDrm libdrm
- ++ stdenv.lib.optional withQuartz ApplicationServices
- ++ stdenv.lib.optionals withCoreLocation [ CoreLocation Foundation Cocoa ]
- ;
-
- pythonPath = [ pygobject3 pyxdg ];
-
- preConfigure = "./bootstrap";
-
- postFixup = "wrapPythonPrograms";
-
- # the geoclue agent may inspect these paths and expect them to be
- # valid without having the correct $PATH set
- postInstall = ''
- substituteInPlace $out/share/applications/redshift.desktop \
- --replace 'Exec=redshift' "Exec=$out/bin/redshift"
- substituteInPlace $out/share/applications/redshift.desktop \
- --replace 'Exec=redshift-gtk' "Exec=$out/bin/redshift-gtk"
- '';
-
- enableParallelBuilding = true;
-
- meta = with stdenv.lib; {
- description = "Screen color temperature manager";
- longDescription = ''
- Redshift adjusts the color temperature according to the position
- of the sun. A different color temperature is set during night and
- daytime. During twilight and early morning, the color temperature
- transitions smoothly from night to daytime temperature to allow
- your eyes to slowly adapt. At night the color temperature should
- be set to match the lamps in your room.
- '';
- license = licenses.gpl3Plus;
- homepage = http://jonls.dk/redshift;
- platforms = platforms.unix;
- maintainers = with maintainers; [ yegortimoshenko globin ];
+ meta = redshift.meta // {
+ description = redshift.meta.description + "(with wlroots patches)";
+ homepage = https://github.com/minus7/redshift;
+ };
};
}
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 2e7fcb09560a..bc1b5e9b23c5 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
- sha256 = "1n45pfpjqrpzmy7k2ps498mm273bpzfda58dz78lbdm6r7z3s7av";
- sha256bin64 = "1rf31v1ipix8c6q4blqjrn2ap3pxnlrpfx7037qjpg84zhip0zpc";
- version = "79.0.3945.29";
+ sha256 = "0sm6x4z6i6p292l98k0h0v69f29hgfd9l46jg8xbh2jzg9f5fp78";
+ sha256bin64 = "1yvy0d2h09cf1w42c93kpw66a2v9yn079zs6qjiqzs07yzxvxjdm";
+ version = "79.0.3945.36";
};
dev = {
- sha256 = "1zj0nmj1687xsyzlh1hy2wblxv1qgdy2kj9h8bmqhld16laxwqw5";
- sha256bin64 = "1x8wpdz18cflvj2ambqwyhzq206dil4szh1s8paqw1jwncaw7gjf";
- version = "80.0.3962.2";
+ sha256 = "0zf434ijk6zw37fricnkb1968nhmb7zlfivf59nx9yh7irbwb4hm";
+ sha256bin64 = "1fphf8pwbbirs9fiislg3vav8c4a393lz487sa7f90mzsx84ffiz";
+ version = "80.0.3964.0";
};
stable = {
- sha256 = "01wx5bi397d80za0sdfwgfbjj6n2ad2i31zmcrhm6wzryjwrmx6i";
- sha256bin64 = "1nwhyasqxkxkx5pn2j9dx95mblj5w7fkh2zwvjz763b331w65ivp";
- version = "78.0.3904.97";
+ sha256 = "03jvfz68nvmmrplygf96sh0l347p4h03c8vpw8yrglh6ycwkiigr";
+ sha256bin64 = "1knsrdh4vj1zl3v1frzrvzg0pwb64zhq2il7pwskrfcbmsj3gkh6";
+ version = "78.0.3904.108";
};
}
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index a72ba1d58846..f8b42470de74 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -112,8 +112,8 @@ in rec {
terraform_0_11-full = terraform_0_11.full;
terraform_0_12 = pluggable (generic {
- version = "0.12.15";
- sha256 = "18kvgb2sjldis7bykb11zqzx6avr7a4ry91xsfq4v0iwbi5k383b";
+ version = "0.12.16";
+ sha256 = "10r9vra4d3lyms9cvl0g1ij6ldcfi3vjrqsmd52isrmlmjdzm8nk";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
});
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
index aefde289db59..917610216aeb 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, gnutls, glib, pkgconfig, check, libotr, python
+{ fetchurl, fetchpatch, stdenv, gnutls, glib, pkgconfig, check, libotr, python
, enableLibPurple ? false, pidgin ? null
, enablePam ? false, pam ? null
}:
@@ -25,6 +25,14 @@ stdenv.mkDerivation rec {
] ++ optional enableLibPurple "--purple=1"
++ optional enablePam "--pam=1";
+ patches = [
+ # This should be dropped once the issue is fixed upstream.
+ (fetchpatch {
+ url = "https://github.com/bitlbee/bitlbee/commit/6ff651b3ec93e5fd74f80766d5e9714d963137bc.diff";
+ sha256 = "144dpm4kq7c268fpww1q3n88ayg068n73fbabr5arh1zryw48qfv";
+ })
+ ];
+
installTargets = [ "install" "install-dev" ];
doCheck = !enableLibPurple; # Checks fail with libpurple for some reason
diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
index 7c474d26c88c..027b5b5805cb 100644
--- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, makeWrapper, jre_headless }:
+{ stdenv, lib, fetchurl, makeWrapper, jre_headless, libmatthew_java, dbus, dbus_java }:
stdenv.mkDerivation rec {
pname = "signal-cli";
@@ -10,16 +10,24 @@ stdenv.mkDerivation rec {
sha256 = "1gvdifscyxmxn2dwlkqi684ahy5kbcj84mqda0m8l4aa8iaq1d59";
};
- buildInputs = [ makeWrapper ];
+ buildInputs = lib.optional stdenv.isLinux [ libmatthew_java dbus dbus_java ];
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin
cp -r lib $out/lib
cp bin/signal-cli $out/bin/signal-cli
+ '' + (if stdenv.isLinux then ''
+ makeWrapper ${jre_headless}/bin/java $out/bin/signal-cli \
+ --set JAVA_HOME "${jre_headless}" \
+ --add-flags "-classpath '$out/lib/*:${libmatthew_java}/lib/jni'" \
+ --add-flags "-Djava.library.path=${libmatthew_java}/lib/jni:${dbus_java}/share/java/dbus:$out/lib" \
+ --add-flags "org.asamk.signal.Main"
+ '' else ''
wrapProgram $out/bin/signal-cli \
--prefix PATH : ${lib.makeBinPath [ jre_headless ]} \
--set JAVA_HOME ${jre_headless}
- '';
+ '');
# Execution in the macOS (10.13) sandbox fails with
# dyld: Library not loaded: /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa
@@ -29,6 +37,7 @@ stdenv.mkDerivation rec {
# /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa: file system sandbox blocked stat()
# /nix/store/in41dz8byyyz4c0w132l7mqi43liv4yr-stdenv-darwin/setup: line 1310: 2231 Abort trap: 6 signal-cli --version
doInstallCheck = stdenv.isLinux;
+
installCheckPhase = ''
export PATH=$PATH:$out/bin
# --help returns non-0 exit code even when working
@@ -39,7 +48,7 @@ stdenv.mkDerivation rec {
homepage = https://github.com/AsamK/signal-cli;
description = "Command-line and dbus interface for communicating with the Signal messaging service";
license = licenses.gpl3;
- maintainers = with maintainers; [ ivan ];
+ maintainers = with maintainers; [ ivan erictapen ];
platforms = platforms.all;
};
}
diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index f29e62a10060..2893f21357b5 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -59,7 +59,10 @@ let
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
- url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb";
+ urls = [
+ "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
+ "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
+ ];
sha256 = "09k260g9qy4n8vy6wr2jb5mm27cvqyapmv8vj4ff2j72f3ad31vm";
}
else
diff --git a/pkgs/applications/networking/irc/glowing-bear/default.nix b/pkgs/applications/networking/irc/glowing-bear/default.nix
index 8bdb23d50dd3..2d12386bafac 100644
--- a/pkgs/applications/networking/irc/glowing-bear/default.nix
+++ b/pkgs/applications/networking/irc/glowing-bear/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "glowing-bear";
- version = "0.7.1";
+ version = "0.7.2";
src = fetchFromGitHub {
rev = version;
owner = "glowing-bear";
repo = "glowing-bear";
- sha256 = "0gwrf67l3i3nl7zy1miljz6f3vv6zzc3g9as06by548f21cizzjb";
+ sha256 = "14a3fqsmi28g7j3lzk4l4m47p2iml1aaf3514wazn2clw48lnqhw";
};
installPhase = ''
diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix
index 4152c08ebaf6..b646d0fc93f7 100644
--- a/pkgs/applications/office/qownnotes/default.nix
+++ b/pkgs/applications/office/qownnotes/default.nix
@@ -2,13 +2,13 @@
mkDerivation rec {
pname = "qownnotes";
- version = "19.10.10";
+ version = "19.11.14";
src = fetchurl {
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
# Can grab official version like so:
# $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-19.1.8.tar.xz.sha256
- sha256 = "1zhszlrcmi8l96wq6hp48d8qv16jlyni02wf41dvh5r9ccfwlq42";
+ sha256 = "8faa67720443fc9a116feae3e7d641922a08814b9af4d973d348ff8a0ee0e35d";
};
nativeBuildInputs = [ qmake qttools ];
diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix
index b4fee1c90fac..d5abb6d004b0 100644
--- a/pkgs/applications/version-management/git-repo/default.nix
+++ b/pkgs/applications/version-management/git-repo/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "git-repo";
- version = "1.13.7.1";
+ version = "1.13.8";
src = fetchFromGitHub {
owner = "android";
repo = "tools_repo";
rev = "v${version}";
- sha256 = "0acsvrc45kdwpj5mi5i61mibr1fdx4g4835c3b8x0fdgrya4n37c";
+ sha256 = "1wmzgijmssgwkkw8g4zgmc4x64xkvz6nq1b3szcvawgv1ndwnb2j";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index 4ee67a6a1ef3..8a22f8c3dc11 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -8,13 +8,13 @@ with stdenv.lib;
buildGoPackage rec {
pname = "gitea";
- version = "1.9.6";
+ version = "1.10.0";
src = fetchFromGitHub {
owner = "go-gitea";
repo = "gitea";
rev = "v${version}";
- sha256 = "0ql6hrrc339hrik4yk26bjn5x167c5q4s10kjld5fsgmn2k1nhdb";
+ sha256 = "19r0gbp4q2sk3br17625m8jinlglijjknqs5y20w3kzxrifrjrmk";
# Required to generate the same checksum on MacOS due to unicode encoding differences
# More information: https://github.com/NixOS/nixpkgs/pull/48128
extraPostFetch = ''
diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix
index a5de209854b3..586779252b63 100644
--- a/pkgs/applications/video/mediathekview/default.nix
+++ b/pkgs/applications/video/mediathekview/default.nix
@@ -1,25 +1,29 @@
{ stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec {
- version = "13.2.1";
+ version = "13.5.0";
pname = "mediathekview";
src = fetchurl {
- url = "https://download.mediathekview.de/stabil/MediathekView-${version}.tar.gz";
- sha256 = "11wg6klviig0h7pprfaygamsgqr7drqra2s4yxgfak6665033l2a";
+ url = "https://download.mediathekview.de/stabil/MediathekView-${version}-linux.tar.gz";
+ sha256 = "0n05w2d6sh03rjms7m9b5nj84cl16gkrc9nsn53kvldglmqmmrac";
};
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
- mkdir -p $out/{lib,bin,share/mediathekview}
+ mkdir -p $out/{bin,lib}
- install -m644 MediathekView.jar $out/
- install -m644 -t $out/lib lib/*
- install -m755 bin/flv.sh $out/share/mediathekview
+ install -m644 MediathekView.jar $out/lib
makeWrapper ${jre}/bin/java $out/bin/mediathek \
- --add-flags "-cp '$out/lib/*' -jar $out/MediathekView.jar"
- '';
+ --add-flags "-Xmx1G -jar $out/lib/MediathekView.jar"
+
+ makeWrapper ${jre}/bin/java $out/bin/MediathekView \
+ --add-flags "-Xmx1G -jar $out/lib/MediathekView.jar"
+
+ makeWrapper ${jre}/bin/java $out/bin/MediathekView_ipv4 \
+ --add-flags "-Xmx1G -Djava.net.preferIPv4Stack=true -jar $out/lib/MediathekView.jar"
+ '';
meta = with stdenv.lib; {
description = "Offers access to the Mediathek of different tv stations (ARD, ZDF, Arte, etc.)";
diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/data/fonts/ibm-plex/default.nix
index d4a673533af7..cd868d88d65e 100644
--- a/pkgs/data/fonts/ibm-plex/default.nix
+++ b/pkgs/data/fonts/ibm-plex/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchzip }:
let
- version = "3.0.0";
+ version = "4.0.1";
in fetchzip {
name = "ibm-plex-${version}";
url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip";
@@ -9,7 +9,7 @@ in fetchzip {
mkdir -p $out/share/fonts
unzip -j $downloadedFile "OpenType/*/*.otf" -d $out/share/fonts/opentype
'';
- sha256 = "1vv0lf2fn0y0ln14s4my8x2mykq1lwqpmkjkhs6cm48mzf740nhs";
+ sha256 = "11d5bsv7d5rbp9f1gf1l4za3xj6jlqwnvsl5ipwx4angh1kb7nk8";
meta = with lib; {
description = "IBM Plex Typeface";
diff --git a/pkgs/data/fonts/public-sans/default.nix b/pkgs/data/fonts/public-sans/default.nix
index cb4c5523a70e..326fe73341ff 100644
--- a/pkgs/data/fonts/public-sans/default.nix
+++ b/pkgs/data/fonts/public-sans/default.nix
@@ -1,18 +1,22 @@
{ lib, fetchzip }:
let
- version = "1.006";
+ version = "1.007";
in fetchzip {
name = "public-sans-${version}";
url = "https://github.com/uswds/public-sans/releases/download/v${version}/public-sans-v${version}.zip";
postFetch = ''
- mkdir -p $out/share
- unzip $downloadedFile fonts/{otf,variable}/\*.\[ot\]tf -d $out/share/
+ mkdir -p $out/share/fonts
+ unzip -j $downloadedFile binaries/otf/\*.otf -d $out/share/fonts/opentype
+ unzip -j $downloadedFile binaries/variable/\*.ttf -d $out/share/fonts/truetype
+ unzip -j $downloadedFile binaries/webfonts/\*.ttf -d $out/share/fonts/truetype
+ unzip -j $downloadedFile binaries/webfonts/\*.woff -d $out/share/fonts/woff
+ unzip -j $downloadedFile binaries/webfonts/\*.woff2 -d $out/share/fonts/woff2
'';
- sha256 = "1x04mpynfhcgiwx68w5sawgn69xld7k65mbq7n5vcgbfzh2sjwhq";
+ sha256 = "1yzraw08qm1ig7ks850b329xp6zv2znjwl610dppax34kwhqghsm";
meta = with lib; {
description = "A strong, neutral, principles-driven, open source typeface for text or display";
diff --git a/pkgs/data/fonts/stix-two/default.nix b/pkgs/data/fonts/stix-two/default.nix
index 1d5ed37767c3..c71b51ad75de 100644
--- a/pkgs/data/fonts/stix-two/default.nix
+++ b/pkgs/data/fonts/stix-two/default.nix
@@ -1,18 +1,22 @@
-{ stdenv, fetchzip }:
+{ stdenv, fetchFromGitHub }:
let
- version = "2.0.0";
-in fetchzip {
+ version = "2.0.2";
+in fetchFromGitHub {
name = "stix-two-${version}";
- url = "https://github.com/stipub/stixfonts/archive/${version}.zip";
+ owner = "stipub";
+ repo = "stixfonts";
+ rev = "v${version}";
postFetch = ''
- mkdir -p $out/share/fonts
- unzip -j $downloadedFile '*/OTF/*.otf' -d $out/share/fonts/opentype
+ tar xf $downloadedFile --strip=1
+ install -m444 -Dt $out/share/fonts/opentype/ OTF/*.otf
+ install -m444 -Dt $out/share/fonts/woff/ WOFF/*.woff
+ install -m444 -Dt $out/share/fonts/woff2/ WOFF2/*.woff2
'';
- sha256 = "19i30d2xjk52bjj7xva1hnlyh58yd5phas1njcc8ldcz87a1lhql";
+ sha256 = "1ah8s0cb67yv4ll8zfs01mdh9m5i2lbkrfbmkhi1xdid6pxsk32x";
meta = with stdenv.lib; {
homepage = http://www.stixfonts.org/;
diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix
index 5658f20c7446..ed4b2581e850 100644
--- a/pkgs/data/icons/numix-icon-theme-circle/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix
@@ -25,6 +25,10 @@ stdenv.mkDerivation rec {
'';
postFixup = ''
+ for panel in $out/share/icons/*/*/panel; do
+ ln -sf $(realpath ${numix-icon-theme}/share/icons/Numix/16/$(readlink $panel)) $panel
+ done
+
for theme in $out/share/icons/*; do
gtk-update-icon-cache $theme
done
diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix
index 76176f9ad04b..620ef02fde72 100644
--- a/pkgs/data/icons/numix-icon-theme-square/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-square/default.nix
@@ -25,6 +25,10 @@ stdenv.mkDerivation rec {
'';
postFixup = ''
+ for panel in $out/share/icons/*/*/panel; do
+ ln -sf $(realpath ${numix-icon-theme}/share/icons/Numix/16/$(readlink $panel)) $panel
+ done
+
for theme in $out/share/icons/*; do
gtk-update-icon-cache $theme
done
diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix
index f7f189e23bdc..33261472487f 100644
--- a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-dash-to-panel";
- version = "23";
+ version = "26";
src = fetchFromGitHub {
owner = "home-sweet-gnome";
repo = "dash-to-panel";
rev = "v${version}";
- sha256 = "12smkz3clcvgicr0pdc0fk6igf82nw4hzih1ywv9q43xkqh9w1i6";
+ sha256 = "1phfx2pblygpcvsppsqqqflm7qnz46mqkw29hj0nv2dn69hf4xbc";
};
buildInputs = [
diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
index 921991a33aea..13b2d6a1db4f 100644
--- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, gnome3 }:
+{ stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop }:
stdenv.mkDerivation rec {
pname = "gnome-shell-system-monitor";
@@ -41,6 +41,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ aneeshusa tiramiseb ];
homepage = https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet;
- broken = versionAtLeast gnome3.gnome-shell.version "3.32";
};
}
diff --git a/pkgs/desktops/xfce/applications/gigolo.nix b/pkgs/desktops/xfce/applications/gigolo.nix
deleted file mode 100644
index d0fc55e77e82..000000000000
--- a/pkgs/desktops/xfce/applications/gigolo.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, python, gettext, intltool, pkgconfig, gtk, gvfs }:
-
-stdenv.mkDerivation rec {
- p_name = "gigolo";
- ver_maj = "0.4";
- ver_min = "2";
-
- src = fetchurl {
- url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "0r4ij0mlnp0bqq44pyrdcpz18r1zwsksw6w5yc0jzgg7wj7wfgsm";
- };
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ python gettext intltool gtk gvfs];
-
- meta = {
- homepage = "https://goodies.xfce.org/projects/applications/${p_name}";
- description = "A frontend to easily manage connections to remote filesystems";
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/desktops/xfce4-14/gigolo/default.nix b/pkgs/desktops/xfce/applications/gigolo/default.nix
similarity index 72%
rename from pkgs/desktops/xfce4-14/gigolo/default.nix
rename to pkgs/desktops/xfce/applications/gigolo/default.nix
index 5b25e474af27..32486aab981f 100644
--- a/pkgs/desktops/xfce4-14/gigolo/default.nix
+++ b/pkgs/desktops/xfce/applications/gigolo/default.nix
@@ -9,4 +9,8 @@ mkXfceDerivation {
nativeBuildInputs = [ exo ];
buildInputs = [ gtk3 glib gvfs ];
+
+ meta = {
+ description = "A frontend to easily manage connections to remote filesystems";
+ };
}
diff --git a/pkgs/desktops/xfce/applications/mousepad-12134.patch b/pkgs/desktops/xfce/applications/mousepad-12134.patch
deleted file mode 100644
index 74a28ecf61af..000000000000
--- a/pkgs/desktops/xfce/applications/mousepad-12134.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -urNZ a/mousepad/mousepad-action-group.c b/mousepad/mousepad-action-group.c
---- a/mousepad/mousepad-action-group.c 2014-09-01 20:50:07.000000000 +0000
-+++ b/mousepad/mousepad-action-group.c 2017-12-18 16:57:46.836538403 +0000
-@@ -302,11 +302,6 @@
- gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE);
- self->locked = FALSE;
-
-- /* update the setting when the active action is changed */
-- self->locked = TRUE;
-- MOUSEPAD_SETTING_SET_STRING (COLOR_SCHEME, gtk_source_style_scheme_get_id (scheme));
-- self->locked = FALSE;
--
- g_object_notify (G_OBJECT (self), "active-style-scheme");
- }
-
-@@ -473,6 +468,8 @@
- mousepad_action_group_style_scheme_action_activate (MousepadActionGroup *self,
- MousepadStyleSchemeAction *action)
- {
-+ const gchar *scheme_name = NULL;
-+
- /* only update the active action if we're not already in the process of
- * setting it and the sender action is actually active */
- if (! self->locked &&
-@@ -481,7 +478,14 @@
- GtkSourceStyleScheme *scheme;
-
- scheme = mousepad_style_scheme_action_get_style_scheme (action);
-- mousepad_action_group_set_active_style_scheme (self, scheme);
-+
-+ /* update the setting when the active action is changed */
-+ if (scheme != NULL)
-+ scheme_name = gtk_source_style_scheme_get_id(scheme);
-+
-+ self->locked = TRUE;
-+ MOUSEPAD_SETTING_SET_STRING (COLOR_SCHEME, scheme_name);
-+ self->locked = FALSE;
- }
- }
-
-diff -urNZ a/mousepad/mousepad-window.c b/mousepad/mousepad-window.c
---- a/mousepad/mousepad-window.c 2014-09-01 20:58:02.000000000 +0000
-+++ b/mousepad/mousepad-window.c 2017-12-18 17:07:51.099321408 +0000
-@@ -712,32 +712,6 @@
-
-
- static void
--mousepad_window_action_group_style_scheme_changed (MousepadWindow *window,
-- GParamSpec *pspec,
-- MousepadActionGroup *group)
--{
-- GtkSourceStyleScheme *scheme;
-- const gchar *scheme_id;
-- gint npages, i;
--
-- /* get the new active language */
-- scheme = mousepad_action_group_get_active_style_scheme (group);
-- scheme_id = gtk_source_style_scheme_get_id (scheme);
--
-- /* update the color scheme on all the documents */
-- npages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (window->notebook));
-- for (i = 0; i < npages; i++)
-- {
-- MousepadDocument *document;
--
-- document = MOUSEPAD_DOCUMENT (gtk_notebook_get_nth_page (GTK_NOTEBOOK (window->notebook), i));
-- mousepad_view_set_color_scheme (document->textview, scheme_id);
-- }
--}
--
--
--
--static void
- mousepad_window_create_style_schemes_menu (MousepadWindow *window)
- {
- GtkWidget *menu, *item;
-@@ -751,13 +725,6 @@
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu);
- gtk_widget_show_all (menu);
- gtk_widget_show (item);
--
-- /* watch for activations of the style schemes actions */
-- g_signal_connect_object (window->action_group,
-- "notify::active-style-scheme",
-- G_CALLBACK (mousepad_window_action_group_style_scheme_changed),
-- window,
-- G_CONNECT_SWAPPED);
- }
-
-
diff --git a/pkgs/desktops/xfce/applications/mousepad.nix b/pkgs/desktops/xfce/applications/mousepad.nix
deleted file mode 100644
index 2dca1fa29b0f..000000000000
--- a/pkgs/desktops/xfce/applications/mousepad.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util
-, gtk, gtksourceview, dbus, dbus-glib, makeWrapper
-, dconf }:
-
-stdenv.mkDerivation rec {
- p_name = "mousepad";
- ver_maj = "0.4";
- ver_min = "0";
-
- src = fetchurl {
- url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "60114431eac8db6bb6ce18bd38f1630cccb684375b97a445a1b6fd619848d132";
- };
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- patches = [ ./mousepad-12134.patch ];
-
- buildInputs =
- [ pkgconfig intltool libxfce4util
- gtk gtksourceview dbus dbus-glib makeWrapper
- dconf
- ];
-
- configureFlags = [ "--enable-keyfile-settings" ];
-
- preFixup = ''
- wrapProgram "$out/bin/mousepad" \
- --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:${gtksourceview}/share" \
- --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules"
- '';
-
- meta = {
- homepage = https://www.xfce.org/;
- description = "A simple text editor for Xfce";
- license = stdenv.lib.licenses.gpl2Plus;
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/desktops/xfce4-14/mousepad/default.nix b/pkgs/desktops/xfce/applications/mousepad/default.nix
similarity index 86%
rename from pkgs/desktops/xfce4-14/mousepad/default.nix
rename to pkgs/desktops/xfce/applications/mousepad/default.nix
index 77559aaf329f..6f841958c795 100644
--- a/pkgs/desktops/xfce4-14/mousepad/default.nix
+++ b/pkgs/desktops/xfce/applications/mousepad/default.nix
@@ -12,4 +12,8 @@ mkXfceDerivation {
# See https://github.com/NixOS/nixpkgs/issues/36468
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
+
+ meta = {
+ description = "A simple text editor for Xfce";
+ };
}
diff --git a/pkgs/desktops/xfce/applications/orage.nix b/pkgs/desktops/xfce/applications/orage.nix
deleted file mode 100644
index 19bd560cbaef..000000000000
--- a/pkgs/desktops/xfce/applications/orage.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, bison, flex, intltool, gtk, libical, dbus-glib, tzdata
-, libnotify, popt, xfce }:
-
-stdenv.mkDerivation rec {
- name = "${p_name}-${ver_maj}.${ver_min}";
- p_name = "orage";
- ver_maj = "4.12";
- ver_min = "1";
-
- src = fetchurl {
- url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "0qlhvnl2m33vfxqlbkic2nmfpwyd4mq230jzhs48cg78392amy9w";
- };
-
- patches = [
- # Fix build with libical 3.0
- (fetchpatch {
- name = "fix-libical3.patch";
- url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/libical3.patch?h=packages/orage&id=7b1b06c42dda034d538977b9f3550b28e370057f;
- sha256 = "1l8s106mcidmbx2p8c2pi8v9ngbv2x3fsgv36j8qk8wyd4qd1jbf";
- })
- ];
-
- postPatch = ''
- substituteInPlace src/parameters.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
- substituteInPlace src/tz_zoneinfo_read.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
- substituteInPlace tz_convert/tz_convert.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
- '';
-
- postConfigure = "rm -rf libical"; # ensure pkgs.libical is used instead of one included in the orage sources
-
- nativeBuildInputs = [ pkgconfig intltool bison flex ];
-
- buildInputs = [ gtk libical dbus-glib libnotify popt xfce.libxfce4util
- xfce.xfce4-panel ];
-
- meta = {
- homepage = https://www.xfce.org/projects/;
- description = "A simple calendar application with reminders";
- license = stdenv.lib.licenses.gpl2;
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.romildo ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/orage/default.nix b/pkgs/desktops/xfce/applications/orage/default.nix
similarity index 93%
rename from pkgs/desktops/xfce4-14/orage/default.nix
rename to pkgs/desktops/xfce/applications/orage/default.nix
index 7bb10c2fd94b..4a48cc83dda4 100644
--- a/pkgs/desktops/xfce4-14/orage/default.nix
+++ b/pkgs/desktops/xfce/applications/orage/default.nix
@@ -32,4 +32,8 @@ mkXfceDerivation {
sha256 = "1l8s106mcidmbx2p8c2pi8v9ngbv2x3fsgv36j8qk8wyd4qd1jbf";
})
];
+
+ meta = {
+ description = "A simple calendar application with reminders";
+ };
}
diff --git a/pkgs/desktops/xfce/applications/parole.nix b/pkgs/desktops/xfce/applications/parole.nix
deleted file mode 100644
index ac0180c20fe8..000000000000
--- a/pkgs/desktops/xfce/applications/parole.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, gst_all_1
-, gtk, dbus-glib, libxfce4ui, libxfce4util, xfconf
-, taglib, libnotify, hicolor-icon-theme
-, withGstPlugins ? true
-}:
-
-stdenv.mkDerivation rec {
- p_name = "parole";
- ver_maj = "0.5";
- ver_min = "4";
-
- src = fetchurl {
- url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "1hxzqg9dfghrhvmnnccwwa4278fh2awkcqy89sla05m08mxvvx60";
- };
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- nativeBuildInputs = [ pkgconfig intltool ];
-
- buildInputs = [
- makeWrapper hicolor-icon-theme
- gtk dbus-glib libxfce4ui libxfce4util xfconf
- taglib libnotify
- ] ++ (with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav]);
-
- configureFlags = [ "--with-gstreamer=1.0" ];
-
- postInstall = stdenv.lib.optionalString withGstPlugins ''
- wrapProgram "$out/bin/parole" --prefix \
- GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0"
- '';
-
- meta = {
- homepage = "https://goodies.xfce.org/projects/applications/${p_name}";
- description = "Modern simple media player";
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/desktops/xfce4-14/parole/default.nix b/pkgs/desktops/xfce/applications/parole/default.nix
similarity index 79%
rename from pkgs/desktops/xfce4-14/parole/default.nix
rename to pkgs/desktops/xfce/applications/parole/default.nix
index ed3979072ed3..20b899165f09 100644
--- a/pkgs/desktops/xfce4-14/parole/default.nix
+++ b/pkgs/desktops/xfce/applications/parole/default.nix
@@ -1,6 +1,5 @@
{ mkXfceDerivation, dbus, dbus-glib
-, gst-plugins-bad, gst-plugins-base, gst-plugins-good
-, gst-plugins-ugly, gtk3, libnotify, libxfce4ui, libxfce4util
+, gst_all_1, gtk3, libnotify, libxfce4ui, libxfce4util
, taglib, xfconf }:
# Doesn't seem to find H.264 codec even though built with gst-plugins-bad.
@@ -17,7 +16,7 @@ mkXfceDerivation {
--replace GST_BASE_CFLAGS GST_VIDEO_CFLAGS
'';
- buildInputs = [
+ buildInputs = with gst_all_1; [
dbus
dbus-glib
gst-plugins-bad
@@ -31,4 +30,8 @@ mkXfceDerivation {
taglib
xfconf
];
+
+ meta = {
+ description = "Modern simple media player";
+ };
}
diff --git a/pkgs/desktops/xfce/applications/ristretto.nix b/pkgs/desktops/xfce/applications/ristretto.nix
deleted file mode 100644
index 3c0e8040c3b2..000000000000
--- a/pkgs/desktops/xfce/applications/ristretto.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libexif, gtk
-, exo, dbus-glib, libxfce4util, libxfce4ui, xfconf
-, hicolor-icon-theme, makeWrapper
-}:
-
-stdenv.mkDerivation rec {
- p_name = "ristretto";
- ver_maj = "0.6";
- ver_min = "3";
-
- src = fetchurl {
- url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "0y9d8w1plwp4vmxs44y8k8x15i0k0xln89k6jndhv6lf57g1cs1b";
- };
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- buildInputs =
- [ pkgconfig intltool libexif gtk dbus-glib exo libxfce4util
- libxfce4ui xfconf hicolor-icon-theme makeWrapper
- ];
-
- postInstall = ''
- wrapProgram "$out/bin/ristretto" \
- --prefix XDG_DATA_DIRS : "${hicolor-icon-theme}/share"
- '';
-
- meta = {
- homepage = "https://goodies.xfce.org/projects/applications/${p_name}";
- description = "A fast and lightweight picture-viewer for the Xfce desktop environment";
- license = stdenv.lib.licenses.gpl2Plus;
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.eelco ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/ristretto/default.nix b/pkgs/desktops/xfce/applications/ristretto/default.nix
similarity index 76%
rename from pkgs/desktops/xfce4-14/ristretto/default.nix
rename to pkgs/desktops/xfce/applications/ristretto/default.nix
index 4a24bf905328..8766bd302ab3 100644
--- a/pkgs/desktops/xfce4-14/ristretto/default.nix
+++ b/pkgs/desktops/xfce/applications/ristretto/default.nix
@@ -10,4 +10,8 @@ mkXfceDerivation {
nativeBuildInputs = [ exo ];
buildInputs = [ glib gtk3 libexif libxfce4ui libxfce4util xfconf ];
+
+ meta = {
+ description = "A fast and lightweight picture-viewer for the Xfce desktop environment";
+ };
}
diff --git a/pkgs/desktops/xfce/applications/terminal.nix b/pkgs/desktops/xfce/applications/terminal.nix
deleted file mode 100644
index 31e851a469d7..000000000000
--- a/pkgs/desktops/xfce/applications/terminal.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, ncurses, gtk, vte, dbus-glib
-, exo, libxfce4util, libxfce4ui
-}:
-
-stdenv.mkDerivation rec {
- p_name = "xfce4-terminal";
- ver_maj = "0.6";
- ver_min = "3";
-
- src = fetchurl {
- url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "023y0lkfijifh05yz8grimxadqpi98mrivr00sl18nirq8b4fbwi";
- };
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool exo gtk vte libxfce4util ncurses dbus-glib libxfce4ui ];
-
- meta = {
- homepage = https://www.xfce.org/projects/terminal;
- description = "A modern terminal emulator primarily for the Xfce desktop environment";
- license = stdenv.lib.licenses.gpl2Plus;
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/desktops/xfce/applications/xfburn/default.nix b/pkgs/desktops/xfce/applications/xfburn/default.nix
new file mode 100644
index 000000000000..08f2bd511a87
--- /dev/null
+++ b/pkgs/desktops/xfce/applications/xfburn/default.nix
@@ -0,0 +1,12 @@
+{ mkXfceDerivation, docbook_xsl, exo, gtk3, libburn, libisofs, libxfce4ui, libxslt }:
+
+mkXfceDerivation {
+ category = "apps";
+ pname = "xfburn";
+ version = "0.6.1";
+
+ sha256 = "0a1ly79x7j5pgr3vbsabb4i0jd5rryaigj9z8iqzr8p9miypx20v";
+
+ nativeBuildInputs = [ libxslt docbook_xsl ];
+ buildInputs = [ exo gtk3 libburn libisofs libxfce4ui ];
+}
diff --git a/pkgs/desktops/xfce4-14/xfce4-dict/configure-gio.patch b/pkgs/desktops/xfce/applications/xfce4-dict/configure-gio.patch
similarity index 100%
rename from pkgs/desktops/xfce4-14/xfce4-dict/configure-gio.patch
rename to pkgs/desktops/xfce/applications/xfce4-dict/configure-gio.patch
diff --git a/pkgs/desktops/xfce4-14/xfce4-dict/default.nix b/pkgs/desktops/xfce/applications/xfce4-dict/default.nix
similarity index 84%
rename from pkgs/desktops/xfce4-14/xfce4-dict/default.nix
rename to pkgs/desktops/xfce/applications/xfce4-dict/default.nix
index 66ca7affa481..b2682080216c 100644
--- a/pkgs/desktops/xfce4-14/xfce4-dict/default.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-dict/default.nix
@@ -16,4 +16,8 @@ mkXfceDerivation {
'';
buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel ];
+
+ meta = {
+ description = "A Dictionary Client for the Xfce desktop environment";
+ };
}
diff --git a/pkgs/desktops/xfce/applications/xfce4-mixer.nix b/pkgs/desktops/xfce/applications/xfce4-mixer.nix
deleted file mode 100644
index e1646d93a619..000000000000
--- a/pkgs/desktops/xfce/applications/xfce4-mixer.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, makeWrapper
-, glib, gstreamer, gst-plugins-base, gtk
-, libxfce4util, libxfce4ui, xfce4-panel, xfconf, libunique ? null
-, pulseaudioSupport ? false, gst-plugins-good
-}:
-
-let
- # The usual Gstreamer plugins package has a zillion dependencies
- # that we don't need for a simple mixer, so build a minimal package.
- gst_plugins_minimal = gst-plugins-base.override {
- minimalDeps = true;
- };
- gst_plugins_pulse = gst-plugins-good.override {
- minimalDeps = true;
- };
- gst_plugins = [ gst_plugins_minimal ] ++ stdenv.lib.optional pulseaudioSupport gst_plugins_pulse;
-
-in
-
-stdenv.mkDerivation rec {
- p_name = "xfce4-mixer";
- ver_maj = "4.10";
- ver_min = "0";
-
- src = fetchurl {
- url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "1pnsd00583l7p5d80rxbh58brzy3jnccwikbbbm730a33c08kid8";
- };
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- buildInputs =
- [ pkgconfig intltool glib gstreamer gtk
- libxfce4util libxfce4ui xfce4-panel xfconf libunique makeWrapper
- ] ++ gst_plugins;
-
- postInstall =
- ''
- wrapProgram "$out/bin/xfce4-mixer" \
- --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
- '';
-
- passthru = { inherit gst_plugins; };
-
- meta = {
- homepage = https://www.xfce.org/projects/xfce4-mixer; # referenced but inactive
- description = "A volume control application for the Xfce desktop environment";
- license = stdenv.lib.licenses.gpl2Plus;
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.eelco ];
- };
-}
diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd.nix
deleted file mode 100644
index 19ecff290933..000000000000
--- a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libnotify
-, gtk , libxfce4util, libxfce4ui, xfconf, hicolor-icon-theme }:
-
-stdenv.mkDerivation rec {
- p_name = "xfce4-notifyd";
- ver_maj = "0.2";
- ver_min = "4";
-
- src = fetchurl {
- url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "1l6fpfk0fkizdx7vwbyjdyzzj5i2ng8pf7r8j49nv0cnjhpxczlc";
- };
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool libnotify gtk libxfce4util libxfce4ui xfconf hicolor-icon-theme ];
-
- preFixup = ''
- # to be able to run the daemon we need it in PATH
- ln -rs $out/lib/xfce4/notifyd/xfce4-notifyd $out/bin
- '';
-
- doCheck = true;
-
- meta = {
- homepage = "http://goodies.xfce.org/projects/applications/${p_name}";
- description = "Notification daemon for Xfce";
- license = stdenv.lib.licenses.gpl2Plus;
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.eelco ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfce4-notifyd/default.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix
similarity index 82%
rename from pkgs/desktops/xfce4-14/xfce4-notifyd/default.nix
rename to pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix
index e468fea637e8..a991e8c81807 100644
--- a/pkgs/desktops/xfce4-14/xfce4-notifyd/default.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix
@@ -9,4 +9,8 @@ mkXfceDerivation {
sha256 = "1lmm9h3ych8dz9jpjkxg91f9ln14xs527nxjxsryks00kmqk4kai";
buildInputs = [ exo gtk3 glib libnotify libxfce4ui libxfce4util xfce4-panel xfconf ];
+
+ meta = {
+ description = "Simple notification daemon for Xfce";
+ };
}
diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix
deleted file mode 100644
index 085cfd7b8f90..000000000000
--- a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, xfce4-panel, libxfce4util, gtk, libsoup
-, glib-networking, exo, hicolor-icon-theme, wrapGAppsHook }:
-
-stdenv.mkDerivation rec {
- p_name = "xfce4-screenshooter";
- ver_maj = "1.8";
- ver_min = "2";
-
- src = fetchurl {
- url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "9dce2ddfaa87f703e870e29bae13f3fc82a1b3f06b44f8386640e45a135f5f69";
- };
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- nativeBuildInputs = [
- pkgconfig intltool wrapGAppsHook
- ];
-
- buildInputs = [
- xfce4-panel libxfce4util gtk libsoup exo hicolor-icon-theme glib-networking
- ];
-
- meta = {
- homepage = https://goodies.xfce.org/projects/applications/xfce4-screenshooter;
- description = "Xfce screenshooter";
- license = stdenv.lib.licenses.gpl2Plus;
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix
similarity index 81%
rename from pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix
rename to pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix
index f13a8fba6d0a..012486baac9b 100644
--- a/pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix
@@ -8,4 +8,8 @@ mkXfceDerivation {
sha256 = "1h14sywvk9l06p3z1cpb79911j8w2wqbk03ldknjkia2rfymjk06";
buildInputs = [ exo gtk3 libsoup libxfce4ui libxfce4util xfce4-panel glib-networking ];
+
+ meta = {
+ description = "Screenshot utility for the Xfce desktop";
+ };
}
diff --git a/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix b/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
deleted file mode 100644
index 96f71e004a87..000000000000
--- a/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gtk, libwnck }:
-
-stdenv.mkDerivation rec {
- p_name = "xfce4-taskmanager";
- ver_maj = "1.1";
- ver_min = "0";
-
- src = fetchurl {
- url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "1jwywmkkkmz7406m1jq40w6apiav25cznafhigbgpjv6z5hv27if";
- };
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool gtk libwnck ];
-
- meta = {
- homepage = "https://goodies.xfce.org/projects/applications/${p_name}";
- description = "Easy to use task manager for Xfce";
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfce4-taskmanager/default.nix b/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix
similarity index 80%
rename from pkgs/desktops/xfce4-14/xfce4-taskmanager/default.nix
rename to pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix
index 776b3797f769..e3d8b4b87d94 100644
--- a/pkgs/desktops/xfce4-14/xfce4-taskmanager/default.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix
@@ -9,4 +9,8 @@ mkXfceDerivation {
nativeBuildInputs = [ exo ];
buildInputs = [ gtk3 libwnck3 libXmu ];
+
+ meta = {
+ description = "Easy to use task manager for Xfce";
+ };
}
diff --git a/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix
similarity index 100%
rename from pkgs/desktops/xfce4-14/xfce4-terminal/default.nix
rename to pkgs/desktops/xfce/applications/xfce4-terminal/default.nix
diff --git a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse.nix b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse.nix
deleted file mode 100644
index 4344d34f13f6..000000000000
--- a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libpulseaudio
-, gtk2, libnotify
-, keybinder, xfconf
-}:
-
-stdenv.mkDerivation rec {
- p_name = "xfce4-volumed-pulse";
- ver_maj = "0.2";
- ver_min = "2";
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "0xjcs1b6ix6rwj9xgr9n89h315r3yhdm8wh5bkincd4lhz6ibhqf";
- };
-
- buildInputs =
- [ libpulseaudio gtk2
- keybinder xfconf libnotify
- ];
-
- nativeBuildInputs = [ pkgconfig ];
-
- meta = with stdenv.lib; {
- homepage = https://launchpad.net/xfce4-volumed-pulse;
- description = "A volume keys control daemon for the Xfce desktop environment (Xubuntu fork)";
- license = licenses.gpl3;
- platforms = platforms.linux;
- maintainers = [ maintainers.abbradar ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfce4-volumed-pulse/default.nix b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix
similarity index 75%
rename from pkgs/desktops/xfce4-14/xfce4-volumed-pulse/default.nix
rename to pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix
index 97a00e9b67fa..413c04a84cc1 100644
--- a/pkgs/desktops/xfce4-14/xfce4-volumed-pulse/default.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix
@@ -10,6 +10,8 @@ mkXfceDerivation {
buildInputs = [ gtk3 libnotify libpulseaudio keybinder3 xfconf ];
meta = with lib; {
+ description = "A volume keys control daemon for Xfce using pulseaudio";
license = licenses.gpl3Plus;
+ maintainers = [ maintainers.abbradar ];
};
}
diff --git a/pkgs/desktops/xfce/applications/xfce4-volumed.nix b/pkgs/desktops/xfce/applications/xfce4-volumed/default.nix
similarity index 100%
rename from pkgs/desktops/xfce/applications/xfce4-volumed.nix
rename to pkgs/desktops/xfce/applications/xfce4-volumed/default.nix
diff --git a/pkgs/desktops/xfce4-14/xfdashboard/default.nix b/pkgs/desktops/xfce/applications/xfdashboard/default.nix
similarity index 100%
rename from pkgs/desktops/xfce4-14/xfdashboard/default.nix
rename to pkgs/desktops/xfce/applications/xfdashboard/default.nix
diff --git a/pkgs/desktops/xfce4-14/automakeAddFlags.sh b/pkgs/desktops/xfce/automakeAddFlags.sh
similarity index 100%
rename from pkgs/desktops/xfce4-14/automakeAddFlags.sh
rename to pkgs/desktops/xfce/automakeAddFlags.sh
diff --git a/pkgs/desktops/xfce/core/exo.nix b/pkgs/desktops/xfce/core/exo.nix
deleted file mode 100644
index 1a7cdd39d101..000000000000
--- a/pkgs/desktops/xfce/core/exo.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, URI, glib, gtk, libxfce4ui, libxfce4util
-, hicolor-icon-theme }:
-
-stdenv.mkDerivation rec {
- p_name = "exo";
- ver_maj = "0.10";
- ver_min = "7";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "521581481128af93e815f9690020998181f947ac9e9c2b232b1f144d76b1b35c";
- };
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- outputs = [ "out" "dev" "devdoc" ];
- # lib/xfce4/exo-1/exo-compose-mail-1 is a perl script :-/
-
- nativeBuildInputs = [ pkgconfig intltool ];
- buildInputs = [ URI glib gtk libxfce4ui libxfce4util hicolor-icon-theme ];
-
- meta = with stdenv.lib; {
- homepage = "https://docs.xfce.org/xfce/${p_name}/start";
- description = "Application library for the Xfce desktop environment";
- license = licenses.gpl2Plus;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/xfce4-14/exo/default.nix b/pkgs/desktops/xfce/core/exo/default.nix
similarity index 100%
rename from pkgs/desktops/xfce4-14/exo/default.nix
rename to pkgs/desktops/xfce/core/exo/default.nix
diff --git a/pkgs/desktops/xfce/core/garcon-10967.patch b/pkgs/desktops/xfce/core/garcon-10967.patch
deleted file mode 100644
index aea123255478..000000000000
--- a/pkgs/desktops/xfce/core/garcon-10967.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urNZ a/garcon-gtk/garcon-gtk-menu.c b/garcon-gtk/garcon-gtk-menu.c
---- a/garcon-gtk/garcon-gtk-menu.c 2017-11-16 19:22:33.551926068 +0000
-+++ b/garcon-gtk/garcon-gtk-menu.c 2017-11-16 19:23:33.055497211 +0000
-@@ -676,6 +676,9 @@
- G_CALLBACK (garcon_gtk_menu_deactivate), menu);
- gtk_widget_show (mi);
-
-+ /* submenu are child items, too. */
-+ has_children = TRUE;
-+
- if (menu->priv->show_menu_icons)
- {
- icon_name = garcon_menu_element_get_icon_name (li->data);
-Binary files a/.git/index and b/.git/index differ
diff --git a/pkgs/desktops/xfce/core/garcon-12700.patch b/pkgs/desktops/xfce/core/garcon-12700.patch
deleted file mode 100644
index b95a65cc2194..000000000000
--- a/pkgs/desktops/xfce/core/garcon-12700.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 222080e6d5fce85eb2a8a5c33df671bd9f21add8 Mon Sep 17 00:00:00 2001
-From: Yegor Timoshenko
-Date: Thu, 14 Dec 2017 22:04:04 +0000
-Subject: [PATCH] Decrement allocation counter on item unref (#12700)
-
----
- garcon/garcon-menu-item-pool.c | 7 ++++++-
- garcon/garcon-menu-item.c | 2 ++
- 2 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/garcon/garcon-menu-item-pool.c b/garcon/garcon-menu-item-pool.c
-index 2017180..355e520 100644
---- a/garcon/garcon-menu-item-pool.c
-+++ b/garcon/garcon-menu-item-pool.c
-@@ -191,7 +191,12 @@ garcon_menu_item_pool_filter_exclude (const gchar *desktop_id,
- g_return_val_if_fail (GARCON_IS_MENU_ITEM (item), FALSE);
- g_return_val_if_fail (node != NULL, FALSE);
-
-- return garcon_menu_node_tree_rule_matches (node, item);
-+ gboolean matches = garcon_menu_node_tree_rule_matches (node, item);
-+
-+ if (matches)
-+ garcon_menu_item_increment_allocated (item);
-+
-+ return matches;
- }
-
-
-diff --git a/garcon/garcon-menu-item.c b/garcon/garcon-menu-item.c
-index 66a86bf..d61c88f 100644
---- a/garcon/garcon-menu-item.c
-+++ b/garcon/garcon-menu-item.c
-@@ -1516,6 +1516,8 @@ garcon_menu_item_unref (GarconMenuItem *item)
- {
- g_return_if_fail (GARCON_IS_MENU_ITEM (item));
-
-+ garcon_menu_item_decrement_allocated (item);
-+
- /* Decrement the reference counter */
- g_object_unref (G_OBJECT (item));
- }
---
-2.15.1
-
diff --git a/pkgs/desktops/xfce/core/garcon.nix b/pkgs/desktops/xfce/core/garcon.nix
deleted file mode 100644
index 41d98f17516d..000000000000
--- a/pkgs/desktops/xfce/core/garcon.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, libxfce4ui, gtk }:
-let
- p_name = "garcon";
- ver_maj = "0.4";
- ver_min = "0";
-in
-stdenv.mkDerivation rec {
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "0wm9pjbwq53s3n3nwvsyf0q8lbmhiy2ln3bn5ncihr9vf5cwhzbq";
- };
-
- outputs = [ "out" "dev" ];
- patches = [ ./garcon-10967.patch ./garcon-12700.patch ];
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool glib libxfce4util gtk libxfce4ui ];
-
- meta = with stdenv.lib; {
- homepage = https://www.xfce.org/;
- description = "Xfce menu support library";
- license = licenses.gpl2Plus;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/xfce4-14/garcon/default.nix b/pkgs/desktops/xfce/core/garcon/default.nix
similarity index 80%
rename from pkgs/desktops/xfce4-14/garcon/default.nix
rename to pkgs/desktops/xfce/core/garcon/default.nix
index 0d6cb8c410e0..69184f2afa88 100644
--- a/pkgs/desktops/xfce4-14/garcon/default.nix
+++ b/pkgs/desktops/xfce/core/garcon/default.nix
@@ -8,4 +8,8 @@ mkXfceDerivation {
sha256 = "0pamhp1wffiw638s66nws2mpzmwkhvhb6iwccfy8b0kyr57wipjv";
buildInputs = [ gtk3 libxfce4ui libxfce4util ];
+
+ meta = {
+ description = "Xfce menu support library";
+ };
}
diff --git a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix
deleted file mode 100644
index 567d3b80387a..000000000000
--- a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk2, withGtk3 ? false, gtk3 ? null }:
-
-assert withGtk3 -> (gtk3 != null);
-
-stdenv.mkDerivation rec {
- p_name = "gtk-xfce-engine";
- ver_maj = "3.2";
- ver_min = "0";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "1va71f3gpl8gikfkmqsd5ikgp7qj8b64jii2l98g1ylnv8xrqp47";
- };
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool gtk2 ] ++ stdenv.lib.optional withGtk3 gtk3;
-
- # `glib-mkenums' is unhappy that some source files are not valid UTF-8
- postPatch = ''find . -type f -name '*.[ch]' -exec sed -r -i 's/\xD6/O/g' {} +'';
-
- configureFlags = stdenv.lib.optional withGtk3 "--enable-gtk3";
-
- meta = {
- homepage = https://www.xfce.org/;
- description = "GTK theme engine for Xfce";
- license = stdenv.lib.licenses.gpl2Plus;
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.eelco ];
- };
-}
diff --git a/pkgs/desktops/xfce/core/libxfce4ui.nix b/pkgs/desktops/xfce/core/libxfce4ui.nix
deleted file mode 100644
index 797b51de8e40..000000000000
--- a/pkgs/desktops/xfce/core/libxfce4ui.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, xorg, gtk, libxfce4util, xfconf
-, libglade, libstartup_notification, hicolor-icon-theme
-, withGtk3 ? false, gtk3
-}:
-let
- p_name = "libxfce4ui";
- ver_maj = "4.12";
- ver_min = "1";
- inherit (stdenv.lib) optional;
-in
-stdenv.mkDerivation rec {
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "3d619811bfbe7478bb984c16543d980cadd08586365a7bc25e59e3ca6384ff43";
- };
-
- outputs = [ "out" "dev" "devdoc" ];
-
- nativeBuildInputs = [ pkgconfig intltool ];
-
- buildInputs =
- [ gtk libxfce4util xfconf libglade
- libstartup_notification hicolor-icon-theme
- ] ++ optional withGtk3 gtk3;
-
- propagatedBuildInputs = [ xorg.libICE xorg.libSM ];
-
- #TODO: glade?
- configureFlags = optional withGtk3 "--enable-gtk3";
-
- enableParallelBuilding = true;
-
- meta = with stdenv.lib; {
- homepage = https://www.xfce.org/;
- description = "Basic GUI library for Xfce";
- license = licenses.lgpl2Plus;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/xfce4-14/libxfce4ui/default.nix b/pkgs/desktops/xfce/core/libxfce4ui/default.nix
similarity index 100%
rename from pkgs/desktops/xfce4-14/libxfce4ui/default.nix
rename to pkgs/desktops/xfce/core/libxfce4ui/default.nix
diff --git a/pkgs/desktops/xfce/core/libxfce4util.nix b/pkgs/desktops/xfce/core/libxfce4util.nix
deleted file mode 100644
index b68b7059f8df..000000000000
--- a/pkgs/desktops/xfce/core/libxfce4util.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, intltool }:
-let
- p_name = "libxfce4util";
- ver_maj = "4.12";
- ver_min = "1";
-in
-stdenv.mkDerivation rec {
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "07c8r3xwx5is298zk77m3r784gmr5y4mh8bbca5zdjqk5vxdwsw7";
- };
-
- outputs = [ "out" "dev" "devdoc" ];
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ glib intltool ];
-
- meta = {
- homepage = https://www.xfce.org/;
- description = "Basic utility non-GUI functions for Xfce";
- license = "bsd";
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/desktops/xfce4-14/libxfce4util/default.nix b/pkgs/desktops/xfce/core/libxfce4util/default.nix
similarity index 100%
rename from pkgs/desktops/xfce4-14/libxfce4util/default.nix
rename to pkgs/desktops/xfce/core/libxfce4util/default.nix
diff --git a/pkgs/desktops/xfce/core/libxfcegui4.nix b/pkgs/desktops/xfce/core/libxfcegui4.nix
deleted file mode 100644
index 5c61c16cbcc1..000000000000
--- a/pkgs/desktops/xfce/core/libxfcegui4.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk
-, libxfce4util, xfconf, libglade, libstartup_notification, hicolor-icon-theme }:
-let
- p_name = "libxfcegui4";
- ver_maj = "4.10";
- ver_min = "0";
-in
-stdenv.mkDerivation rec {
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "0cs5im0ib0cmr1lhr5765yliqjfyxvk4kwy8h1l8bn3mj6bzk0ib";
- };
-
- outputs = [ "out" "dev" "devdoc" ];
-
- #TODO: gladeui
- # By default, libxfcegui4 tries to install into libglade's prefix.
- # Install into our own prefix instead.
- configureFlags = [
- "--with-libglade-module-path=$(out)/lib/libglade/2.0"
- ];
- #NOTE: missing keyboard library support is OK according to the mailing-list
-
- buildInputs =
- [ pkgconfig intltool gtk libxfce4util xfconf libglade
- libstartup_notification hicolor-icon-theme
- ];
-
- meta = {
- homepage = https://www.xfce.org/;
- description = "Basic GUI library for Xfce";
- license = stdenv.lib.licenses.lgpl2Plus;
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/desktops/xfce/core/thunar-build.nix b/pkgs/desktops/xfce/core/thunar-build.nix
deleted file mode 100644
index 0b606ee5fdd7..000000000000
--- a/pkgs/desktops/xfce/core/thunar-build.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool
-, gtk, dbus-glib, libstartup_notification, libnotify, libexif, pcre, udev
-, exo, libxfce4util, xfconf, xfce4-panel, hicolor-icon-theme, wrapGAppsHook
-}:
-
-stdenv.mkDerivation rec {
- p_name = "thunar";
- ver_maj = "1.6";
- ver_min = "10";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/Thunar-${ver_maj}.${ver_min}.tar.bz2";
- sha256 = "7e9d24067268900e5e44d3325e60a1a2b2f8f556ec238ec12574fbea15fdee8a";
- };
-
- name = "${p_name}-build-${ver_maj}.${ver_min}";
-
- patches = [ ./thunarx_plugins_directory.patch ];
-
- postPatch = ''
- sed -i -e 's|thunar_dialogs_show_insecure_program (parent, _(".*"), file, exec)|1|' thunar/thunar-file.c
- '';
-
- nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
- buildInputs = [
- intltool
- gtk dbus-glib libstartup_notification libnotify libexif pcre udev
- exo libxfce4util xfconf xfce4-panel
- hicolor-icon-theme
- ];
- # TODO: optionality?
-
- enableParallelBuilding = true;
-
- meta = {
- homepage = http://thunar.xfce.org/;
- description = "Xfce file manager";
- license = stdenv.lib.licenses.gpl2Plus;
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.eelco ];
- };
-}
diff --git a/pkgs/desktops/xfce/core/thunar-volman.nix b/pkgs/desktops/xfce/core/thunar-volman.nix
deleted file mode 100644
index eda3aab070ac..000000000000
--- a/pkgs/desktops/xfce/core/thunar-volman.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui
-, xfconf, udev, libgudev, libnotify, hicolor-icon-theme }:
-
-stdenv.mkDerivation rec {
- p_name = "thunar-volman";
- ver_maj = "0.8";
- ver_min = "1";
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "1gf259n1v3y23n1zlkhyr6r0i8j59rnl1cmxvxj6la9cwdfbn22s";
- };
-
-
- buildInputs =
- [ pkgconfig intltool exo gtk udev libgudev libxfce4ui libxfce4util
- xfconf libnotify hicolor-icon-theme
- ];
-
- enableParallelBuilding = true;
-
- meta = {
- homepage = https://goodies.xfce.org/projects/thunar-plugins/thunar-volman;
- description = "Thunar extension for automatic management of removable drives and media";
- license = stdenv.lib.licenses.gpl2Plus;
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.eelco ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/thunar-volman/default.nix b/pkgs/desktops/xfce/core/thunar-volman/default.nix
similarity index 73%
rename from pkgs/desktops/xfce4-14/thunar-volman/default.nix
rename to pkgs/desktops/xfce/core/thunar-volman/default.nix
index 11b29c64b33f..fc6db0fcce4f 100644
--- a/pkgs/desktops/xfce4-14/thunar-volman/default.nix
+++ b/pkgs/desktops/xfce/core/thunar-volman/default.nix
@@ -8,4 +8,8 @@ mkXfceDerivation {
buildInputs = [ exo gtk3 libgudev libxfce4ui libxfce4util xfconf ];
sha256 = "1qrlpn0q5g9psd41l6y80r3bvbg8jaic92m6r400zzwcvivf95z0";
+
+ meta = {
+ description = "Thunar extension for automatic management of removable drives and media";
+ };
}
diff --git a/pkgs/desktops/xfce/core/thunar.nix b/pkgs/desktops/xfce/core/thunar.nix
deleted file mode 100644
index 83e3a2879d79..000000000000
--- a/pkgs/desktops/xfce/core/thunar.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{ stdenv, buildEnv, runCommand, makeWrapper, lndir, thunar-bare
-, thunarPlugins ? []
-}:
-
-with stdenv.lib;
-
-let
-
- build = thunar-bare;
-
- replaceLnExeListWithWrapped = exeDir: exeNameList: mkWrapArgs: ''
- exeDir="${exeDir}"
- oriDir=`realpath -e "$exeDir"`
- unlink "$exeDir"
- mkdir -p "$exeDir"
- lndir "$oriDir" "$exeDir"
-
- exeList="${concatStrings (intersperse " " (map (x: "${exeDir}/${x}") exeNameList))}"
-
- for exe in $exeList; do
- oriExe=`realpath -e "$exe"`
- rm -f "$exe"
- makeWrapper "$oriExe" "$exe" ${concatStrings (intersperse " " mkWrapArgs)}
- done
- '';
-
- name = "${build.p_name}-${build.ver_maj}.${build.ver_min}";
-
- meta = {
- inherit (build.meta) homepage license platforms;
-
- description = build.meta.description + optionalString
- (0 != length thunarPlugins)
- " (with plugins: ${concatStrings (intersperse ", " (map (x: x.name) thunarPlugins))})";
- maintainers = build.meta.maintainers /*++ [ jraygauthier ]*/;
- };
-
-in
-
-# TODO: To be replaced with `buildEnv` awaiting missing features.
-runCommand name {
- inherit build;
- inherit meta;
-
- nativeBuildInputs = [ makeWrapper lndir ];
-
- dontPatchELF = true;
- dontStrip = true;
-
-}
-(let
- buildWithPlugins = buildEnv {
- name = "thunar-bare-with-plugins";
- paths = [ build ] ++ thunarPlugins;
- };
-
-in ''
- mkdir -p $out
- pushd ${buildWithPlugins} > /dev/null
- for d in `find . -maxdepth 1 -name "*" -printf "%f\n" | tail -n+2`; do
- ln -s "${buildWithPlugins}/$d" "$out/$d"
- done
- popd > /dev/null
-
- ${replaceLnExeListWithWrapped "$out/bin" [ "thunar" "thunar-settings" ] [
- "--set THUNARX_MODULE_DIR \"${buildWithPlugins}/lib/thunarx-2\""
- ]}
-'')
diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix
new file mode 100644
index 000000000000..11220141d2a0
--- /dev/null
+++ b/pkgs/desktops/xfce/core/thunar/default.nix
@@ -0,0 +1,70 @@
+{ mkXfceDerivation
+, lib
+, docbook_xsl
+, exo
+, gdk-pixbuf
+, gtk3
+, libgudev
+, libnotify
+, libX11
+, libxfce4ui
+, libxfce4util
+, libxslt
+, xfconf
+, gobject-introspection
+, gvfs
+, makeWrapper
+, symlinkJoin
+, thunarPlugins ? []
+}:
+
+let unwrapped = mkXfceDerivation {
+ category = "xfce";
+ pname = "thunar";
+ version = "1.8.9";
+
+ sha256 = "01w60csbs2nq1bhb8n1bnmjmx48fm0va3qbnq84z0h2dxpr80b1w";
+
+ nativeBuildInputs = [
+ docbook_xsl
+ gobject-introspection
+ libxslt
+ ];
+
+ buildInputs = [
+ exo
+ gdk-pixbuf
+ gtk3
+ gvfs
+ libX11
+ libgudev
+ libnotify
+ libxfce4ui
+ libxfce4util
+ xfconf
+ ];
+
+ patches = [
+ ./thunarx_plugins_directory.patch
+ ];
+
+ # the desktop file … is in an insecure location»
+ # which pops up when invoking desktop files that are
+ # symlinks to the /nix/store
+ #
+ # this error was added by this commit:
+ # https://github.com/xfce-mirror/thunar/commit/1ec8ff89ec5a3314fcd6a57f1475654ddecc9875
+ postPatch = ''
+ sed -i -e 's|thunar_dialogs_show_insecure_program (parent, _(".*"), file, exec)|1|' thunar/thunar-file.c
+ '';
+
+ meta = {
+ description = "Xfce file manager";
+ };
+};
+
+in if thunarPlugins == [] then unwrapped
+ else import ./wrapper.nix {
+ inherit makeWrapper symlinkJoin thunarPlugins lib;
+ thunar = unwrapped;
+ }
diff --git a/pkgs/desktops/xfce/core/thunarx_plugins_directory.patch b/pkgs/desktops/xfce/core/thunar/thunarx_plugins_directory.patch
similarity index 94%
rename from pkgs/desktops/xfce/core/thunarx_plugins_directory.patch
rename to pkgs/desktops/xfce/core/thunar/thunarx_plugins_directory.patch
index e1431d86b147..594a81c829ef 100644
--- a/pkgs/desktops/xfce/core/thunarx_plugins_directory.patch
+++ b/pkgs/desktops/xfce/core/thunar/thunarx_plugins_directory.patch
@@ -1,8 +1,8 @@
diff --git a/thunarx/thunarx-provider-factory.c b/thunarx/thunarx-provider-factory.c
-index 31b8835..a3e7f4e 100644
+index 94b11545..1f66c982 100644
--- a/thunarx/thunarx-provider-factory.c
+++ b/thunarx/thunarx-provider-factory.c
-@@ -141,12 +141,19 @@ static GList*
+@@ -150,12 +150,19 @@ static GList*
thunarx_provider_factory_load_modules (ThunarxProviderFactory *factory)
{
ThunarxProviderModule *module;
@@ -24,7 +24,7 @@ index 31b8835..a3e7f4e 100644
{
/* determine the types for all existing plugins */
diff --git a/thunarx/thunarx-provider-module.c b/thunarx/thunarx-provider-module.c
-index 023ad2a..6c21997 100644
+index 023ad2ae..b1d1be8f 100644
--- a/thunarx/thunarx-provider-module.c
+++ b/thunarx/thunarx-provider-module.c
@@ -174,10 +174,17 @@ static gboolean
@@ -33,13 +33,13 @@ index 023ad2a..6c21997 100644
ThunarxProviderModule *module = THUNARX_PROVIDER_MODULE (type_module);
+ const gchar *thunar_dir;
gchar *path;
-+
+
+ thunar_dir = g_getenv("THUNARX_MODULE_DIR");
+ if (NULL == thunar_dir)
+ {
+ thunar_dir = THUNARX_DIRECTORY;
+ }
-
++
/* load the module using the runtime link editor */
- path = g_build_filename (THUNARX_DIRECTORY, type_module->name, NULL);
+ path = g_build_filename (thunar_dir, type_module->name, NULL);
diff --git a/pkgs/desktops/xfce/core/thunar/wrapper.nix b/pkgs/desktops/xfce/core/thunar/wrapper.nix
new file mode 100644
index 000000000000..cc44e6624571
--- /dev/null
+++ b/pkgs/desktops/xfce/core/thunar/wrapper.nix
@@ -0,0 +1,34 @@
+{ makeWrapper, symlinkJoin, thunar, thunarPlugins, lib }:
+
+symlinkJoin {
+ name = "thunar-with-plugins-${thunar.version}";
+
+ paths = [ thunar ] ++ thunarPlugins;
+
+ buildInputs = [ makeWrapper ];
+
+ postBuild = ''
+ wrapProgram "$out/bin/thunar" \
+ --set "THUNARX_MODULE_DIR" "$out/lib/thunarx-3"
+
+ wrapProgram "$out/bin/thunar-settings" \
+ --set "THUNARX_MODULE_DIR" "$out/lib/thunarx-3"
+
+ for file in "lib/systemd/user/thunar.service" "share/dbus-1/services/org.xfce.FileManager.service" \
+ "share/dbus-1/services/org.xfce.Thunar.FileManager1.service" \
+ "share/dbus-1/services/org.xfce.Thunar.service"
+ do
+ rm -f "$out/$file"
+ substitute "${thunar}/$file" "$out/$file" \
+ --replace "${thunar}" "$out"
+ done
+ '';
+
+ meta = with lib; {
+ inherit (thunar.meta) homepage license platforms maintainers;
+
+ description = thunar.meta.description + optionalString
+ (0 != length thunarPlugins)
+ " (with plugins: ${concatStrings (intersperse ", " (map (x: x.name) thunarPlugins))})";
+ };
+}
diff --git a/pkgs/desktops/xfce/core/tumbler.nix b/pkgs/desktops/xfce/core/tumbler.nix
deleted file mode 100644
index 9087d3a02553..000000000000
--- a/pkgs/desktops/xfce/core/tumbler.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, dbus-glib, gdk-pixbuf, curl, freetype
-, libgsf, poppler, bzip2 }:
-let
- p_name = "tumbler";
- ver_maj = "0.1";
- ver_min = "31";
-in
-stdenv.mkDerivation rec {
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "0wvip28gm2w061hn84zp2q4dv947ihylrppahn4cjspzff935zfh";
- };
-
- outputs = [ "out" "dev" "devdoc" ];
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [
- intltool dbus-glib gdk-pixbuf curl freetype
- poppler libgsf bzip2
- ];
-
- configureFlags = [
- # Needs gst-tag
- # "--enable-gstreamer-thumbnailer"
-
- # Needs libffmpegthumbnailer
- # "--enable-ffmpeg-thumbnailer"
-
- "--enable-odf-thumbnailer"
- "--enable-poppler-thumbnailer"
- ];
-
- meta = with stdenv.lib; {
- homepage = http://git.xfce.org/xfce/tumbler/;
- description = "A D-Bus thumbnailer service";
- platforms = platforms.linux;
- license = licenses.gpl2;
- };
-}
-
diff --git a/pkgs/desktops/xfce4-14/tumbler/default.nix b/pkgs/desktops/xfce/core/tumbler/default.nix
similarity index 90%
rename from pkgs/desktops/xfce4-14/tumbler/default.nix
rename to pkgs/desktops/xfce/core/tumbler/default.nix
index e99551bd8d26..b795007ca7c1 100644
--- a/pkgs/desktops/xfce4-14/tumbler/default.nix
+++ b/pkgs/desktops/xfce/core/tumbler/default.nix
@@ -32,4 +32,8 @@ mkXfceDerivation {
postFixup = ''
wrapProgram $out/lib/tumbler-1/tumblerd "''${gappsWrapperArgs[@]}"
'';
+
+ meta = {
+ description = "A D-Bus thumbnailer service";
+ };
}
diff --git a/pkgs/desktops/xfce/core/xfce4-appfinder.nix b/pkgs/desktops/xfce/core/xfce4-appfinder.nix
deleted file mode 100644
index d39708dd523f..000000000000
--- a/pkgs/desktops/xfce/core/xfce4-appfinder.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, gtk, libxfce4util
-, libxfce4ui, garcon, xfconf }:
-let
- p_name = "xfce4-appfinder";
- ver_maj = "4.12";
- ver_min = "0";
-in
-stdenv.mkDerivation rec {
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "0ry5hin8xhgnkmm9vs7jq8blk1cnbyr0s18nm1j6nsm7360abm1a";
- };
-
- buildInputs =
- [ pkgconfig intltool glib gtk libxfce4util libxfce4ui garcon xfconf ];
-
- enableParallelBuilding = true;
-
- meta = with stdenv.lib; {
- homepage = http://docs.xfce.org/xfce/xfce4-appfinder/;
- description = "Xfce application finder, a tool to locate and launch programs on your system";
- license = licenses.gpl2Plus;
- platforms = platforms.linux;
- maintainers = [ maintainers.eelco ];
- };
-}
-
diff --git a/pkgs/desktops/xfce4-14/xfce4-appfinder/default.nix b/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix
similarity index 80%
rename from pkgs/desktops/xfce4-14/xfce4-appfinder/default.nix
rename to pkgs/desktops/xfce/core/xfce4-appfinder/default.nix
index 6c4af66c8666..cbb444c6c764 100644
--- a/pkgs/desktops/xfce4-14/xfce4-appfinder/default.nix
+++ b/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix
@@ -9,4 +9,8 @@ mkXfceDerivation {
nativeBuildInputs = [ exo ];
buildInputs = [ garcon gtk3 libxfce4ui libxfce4util xfconf ];
+
+ meta = {
+ description = "Appfinder for the Xfce4 Desktop Environment";
+ };
}
diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools.nix b/pkgs/desktops/xfce/core/xfce4-dev-tools.nix
deleted file mode 100644
index 109c22f1e58c..000000000000
--- a/pkgs/desktops/xfce/core/xfce4-dev-tools.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, autoconf, automake, libtool, intltool }:
-let
- p_name = "xfce4-dev-tools";
- ver_maj = "4.12";
- ver_min = "0";
-in
-stdenv.mkDerivation rec {
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "1jxmyp80pwbfgmqmwpjxs7z5dmm6pyf3qj62z20xy44izraadqz2";
- };
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ glib ];
-
- # not needed to build it but to use it
- propagatedBuildInputs = [ autoconf automake libtool intltool ];
-
- meta = {
- homepage = http://foo-projects.org/~benny/projects/xfce4-dev-tools/;
- description = "Tools and M4 macros for Xfce4 developers";
- license = stdenv.lib.licenses.gpl2Plus;
- platforms = stdenv.lib.platforms.linux;
- };
-}
-
diff --git a/pkgs/desktops/xfce4-14/xfce4-dev-tools/default.nix b/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix
similarity index 100%
rename from pkgs/desktops/xfce4-14/xfce4-dev-tools/default.nix
rename to pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix
diff --git a/pkgs/desktops/xfce4-14/xfce4-dev-tools/setup-hook.sh b/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh
similarity index 100%
rename from pkgs/desktops/xfce4-14/xfce4-dev-tools/setup-hook.sh
rename to pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh
diff --git a/pkgs/desktops/xfce/core/xfce4-light-locker.patch b/pkgs/desktops/xfce/core/xfce4-light-locker.patch
deleted file mode 100644
index 0fabdffd7ed6..000000000000
--- a/pkgs/desktops/xfce/core/xfce4-light-locker.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- ./scripts/xflock4.orig 2017-08-06 23:05:53.807688995 +0100
-+++ ./scripts/xflock4 2017-08-06 23:09:06.171789989 +0100
-@@ -24,12 +24,19 @
- PATH=/bin:/usr/bin
- export PATH
-
--# Lock by xscreensaver or gnome-screensaver, if a respective daemon is running
-+# First test for the command set in the session's xfconf channel
-+LOCK_CMD=$(xfconf-query -c xfce4-session -p /general/LockCommand)
-+
-+# Lock by xscreensaver, gnome-screensaver, or light-locker, if a respective daemon is running
- for lock_cmd in \
-+ "$LOCK_CMD" \
- "xscreensaver-command -lock" \
-- "gnome-screensaver-command --lock"
-+ "gnome-screensaver-command --lock" \
-+ "light-locker-command -l"
- do
-- $lock_cmd >/dev/null 2>&1 && exit
-+ if [ ! -z "$lock_cmd" ]; then
-+ $lock_cmd >/dev/null 2>&1 && exit
-+ fi
- done
-
- # else run another access locking utility, if installed
diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix
deleted file mode 100644
index b8ecae7e4e64..000000000000
--- a/pkgs/desktops/xfce/core/xfce4-panel.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui
-, libxfce4ui_gtk3, libwnck, exo, garcon, xfconf, libstartup_notification
-, makeWrapper, xfce4-mixer, hicolor-icon-theme, tzdata
-, withGtk3 ? false, gtk3, gettext, glib-networking
-}:
-let
- inherit (stdenv.lib) optional;
- p_name = "xfce4-panel";
- ver_maj = "4.12";
- ver_min = "2";
-in
-stdenv.mkDerivation rec {
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "1s8cvsrgmkmmm84g6mghpj2k4777gm22g5lrsf8pdy5qh6xql1a2";
- };
-
- patches = [ ./xfce4-panel-datadir.patch ];
- patchFlags = "-p1";
-
- postPatch = ''
- for f in $(find . -name \*.sh); do
- substituteInPlace $f --replace gettext ${gettext}/bin/gettext
- done
- substituteInPlace plugins/clock/clock.c \
- --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" \
- --replace "if (!g_file_test (filename, G_FILE_TEST_IS_SYMLINK))" ""
- '';
-
- outputs = [ "out" "dev" "devdoc" ];
-
- buildInputs =
- [ pkgconfig intltool gtk libxfce4util exo libwnck
- garcon xfconf libstartup_notification makeWrapper hicolor-icon-theme
- ] ++ xfce4-mixer.gst_plugins
- ++ optional withGtk3 gtk3;
-
- propagatedBuildInputs = [ (if withGtk3 then libxfce4ui_gtk3 else libxfce4ui) ];
-
- configureFlags = optional withGtk3 "--enable-gtk3";
-
- postInstall = ''
- wrapProgram "$out/bin/xfce4-panel" \
- --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \
- --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules"
- '';
-
- enableParallelBuilding = true;
-
- meta = with stdenv.lib; {
- homepage = https://www.xfce.org/projects/xfce4-panel;
- description = "Xfce panel";
- license = licenses.gpl2Plus;
- platforms = platforms.linux;
- maintainers = [ maintainers.eelco ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfce4-panel/default.nix b/pkgs/desktops/xfce/core/xfce4-panel/default.nix
similarity index 93%
rename from pkgs/desktops/xfce4-14/xfce4-panel/default.nix
rename to pkgs/desktops/xfce/core/xfce4-panel/default.nix
index c571666e5c4b..f7e500bdf543 100644
--- a/pkgs/desktops/xfce4-14/xfce4-panel/default.nix
+++ b/pkgs/desktops/xfce/core/xfce4-panel/default.nix
@@ -10,7 +10,7 @@ mkXfceDerivation {
nativeBuildInputs = [ gobject-introspection ];
buildInputs = [ exo garcon gtk2 gtk3 glib glib-networking libxfce4ui libxfce4util libwnck3 xfconf ];
- patches = [ ../../xfce/core/xfce4-panel-datadir.patch ];
+ patches = [ ./xfce4-panel-datadir.patch ];
patchFlags = "-p1";
postPatch = ''
diff --git a/pkgs/desktops/xfce/core/xfce4-panel-datadir.patch b/pkgs/desktops/xfce/core/xfce4-panel/xfce4-panel-datadir.patch
similarity index 100%
rename from pkgs/desktops/xfce/core/xfce4-panel-datadir.patch
rename to pkgs/desktops/xfce/core/xfce4-panel/xfce4-panel-datadir.patch
diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager.nix b/pkgs/desktops/xfce/core/xfce4-power-manager.nix
deleted file mode 100644
index 266f30645075..000000000000
--- a/pkgs/desktops/xfce/core/xfce4-power-manager.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, lib, fetchurl, pkgconfig, intltool, glib, gtk, dbus-glib, upower, xfconf
-, libxfce4ui, libxfce4util, libnotify, xfce4-panel, hicolor-icon-theme
-, withGtk3 ? false, gtk3, libxfce4ui_gtk3, xfce4panel_gtk3 }:
-let
- p_name = "xfce4-power-manager";
- ver_maj = if withGtk3 then "1.6" else "1.4";
- ver_min = if withGtk3 then "0" else "4";
-in
-stdenv.mkDerivation rec {
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 =
- if withGtk3
- then "0avzhllpimcn7a6z9aa4jn0zg5ahxr9ks5ldchizycdb0rz1bqxx"
- else "01rvqy1cif4s8lkidb7hhmsz7d9f2fwcwvc51xycaj3qgsmch3n5";
- };
-
- buildInputs =
- [ pkgconfig intltool glib dbus-glib upower xfconf libxfce4util
- libnotify hicolor-icon-theme
- ] ++
- (if withGtk3
- then [ gtk3 libxfce4ui_gtk3 xfce4panel_gtk3 ]
- else [ gtk libxfce4ui xfce4-panel ]);
-
- postPatch = lib.optionalString withGtk3 ''
- substituteInPlace configure --replace gio-2.0 gio-unix-2.0
- '';
-
- postConfigure = lib.optionalString withGtk3 ''
- substituteInPlace src/Makefile --replace "xfce4_power_manager_CFLAGS = " "xfce4_power_manager_CFLAGS = \$(GIO_CFLAGS) "
- substituteInPlace settings/Makefile --replace "xfce4_power_manager_settings_CFLAGS = " "xfce4_power_manager_settings_CFLAGS = \$(GIO_CFLAGS) "
- '';
-
- meta = with stdenv.lib; {
- homepage = https://goodies.xfce.org/projects/applications/xfce4-power-manager;
- description = "A power manager for the Xfce Desktop Environment";
- license = licenses.gpl2Plus;
- platforms = platforms.linux;
- maintainers = [ maintainers.eelco ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfce4-power-manager/default.nix b/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix
similarity index 88%
rename from pkgs/desktops/xfce4-14/xfce4-power-manager/default.nix
rename to pkgs/desktops/xfce/core/xfce4-power-manager/default.nix
index 985146c82571..fb3f05b36646 100644
--- a/pkgs/desktops/xfce4-14/xfce4-power-manager/default.nix
+++ b/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix
@@ -16,4 +16,8 @@ mkXfceDerivation {
automakeAddFlags src/Makefile.am xfce4_power_manager_CFLAGS GIO_CFLAGS
automakeAddFlags settings/Makefile.am xfce4_power_manager_settings_CFLAGS GIO_CFLAGS
'';
+
+ meta = {
+ description = "A power manager for the Xfce Desktop Environment";
+ };
}
diff --git a/pkgs/desktops/xfce/core/xfce4-session.nix b/pkgs/desktops/xfce/core/xfce4-session.nix
deleted file mode 100644
index b57dd252033f..000000000000
--- a/pkgs/desktops/xfce/core/xfce4-session.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk, polkit
-, libxfce4util, libxfce4ui, xfce4-panel, libwnck, dbus-glib, xfconf, libglade, xorg
-, hicolor-icon-theme
-}:
-
-let
- p_name = "xfce4-session";
- ver_maj = "4.12";
- ver_min = "1";
-in
-stdenv.mkDerivation rec {
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "97d7f2a2d0af7f3623b68d1f04091e02913b28f9555dab8b0d26c8a1299d08fd";
- };
-
- patches = [
- # Fix "lock screen" not working for light-locker
- ./xfce4-light-locker.patch
- ];
-
- buildInputs =
- [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus-glib
- xfconf xfce4-panel libglade xorg.iceauth xorg.libSM
- polkit hicolor-icon-theme
- ]; #TODO: upower-glib, gconf (assistive?), gnome keyring
-
- preBuild = ''
- sed '/^PATH=/d' -i scripts/xflock4
- sed '/^export PATH$/d' -i scripts/xflock4
- '';
-
- configureFlags = [ "--with-xsession-prefix=$(out)" ];
-
- meta = with stdenv.lib; {
- homepage = https://www.xfce.org/projects/xfce4-session;
- description = "Session manager for Xfce";
- license = licenses.gpl2Plus;
- platforms = platforms.linux;
- maintainers = [ maintainers.eelco ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfce4-session/default.nix b/pkgs/desktops/xfce/core/xfce4-session/default.nix
similarity index 82%
rename from pkgs/desktops/xfce4-14/xfce4-session/default.nix
rename to pkgs/desktops/xfce/core/xfce4-session/default.nix
index d44cd8b0dd7c..0ab362aa21d0 100644
--- a/pkgs/desktops/xfce4-14/xfce4-session/default.nix
+++ b/pkgs/desktops/xfce/core/xfce4-session/default.nix
@@ -1,4 +1,4 @@
-{ mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck3, xorg }:
+{ mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck3, xorg, xfce4-session }:
mkXfceDerivation {
category = "xfce";
@@ -14,6 +14,8 @@ mkXfceDerivation {
# See https://github.com/NixOS/nixpkgs/issues/36468
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
+ passthru.xinitrc = "${xfce4-session}/etc/xdg/xfce4/xinitrc";
+
meta = {
description = "Session manager for Xfce";
};
diff --git a/pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch b/pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch
deleted file mode 100644
index 2683b3c3dfdd..000000000000
--- a/pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xfsettingsd/xsettings.xml 2015-02-28 22:32:02.681796319 +0100
-+++ b/xfsettingsd/xsettings.xml 2015-02-28 22:32:27.881214735 +0100
-@@ -7,7 +7,7 @@
-
-
-
--
-+
-
-
-
\ No newline at end of file
diff --git a/pkgs/desktops/xfce/core/xfce4-settings.nix b/pkgs/desktops/xfce/core/xfce4-settings.nix
deleted file mode 100644
index 584055c8ddf6..000000000000
--- a/pkgs/desktops/xfce/core/xfce4-settings.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, garcon, libxfce4util
-, libxfce4ui, xfconf, libXi, upower ? null, libnotify ? null
-, libXcursor ? null, xf86inputlibinput ? null, libxklavier ? null }:
-
-let
- p_name = "xfce4-settings";
- ver_maj = "4.12";
- ver_min = "1";
-in
-stdenv.mkDerivation rec {
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "0x35i1cvkqp0hib1knwa58mckdwrfbhaisz4bsx6bbbx385llj7n";
- };
-
- patches = [ ./xfce4-settings-default-icon-theme.patch ];
-
- postPatch = ''
- for f in $(find . -name \*.c); do
- substituteInPlace $f --replace \"libinput-properties.h\" ''
- done
- '';
-
- nativeBuildInputs = [ pkgconfig intltool ];
-
- buildInputs = [
- exo
- gtk
- garcon
- libxfce4util
- libxfce4ui
- xfconf
- libXi
- upower
- libnotify
- libXcursor
- xf86inputlibinput
- libxklavier
- ];
-
- configureFlags = [ "--enable-pluggable-dialogs" "--enable-sound-settings" ];
-
- enableParallelBuilding = true;
-
- meta = with stdenv.lib; {
- homepage = https://www.xfce.org/projects/xfce4-settings;
- description = "Settings manager for Xfce";
- license = licenses.gpl2Plus;
- platforms = platforms.linux;
- maintainers = [ maintainers.eelco ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfce4-settings/default.nix b/pkgs/desktops/xfce/core/xfce4-settings/default.nix
similarity index 91%
rename from pkgs/desktops/xfce4-14/xfce4-settings/default.nix
rename to pkgs/desktops/xfce/core/xfce4-settings/default.nix
index 8cda66359e34..74ab96ed1bcd 100644
--- a/pkgs/desktops/xfce4-14/xfce4-settings/default.nix
+++ b/pkgs/desktops/xfce/core/xfce4-settings/default.nix
@@ -33,4 +33,8 @@ mkXfceDerivation {
"--enable-pluggable-dialogs"
"--enable-sound-settings"
];
+
+ meta = {
+ description = "Settings manager for Xfce";
+ };
}
diff --git a/pkgs/desktops/xfce/core/xfconf.nix b/pkgs/desktops/xfce/core/xfconf.nix
deleted file mode 100644
index 9af365c6f14d..000000000000
--- a/pkgs/desktops/xfce/core/xfconf.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, dbus-glib }:
-let
- p_name = "xfconf";
- ver_maj = "4.12";
- ver_min = "1";
-in
-stdenv.mkDerivation rec {
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "0dns190bwb615wy9ma2654sw4vz1d0rcv061zmaalkv9wmj8bx1m";
- };
-
- outputs = [ "out" "dev" "devdoc" ];
-
- #TODO: no perl bingings yet (ExtUtils::Depends, ExtUtils::PkgConfig, Glib)
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool glib libxfce4util ];
- propagatedBuildInputs = [ dbus-glib ];
-
- doCheck = false; # requires dbus daemon
-
- meta = with stdenv.lib; {
- homepage = http://docs.xfce.org/xfce/xfconf/start;
- description = "Simple client-server configuration storage and query system for Xfce";
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfconf/default.nix b/pkgs/desktops/xfce/core/xfconf/default.nix
similarity index 67%
rename from pkgs/desktops/xfce4-14/xfconf/default.nix
rename to pkgs/desktops/xfce/core/xfconf/default.nix
index a9d6ceaf4695..a0923f0fda1b 100644
--- a/pkgs/desktops/xfce4-14/xfconf/default.nix
+++ b/pkgs/desktops/xfce/core/xfconf/default.nix
@@ -8,4 +8,8 @@ mkXfceDerivation {
sha256 = "1mbqc1463xgn7gafbh2fyshshdxin33iwk96y4nw2gl48nhx4sgs";
buildInputs = [ libxfce4util ];
+
+ meta = {
+ description = "Simple client-server configuration storage and query system for Xfce";
+ };
}
diff --git a/pkgs/desktops/xfce/core/xfdesktop.nix b/pkgs/desktops/xfce/core/xfdesktop.nix
deleted file mode 100644
index 091dd03c0bcf..000000000000
--- a/pkgs/desktops/xfce/core/xfdesktop.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui
-, libwnck, xfconf, libglade, xfce4-panel, thunar, exo, garcon, libnotify
-, hicolor-icon-theme }:
-let
- p_name = "xfdesktop";
- ver_maj = "4.12";
- ver_min = "3";
-in
-stdenv.mkDerivation rec {
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "a8a8d93744d842ca6ac1f9bd2c8789ee178937bca7e170e5239cbdbef30520ac";
- };
-
- buildInputs = [
- pkgconfig intltool gtk libxfce4util libxfce4ui libwnck xfconf
- libglade xfce4-panel thunar exo garcon libnotify hicolor-icon-theme
- ];
-
- patches = [(fetchpatch {
- url = https://git.xfce.org/xfce/xfdesktop/patch?id=157f5b55cfc3629d595ef38984278de5915aac27;
- sha256 = "0ki7hnyfpz7bdmsxqnm9qvyk040iyv1fawnhzfbyyzrh4nc5jd3x";
- })];
-
- enableParallelBuilding = true;
-
- meta = with stdenv.lib; {
- homepage = https://www.xfce.org/projects/xfdesktop;
- description = "Xfce desktop manager";
- license = licenses.gpl2Plus;
- platforms = platforms.linux;
- maintainers = [ maintainers.eelco ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfdesktop/default.nix b/pkgs/desktops/xfce/core/xfdesktop/default.nix
similarity index 100%
rename from pkgs/desktops/xfce4-14/xfdesktop/default.nix
rename to pkgs/desktops/xfce/core/xfdesktop/default.nix
diff --git a/pkgs/desktops/xfce/core/xfwm4.nix b/pkgs/desktops/xfce/core/xfwm4.nix
deleted file mode 100644
index d26649ee6ce9..000000000000
--- a/pkgs/desktops/xfce/core/xfwm4.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, intltool, libglade, libxfce4util
-, libxfce4ui, xfconf, libwnck, libstartup_notification, xorg }:
-let
- p_name = "xfwm4";
- ver_maj = "4.12";
- ver_min = "4";
-in
-stdenv.mkDerivation rec {
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "0dpvdrd5lclkcrzmdpva38gfsgvdf3xkqfknvy96x6k4fn508x7s";
- };
-
- buildInputs =
- [ pkgconfig intltool gtk libglade libxfce4util libxfce4ui xfconf
- libwnck libstartup_notification
- xorg.libXcomposite xorg.libXfixes xorg.libXdamage
- ];
-
- enableParallelBuilding = true;
-
- meta = with stdenv.lib; {
- homepage = https://www.xfce.org/projects/xfwm4;
- description = "Window manager for Xfce";
- license = licenses.gpl2Plus;
- platforms = platforms.linux;
- maintainers = [ maintainers.eelco ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfwm4/default.nix b/pkgs/desktops/xfce/core/xfwm4/default.nix
similarity index 89%
rename from pkgs/desktops/xfce4-14/xfwm4/default.nix
rename to pkgs/desktops/xfce/core/xfwm4/default.nix
index 358e99c893f1..2dff3302617c 100644
--- a/pkgs/desktops/xfce4-14/xfwm4/default.nix
+++ b/pkgs/desktops/xfce/core/xfwm4/default.nix
@@ -23,4 +23,8 @@ mkXfceDerivation {
libXpresent
xfconf
];
+
+ meta = {
+ description = "Window manager for Xfce";
+ };
}
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 20d5175fed6f..07773523b3e0 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -3,91 +3,91 @@
lib.makeScope pkgs.newScope (self: with self; {
#### NixOS support
- inherit (pkgs.gnome2) libglade vte gtksourceview;
inherit (pkgs.gnome3) dconf;
- inherit (pkgs.perlPackages) URI;
- gtk = pkgs.gtk2;
+ mkXfceDerivation = callPackage ./mkXfceDerivation.nix { };
+
+ automakeAddFlags = pkgs.makeSetupHook { } ./automakeAddFlags.sh;
# Samba is a rather heavy dependency
gvfs = pkgs.gvfs.override { samba = null; };
- xinitrc = "${xfce4-session}/etc/xdg/xfce4/xinitrc";
-
#### CORE
- exo = callPackage ./core/exo.nix { };
+ exo = callPackage ./core/exo { };
- garcon = callPackage ./core/garcon.nix { };
+ garcon = callPackage ./core/garcon { };
- # When built with GTK 3, it was breaking GTK 3 app layout
- gtk-xfce-engine = callPackage ./core/gtk-xfce-engine.nix { withGtk3 = false; };
+ libxfce4ui = callPackage ./core/libxfce4ui { };
- libxfce4ui = callPackage ./core/libxfce4ui.nix { };
+ libxfce4util = callPackage ./core/libxfce4util { };
- libxfce4util = callPackage ./core/libxfce4util.nix { };
+ thunar = callPackage ./core/thunar {
+ thunarPlugins = [];
+ };
- libxfcegui4 = callPackage ./core/libxfcegui4.nix { };
-
- thunar-bare = callPackage ./core/thunar-build.nix { };
-
- thunar = callPackage ./core/thunar.nix { };
-
- # NB: thunar already has it
- thunar-volman = callPackage ./core/thunar-volman.nix { };
+ thunar-volman = callPackage ./core/thunar-volman { };
thunar-archive-plugin = callPackage ./thunar-plugins/archive { };
thunar-dropbox-plugin = callPackage ./thunar-plugins/dropbox { };
- tumbler = callPackage ./core/tumbler.nix { };
+ tumbler = callPackage ./core/tumbler { };
- # TODO: impure plugins from /run/current-system/sw/lib/xfce4
- xfce4-panel = callPackage ./core/xfce4-panel.nix { };
+ xfce4-panel = callPackage ./core/xfce4-panel { };
- xfce4-session = callPackage ./core/xfce4-session.nix { };
+ xfce4-session = callPackage ./core/xfce4-session { };
- xfce4-settings = callPackage ./core/xfce4-settings.nix { };
+ xfce4-settings = callPackage ./core/xfce4-settings { };
- xfce4-power-manager = callPackage ./core/xfce4-power-manager.nix { };
+ xfce4-power-manager = callPackage ./core/xfce4-power-manager { };
- xfconf = callPackage ./core/xfconf.nix { };
+ xfconf = callPackage ./core/xfconf { };
- xfdesktop = callPackage ./core/xfdesktop.nix { };
+ xfdesktop = callPackage ./core/xfdesktop { };
- xfwm4 = callPackage ./core/xfwm4.nix { };
+ xfwm4 = callPackage ./core/xfwm4 { };
- xfce4-appfinder = callPackage ./core/xfce4-appfinder.nix { };
+ xfce4-appfinder = callPackage ./core/xfce4-appfinder { };
- xfce4-dev-tools = callPackage ./core/xfce4-dev-tools.nix { };
+ xfce4-dev-tools = callPackage ./core/xfce4-dev-tools {
+ mkXfceDerivation = mkXfceDerivation.override {
+ xfce4-dev-tools = null;
+ };
+ };
#### APPLICATIONS
- gigolo = callPackage ./applications/gigolo.nix { };
+ gigolo = callPackage ./applications/gigolo { };
- mousepad = callPackage ./applications/mousepad.nix { };
+ mousepad = callPackage ./applications/mousepad { };
- orage = callPackage ./applications/orage.nix { };
+ orage = callPackage ./applications/orage { };
- parole = callPackage ./applications/parole.nix { };
+ parole = callPackage ./applications/parole { };
- ristretto = callPackage ./applications/ristretto.nix { };
+ ristretto = callPackage ./applications/ristretto { };
- xfce4-mixer = callPackage ./applications/xfce4-mixer.nix { };
+ xfce4-taskmanager = callPackage ./applications/xfce4-taskmanager { };
- xfce4-mixer-pulse = callPackage ./applications/xfce4-mixer.nix { pulseaudioSupport = true; };
+ xfce4-dict = callPackage ./applications/xfce4-dict { };
- xfce4-notifyd = callPackage ./applications/xfce4-notifyd.nix { };
+ xfce4-terminal = callPackage ./applications/xfce4-terminal { };
- xfce4-taskmanager = callPackage ./applications/xfce4-taskmanager.nix { };
+ xfce4-screenshooter = callPackage ./applications/xfce4-screenshooter {
+ inherit (pkgs.gnome3) libsoup;
+ };
- xfce4-terminal = callPackage ./applications/terminal.nix { };
+ xfdashbooard = callPackage ./applications/xfdashboard {};
- xfce4-screenshooter = callPackage ./applications/xfce4-screenshooter.nix { };
+ # TODO: this repo is inactive for many years. Remove?
+ xfce4-volumed = callPackage ./applications/xfce4-volumed { };
- xfce4-volumed = callPackage ./applications/xfce4-volumed.nix { };
+ xfce4-volumed-pulse = callPackage ./applications/xfce4-volumed-pulse { };
- xfce4-volumed-pulse = callPackage ./applications/xfce4-volumed-pulse.nix { };
+ xfce4-notifyd = callPackage ./applications/xfce4-notifyd { };
+
+ xfburn = callPackage ./applications/xfburn { };
#### ART
@@ -99,15 +99,15 @@ lib.makeScope pkgs.newScope (self: with self; {
xfce4-vala-panel-appmenu-plugin = callPackage ./panel-plugins/xfce4-vala-panel-appmenu-plugin { };
- xfce4-battery-plugin = callPackage ./panel-plugins/xfce4-battery-plugin.nix { };
+ xfce4-battery-plugin = callPackage ./panel-plugins/xfce4-battery-plugin { };
- xfce4-clipman-plugin = callPackage ./panel-plugins/xfce4-clipman-plugin.nix { };
+ xfce4-clipman-plugin = callPackage ./panel-plugins/xfce4-clipman-plugin { };
- xfce4-cpufreq-plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix { };
+ xfce4-cpufreq-plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin { };
xfce4-cpugraph-plugin = callPackage ./panel-plugins/xfce4-cpugraph-plugin.nix { };
- xfce4-datetime-plugin = callPackage ./panel-plugins/xfce4-datetime-plugin.nix { };
+ xfce4-datetime-plugin = callPackage ./panel-plugins/xfce4-datetime-plugin { };
xfce4-dict-plugin = callPackage ./panel-plugins/xfce4-dict-plugin.nix { };
@@ -125,7 +125,7 @@ lib.makeScope pkgs.newScope (self: with self; {
xfce4-namebar-plugin = callPackage ./panel-plugins/xfce4-namebar-plugin.nix { };
- xfce4-netload-plugin = callPackage ./panel-plugins/xfce4-netload-plugin.nix { };
+ xfce4-netload-plugin = callPackage ./panel-plugins/xfce4-netload-plugin { };
xfce4-notes-plugin = callPackage ./panel-plugins/xfce4-notes-plugin.nix { };
@@ -141,23 +141,15 @@ lib.makeScope pkgs.newScope (self: with self; {
xfce4-verve-plugin = callPackage ./panel-plugins/xfce4-verve-plugin.nix { };
- xfce4-xkb-plugin = callPackage ./panel-plugins/xfce4-xkb-plugin.nix { };
+ xfce4-xkb-plugin = callPackage ./panel-plugins/xfce4-xkb-plugin { };
xfce4-weather-plugin = callPackage ./panel-plugins/xfce4-weather-plugin.nix { };
- xfce4-whiskermenu-plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin.nix { };
+ xfce4-whiskermenu-plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin { };
xfce4-windowck-plugin = callPackage ./panel-plugins/xfce4-windowck-plugin.nix { };
- xfce4-pulseaudio-plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin.nix { };
-
- #### GTK3 (deprecated, see NixOS/nixpkgs#32763)
-
- libxfce4ui_gtk3 = libxfce4ui.override { withGtk3 = true; };
-
- xfce4panel_gtk3 = xfce4-panel.override { withGtk3 = true; };
-
- xfce4_power_manager_gtk3 = xfce4-power-manager.override { withGtk3 = true; };
+ xfce4-pulseaudio-plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin { };
} // lib.optionalAttrs (config.allowAliases or true) {
#### ALIASES - added 2018-01
@@ -208,4 +200,21 @@ lib.makeScope pkgs.newScope (self: with self; {
xfce4_whiskermenu_plugin = xfce4-whiskermenu-plugin;
xfce4_windowck_plugin = xfce4-windowck-plugin;
xfce4_pulseaudio_plugin = xfce4-pulseaudio-plugin;
+
+ xfce4-mixer = throw "deprecated 2019-08-18: obsoleted by xfce4-pulseaudio-plugin"; # added 2019-08-18
+ gtk-xfce-engine = throw "deprecated 2019-09-17: Xfce 4.14 deprecated gtk-xfce-engine"; # added 2019-09-17
+
+ # added 2019-11-04
+ libxfce4ui_gtk3 = libxfce4ui;
+ xfce4panel_gtk3 = xfce4-panel;
+ xfce4_power_manager_gtk3 = xfce4-power-manager;
+ gtk = pkgs.gtk2;
+ libxfcegui4 = throw "libxfcegui4 is the deprecated Xfce GUI library. It has been superseded by the libxfce4ui library";
+ xinitrc = xfce4-session.xinitrc;
+ inherit (pkgs.gnome2) libglade;
+ inherit (pkgs.gnome3) vte gtksourceview;
+ xfce4-mixer-pulse = xfce4-mixer;
+ thunar-bare = thunar.override {
+ thunarPlugins = [];
+ };
})
diff --git a/pkgs/desktops/xfce4-14/mkXfceDerivation.nix b/pkgs/desktops/xfce/mkXfceDerivation.nix
similarity index 100%
rename from pkgs/desktops/xfce4-14/mkXfceDerivation.nix
rename to pkgs/desktops/xfce/mkXfceDerivation.nix
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix
deleted file mode 100644
index 6399aa3cc20d..000000000000
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }:
-
-with stdenv.lib;
-stdenv.mkDerivation rec {
- p_name = "xfce4-battery-plugin";
- ver_maj = "1.0";
- ver_min = "5";
-
- src = fetchurl {
- url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "04gbplcj8z4vg5xbks8cc2jjf62mmf9sdymg90scjwmb82pv2ngn";
- };
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ];
-
- meta = {
- homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
- description = "Battery plugin for Xfce panel";
- platforms = platforms.linux;
- maintainers = [ maintainers.AndersonTorres ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfce4-battery-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix
similarity index 83%
rename from pkgs/desktops/xfce4-14/xfce4-battery-plugin/default.nix
rename to pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix
index 376551b09c0f..3966e256b160 100644
--- a/pkgs/desktops/xfce4-14/xfce4-battery-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix
@@ -8,4 +8,8 @@ mkXfceDerivation rec {
sha256 = "0329miiclc8da6j0sz495p99hyrf9fjhvpmdl0556fphybz5agc0";
buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];
+
+ meta = {
+ description = "Battery plugin for Xfce panel";
+ };
}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix
deleted file mode 100644
index 280f39f8d997..000000000000
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xorgproto, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }:
-
-with stdenv.lib;
-stdenv.mkDerivation rec {
- p_name = "xfce4-clipman-plugin";
- ver_maj = "1.2";
- ver_min = "6";
-
- src = fetchurl {
- url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "19a8gwcqc0r5qqi8w28dc8arqip34m8yxdb87lgps9g5qfcky113";
- };
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool glib exo libXtst xorgproto libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ];
-
- meta = {
- homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
- description = "Clipboard manager for Xfce panel";
- platforms = platforms.linux;
- maintainers = [ maintainers.AndersonTorres ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfce4-clipman-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix
similarity index 83%
rename from pkgs/desktops/xfce4-14/xfce4-clipman-plugin/default.nix
rename to pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix
index 74628a325d41..bd1a3b5e5e35 100644
--- a/pkgs/desktops/xfce4-14/xfce4-clipman-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix
@@ -8,4 +8,8 @@ mkXfceDerivation rec {
sha256 = "1xk79xh1zk0x4r1z9m1dakp79pip0zh3naviybvl1dnpwwfc03gq";
buildInputs = [ exo gtk3 libXtst libxfce4ui libxfce4util xfce4-panel xfconf ];
+
+ meta = {
+ description = "Clipboard manager for Xfce panel";
+ };
}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
deleted file mode 100644
index 07838f8fe7c9..000000000000
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }:
-
-with stdenv.lib;
-stdenv.mkDerivation rec {
- p_name = "xfce4-cpufreq-plugin";
- ver_maj = "1.1";
- ver_min = "3";
-
- src = fetchurl {
- url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "0crd21l5cw0xgm6w7s049xa36k203yx7l56ssnah9nq1w73n58bl";
- };
-
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- nativeBuildInputs = [ pkgconfig intltool ];
-
- buildInputs = [ libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ];
-
- enableParallelBuilding = true;
-
- meta = {
- homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
- description = "CPU Freq load plugin for Xfce panel";
- license = [ licenses.gpl2Plus ];
- platforms = platforms.linux;
- maintainers = [ maintainers.AndersonTorres ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfce4-cpufreq-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix
similarity index 81%
rename from pkgs/desktops/xfce4-14/xfce4-cpufreq-plugin/default.nix
rename to pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix
index 22793963df3d..3798edbf89dc 100644
--- a/pkgs/desktops/xfce4-14/xfce4-cpufreq-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix
@@ -7,4 +7,8 @@ mkXfceDerivation {
sha256 = "1p7c4g3yfc19ksdckxpzq1q35jvplh5g55299cvv0afhdb5l8zhv";
buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];
+
+ meta = {
+ description = "CPU Freq load plugin for Xfce panel";
+ };
}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix
index e088e74cfb1c..ef7f7e580206 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xorgproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk, hicolor-icon-theme }:
+{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xorgproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, hicolor-icon-theme }:
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool glib exo libXtst xorgproto libxfce4util libxfce4ui xfce4-panel xfconf gtk hicolor-icon-theme ];
+ buildInputs = [ intltool glib exo libXtst xorgproto libxfce4util libxfce4ui xfce4-panel xfconf gtk2 hicolor-icon-theme ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix
deleted file mode 100644
index c63170100312..000000000000
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfcegui4, xfce4-panel
-, gtk }:
-
-with stdenv.lib;
-stdenv.mkDerivation rec {
- p_name = "xfce4-datetime-plugin";
- ver_maj = "0.6";
- ver_min = "2";
-
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "0b4yril07qgkmywjym1qp12r4g35bnh96879zbjps7cd3rkxld4p";
- };
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool libxfce4util libxfcegui4 xfce4-panel gtk ];
-
- meta = {
- homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
- description = "Shows the date and time in the panel, and a calendar appears when you left-click on it";
- platforms = platforms.linux;
- maintainers = [ maintainers.AndersonTorres ];
- };
-}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix
new file mode 100644
index 000000000000..3cfb010b12da
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix
@@ -0,0 +1,34 @@
+{ mkXfceDerivation
+, stdenv
+, intltool
+, libxfce4ui
+, xfce4-panel
+, gtk3
+, gettext
+}:
+
+mkXfceDerivation rec {
+ category = "panel-plugins";
+ pname = "xfce4-datetime-plugin";
+ version = "0.8.0";
+
+ rev = "datetime-${version}";
+
+ sha256 = "12drh7y70d70r93lpv43fkj5cbyl0vciz4a41nxrknrfbhxrvyah";
+
+ nativeBuildInputs = [
+ gettext
+ intltool
+ ];
+
+ buildInputs = [
+ gtk3
+ libxfce4ui
+ xfce4-panel
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Shows the date and time in the panel, and a calendar appears when you left-click on it";
+ maintainers = [ maintainers.AndersonTorres ];
+ };
+}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix
index 8210fc62ccb4..0b31bac8d54b 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2}:
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ];
+ buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix
index 3a79f67068c8..03e5a2229672 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2}:
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -13,12 +13,13 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ];
+ buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
description = "Eyes following you!";
platforms = platforms.linux;
maintainers = [ maintainers.AndersonTorres ];
+ broken = true;
};
}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix
index 6d0f8ee73a4c..ee663aa71ca8 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2}:
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -13,12 +13,13 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ];
+ buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
description = "Filesystem monitor";
platforms = platforms.linux;
maintainers = [ maintainers.AndersonTorres ];
+ broken = true;
};
}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix
index 039ac1440947..193d27af98a3 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2}:
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -13,12 +13,13 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ];
+ buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
description = "Cyclically spawns a command and captures its output";
platforms = platforms.linux;
maintainers = [ maintainers.AndersonTorres ];
+ broken = true;
};
}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix
index 541b30ec1b3d..e9d2eb590be9 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui,
-libxfcegui4, xfconf, gtk, exo, gnutls, libgcrypt }:
+ xfconf, gtk2, exo, gnutls, libgcrypt }:
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -15,12 +15,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel
- libxfcegui4 xfconf gtk exo gnutls libgcrypt ];
+ xfconf gtk2 exo gnutls libgcrypt ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
description = "Mailwatch plugin for Xfce panel";
platforms = platforms.linux;
maintainers = [ ];
+ broken = true;
};
}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix
index 5331c29a4546..b909540144ae 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui,
-libxfcegui4, xfconf, gtk, exo }:
+ xfconf, gtk2, exo }:
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -15,12 +15,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel
- libxfcegui4 xfconf gtk exo ];
+ xfconf gtk2 exo ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
description = "MPD plugin for Xfce panel";
platforms = platforms.linux;
maintainers = [ ];
+ broken = true;
};
}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix
deleted file mode 100644
index e82669cc1a35..000000000000
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }:
-
-with stdenv.lib;
-stdenv.mkDerivation rec {
- p_name = "xfce4-netload-plugin";
- ver_maj = "1.2";
- ver_min = "4";
-
- src = fetchurl {
- url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "1lrhhzxmybcfl52hnadr2dvasis9wmk6a48pcy02s09ch8cfkb7z";
- };
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ];
-
- meta = {
- homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
- description = "Battery plugin for Xfce panel";
- platforms = platforms.linux;
- maintainers = [ maintainers.AndersonTorres ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfce4-netload-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix
similarity index 83%
rename from pkgs/desktops/xfce4-14/xfce4-netload-plugin/default.nix
rename to pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix
index d9f517981d3e..d774649b5369 100644
--- a/pkgs/desktops/xfce4-14/xfce4-netload-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix
@@ -8,4 +8,8 @@ mkXfceDerivation rec {
sha256 = "0nm8advafw4jpc9p1qszyfqa56194sz51z216rdh4c6ilcrrpy1h";
buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];
+
+ meta = {
+ description = "Battery plugin for Xfce panel";
+ };
}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix
index d61dae6bdd56..2876c1b1f7d8 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, libunique }:
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, libunique }:
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk libunique ];
+ buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 libunique ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin.nix
deleted file mode 100644
index 6f6f5699b6e9..000000000000
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel_gtk3, xfconf
-, gtk3, libpulseaudio, hicolor-icon-theme
-, withKeybinder ? true, keybinder3
-, withLibnotify ? true, libnotify
-}:
-
-assert withKeybinder -> keybinder3 != null;
-assert withLibnotify -> libnotify != null;
-
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
- p_name = "xfce4-pulseaudio-plugin";
- ver_maj = "0.2";
- ver_min = "3";
-
- src = fetchurl {
- url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "e82836bc8cf7d905b4e60d43dc630ba8e32dea785989700c71d4aeee9f583b33";
- };
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- nativeBuildInputs = [ pkgconfig intltool ];
- buildInputs = [ libxfce4util xfce4panel_gtk3 xfconf gtk3 libpulseaudio hicolor-icon-theme ]
- ++ optional withKeybinder keybinder3
- ++ optional withLibnotify libnotify;
-
- meta = {
- homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
- description = "Adjust the audio volume of the PulseAudio sound system";
- platforms = platforms.linux;
- maintainers = [ ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfce4-pulseaudio-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix
similarity index 87%
rename from pkgs/desktops/xfce4-14/xfce4-pulseaudio-plugin/default.nix
rename to pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix
index 6fca6069d1e8..59f282d74117 100644
--- a/pkgs/desktops/xfce4-14/xfce4-pulseaudio-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix
@@ -16,4 +16,8 @@ mkXfceDerivation {
'';
buildInputs = [ gtk3 libnotify libpulseaudio libxfce4ui libxfce4util xfce4-panel xfconf ];
+
+ meta = {
+ description = "Adjust the audio volume of the PulseAudio sound system";
+ };
}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix
index 5a4dfee76fc4..2e7233e6cdb0 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gnome2, libxfce4ui,
+{ stdenv, fetchurl, pkgconfig, intltool, gtk2, libxfce4ui,
libxfce4util, xfce4-panel, libnotify, lm_sensors, hddtemp, netcat-gnu
}:
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- gnome2.gtk
+ gtk2
libxfce4ui
libxfce4util
xfce4-panel
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix
index 698d4aae5328..5575962ab77e 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk}:
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk2}:
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel gtk ];
+ buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel gtk2 ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix
index 57cd48c6f270..4eddfe8df574 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel
-, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }:
+, libxfce4ui, xfconf, gtk2, hicolor-icon-theme }:
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
};
name = "${p_name}-${ver_maj}.${ver_min}";
- buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf
- gtk hicolor-icon-theme ];
+ buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf
+ gtk2 hicolor-icon-theme ];
nativeBuildInputs = [ pkgconfig ];
@@ -26,5 +26,6 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
license = licenses.gpl2;
maintainers = [ ];
+ broken = true;
};
}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix
index 96ef08cbeb70..c9e5c8befbbb 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, pcre
-, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk }:
+, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2 }:
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool glib exo pcre libxfce4util libxfce4ui xfce4-panel xfconf gtk ];
+ buildInputs = [ intltool glib exo pcre libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ];
hardeningDisable = [ "format" ];
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix
index 15cd526d6def..5ab311ef16f7 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxml2, libsoup, upower,
+{ stdenv, fetchurl, pkgconfig, intltool, gtk2, libxml2, libsoup, upower,
libxfce4ui, libxfce4util, xfce4-panel, hicolor-icon-theme }:
stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool ];
- buildInputs = [ gtk libxml2 libsoup upower libxfce4ui libxfce4util
+ buildInputs = [ gtk2 libxml2 libsoup upower libxfce4ui libxfce4util
xfce4-panel hicolor-icon-theme ];
enableParallelBuilding = true;
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
deleted file mode 100644
index c29758452ae6..000000000000
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, intltool, libxfce4util, libxfcegui4
-, xfce4-panel, gtk, exo, garcon }:
-
-with stdenv.lib;
-stdenv.mkDerivation rec {
- p_name = "xfce4-whiskermenu-plugin";
- version = "1.7.2";
-
- name = "${p_name}-${version}";
-
- src = fetchFromGitHub {
- owner = "gottcode";
- repo = "xfce4-whiskermenu-plugin";
- rev = "v${version}";
- sha256 = "1rpazgnjp443abc31bgi6gp9q3sgbg13v7v74nn7vf6kl4v725ah";
- };
-
- nativeBuildInputs = [ cmake pkgconfig intltool ];
-
- buildInputs = [ libxfce4util libxfcegui4 xfce4-panel gtk exo garcon ];
-
- enableParallelBuilding = true;
-
- preFixup = ''
- substituteInPlace $out/bin/xfce4-popup-whiskermenu \
- --replace $out/bin/xfce4-panel ${xfce4-panel.out}/bin/xfce4-panel
- '';
-
- meta = {
- homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
- description = "Alternate application launcher for Xfce";
- license = licenses.gpl2Plus;
- platforms = platforms.linux;
- maintainers = [ maintainers.pjbarnoy ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfce4-whiskermenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix
similarity index 88%
rename from pkgs/desktops/xfce4-14/xfce4-whiskermenu-plugin/default.nix
rename to pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix
index f943f2ab333a..ef47d37e5efd 100644
--- a/pkgs/desktops/xfce4-14/xfce4-whiskermenu-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix
@@ -15,4 +15,8 @@ mkXfceDerivation rec {
substituteInPlace $out/bin/xfce4-popup-whiskermenu \
--replace $out/bin/xfce4-panel ${xfce4-panel.out}/bin/xfce4-panel
'';
+
+ meta = {
+ description = "Alternate application launcher for Xfce";
+ };
}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix
deleted file mode 100644
index 307d2e81bf24..000000000000
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfce4ui, xfce4-panel
-, garcon, gtk, libxklavier, librsvg, libwnck
-}:
-
-with stdenv.lib;
-stdenv.mkDerivation rec {
- p_name = "xfce4-xkb-plugin";
- ver_maj = "0.7";
- ver_min = "1";
-
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "10g65j5ia389ahhn3b9hr52ghpp0817fk0m60rfrv4wrzqrjxzk1";
- };
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel garcon
- gtk libxklavier librsvg libwnck ];
-
- meta = {
- homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
- description = "Allows you to setup and use multiple keyboard layouts";
- platforms = platforms.linux;
- maintainers = [ maintainers.AndersonTorres ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfce4-xkb-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix
similarity index 52%
rename from pkgs/desktops/xfce4-14/xfce4-xkb-plugin/default.nix
rename to pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix
index a024d3a88ba0..4497a7b0e36a 100644
--- a/pkgs/desktops/xfce4-14/xfce4-xkb-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix
@@ -1,4 +1,4 @@
-{ mkXfceDerivation, gtk3, librsvg, libwnck3, libxklavier, garcon, libxfce4ui, libxfce4util, xfce4-panel, xfconf }:
+{ lib, mkXfceDerivation, gtk3, librsvg, libwnck3, libxklavier, garcon, libxfce4ui, libxfce4util, xfce4-panel, xfconf }:
mkXfceDerivation rec {
category = "panel-plugins";
@@ -8,4 +8,9 @@ mkXfceDerivation rec {
sha256 = "1gyky4raynp2ggdnq0g96c6646fjm679fzipcsmf1q0aymr8d5ky";
buildInputs = [ garcon gtk3 librsvg libxfce4ui libxfce4util libxklavier libwnck3 xfce4-panel xfconf ];
+
+ meta = with lib; {
+ description = "Allows you to setup and use multiple keyboard layouts";
+ maintainers = [ maintainers.AndersonTorres ];
+ };
}
diff --git a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix
index ea3a0f084439..e3c72d3b50e2 100644
--- a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix
+++ b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix
@@ -1,57 +1,38 @@
-{ stdenv, fetchFromGitHub, pkgconfig, xfce4-dev-tools
-, gtk
-, thunar-bare
-, exo, libxfce4util, libxfce4ui
-, xfconf, udev, libnotify, hicolor-icon-theme
+{ stdenv
+, mkXfceDerivation
+, fetchFromGitHub
+, gtk3
+, thunar
+, exo
+, libxfce4util
+, intltool
+, gettext
}:
-stdenv.mkDerivation rec {
- p_name = "thunar-archive-plugin";
- ver_maj = "0.3";
- ver_min = "1";
- name = "${p_name}-${ver_maj}.${ver_min}";
+mkXfceDerivation rec {
+ category = "thunar-plugins";
+ pname = "thunar-archive-plugin";
+ version = "0.4.0";
- src = fetchFromGitHub {
- owner = "xfce-mirror";
- repo = p_name;
- rev = "72b23eefc348bee31e06a04f968e430bc7dfa51e";
- sha256 = "0l8715x23qmk0jkywiza3qx0xxmafxi4grp7p82kkc5df5ccs8kx";
- };
+ sha256 = "1793zicm00fail4iknliwy2b668j239ndxhc9hy6jarvdyp08h38";
+
+ nativeBuildInputs = [
+ intltool
+ gettext
+ ];
- nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- xfce4-dev-tools
- thunar-bare
- exo gtk libxfce4util libxfce4ui
- xfconf udev libnotify hicolor-icon-theme
+ thunar
+ exo
+ gtk3
+ libxfce4util
];
preConfigure = ''
./autogen.sh
'';
- /*
- File roller `*.desktop` situation
- ---------------------------------
-
- For some odd reason, in nix os, gnome file-roller's desktop file has the non-standard name
- `org.gnome.FileRoller.desktop`. In order to be compatible with this odd context, create
- a `*.tap` file of the same name.
-
- IMPORTANT: Adapt or remove the symbolic link if the situation changes.
- */
- preFixup = ''
- pushd $out/libexec/thunar-archive-plugin > /dev/null
- ln -s ./file-roller.tap org.gnome.FileRoller.tap
- popd > /dev/null
- '';
-
- enableParallelBuilding = true;
-
meta = with stdenv.lib; {
- homepage = http://foo-projects.org/~benny/projects/thunar-archive-plugin/;
description = "Thunar plugin providing file context menus for archives";
- license = licenses.gpl2Plus;
- platforms = platforms.linux;
};
}
diff --git a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix
index 217cecf85a8c..8674c586552c 100644
--- a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix
+++ b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix
@@ -1,31 +1,39 @@
-{ stdenv, fetchurl, pkgconfig
-, gtk
-, thunar-bare, python2, hicolor-icon-theme
-, wafHook
+{ stdenv
+, fetchFromGitHub
+, pkgconfig
+, gtk3
+, thunar
+, cmake
+, ninja
}:
stdenv.mkDerivation rec {
- p_name = "thunar-dropbox-plugin";
- ver_maj = "0.2";
- ver_min = "1";
- name = "${p_name}-${ver_maj}.${ver_min}";
+ pname = "thunar-dropbox";
+ version = "0.3.1";
- src = fetchurl {
- url = "http://softwarebakery.com/maato/files/thunar-dropbox/thunar-dropbox-${ver_maj}.${ver_min}.tar.bz2";
- sha256 = "08vhzzzwshyz371yl7fzfylmhvchhv3s5kml3dva4v39jhvrpnkf";
+ src = fetchFromGitHub {
+ owner = "Jeinzi";
+ repo = "thunar-dropbox";
+ rev = version;
+ sha256 = "1fshjvh542ffa8npfxv3cassgn6jclb2ix9ir997y4k0abzp1fxb";
};
- nativeBuildInputs = [ pkgconfig wafHook ];
+ nativeBuildInputs = [
+ pkgconfig
+ cmake
+ ninja
+ ];
+
buildInputs = [
- gtk
- thunar-bare python2 hicolor-icon-theme
+ thunar
+ gtk3
];
enableParallelBuilding = true;
meta = with stdenv.lib; {
- homepage = http://softwarebakery.com/maato/thunar-dropbox.html;
- description = "A plugin for thunar that adds context-menu items from dropbox";
+ homepage = "https://github.com/Jeinzi/thunar-dropbox";
+ description = "A plugin that adds context-menu items for Dropbox to Thunar";
license = licenses.gpl3;
platforms = platforms.linux;
};
diff --git a/pkgs/desktops/xfce4-14/default.nix b/pkgs/desktops/xfce4-14/default.nix
deleted file mode 100644
index 0e2c8c1696b2..000000000000
--- a/pkgs/desktops/xfce4-14/default.nix
+++ /dev/null
@@ -1,116 +0,0 @@
-{ lib, makeSetupHook, newScope, gnome3, gst_all_1 }:
-
-let
- inherit (lib) makeScope;
-in
-
-makeScope newScope (self: with self; {
- mkXfceDerivation = callPackage ./mkXfceDerivation.nix { };
-
- automakeAddFlags = makeSetupHook { } ./automakeAddFlags.sh;
-
- exo = callPackage ./exo { };
-
- garcon = callPackage ./garcon { };
-
- gigolo = callPackage ./gigolo { };
-
- libxfce4util = callPackage ./libxfce4util { };
-
- libxfce4ui = callPackage ./libxfce4ui { };
-
- mousepad = callPackage ./mousepad { };
-
- orage = callPackage ./orage { };
-
- parole = callPackage ./parole {
- inherit (gst_all_1) gst-plugins-bad gst-plugins-base gst-plugins-good;
- gst-plugins-ugly = null;
- };
-
- ristretto = callPackage ./ristretto { };
-
- thunar = callPackage ./thunar { };
-
- thunar-volman = callPackage ./thunar-volman { };
-
- tumbler = callPackage ./tumbler { };
-
- xfburn = callPackage ./xfburn { };
-
- xfconf = callPackage ./xfconf { };
-
- xfdesktop = callPackage ./xfdesktop { };
-
- xfce4-appfinder = callPackage ./xfce4-appfinder { };
-
- xfce4-battery-plugin = callPackage ./xfce4-battery-plugin { };
-
- xfce4-cpufreq-plugin = callPackage ./xfce4-cpufreq-plugin { };
-
- xfce4-clipman-plugin = callPackage ./xfce4-clipman-plugin { };
-
- xfce4-dev-tools = callPackage ./xfce4-dev-tools {
- mkXfceDerivation = mkXfceDerivation.override {
- xfce4-dev-tools = null;
- };
- };
-
- xfce4-dict = callPackage ./xfce4-dict { };
-
- xfce4-netload-plugin = callPackage ./xfce4-netload-plugin { };
-
- xfce4-notifyd = callPackage ./xfce4-notifyd { };
-
- xfce4-panel = callPackage ./xfce4-panel { };
-
- xfce4-power-manager = callPackage ./xfce4-power-manager { };
-
- xfce4-pulseaudio-plugin = callPackage ./xfce4-pulseaudio-plugin { };
-
- xfce4-screenshooter = callPackage ./xfce4-screenshooter {
- inherit (gnome3) libsoup;
- };
-
- xfce4-session = callPackage ./xfce4-session { };
- xinitrc = "${xfce4-session}/etc/xdg/xfce4/xinitrc";
-
- xfce4-settings = callPackage ./xfce4-settings { };
-
- xfce4-taskmanager = callPackage ./xfce4-taskmanager { };
-
- xfce4-terminal = callPackage ./xfce4-terminal { };
-
- xfdashboard = callPackage ./xfdashboard { };
-
- xfce4-volumed-pulse = callPackage ./xfce4-volumed-pulse { };
-
- xfce4-whiskermenu-plugin = callPackage ./xfce4-whiskermenu-plugin { };
-
- xfce4-xkb-plugin = callPackage ./xfce4-xkb-plugin { };
-
- xfwm4 = callPackage ./xfwm4 { };
-
- ## COMMON PARTS WITH XFCE 4.12
-
- xfce4-icon-theme = callPackage ../xfce/art/xfce4-icon-theme.nix { };
-
- xfwm4-themes = callPackage ../xfce/art/xfwm4-themes.nix { };
-
- xfce4-embed-plugin = callPackage ../xfce/panel-plugins/xfce4-embed-plugin.nix { };
-
- xfce4-hardware-monitor-plugin = callPackage ../xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix { };
-
- ## THIRD PARTY PLIGINS
-
- xfce4-dockbarx-plugin = callPackage ../xfce/panel-plugins/xfce4-dockbarx-plugin.nix { };
-
- xfce4-namebar-plugin = callPackage ../xfce/panel-plugins/xfce4-namebar-plugin.nix { };
-
- xfce4-windowck-plugin = callPackage ../xfce/panel-plugins/xfce4-windowck-plugin.nix { };
-
-
- ## ALIASES
- xfce4-mixer = throw "deprecated 2019-08-18: obsoleted by xfce4-pulseaudio-plugin"; # added 2019-08-18
- gtk-xfce-engine = throw "deprecated 2019-09-17: Xfce 4.14 deprecated gtk-xfce-engine"; # added 2019-09-17
-})
diff --git a/pkgs/desktops/xfce4-14/thunar/default.nix b/pkgs/desktops/xfce4-14/thunar/default.nix
deleted file mode 100644
index 12a1a62991a7..000000000000
--- a/pkgs/desktops/xfce4-14/thunar/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkXfceDerivation, docbook_xsl, exo, gdk-pixbuf, gtk3, libgudev
-, libnotify, libX11, libxfce4ui, libxfce4util, libxslt, xfconf, gobject-introspection, gvfs }:
-
-mkXfceDerivation {
- category = "xfce";
- pname = "thunar";
- version = "1.8.9";
-
- sha256 = "01w60csbs2nq1bhb8n1bnmjmx48fm0va3qbnq84z0h2dxpr80b1w";
-
- nativeBuildInputs = [ libxslt docbook_xsl gobject-introspection ];
-
- buildInputs = [
- exo
- gdk-pixbuf
- gtk3
- libgudev
- libnotify
- libX11
- libxfce4ui
- libxfce4util
- xfconf
- gvfs
- ];
-}
diff --git a/pkgs/desktops/xfce4-14/xfburn/default.nix b/pkgs/desktops/xfce4-14/xfburn/default.nix
deleted file mode 100644
index dd3a9af16804..000000000000
--- a/pkgs/desktops/xfce4-14/xfburn/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ mkXfceDerivation, docbook_xsl, exo, gtk2, libburn, libisofs, libxfce4ui, libxslt }:
-
-mkXfceDerivation {
- category = "apps";
- pname = "xfburn";
- version = "0.5.5";
-
- sha256 = "1lmv48vqrlap1a2ha72g16vqly18zvcwj8y3f3f00l10pmn52bkp";
-
- nativeBuildInputs = [ libxslt docbook_xsl ];
- buildInputs = [ exo gtk2 libburn libisofs libxfce4ui ];
- meta.broken = true;
-}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 5c54a90ce7e7..ec0e4377f764 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -102,11 +102,6 @@ self: super: {
vault = dontHaddock super.vault;
monad-par = dontCheck super.monad-par; # test suite does not compile in monad-par-0.3.4.8
- # TODO dont fetch patch if https://github.com/simonmar/alex/issues/140 is resolved
- alex = appendPatch super.alex (pkgs.fetchpatch {
- url = "https://github.com/simonmar/alex/commit/deaae6eddef5186bfd0e42e2c3ced39e26afa4d6.patch";
- sha256 = "1v40gmnw4lqyk271wngdwz8whpfdhmza58srbkka8icwwwrck3l5";
- });
# https://github.com/snapframework/snap-core/issues/288
snap-core = overrideCabal super.snap-core (drv: { prePatch = "substituteInPlace src/Snap/Internal/Core.hs --replace 'fail = Fail.fail' ''"; });
# needs a release
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index ba477e06e2f1..e2d01c5798f9 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -181,7 +181,10 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
# '... foo = self.callHackage "foo" "1.5.3" {}; ...'
callHackage = name: version: callPackageKeepDeriver (self.hackage2nix name version);
- # callHackageDirect :: Text -> Text -> AttrSet -> HaskellPackage
+ # callHackageDirect
+ # :: { pkg :: Text, ver :: Text, sha256 :: Text }
+ # -> AttrSet
+ # -> HaskellPackage
#
# This function does not depend on all-cabal-hashes and therefore will work
# for any version that has been released on hackage as opposed to only
diff --git a/pkgs/development/interpreters/elixir/1.9.nix b/pkgs/development/interpreters/elixir/1.9.nix
index 2d9fec02e106..4eead35bae37 100644
--- a/pkgs/development/interpreters/elixir/1.9.nix
+++ b/pkgs/development/interpreters/elixir/1.9.nix
@@ -1,7 +1,9 @@
{ mkDerivation }:
+# How to obtain `sha256`:
+# nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz
mkDerivation {
- version = "1.9.2";
- sha256 = "19yn6nx6r627f5zbyc7ckgr96d6b45sgwx95n2gp2imqwqvpj8wc";
+ version = "1.9.4";
+ sha256 = "1l4318g35y4h0vi2w07ayc3jizw1xc3s7hdb47w6j3iw33y06g6b";
minimumOTPVersion = "20";
}
diff --git a/pkgs/development/interpreters/erlang/R22.nix b/pkgs/development/interpreters/erlang/R22.nix
index 8b471f632471..88fe21453a82 100644
--- a/pkgs/development/interpreters/erlang/R22.nix
+++ b/pkgs/development/interpreters/erlang/R22.nix
@@ -1,8 +1,10 @@
{ mkDerivation }:
+# How to obtain `sha256`:
+# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
mkDerivation {
- version = "22.0.4";
- sha256 = "1aqkhd6nwdn4xp5yz02zbymd4x8ij8fjw9ji8kh860n1a513k9ai";
+ version = "22.1.7";
+ sha256 = "18aqy2s8nqd82v4lzzxknrwjva8mv1y2hvai9cakz5nkyd3vwq62";
prePatch = ''
substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}"
diff --git a/pkgs/development/interpreters/python/cpython/3.9/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.9/no-ldconfig.patch
new file mode 100644
index 000000000000..a1f9d68eb166
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/3.9/no-ldconfig.patch
@@ -0,0 +1,100 @@
+From 597e73f2a4b2f0b508127931b36d5540d6941823 Mon Sep 17 00:00:00 2001
+From: Frederik Rietdijk
+Date: Mon, 28 Aug 2017 09:24:06 +0200
+Subject: [PATCH] Don't use ldconfig
+
+---
+ Lib/ctypes/util.py | 70 ++----------------------------------------------------
+ 1 file changed, 2 insertions(+), 68 deletions(-)
+
+diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
+index 5e8b31a854..7b45ce6c15 100644
+--- a/Lib/ctypes/util.py
++++ b/Lib/ctypes/util.py
+@@ -94,46 +94,7 @@ elif os.name == "posix":
+ import re, tempfile
+
+ def _findLib_gcc(name):
+- # Run GCC's linker with the -t (aka --trace) option and examine the
+- # library name it prints out. The GCC command will fail because we
+- # haven't supplied a proper program with main(), but that does not
+- # matter.
+- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name))
+-
+- c_compiler = shutil.which('gcc')
+- if not c_compiler:
+- c_compiler = shutil.which('cc')
+- if not c_compiler:
+- # No C compiler available, give up
+- return None
+-
+- temp = tempfile.NamedTemporaryFile()
+- try:
+- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name]
+-
+- env = dict(os.environ)
+- env['LC_ALL'] = 'C'
+- env['LANG'] = 'C'
+- try:
+- proc = subprocess.Popen(args,
+- stdout=subprocess.PIPE,
+- stderr=subprocess.STDOUT,
+- env=env)
+- except OSError: # E.g. bad executable
+- return None
+- with proc:
+- trace = proc.stdout.read()
+- finally:
+- try:
+- temp.close()
+- except FileNotFoundError:
+- # Raised if the file was already removed, which is the normal
+- # behaviour of GCC if linking fails
+- pass
+- res = re.search(expr, trace)
+- if not res:
+- return None
+- return os.fsdecode(res.group(0))
++ return None
+
+
+ if sys.platform == "sunos5":
+@@ -255,34 +216,7 @@ elif os.name == "posix":
+ else:
+
+ def _findSoname_ldconfig(name):
+- import struct
+- if struct.calcsize('l') == 4:
+- machine = os.uname().machine + '-32'
+- else:
+- machine = os.uname().machine + '-64'
+- mach_map = {
+- 'x86_64-64': 'libc6,x86-64',
+- 'ppc64-64': 'libc6,64bit',
+- 'sparc64-64': 'libc6,64bit',
+- 's390x-64': 'libc6,64bit',
+- 'ia64-64': 'libc6,IA-64',
+- }
+- abi_type = mach_map.get(machine, 'libc6')
+-
+- # XXX assuming GLIBC's ldconfig (with option -p)
+- regex = r'\s+(lib%s\.[^\s]+)\s+\(%s'
+- regex = os.fsencode(regex % (re.escape(name), abi_type))
+- try:
+- with subprocess.Popen(['/sbin/ldconfig', '-p'],
+- stdin=subprocess.DEVNULL,
+- stderr=subprocess.DEVNULL,
+- stdout=subprocess.PIPE,
+- env={'LC_ALL': 'C', 'LANG': 'C'}) as p:
+- res = re.search(regex, p.stdout.read())
+- if res:
+- return os.fsdecode(res.group(1))
+- except OSError:
+- pass
++ return None
+
+ def _findLib_ld(name):
+ # See issue #9998 for why this is needed
+--
+2.15.0
+
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index ddfa9557582a..f5f4dce68b42 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -29,6 +29,7 @@ with pkgs;
isPy36 = pythonVersion == "3.6";
isPy37 = pythonVersion == "3.7";
isPy38 = pythonVersion == "3.8";
+ isPy39 = pythonVersion == "3.9";
isPy2 = lib.strings.substring 0 1 pythonVersion == "2";
isPy3 = lib.strings.substring 0 1 pythonVersion == "3";
isPy3k = isPy3;
@@ -112,6 +113,19 @@ in {
inherit passthruFun;
};
+ python39 = callPackage ./cpython {
+ self = python39;
+ sourceVersion = {
+ major = "3";
+ minor = "9";
+ patch = "0";
+ suffix = "a1";
+ };
+ sha256 = "02b337kvzb6ncqab21xnayh562zpz6bqzjmh35iy9l48zgpkvf1n";
+ inherit (darwin) CF configd;
+ inherit passthruFun;
+ };
+
# Minimal versions of Python (built without optional dependencies)
python3Minimal = (callPackage ./cpython {
self = python3Minimal;
diff --git a/pkgs/development/libraries/ffmpeg/2.8.nix b/pkgs/development/libraries/ffmpeg/2.8.nix
index 5ffbc215d8b3..98ada9a3f09f 100644
--- a/pkgs/development/libraries/ffmpeg/2.8.nix
+++ b/pkgs/development/libraries/ffmpeg/2.8.nix
@@ -1,7 +1,7 @@
{ callPackage, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (rec {
version = "${branch}.14";
branch = "2.8";
sha256 = "1g6x3lyjl1zlfksizj1ys61kj97yg0xf4dlr6sr5acpbja3a26yn";
-})
+} // args)
diff --git a/pkgs/development/libraries/ffmpeg/3.4.nix b/pkgs/development/libraries/ffmpeg/3.4.nix
index bea367b2554e..759fba65587f 100644
--- a/pkgs/development/libraries/ffmpeg/3.4.nix
+++ b/pkgs/development/libraries/ffmpeg/3.4.nix
@@ -4,9 +4,9 @@
, ...
}@args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (rec {
version = branch;
branch = "3.4.6";
sha256 = "1s20wzgxxrm56gckyb8cf1lh36hdnkdxvmmnnvdxvia4zb3grf1b";
darwinFrameworks = [ Cocoa CoreMedia ];
-})
+} // args)
diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix
index a0b95cecaaba..387069d16189 100644
--- a/pkgs/development/libraries/ffmpeg/4.nix
+++ b/pkgs/development/libraries/ffmpeg/4.nix
@@ -4,9 +4,9 @@
, ...
}@args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (rec {
version = "4.2.1";
branch = "4.2";
sha256 = "090naa6rj46pzkgh03bf51hbqdz356qqckr2pw6pykc6ysiryak8";
darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
-})
+} // args)
diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix
index b2a799674771..9bf246f556d3 100644
--- a/pkgs/development/libraries/libsearpc/default.nix
+++ b/pkgs/development/libraries/libsearpc/default.nix
@@ -1,14 +1,14 @@
{stdenv, fetchFromGitHub, automake, autoconf, pkgconfig, libtool, python2Packages, glib, jansson}:
stdenv.mkDerivation rec {
- version = "3.1.0";
+ version = "3.2.0";
pname = "libsearpc";
src = fetchFromGitHub {
owner = "haiwen";
repo = "libsearpc";
rev = "v${version}";
- sha256 = "1zf8xxsl95wdx0372kl8s153hd8q3lhwwvwr2k96ia8scbn2ylkp";
+ sha256 = "18i5zvrp6dv6vygxx5nc93mai2p2x786n5lnf5avrin6xiz2j6hd";
};
patches = [ ./libsearpc.pc.patch ];
diff --git a/pkgs/development/libraries/physics/fastjet-contrib/default.nix b/pkgs/development/libraries/physics/fastjet-contrib/default.nix
new file mode 100644
index 000000000000..2bc5b12dfb77
--- /dev/null
+++ b/pkgs/development/libraries/physics/fastjet-contrib/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, fastjet }:
+
+stdenv.mkDerivation rec {
+ pname = "fastjet-contrib";
+ version = "1.042";
+
+ src = fetchurl {
+ url = "http://fastjet.hepforge.org/contrib/downloads/fjcontrib-${version}.tar.gz";
+ sha256 = "0cc8dn6g7adj2pgs8hvczg68i3xhlk6978m4gxamgibilf9jw1av";
+ };
+
+ buildInputs = [ fastjet ];
+
+ postPatch = ''
+ for f in Makefile.in */Makefile; do
+ substituteInPlace "$f" --replace "CXX=g++" ""
+ done
+ patchShebangs ./configure ./utils/check.sh ./utils/install-sh
+ '';
+
+ enableParallelBuilding = true;
+
+ doCheck = true;
+
+ postBuild = ''
+ make fragile-shared
+ '';
+
+ postInstall = ''
+ make fragile-shared-install
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Third party extensions for FastJet";
+ homepage = "http://fastjet.fr/";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ veprbl ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix
index 9105b1c52acf..4cfc07c1cbaa 100644
--- a/pkgs/development/libraries/science/biology/elastix/default.nix
+++ b/pkgs/development/libraries/science/biology/elastix/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, cmake, itk, python }:
+{ stdenv, fetchFromGitHub, cmake, itk, python }:
stdenv.mkDerivation rec {
pname = "elastix";
- pversion = "4.9.0";
- name = "${pname}-${pversion}";
+ version = "5.0.0";
- src = fetchurl {
- url = "https://github.com/SuperElastix/${pname}/archive/${pversion}.tar.gz";
- sha256 = "02pbln36nq98xxfyqwlxg7b6gmigdq4fgfqr9mym1qn58aj04shg";
+ src = fetchFromGitHub {
+ owner = "SuperElastix";
+ repo = pname;
+ rev = version;
+ sha256 = "1zrl7rz4lwsx88b2shnl985f3a97lmp4ksbd437h9y0hfjq8l0lj";
};
-
nativeBuildInputs = [ cmake python ];
buildInputs = [ itk ];
@@ -19,6 +19,5 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ bcdarwin ];
platforms = platforms.linux;
license = licenses.asl20;
- broken = true;
};
}
diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix
index 9d2f6eb6075e..5b4cad1f264f 100644
--- a/pkgs/development/mobile/androidenv/platform-tools.nix
+++ b/pkgs/development/mobile/androidenv/platform-tools.nix
@@ -8,7 +8,7 @@ deployAndroidPackage {
addAutoPatchelfSearchPath $packageBaseDir/lib64
autoPatchelf --no-recurse $packageBaseDir/lib64
autoPatchelf --no-recurse $packageBaseDir
-
+ '' + ''
mkdir -p $out/bin
cd $out/bin
find $out/libexec/android-sdk/platform-tools -type f -executable -mindepth 1 -maxdepth 1 -not -name sqlite3 | while read i
diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix
new file mode 100644
index 000000000000..c15aac61b5c0
--- /dev/null
+++ b/pkgs/development/python-modules/apache-airflow/default.nix
@@ -0,0 +1,188 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
+, fetchFromGitHub
+, fetchpatch
+, alembic
+, cached-property
+, configparser
+, colorlog
+, croniter
+, dill
+, flask
+, flask-appbuilder
+, flask-admin
+, flask-caching
+, flask_login
+, flask-swagger
+, flask_wtf
+, flask-bcrypt
+, funcsigs
+, future
+, GitPython
+, gunicorn
+, iso8601
+, json-merge-patch
+, jinja2
+, ldap3
+, lxml
+, lazy-object-proxy
+, markdown
+, pandas
+, pendulum
+, psutil
+, pygments
+, python-daemon
+, python-dateutil
+, requests
+, setproctitle
+, snakebite
+, sqlalchemy
+, tabulate
+, tenacity
+, termcolor
+, text-unidecode
+, thrift
+, tzlocal
+, unicodecsv
+, werkzeug
+, zope_deprecation
+, enum34
+, typing
+, nose
+, python
+, isPy3k
+}:
+
+buildPythonPackage rec {
+ pname = "apache-airflow";
+ version = "1.10.5";
+ disabled = (!isPy3k);
+
+ src = fetchFromGitHub rec {
+ owner = "apache";
+ repo = "airflow";
+ rev = version;
+ sha256 = "14fmhfwx977c9jdb2kgm93i6acx43l45ggj30rb37r68pzpb6l6h";
+ };
+
+ patches = [
+ # Not yet accepted: https://github.com/apache/airflow/pull/6562
+ (fetchpatch {
+ name = "avoid-warning-from-abc.collections";
+ url = https://patch-diff.githubusercontent.com/raw/apache/airflow/pull/6562.patch;
+ sha256 = "0swpay1qlb7f9kgc56631s1qd9k82w4nw2ggvkm7jvxwf056k61z";
+ })
+ # Not yet accepted: https://github.com/apache/airflow/pull/6561
+ (fetchpatch {
+ name = "pendulum2-compatibility";
+ url = https://patch-diff.githubusercontent.com/raw/apache/airflow/pull/6561.patch;
+ sha256 = "17hw8qyd4zxvib9zwpbn32p99vmrdz294r31gnsbkkcl2y6h9knk";
+ })
+ ];
+
+ propagatedBuildInputs = [
+ alembic
+ cached-property
+ colorlog
+ configparser
+ croniter
+ dill
+ flask
+ flask-admin
+ flask-appbuilder
+ flask-bcrypt
+ flask-caching
+ flask_login
+ flask-swagger
+ flask_wtf
+ funcsigs
+ future
+ GitPython
+ gunicorn
+ iso8601
+ json-merge-patch
+ jinja2
+ ldap3
+ lxml
+ lazy-object-proxy
+ markdown
+ pandas
+ pendulum
+ psutil
+ pygments
+ python-daemon
+ python-dateutil
+ requests
+ setproctitle
+ sqlalchemy
+ tabulate
+ tenacity
+ termcolor
+ text-unidecode
+ thrift
+ tzlocal
+ unicodecsv
+ werkzeug
+ zope_deprecation
+ ];
+
+ checkInputs = [
+ snakebite
+ nose
+ ];
+
+ postPatch = ''
+
+ substituteInPlace setup.py \
+ --replace "flask>=1.1.0, <2.0" "flask" \
+ --replace "flask-caching>=1.3.3, <1.4.0" "flask-caching" \
+ --replace "flask-appbuilder>=1.12.5, <2.0.0" "flask-appbuilder" \
+ --replace "pendulum==1.4.4" "pendulum" \
+ --replace "cached_property~=1.5" "cached_property" \
+ --replace "dill>=0.2.2, <0.3" "dill" \
+ --replace "configparser>=3.5.0, <3.6.0" "configparser" \
+ --replace "jinja2>=2.7.3, <=2.10.0" "jinja2" \
+ --replace "funcsigs==1.0.0" "funcsigs" \
+ --replace "flask-swagger==0.2.13" "flask-swagger" \
+ --replace "python-daemon>=2.1.1, <2.2" "python-daemon" \
+ --replace "alembic>=0.9, <1.0" "alembic" \
+ --replace "markdown>=2.5.2, <3.0" "markdown" \
+ --replace "future>=0.16.0, <0.17" "future" \
+ --replace "tenacity==4.12.0" "tenacity" \
+ --replace "text-unidecode==1.2" "text-unidecode" \
+ --replace "tzlocal>=1.4,<2.0.0" "tzlocal" \
+ --replace "sqlalchemy~=1.3" "sqlalchemy" \
+ --replace "werkzeug>=0.14.1, <0.15.0" "werkzeug"
+
+ # dumb-init is only needed for CI and Docker, not relevant for NixOS.
+ substituteInPlace setup.py \
+ --replace "'dumb-init>=1.2.2'," ""
+
+ substituteInPlace tests/core.py \
+ --replace "/bin/bash" "${stdenv.shell}"
+ '';
+
+ checkPhase = ''
+ export HOME=$(mktemp -d)
+ export AIRFLOW_HOME=$HOME
+ export AIRFLOW__CORE__UNIT_TEST_MODE=True
+ export AIRFLOW_DB="$HOME/airflow.db"
+ export PATH=$PATH:$out/bin
+
+ airflow version
+ airflow initdb
+ airflow resetdb -y
+ nosetests tests.core.CoreTest
+ ## all tests
+ # nosetests --cover-package=airflow
+ '';
+
+ meta = with lib; {
+ description = "Programmatically author, schedule and monitor data pipelines";
+ homepage = http://airflow.apache.org/;
+ license = licenses.asl20;
+ maintainers = [ maintainers.costrouc maintainers.ingenieroariel ];
+ };
+}
diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix
new file mode 100644
index 000000000000..217a921a634e
--- /dev/null
+++ b/pkgs/development/python-modules/apispec/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pyyaml
+, prance
+, marshmallow
+, pytestCheckHook
+, mock
+, openapi-spec-validator
+}:
+
+buildPythonPackage rec {
+ pname = "apispec";
+ version = "3.1.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0rr32z9hbf8w4w1fs5gj2v0ixcq2vq7a3wssrlxagi5ii7ygap7y";
+ };
+
+ checkInputs = [
+ pyyaml
+ prance
+ openapi-spec-validator
+ marshmallow
+ mock
+ pytestCheckHook
+ ];
+
+ meta = with lib; {
+ description = "A pluggable API specification generator. Currently supports the OpenAPI Specification (f.k.a. the Swagger specification";
+ homepage = https://github.com/marshmallow-code/apispec;
+ license = licenses.mit;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix
index d8ecd2553e8c..7882c98e524d 100644
--- a/pkgs/development/python-modules/cliff/default.nix
+++ b/pkgs/development/python-modules/cliff/default.nix
@@ -9,6 +9,10 @@
, pyyaml
, unicodecsv
, cmd2
+, pytest
+, mock
+, testtools
+, fixtures
}:
buildPythonPackage rec {
@@ -31,10 +35,17 @@ buildPythonPackage rec {
unicodecsv
];
- # test dependencies are complex
- # and would require about 20 packages
- # to be added
- doCheck = false;
+ # remove version constraints
+ postPatch = ''
+ sed -i '/cmd2/c\cmd2' requirements.txt
+ '';
+
+ checkInputs = [ fixtures mock pytest testtools ];
+ # add some tests
+ checkPhase = ''
+ pytest cliff/tests/test_{utils,app,command,help,lister}.py \
+ -k 'not interactive_mode'
+ '';
meta = with lib; {
description = "Command Line Interface Formulation Framework";
diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix
index 6db6c93a2628..9e3a9ac1b824 100644
--- a/pkgs/development/python-modules/cmd2/default.nix
+++ b/pkgs/development/python-modules/cmd2/default.nix
@@ -6,11 +6,11 @@
}:
buildPythonPackage rec {
pname = "cmd2";
- version = "0.9.19";
+ version = "0.9.20";
src = fetchPypi {
inherit pname version;
- sha256 = "c81284083d993af18b8fef57d89d854d49d051d4c2c8a8e12d0281e369ac3682";
+ sha256 = "0id8247m05xi26xbzg7jj1gcmy91p77wpbbj74v5543z2aplk8qv";
};
LC_ALL="en_US.UTF-8";
diff --git a/pkgs/development/python-modules/configshell/default.nix b/pkgs/development/python-modules/configshell/default.nix
index 9b54f4398477..fed5a71fd178 100644
--- a/pkgs/development/python-modules/configshell/default.nix
+++ b/pkgs/development/python-modules/configshell/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "configshell";
- version = "1.1.fb25";
+ version = "1.1.27";
src = fetchFromGitHub {
owner = "open-iscsi";
repo ="${pname}-fb";
rev = "v${version}";
- sha256 = "0zpr2n4105qqsklyfyr9lzl1rhxjcv0mnsl57hgk0m763w6na90h";
+ sha256 = "1nldzq3097xqgzd8qxv36ydvx6vj2crwanihz53k46is0myrwcnn";
};
propagatedBuildInputs = [ pyparsing six urwid ];
diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix
new file mode 100644
index 000000000000..e262a7f164c8
--- /dev/null
+++ b/pkgs/development/python-modules/croniter/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, python-dateutil
+, pytest
+, pytz
+}:
+
+buildPythonPackage rec {
+ pname = "croniter";
+ version = "0.3.30";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "538adeb3a7f7816c3cdec6db974c441620d764c25ff4ed0146ee7296b8a50590";
+ };
+
+ propagatedBuildInputs = [
+ python-dateutil
+ ];
+
+ checkInputs = [
+ pytest
+ pytz
+ ];
+
+ checkPhase = ''
+ pytest src/croniter
+ '';
+
+ meta = with lib; {
+ description = "croniter provides iteration for datetime object with cron like format";
+ homepage = http://github.com/kiorky/croniter;
+ license = licenses.mit;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/python-modules/flask-admin/default.nix b/pkgs/development/python-modules/flask-admin/default.nix
new file mode 100644
index 000000000000..3a2c1fe5e9b6
--- /dev/null
+++ b/pkgs/development/python-modules/flask-admin/default.nix
@@ -0,0 +1,71 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, pillow
+, mongoengine
+, pymongo
+, wtf-peewee
+, sqlalchemy
+, sqlalchemy-citext
+, flask-mongoengine
+, flask_sqlalchemy
+, flask-babelex
+, shapely
+, geoalchemy2
+, psycopg2
+, flask
+, wtforms
+, isPy27
+, enum34
+}:
+
+buildPythonPackage rec {
+ pname = "flask-admin";
+ version = "1.5.3";
+
+ src = fetchPypi {
+ pname = "Flask-Admin";
+ inherit version;
+ sha256 = "ca0be6ec11a6913b73f656c65c444ae5be416c57c75638dd3199376ce6bc7422";
+ };
+
+ checkInputs = [
+ nose
+ pillow
+ mongoengine
+ pymongo
+ wtf-peewee
+ sqlalchemy
+ sqlalchemy-citext
+ flask-mongoengine
+ flask_sqlalchemy
+ flask-babelex
+ shapely
+ geoalchemy2
+ psycopg2
+ ];
+
+ propagatedBuildInputs = [
+ flask
+ wtforms
+ ] ++ lib.optionals isPy27 [ enum34 ];
+
+ checkPhase = ''
+ # disable tests that require mongodb, postresql
+ nosetests \
+ -e "mongoengine" \
+ -e "pymongo" \
+ -e "test_form_upload" \
+ -e "test_postgres" \
+ -e "geoa" \
+ flask_admin/tests
+ '';
+
+ meta = with lib; {
+ description = "Simple and extensible admin interface framework for Flask";
+ homepage = https://github.com/flask-admin/flask-admin/;
+ license = licenses.bsd3;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix
new file mode 100644
index 000000000000..46841f68d60f
--- /dev/null
+++ b/pkgs/development/python-modules/flask-appbuilder/default.nix
@@ -0,0 +1,80 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, apispec
+, colorama
+, click
+, flask
+, flask-babel
+, flask_login
+, flask-openid
+, flask_sqlalchemy
+, flask_wtf
+, flask-jwt-extended
+, jsonschema
+, marshmallow
+, marshmallow-enum
+, marshmallow-sqlalchemy
+, python-dateutil
+, prison
+, pyjwt
+, pyyaml
+, sqlalchemy-utils
+}:
+
+buildPythonPackage rec {
+ pname = "flask-appbuilder";
+ version = "2.1.6";
+
+ src = fetchPypi {
+ pname = "Flask-AppBuilder";
+ inherit version;
+ sha256 = "a37d7d6a62407a2e0975af5305c795f2fb5c06ecc34e3cf64659d083b1b2dd5f";
+ };
+
+ checkInputs = [
+ nose
+ ];
+
+ propagatedBuildInputs = [
+ apispec
+ colorama
+ click
+ flask
+ flask-babel
+ flask_login
+ flask-openid
+ flask_sqlalchemy
+ flask_wtf
+ flask-jwt-extended
+ jsonschema
+ marshmallow
+ marshmallow-enum
+ marshmallow-sqlalchemy
+ python-dateutil
+ prison
+ pyjwt
+ sqlalchemy-utils
+ pyyaml
+ ];
+
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "jsonschema>=3.0.1<4" "jsonschema" \
+ --replace "marshmallow>=2.18.0,<2.20" "marshmallow" \
+ --replace "PyJWT>=1.7.1" "PyJWT" \
+ --replace "Flask-SQLAlchemy>=2.4,<3" "Flask-SQLAlchemy" \
+ --replace "Flask-JWT-Extended>=3.18,<4" "Flask-JWT-Extended"
+ '';
+
+ # majority of tests require network access or mongo
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Simple and rapid application development framework, built on top of Flask";
+ homepage = https://github.com/dpgaspar/flask-appbuilder/;
+ license = licenses.bsd3;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/python-modules/flask-babelex/default.nix b/pkgs/development/python-modules/flask-babelex/default.nix
new file mode 100644
index 000000000000..c5968be6b8fa
--- /dev/null
+++ b/pkgs/development/python-modules/flask-babelex/default.nix
@@ -0,0 +1,47 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, flask
+, Babel
+, speaklater
+, jinja2
+, pytest
+}:
+
+buildPythonPackage rec {
+ pname = "flask-babelex";
+ version = "0.9.3";
+
+ src = fetchPypi {
+ inherit version;
+ pname = "Flask-BabelEx";
+ sha256 = "cf79cdedb5ce860166120136b0e059e9d97b8df07a3bc2411f6243de04b754b4";
+ };
+
+ propagatedBuildInputs = [
+ flask
+ Babel
+ speaklater
+ jinja2
+ ];
+
+ checkInputs = [
+ pytest
+ ];
+
+ checkPhase = ''
+ # Disabled 3 tests failing due to string representations of dates:
+ # Like "12. April 2010 um 15:46:00 MESZ" != 12. "April 2010 15:46:00 MESZ"
+
+ pytest tests/tests.py -k "not test_init_app \
+ and not test_custom_locale_selector \
+ and not test_basics"
+ '';
+
+ meta = with lib; {
+ description = "Adds i18n/l10n support to Flask applications";
+ homepage = http://github.com/mrjoes/flask-babelex;
+ license = licenses.bsd3;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/python-modules/flask-bcrypt/default.nix b/pkgs/development/python-modules/flask-bcrypt/default.nix
new file mode 100644
index 000000000000..dfcdad18f9c6
--- /dev/null
+++ b/pkgs/development/python-modules/flask-bcrypt/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, flask
+, bcrypt
+, python
+}:
+
+buildPythonPackage rec {
+ pname = "flask-bcrypt";
+ version = "0.7.1";
+
+ src = fetchFromGitHub {
+ owner = "maxcountryman";
+ repo = pname;
+ rev = version;
+ sha256 = "0036gag3nj7fzib23lbbpwhlrn1s0kkrfwk5pd90y4cjcfqh8z9x";
+ };
+
+ propagatedBuildInputs = [
+ flask
+ bcrypt
+ ];
+
+ checkPhase = ''
+ ${python.interpreter} test_bcrypt.py
+ '';
+
+ meta = with lib; {
+ description = "Brcrypt hashing for Flask";
+ homepage = https://github.com/maxcountryman/flask-bcrypt;
+ license = licenses.bsd3;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/python-modules/flask-mongoengine/default.nix b/pkgs/development/python-modules/flask-mongoengine/default.nix
new file mode 100644
index 000000000000..5e61a2415b7c
--- /dev/null
+++ b/pkgs/development/python-modules/flask-mongoengine/default.nix
@@ -0,0 +1,47 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, flask
+, flask_wtf
+, mongoengine
+, six
+, nose
+, rednose
+, coverage
+}:
+
+buildPythonPackage rec {
+ pname = "flask-mongoengine";
+ version = "0.9.5";
+
+ src = fetchFromGitHub {
+ owner = "MongoEngine";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "05hfddf1dm594wnjyqhj0zmjfsf1kpmx1frjwhypgzx4hf62qcmr";
+ };
+
+ propagatedBuildInputs = [
+ flask
+ flask_wtf
+ mongoengine
+ six
+ ];
+
+ # they set test requirements to setup_requirements...
+ buildInputs = [
+ nose
+ rednose
+ coverage
+ ];
+
+ # tests require working mongodb connection
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Flask-MongoEngine is a Flask extension that provides integration with MongoEngine and WTF model forms";
+ homepage = https://github.com/mongoengine/flask-mongoengine;
+ license = licenses.bsd3;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/python-modules/flask-openid/default.nix b/pkgs/development/python-modules/flask-openid/default.nix
new file mode 100644
index 000000000000..ad5001636095
--- /dev/null
+++ b/pkgs/development/python-modules/flask-openid/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, flask
+, python3-openid
+, isPy3k
+}:
+
+buildPythonPackage rec {
+ pname = "flask-openid";
+ version = "1.2.5";
+ disable = !isPy3k;
+
+ src = fetchPypi {
+ pname = "Flask-OpenID";
+ inherit version;
+ sha256 = "5a8ffe1c8c0ad1cc1f5030e1223ea27f8861ee0215a2a58a528cc61379e5ccab";
+ };
+
+ propagatedBuildInputs = [
+ flask
+ python3-openid
+ ];
+
+ # no tests for repo...
+ doCheck = false;
+
+ meta = with lib; {
+ description = "OpenID support for Flask";
+ homepage = http://github.com/mitsuhiko/flask-openid/;
+ license = licenses.bsd3;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/python-modules/gpyopt/default.nix b/pkgs/development/python-modules/gpyopt/default.nix
new file mode 100644
index 000000000000..3ad5cb7d89b5
--- /dev/null
+++ b/pkgs/development/python-modules/gpyopt/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, setuptools
+, numpy, scipy, gpy, emcee, nose }:
+
+buildPythonPackage rec {
+ pname = "GPyOpt";
+ version = "unstable-2019-09-25";
+
+ src = fetchFromGitHub {
+ repo = pname;
+ owner = "SheffieldML";
+ rev = "249b8ff29c52c12ed867f145a627d529372022d8";
+ sha256 = "1ywaw1kpdr7dv4s4cr7afmci86sw7w61178gs45b0lq08652zdlb";
+ };
+
+ doCheck = false; # requires several packages not available in Nix
+
+ checkInputs = [ nose ];
+
+ checkPhase = "nosetests -v GPyOpt/testing";
+
+ propagatedBuildInputs = [ setuptools numpy scipy gpy emcee ];
+
+ meta = with stdenv.lib; {
+ description = "Bayesian optimization toolbox in Python";
+ homepage = https://sheffieldml.github.io/GPyOpt;
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ bcdarwin ];
+ };
+}
diff --git a/pkgs/development/python-modules/json-merge-patch/default.nix b/pkgs/development/python-modules/json-merge-patch/default.nix
new file mode 100644
index 000000000000..b0bc2a835c41
--- /dev/null
+++ b/pkgs/development/python-modules/json-merge-patch/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, fetchpatch
+}:
+
+buildPythonPackage rec {
+ pname = "json-merge-patch";
+ version = "0.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "09898b6d427c08754e2a97c709cf2dfd7e28bd10c5683a538914975eab778d39";
+ };
+
+ patches = [
+ # This prevented tests from running (was using a relative import)
+ # https://github.com/OpenDataServices/json-merge-patch/pull/1
+ (fetchpatch {
+ name = "fully-qualified-json-merge-patch-import-on-tests";
+ url = https://patch-diff.githubusercontent.com/raw/OpenDataServices/json-merge-patch/pull/1.patch;
+ sha256 = "1k6xsrxsmz03nwcqsf4gf0zsfnl2r20n83npic8z6bqlpl4lidl4";
+ })
+ ];
+
+ meta = with lib; {
+ description = "JSON Merge Patch library";
+ homepage = https://github.com/open-contracting/json-merge-patch;
+ license = licenses.bsd3;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/python-modules/marshmallow-enum/default.nix b/pkgs/development/python-modules/marshmallow-enum/default.nix
new file mode 100644
index 000000000000..9d68e66c91ab
--- /dev/null
+++ b/pkgs/development/python-modules/marshmallow-enum/default.nix
@@ -0,0 +1,42 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, marshmallow
+, pytestCheckHook
+, isPy27
+, enum34
+, pytest-flake8
+}:
+
+buildPythonPackage rec {
+ pname = "marshmallow-enum";
+ version = "1.5.1";
+
+ src = fetchFromGitHub {
+ owner = "justanr";
+ repo = "marshmallow_enum";
+ rev = "v${version}";
+ sha256 = "1ihrcmyfjabivg6hc44i59hnw5ijlg1byv3zs1rqxfynp8xr7398";
+ };
+
+ propagatedBuildInputs = [
+ marshmallow
+ ] ++ lib.optionals isPy27 [ enum34 ];
+
+ checkInputs = [
+ pytestCheckHook
+ pytest-flake8
+ ];
+
+ disabledTests = [
+ "test_custom_error_in_deserialize_by_name"
+ "test_custom_error_in_deserialize_by_value"
+ ];
+
+ meta = with lib; {
+ description = "Enum field for Marshmallow";
+ homepage = https://github.com/justanr/marshmallow_enum;
+ license = licenses.mit;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/python-modules/mongoengine/default.nix b/pkgs/development/python-modules/mongoengine/default.nix
new file mode 100644
index 000000000000..db20d9442ef1
--- /dev/null
+++ b/pkgs/development/python-modules/mongoengine/default.nix
@@ -0,0 +1,49 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pymongo
+, six
+, blinker
+, nose
+, pillow
+, coverage
+}:
+
+buildPythonPackage rec {
+ pname = "mongoengine";
+ version = "0.18.2";
+
+ src = fetchFromGitHub {
+ owner = "MongoEngine";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0gx091h9rcykdj233srrl3dfc0ly52p6r4qc9ah6z0f694kmqj1v";
+ };
+
+ propagatedBuildInputs = [
+ pymongo
+ six
+ ];
+
+ checkInputs = [
+ nose
+ pillow
+ coverage
+ blinker
+ ];
+
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "coverage==4.2" "coverage"
+ '';
+
+ # tests require mongodb running in background
+ doCheck = false;
+
+ meta = with lib; {
+ description = "MongoEngine is a Python Object-Document Mapper for working with MongoDB";
+ homepage = http://mongoengine.org/;
+ license = licenses.mit;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix
new file mode 100644
index 000000000000..38133172ecf7
--- /dev/null
+++ b/pkgs/development/python-modules/prance/default.nix
@@ -0,0 +1,57 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, chardet
+, pyyaml
+, requests
+, six
+, semver
+, pytest
+, pytestcov
+, pytestrunner
+, sphinx
+, openapi-spec-validator
+}:
+
+buildPythonPackage rec {
+ pname = "prance";
+ version = "0.15.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "793f96dc8bba73bf4342f57b3570f5e0a94c30e60f0c802a2aaa302759dd8610";
+ };
+
+ buildInputs = [
+ pytestrunner
+ ];
+
+ propagatedBuildInputs = [
+ chardet
+ pyyaml
+ requests
+ six
+ semver
+ ];
+
+ checkInputs = [
+ pytest
+ pytestcov
+ openapi-spec-validator
+ ];
+
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "tests_require = dev_require," "tests_require = None,"
+ '';
+
+ # many tests require network connection
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Resolving Swagger/OpenAPI 2.0 and 3.0.0 Parser";
+ homepage = https://github.com/jfinkhaeuser/prance;
+ license = licenses.mit;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/python-modules/prison/default.nix b/pkgs/development/python-modules/prison/default.nix
new file mode 100644
index 000000000000..4993976b51df
--- /dev/null
+++ b/pkgs/development/python-modules/prison/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, six
+, nose
+}:
+
+buildPythonPackage rec {
+ pname = "prison";
+ version = "0.1.2";
+
+ src = fetchFromGitHub {
+ owner = "betodealmeida";
+ repo = "python-rison";
+ rev = version;
+ sha256 = "14vb468iznf9416z993bbqihywp9ibyslw5vp67wfr200zyxjwak";
+ };
+
+ propagatedBuildInputs = [
+ six
+ ];
+
+ checkInputs = [
+ nose
+ ];
+
+ meta = with lib; {
+ description = "Rison encoder/decoder";
+ homepage = https://github.com/betodealmeida/python-rison;
+ license = licenses.mit;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/python-modules/rtslib/default.nix b/pkgs/development/python-modules/rtslib/default.nix
index 5453541e2de5..c1d27488bddf 100644
--- a/pkgs/development/python-modules/rtslib/default.nix
+++ b/pkgs/development/python-modules/rtslib/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "rtslib";
- version = "2.1.fb69";
+ version = "2.1.71";
src = fetchFromGitHub {
owner = "open-iscsi";
repo ="${pname}-fb";
rev = "v${version}";
- sha256 = "17rlcrd9757nq91pa8xjr7147k7mxxp8zdka7arhlgsp3kcnbsfd";
+ sha256 = "0cn9azi44hf59mp47207igv72kjbkyz4rsvgzmwbpz0s57b0hnab";
};
propagatedBuildInputs = [ six pyudev pygobject3 ];
diff --git a/pkgs/development/python-modules/snakebite/default.nix b/pkgs/development/python-modules/snakebite/default.nix
new file mode 100644
index 000000000000..1d08570d7276
--- /dev/null
+++ b/pkgs/development/python-modules/snakebite/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, tox
+, virtualenv
+, protobuf
+}:
+
+buildPythonPackage rec {
+ pname = "snakebite";
+ version = "2.11.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "085238b4944cb9c658ee62d5794de936ac3d0c337c504b2cc86424a205ae978a";
+ };
+
+ checkInputs = [
+ tox
+ virtualenv
+ ];
+
+ propagatedBuildInputs = [
+ protobuf
+ ];
+
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "'argparse'" ""
+ '';
+
+ # tests require hadoop hdfs
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Pure Python HDFS client";
+ homepage = http://github.com/spotify/snakebite;
+ license = licenses.asl20;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/python-modules/sqlalchemy-citext/default.nix b/pkgs/development/python-modules/sqlalchemy-citext/default.nix
new file mode 100644
index 000000000000..b91e33854043
--- /dev/null
+++ b/pkgs/development/python-modules/sqlalchemy-citext/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, sqlalchemy
+, python
+}:
+
+buildPythonPackage rec {
+ pname = "sqlalchemy-citext";
+ version = "1.3-0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "7d7343037a35153d6f94c3c2f6baf391f88a57651c3bde5d6749d216859ae4c5";
+ };
+
+ propagatedBuildInputs = [
+ sqlalchemy
+ ];
+
+ checkPhase = ''
+ ${python.interpreter} tests/test_citext.py
+ '';
+
+ meta = with lib; {
+ description = "A sqlalchemy plugin that allows postgres use of CITEXT";
+ homepage = https://github.com/mahmoudimus/sqlalchemy-citext;
+ license = licenses.mit;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/python-modules/wrf-python/default.nix b/pkgs/development/python-modules/wrf-python/default.nix
index 8d1443837cde..29c1f8dfa797 100644
--- a/pkgs/development/python-modules/wrf-python/default.nix
+++ b/pkgs/development/python-modules/wrf-python/default.nix
@@ -1,19 +1,20 @@
-{lib, fetchFromGitHub, pythonOlder, buildPythonPackage, gfortran, mock, xarray, wrapt, numpy, netcdf4}:
+{lib, fetchFromGitHub, pythonOlder, buildPythonPackage, gfortran, mock, xarray, wrapt, numpy, netcdf4, setuptools}:
buildPythonPackage rec {
pname = "wrf-python";
- version = "1.3.1.1";
+ version = "1.3.2";
src = fetchFromGitHub {
owner = "NCAR";
repo = "wrf-python";
rev = version;
- sha256 = "12mm7x1r5md6x28vmwyh6k655pgsv6knj8ycmjbxxk8bk7qsj74h";
+ sha256 = "1rklkki54z5392cpwwy78bnmsy2ghc187l3j7nv0rzn6jk5bvyi7";
};
propagatedBuildInputs = [
wrapt
numpy
+ setuptools
xarray
];
@@ -39,4 +40,4 @@ buildPythonPackage rec {
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ mhaselsteiner ];
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/python-modules/wtf-peewee/default.nix b/pkgs/development/python-modules/wtf-peewee/default.nix
new file mode 100644
index 000000000000..a01aaa4631af
--- /dev/null
+++ b/pkgs/development/python-modules/wtf-peewee/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, peewee
+, wtforms
+, python
+}:
+
+buildPythonPackage rec {
+ pname = "wtf-peewee";
+ version = "3.0.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "acd05d136c8595da3327fcf9176fa85fdcec1f2aac51d235e46e6fc7a0871283";
+ };
+
+ propagatedBuildInputs = [
+ peewee
+ wtforms
+ ];
+
+ checkPhase = ''
+ ${python.interpreter} runtests.py
+ '';
+
+ meta = with lib; {
+ description = "WTForms integration for peewee models";
+ homepage = https://github.com/coleifer/wtf-peewee/;
+ license = licenses.mit;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix
index ce7b08710441..59b1b14ac5fa 100644
--- a/pkgs/development/tools/build-managers/conan/default.nix
+++ b/pkgs/development/tools/build-managers/conan/default.nix
@@ -1,4 +1,4 @@
-{ lib, python3, git }:
+{ lib, python3, git, pkgconfig }:
let newPython = python3.override {
packageOverrides = self: super: {
@@ -37,28 +37,17 @@ let newPython = python3.override {
sha256 = "c0abe3218b86533cca287e7057a37481883c07acef7814b70583406938214cc8";
};
});
- pyyaml = super.pyyaml_3;
};
};
in newPython.pkgs.buildPythonApplication rec {
- version = "1.12.0";
+ version = "1.12.3";
pname = "conan";
src = newPython.pkgs.fetchPypi {
inherit pname version;
- sha256 = "0hgy3wfy96likdchz42h9mawfjw4dxx7k2iinrrlhph7128kji1j";
+ sha256 = "1cnfy9b57apps4bfai6r67g0mrvgnqa154z9idv0kf93k1nvx53g";
};
- checkInputs = [
- git
- ] ++ (with newPython.pkgs; [
- codecov
- mock
- node-semver
- nose
- parameterized
- webtest
- ]);
propagatedBuildInputs = with newPython.pkgs; [
colorama deprecation distro fasteners bottle
@@ -66,14 +55,30 @@ in newPython.pkgs.buildPythonApplication rec {
pyjwt pylint pyyaml requests six tqdm
];
+ checkInputs = [
+ pkgconfig
+ git
+ ] ++ (with newPython.pkgs; [
+ codecov
+ mock
+ pytest
+ node-semver
+ nose
+ parameterized
+ webtest
+ ]);
+
checkPhase = ''
- export HOME="$TMP/conan-home"
- mkdir -p "$HOME"
+ export HOME=$TMPDIR
+ pytest conans/test/{utils,unittests} \
+ -k 'not SVN and not ToolsNetTest'
'';
postPatch = ''
substituteInPlace conans/requirements_server.txt \
--replace "pluginbase>=0.5, < 1.0" "pluginbase>=0.5"
+ substituteInPlace conans/requirements.txt \
+ --replace "PyYAML>=3.11, <3.14.0" "PyYAML"
'';
meta = with lib; {
diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/development/tools/buildpack/default.nix
new file mode 100644
index 000000000000..8c1a2bbb62d4
--- /dev/null
+++ b/pkgs/development/tools/buildpack/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ pname = "pack";
+ version = "0.5.0";
+
+ src = fetchFromGitHub {
+ owner = "buildpack";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0yh62h7lz2i07gixccmfyxk607djp1nrs57rzk7nkxnjcj4jj5sr";
+ };
+
+ goPackagePath = "github.com/buildpack/pack";
+
+ subPackages = [ "cmd/pack" ];
+
+ buildFlagsArray = [ "-ldflags=-s -w -X github.com/buildpack/pack/cmd.Version=${version}" ];
+
+ meta = with lib; {
+ homepage = "https://buildpacks.io/";
+ description = "Local CLI for building apps using Cloud Native Buildpacks";
+ license = licenses.asl20;
+ maintainers = [ maintainers.marsam ];
+ };
+}
diff --git a/pkgs/development/web/nodejs/disable-libatomic-darwin-12_x.patch b/pkgs/development/web/nodejs/disable-libatomic-darwin-12_x.patch
deleted file mode 100644
index d6ac38138b88..000000000000
--- a/pkgs/development/web/nodejs/disable-libatomic-darwin-12_x.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/node.gyp
-+++ b/node.gyp
-@@ -289,7 +289,7 @@
- '-Wl,-bnoerrmsg',
- ],
- }],
-- ['(OS=="linux" or OS=="mac") and llvm_version!=0', {
-+ ['OS=="linux" and llvm_version!=0', {
- 'libraries': ['-latomic'],
- }],
- ],
diff --git a/pkgs/development/web/nodejs/disable-libatomic-darwin-13_x.patch b/pkgs/development/web/nodejs/disable-libatomic-darwin.patch
similarity index 80%
rename from pkgs/development/web/nodejs/disable-libatomic-darwin-13_x.patch
rename to pkgs/development/web/nodejs/disable-libatomic-darwin.patch
index b3b2c8b0fb65..7ac6c2ef8953 100644
--- a/pkgs/development/web/nodejs/disable-libatomic-darwin-13_x.patch
+++ b/pkgs/development/web/nodejs/disable-libatomic-darwin.patch
@@ -5,7 +5,7 @@
],
}],
- ['OS in ("linux", "mac") and llvm_version != "0.0"', {
-+ ['OS=="linux" and llvm_version!=0', {
++ ['OS == "linux" and llvm_version != "0.0"', {
'libraries': ['-latomic'],
}],
],
diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix
index bed3127ee4bf..fbec83c387a0 100644
--- a/pkgs/development/web/nodejs/v12.nix
+++ b/pkgs/development/web/nodejs/v12.nix
@@ -5,8 +5,8 @@ let
in
buildNodejs {
inherit enableNpm;
- version = "12.13.0";
- sha256 = "1xmy73q3qjmy68glqxmfrk6baqk655py0cic22h1h0v7rx0iaax8";
+ version = "12.13.1";
+ sha256 = "14mia71sr8p0ibz9g4j5xb5qwmik36qi5nhabjbv0sy2kirkm7il";
- patches = stdenv.lib.optionals stdenv.isDarwin [ ./disable-libatomic-darwin-12_x.patch ];
+ patches = stdenv.lib.optionals stdenv.isDarwin [ ./disable-libatomic-darwin.patch ];
}
diff --git a/pkgs/development/web/nodejs/v13.nix b/pkgs/development/web/nodejs/v13.nix
index df7e7ed92669..6b6e4f438b82 100644
--- a/pkgs/development/web/nodejs/v13.nix
+++ b/pkgs/development/web/nodejs/v13.nix
@@ -8,5 +8,5 @@ in
version = "13.1.0";
sha256 = "0s6b2k7i89j9mxwyz271fvm6bf8jcz2v5kzmn0v5icrkpmn0ab6l";
- patches = stdenv.lib.optionals stdenv.isDarwin [ ./disable-libatomic-darwin-13_x.patch ];
+ patches = stdenv.lib.optionals stdenv.isDarwin [ ./disable-libatomic-darwin.patch ];
}
diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix
index 14bea8185c6f..5d1ed1c11a95 100644
--- a/pkgs/games/endless-sky/default.nix
+++ b/pkgs/games/endless-sky/default.nix
@@ -3,7 +3,7 @@
}:
let
- version = "0.9.8";
+ version = "0.9.10";
in
stdenv.mkDerivation {
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
owner = "endless-sky";
repo = "endless-sky";
rev = "v${version}";
- sha256 = "0i36lawypikbq8vvzfis1dn7yf6q0d2s1cllshfn7kmjb6pqfi6c";
+ sha256 = "1wax9qhxakydg6bs92d1jy2fki1n9r0wkps1np02y0pvm1fl189i";
};
enableParallelBuilding = true;
diff --git a/pkgs/games/endless-sky/fixes.patch b/pkgs/games/endless-sky/fixes.patch
index cad7a6acaed0..359e2ee4af3b 100644
--- a/pkgs/games/endless-sky/fixes.patch
+++ b/pkgs/games/endless-sky/fixes.patch
@@ -2,15 +2,6 @@ diff --git a/SConstruct b/SConstruct
index 48fd080..419b40d 100644
--- a/SConstruct
+++ b/SConstruct
-@@ -1,7 +1,7 @@
- import os
-
- # Load any environment variables that alter the build.
--env = Environment()
-+env = Environment(ENV = os.environ)
- if 'CCFLAGS' in os.environ:
- env.Append(CCFLAGS = os.environ['CCFLAGS'])
- if 'CXXFLAGS' in os.environ:
@@ -55,7 +55,7 @@ sky = env.Program("endless-sky", Glob("build/" + env["mode"] + "/*.cpp"))
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 9abd1b5e7181..ced786abeeef 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -799,12 +799,12 @@ let
defx-nvim = buildVimPluginFrom2Nix {
pname = "defx-nvim";
- version = "2019-11-16";
+ version = "2019-11-18";
src = fetchFromGitHub {
owner = "Shougo";
repo = "defx.nvim";
- rev = "663cebbcbd2d1ecb3c052cffdd397b6157bc22f1";
- sha256 = "0cjxdsz8ya09pbp70lk0cd3zizqgcpvk0wcdqqin73b59xirq5nr";
+ rev = "1c59c0bbeea3d9162b1f8405c0cdcf23f29860f6";
+ sha256 = "0pn3szp6kpk6za1q7f5wimwxsfrz5csgx8sxkzsch133q0f24p7f";
};
};
@@ -843,12 +843,12 @@ let
denite-nvim = buildVimPluginFrom2Nix {
pname = "denite-nvim";
- version = "2019-11-11";
+ version = "2019-11-18";
src = fetchFromGitHub {
owner = "Shougo";
repo = "denite.nvim";
- rev = "671da21f020445cf86836b5387000e0826f1b16e";
- sha256 = "166kkkpvbrlyyn70vr0n5vrwrnk4rvwfvqfcw1hy0lx2wx7jal10";
+ rev = "2f8e00266f2958a02eb870b69f4ab0ef1d91c022";
+ sha256 = "1n5h1ys0pb3lfg7zbyfdkshcy05kxd7f4d81qcr69k7n1ni44fvq";
};
};
@@ -978,12 +978,12 @@ let
deoplete-nvim = buildVimPluginFrom2Nix {
pname = "deoplete-nvim";
- version = "2019-11-15";
+ version = "2019-11-17";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete.nvim";
- rev = "84981f49c68d07749a5d522f8df595c60fdbcb6f";
- sha256 = "0ix8a8ayshkr284vip9pvc6rw1q3vb4s6jny7lkv4zqh3g4jm3hg";
+ rev = "edbc7b721e45f1eaa9e1ebe695f4f363f14a7a67";
+ sha256 = "1l33wxdsyvhksnbkv1k924qvgdy9s3rksmqsa1yv7zrssl8xdmjn";
};
};
@@ -1201,12 +1201,12 @@ let
fzf-vim = buildVimPluginFrom2Nix {
pname = "fzf-vim";
- version = "2019-11-01";
+ version = "2019-11-17";
src = fetchFromGitHub {
owner = "junegunn";
repo = "fzf.vim";
- rev = "bce6588d2422df75ca0091edac48aa9f87f163e5";
- sha256 = "1gpldyyqb1z38jqda098h0yw8frjb08lkqbkwxl064fd2wg2844g";
+ rev = "98cf39949b617b9f3a47d2e092af573060022301";
+ sha256 = "1h3nz1rqkggf2gs9hywl3x67hprpspm3qc0lmjc3msc5p221f2n4";
};
};
@@ -1807,12 +1807,12 @@ let
neco-vim = buildVimPluginFrom2Nix {
pname = "neco-vim";
- version = "2019-11-10";
+ version = "2019-11-18";
src = fetchFromGitHub {
owner = "Shougo";
repo = "neco-vim";
- rev = "db12271232fdc29dbbd10edd0c45affa58d30ab8";
- sha256 = "1gvl2kr05b4fp67y9df15xnkv3vxjg9pb7b9rbk3lg4cw6ky80hy";
+ rev = "5be295ef60f0e3234164ef822a7471389a7035c5";
+ sha256 = "1y73hyb82vs3wcbv02k9n4krvmyn1yhp1mh88jslhcniql2nnj2a";
};
};
@@ -1840,12 +1840,12 @@ let
neoformat = buildVimPluginFrom2Nix {
pname = "neoformat";
- version = "2019-10-07";
+ version = "2019-11-17";
src = fetchFromGitHub {
owner = "sbdchd";
repo = "neoformat";
- rev = "ec512eb8d8d66fa15bb7f5df2f500d117aa3ee0d";
- sha256 = "0v2i0wwiyc5x9s3ff7qpddicf9i18hhmzffgkm0hfmnspln04vml";
+ rev = "33f7dfb231382998df77cf9fc8cef39778ec9449";
+ sha256 = "1784p1lbhndpa7nr9771jx6kbmfnfx9bvrrmin9hxskffs8vr1k5";
};
};
@@ -3337,12 +3337,12 @@ let
vim-commentary = buildVimPluginFrom2Nix {
pname = "vim-commentary";
- version = "2019-11-12";
+ version = "2019-11-18";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-commentary";
- rev = "3e5d04ddbc156288fd4c114f4a802da117fd0f26";
- sha256 = "0f2q20699a0jiq3rm3jrsshjg3k3l0g115501iyn57d2yw60cggn";
+ rev = "f8238d70f873969fb41bf6a6b07ca63a4c0b82b1";
+ sha256 = "09d81q9na7pvvrmxxqy09ffdzsx5v5dikinb704c9wm4ys2bidr9";
};
};
@@ -3689,12 +3689,12 @@ let
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
- version = "2019-11-16";
+ version = "2019-11-18";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
- rev = "0004f585fde10ccb1617cbe53c97a4c0ecd622ce";
- sha256 = "1nkvf75kr1ibg50jbrb1ysia24wr244vaqn6kjyfki74mdvyx9hw";
+ rev = "13fdeb5fa7f464266163f405f42322e6fb0d3067";
+ sha256 = "1605vznbf66z7f2g2lzx4yzxm0dnzddwzfa9mgbxa4wv1836ng0x";
};
};
@@ -3766,12 +3766,12 @@ let
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
- version = "2019-11-14";
+ version = "2019-11-18";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
- rev = "58ddb1d95ee3c48877ca41e246c1faed654e1e2b";
- sha256 = "0y0dimm7d76j1zfps1ndpbna4j1sc8c7gclv6p2b36nkv5d6hyw2";
+ rev = "6d9cabbfa2ed92ef764f87041b60fcab010f7bc7";
+ sha256 = "0621mh4vh92dp4jhcklgghppncbvpbzzwx9xpxs7b6917hmsxp8g";
};
};
@@ -4130,12 +4130,12 @@ let
vim-jsx-pretty = buildVimPluginFrom2Nix {
pname = "vim-jsx-pretty";
- version = "2019-11-14";
+ version = "2019-11-18";
src = fetchFromGitHub {
owner = "MaxMEllon";
repo = "vim-jsx-pretty";
- rev = "cd6608c7ad33c50c47d6d7f91844fff84af7fa60";
- sha256 = "100n5ss5y5jr6f38w4x418ld6hwdv6xpl129lzz43d2q2w428bqj";
+ rev = "70586430c0f05c91ed2832db2c65769501978d94";
+ sha256 = "1b2qssdzc0b7pzr1ws86zybvwnwby987xsa7sfizsjqslb14xw4w";
};
};
@@ -4339,12 +4339,12 @@ let
vim-mucomplete = buildVimPluginFrom2Nix {
pname = "vim-mucomplete";
- version = "2019-09-30";
+ version = "2019-11-17";
src = fetchFromGitHub {
owner = "lifepillar";
repo = "vim-mucomplete";
- rev = "3a512e21a9c91cb61103734b8bb5dc776c1a3146";
- sha256 = "1dh26qwsky12fhc8v9d6x841nhgbdnp2xgsrlnqak7cyiwmwp41g";
+ rev = "8964f852a5990c79c55571aef8d137a5e90c9e7c";
+ sha256 = "08mixa8frla5djcmka9sard4bzwjcrs3pb68si75mmrv9i9n0pd8";
};
};
@@ -4416,12 +4416,12 @@ let
vim-obsession = buildVimPluginFrom2Nix {
pname = "vim-obsession";
- version = "2019-11-13";
+ version = "2019-11-16";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-obsession";
- rev = "a794bba99644b959c47fe46f82d0b9e676386b2f";
- sha256 = "11ds45kj3ckx67n5065vygc40bnwvamj9dyfpq9ir6a600xvv23i";
+ rev = "c44d3c432243d39469046f4e25d38a690e49c755";
+ sha256 = "0bvml6jcjd986ggx63sf9w4h852ivnshw6ilf6x2grfhnvsdgcgs";
};
};
@@ -5043,12 +5043,12 @@ let
vim-table-mode = buildVimPluginFrom2Nix {
pname = "vim-table-mode";
- version = "2019-09-28";
+ version = "2019-11-16";
src = fetchFromGitHub {
owner = "dhruvasagar";
repo = "vim-table-mode";
- rev = "126897a6fbcbf24523737502524208f75f255b88";
- sha256 = "1cdnggcl8vkz74l5k1yl2y3yg1zawvg1zj2nlqrk3c5qm9qzhkzq";
+ rev = "5ec330d114bdc27d636ce16a6186013f121470df";
+ sha256 = "168y5wbvhrislvj04g768mfhklczw7phmgf5am61gh4z2nsyw2lp";
};
};
@@ -5494,12 +5494,12 @@ let
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
- version = "2019-11-15";
+ version = "2019-11-18";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
- rev = "7a11cf3ddf65584232d02d9d235bd6b8940a4288";
- sha256 = "0k7k6f4bx0f1svlph4h39w14qqawkqihp668jnjj6p0ppffxa7a4";
+ rev = "e555f48c131088fd66a9f7822c24e6edba8bfd03";
+ sha256 = "1l3a6isf4r46yn8kawlm11b5i1vpdpdnbwfi8kch7z90j7dmwlg6";
};
};
@@ -5560,12 +5560,12 @@ let
webapi-vim = buildVimPluginFrom2Nix {
pname = "webapi-vim";
- version = "2019-07-11";
+ version = "2019-11-18";
src = fetchFromGitHub {
owner = "mattn";
repo = "webapi-vim";
- rev = "4d1e59c4fe01dec9d3008704dd06977a7bc3b0f2";
- sha256 = "15k9h4nhsiwasv8l4mq6m8mw989pmpdfsinv9bdwh41q1pmkv551";
+ rev = "10b8e926d85a3ab689c2966a3df1139bcb4e197f";
+ sha256 = "1hbm2mgsncqdjjfgabgncr4ji90mjsa3z0cx7813vdf113v41x26";
};
};
@@ -5649,12 +5649,12 @@ let
youcompleteme = buildVimPluginFrom2Nix {
pname = "youcompleteme";
- version = "2019-11-14";
+ version = "2019-11-18";
src = fetchFromGitHub {
owner = "valloric";
repo = "youcompleteme";
- rev = "03ab4574d1c009be0da22c93ca96cf079b6ca99b";
- sha256 = "0n375wxbm1q7m585s5yvj3v16dqvrp21c8s4ikjnwq4gkwh623ph";
+ rev = "25fbeadba44be998667ba47a1bce16219d01148c";
+ sha256 = "02hl0gyx189q6k3z9dvnwpgn5sw76rz4j9y0hrj8yqzaqk7xv7fw";
fetchSubmodules = true;
};
};
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 19902174a83b..b9c599da66c2 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -112,14 +112,15 @@ self: super: {
});
# Only official releases contains the required index.js file
+ # NB: Make sure you pick a rev from the release branch!
coc-nvim = buildVimPluginFrom2Nix rec {
pname = "coc-nvim";
- version = "0.0.74";
+ version = "2019-11-18";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc.nvim";
- rev = "v${version}";
- sha256 = "1s4nib2mnhagd0ymx254vf7l1iijwrh2xdqn3bdm4f1jnip81r10";
+ rev = "a12d6833b4611f996528615186af86c3e041ffb6";
+ sha256 = "0rkfhzyf42rbsv8p2337pvkbs3crz1z3vv6ar26sadjg3802118z";
};
};
diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py
index 78abdbd6ab27..92a47bc5d131 100755
--- a/pkgs/misc/vim-plugins/update.py
+++ b/pkgs/misc/vim-plugins/update.py
@@ -8,6 +8,7 @@
# linted:
# $ nix run nixpkgs.python3Packages.flake8 -c flake8 --ignore E501,E265 update.py
+import argparse
import functools
import json
import os
@@ -29,6 +30,8 @@ ATOM_LINK = "{http://www.w3.org/2005/Atom}link"
ATOM_UPDATED = "{http://www.w3.org/2005/Atom}updated"
ROOT = Path(__file__).parent
+DEFAULT_IN = ROOT.joinpath("vim-plugin-names")
+DEFAULT_OUT = ROOT.joinpath("generated.nix")
class Repo:
@@ -209,9 +212,9 @@ def check_results(
def parse_plugin_line(line: str) -> Tuple[str, str, str]:
try:
- name, repo = line.split('/')
+ name, repo = line.split("/")
try:
- repo, alias = repo.split(' as ')
+ repo, alias = repo.split(" as ")
return (name, repo, alias.strip())
except ValueError:
# no alias defined
@@ -220,8 +223,7 @@ def parse_plugin_line(line: str) -> Tuple[str, str, str]:
return (None, None, None)
-def load_plugin_spec() -> List[Tuple[str, str]]:
- plugin_file = ROOT.joinpath("vim-plugin-names")
+def load_plugin_spec(plugin_file: str) -> List[Tuple[str, str]]:
plugins = []
with open(plugin_file) as f:
for line in f:
@@ -305,10 +307,10 @@ header = (
)
-def generate_nix(plugins: List[Tuple[str, str, Plugin]]):
+def generate_nix(plugins: List[Tuple[str, str, Plugin]], outfile: str):
sorted_plugins = sorted(plugins, key=lambda v: v[2].name.lower())
- with open(ROOT.joinpath("generated.nix"), "w+") as f:
+ with open(outfile, "w+") as f:
f.write(header)
f.write(
"""
@@ -338,15 +340,44 @@ let
}};
"""
)
- f.write("""
+ f.write(
+ """
});
in lib.fix' (lib.extends overrides packages)
-""")
- print("updated generated.nix")
+"""
+ )
+ print(f"updated {outfile}")
+
+
+def parse_args():
+ parser = argparse.ArgumentParser(
+ description=(
+ "Updates nix derivations for vim plugins"
+ f"By default from {DEFAULT_IN} to {DEFAULT_OUT}"
+ )
+ )
+ parser.add_argument(
+ "--input-names",
+ "-i",
+ dest="input_file",
+ default=DEFAULT_IN,
+ help="A list of plugins in the form owner/repo",
+ )
+ parser.add_argument(
+ "--out",
+ "-o",
+ dest="outfile",
+ default=DEFAULT_OUT,
+ help="Filename to save generated nix code",
+ )
+
+ return parser.parse_args()
def main() -> None:
- plugin_names = load_plugin_spec()
+
+ args = parse_args()
+ plugin_names = load_plugin_spec(args.input_file)
current_plugins = get_current_plugins()
cache = Cache(current_plugins)
@@ -362,7 +393,7 @@ def main() -> None:
plugins = check_results(results)
- generate_nix(plugins)
+ generate_nix(plugins, args.outfile)
if __name__ == "__main__":
diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix
index 3f6c65241750..642d05e4beb6 100644
--- a/pkgs/os-specific/linux/displaylink/default.nix
+++ b/pkgs/os-specific/linux/displaylink/default.nix
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
unpackPhase = ''
unzip $src
chmod +x displaylink-driver-${version}.run
- ./displaylink-driver-${version}.run --target . --noexec
+ ./displaylink-driver-${version}.run --target . --noexec --nodiskspace
'';
patches = [ (substituteAll {
diff --git a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch
index 4903eadef4b5..81e82d68dbc4 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch
+++ b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch
@@ -1,30 +1,21 @@
diff --git a/data/meson.build b/data/meson.build
-index 61664cd6..f10abbba 100644
+index 25db9509..f394eb25 100644
--- a/data/meson.build
+++ b/data/meson.build
-@@ -11,7 +11,7 @@ if get_option('daemon')
+@@ -13,7 +13,7 @@
+ if build_daemon
+ subdir('installed-tests')
+ install_data(['daemon.conf'],
+- install_dir : join_paths(sysconfdir, 'fwupd')
++ install_dir : join_paths(sysconfdir_install, 'fwupd')
+ )
endif
- install_data(['daemon.conf'],
-- install_dir : join_paths(sysconfdir, 'fwupd')
-+ install_dir : join_paths(sysconfdir_install, 'fwupd')
- )
-
- install_data(['org.freedesktop.fwupd.metainfo.xml'],
-@@ -23,7 +23,7 @@ install_data(['org.freedesktop.fwupd.svg'],
- )
-
- install_data(['org.freedesktop.fwupd.conf'],
-- install_dir : join_paths(sysconfdir, 'dbus-1', 'system.d')
-+ install_dir : join_paths(sysconfdir_install, 'dbus-1', 'system.d')
- )
-
- if get_option('daemon')
diff --git a/data/pki/meson.build b/data/pki/meson.build
index eefcc914..dc801fa1 100644
--- a/data/pki/meson.build
+++ b/data/pki/meson.build
-@@ -4,14 +4,14 @@ if get_option('gpg')
+@@ -4,14 +4,14 @@
'GPG-KEY-Linux-Foundation-Firmware',
'GPG-KEY-Linux-Vendor-Firmware-Service',
],
@@ -41,7 +32,7 @@ index eefcc914..dc801fa1 100644
)
endif
-@@ -19,12 +19,12 @@ if get_option('pkcs7')
+@@ -19,12 +19,12 @@
install_data([
'LVFS-CA.pem',
],
@@ -57,10 +48,10 @@ index eefcc914..dc801fa1 100644
endif
diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build
-index a27c31ef..374e09b6 100644
+index 826a3c1d..b78db663 100644
--- a/data/remotes.d/meson.build
+++ b/data/remotes.d/meson.build
-@@ -3,7 +3,7 @@ if get_option('daemon') and get_option('lvfs')
+@@ -3,7 +3,7 @@
'lvfs.conf',
'lvfs-testing.conf',
],
@@ -69,7 +60,7 @@ index a27c31ef..374e09b6 100644
)
i18n.merge_file(
input: 'lvfs.metainfo.xml',
-@@ -37,12 +37,12 @@ configure_file(
+@@ -37,12 +37,12 @@
output : 'vendor.conf',
configuration : con2,
install: true,
@@ -85,10 +76,10 @@ index a27c31ef..374e09b6 100644
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
)
diff --git a/meson.build b/meson.build
-index a89f9b3f..736896eb 100644
+index 8e1de887..a5bb1fe6 100644
--- a/meson.build
+++ b/meson.build
-@@ -145,6 +145,12 @@ localstatedir = join_paths(prefix, get_option('localstatedir'))
+@@ -158,6 +158,12 @@
mandir = join_paths(prefix, get_option('mandir'))
localedir = join_paths(prefix, get_option('localedir'))
@@ -99,13 +90,13 @@ index a89f9b3f..736896eb 100644
+endif
+
gio = dependency('gio-2.0', version : '>= 2.45.8')
+ giounix = dependency('gio-unix-2.0', version : '>= 2.45.8')
if gio.version().version_compare ('>= 2.55.0')
- conf.set('HAVE_GIO_2_55_0', '1')
diff --git a/meson_options.txt b/meson_options.txt
-index 5d4163e8..db81fd1f 100644
+index 71b50c6a..561c2031 100644
--- a/meson_options.txt
+++ b/meson_options.txt
-@@ -21,6 +21,7 @@ option('plugin_modem_manager', type : 'boolean', value : false, description : 'e
+@@ -24,6 +24,7 @@
option('systemd', type : 'boolean', value : true, description : 'enable systemd support')
option('systemdunitdir', type: 'string', value: '', description: 'Directory for systemd units')
option('elogind', type : 'boolean', value : false, description : 'enable elogind support')
@@ -117,7 +108,7 @@ diff --git a/plugins/dell-esrt/meson.build b/plugins/dell-esrt/meson.build
index cb9f4555..b972d7fb 100644
--- a/plugins/dell-esrt/meson.build
+++ b/plugins/dell-esrt/meson.build
-@@ -36,5 +36,5 @@ configure_file(
+@@ -36,5 +36,5 @@
output : 'dell-esrt.conf',
configuration : con2,
install: true,
@@ -128,7 +119,7 @@ diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build
index 5c88504e..7706da71 100644
--- a/plugins/redfish/meson.build
+++ b/plugins/redfish/meson.build
-@@ -26,7 +26,7 @@ shared_module('fu_plugin_redfish',
+@@ -26,7 +26,7 @@
)
install_data(['redfish.conf'],
@@ -137,11 +128,24 @@ index 5c88504e..7706da71 100644
)
if get_option('tests')
+diff --git a/plugins/thunderbolt/meson.build b/plugins/thunderbolt/meson.build
+index 42718abf..bc815491 100644
+--- a/plugins/thunderbolt/meson.build
++++ b/plugins/thunderbolt/meson.build
+@@ -46,7 +46,7 @@
+ )
+
+ install_data(['thunderbolt.conf'],
+- install_dir: join_paths(sysconfdir, 'fwupd')
++ install_dir: join_paths(sysconfdir_install, 'fwupd')
+ )
+ # we use functions from 2.52 in the tests
+ if get_option('tests') and umockdev.found() and gio.version().version_compare('>= 2.52')
diff --git a/plugins/uefi/meson.build b/plugins/uefi/meson.build
-index ac9f5dd8..1ab51b5e 100644
+index 45b18d7d..ef8e0b04 100644
--- a/plugins/uefi/meson.build
+++ b/plugins/uefi/meson.build
-@@ -79,7 +79,7 @@ executable(
+@@ -85,7 +85,7 @@
)
install_data(['uefi.conf'],
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
index 785693272191..1f6a7145b779 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -45,6 +45,7 @@
, freetype
, fontconfig
, pango
+, tpm2-tss
, bubblewrap
, efibootmgr
, flashrom
@@ -79,18 +80,18 @@ let
# # Currently broken on Aarch64
# haveFlashrom = isx86;
- # Experimental in 1.2.10
+ # Experimental
haveFlashrom = false;
in
stdenv.mkDerivation rec {
pname = "fwupd";
- version = "1.2.10";
+ version = "1.3.3";
src = fetchurl {
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
- sha256 = "0inngs7i48akm9c7fmdsf9zjif595rkaba69rl76jfwfv8r21vjb";
+ sha256 = "0nqzqvx8nzflhb4kzvkdcv7kixb50vh6h21kpkd7pjxp942ndzql";
};
outputs = [ "out" "lib" "dev" "devdoc" "man" "installedTests" ];
@@ -137,6 +138,7 @@ stdenv.mkDerivation rec {
freetype
fontconfig
pango
+ tpm2-tss
efivar
] ++ stdenv.lib.optionals haveDell [
libsmbios
@@ -146,6 +148,10 @@ stdenv.mkDerivation rec {
./fix-paths.patch
./add-option-for-installation-sysconfdir.patch
+ # do not require which
+ # https://github.com/fwupd/fwupd/pull/1568
+ ./no-which.patch
+
# installed tests are installed to different output
# we also cannot have fwupd-tests.conf in $out/etc since it would form a cycle
(substituteAll {
@@ -195,6 +201,7 @@ stdenv.mkDerivation rec {
'';
mesonFlags = [
+ "-Dgtkdoc=true"
"-Dplugin_dummy=true"
"-Dudevdir=lib/udev"
"-Dsystemdunitdir=lib/systemd/system"
@@ -209,8 +216,8 @@ stdenv.mkDerivation rec {
"-Dplugin_synaptics=false"
] ++ stdenv.lib.optionals (!haveRedfish) [
"-Dplugin_redfish=false"
- ] ++ stdenv.lib.optionals (!haveFlashrom) [
- "-Dplugin_flashrom=false"
+ ] ++ stdenv.lib.optionals haveFlashrom [
+ "-Dplugin_flashrom=true"
];
# TODO: We need to be able to override the directory flags from meson setup hook
@@ -231,6 +238,9 @@ stdenv.mkDerivation rec {
# https://github.com/NixOS/nixpkgs/pull/67625#issuecomment-525788428
PKG_CONFIG_POLKIT_GOBJECT_1_ACTIONDIR = "/run/current-system/sw/share/polkit-1/actions";
+ # cannot install to systemd prefix
+ PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMPRESETDIR = "${placeholder "out"}/lib/systemd/system-preset";
+
# TODO: wrapGAppsHook wraps efi capsule even though it is not elf
dontWrapGApps = true;
# so we need to wrap the executables manually
@@ -247,11 +257,15 @@ stdenv.mkDerivation rec {
# /etc/fwupd/uefi.conf is created by the services.hardware.fwupd NixOS module
passthru = {
filesInstalledToEtc = [
+ # "fwupd/daemon.conf" # already created by the module
+ "fwupd/redfish.conf"
"fwupd/remotes.d/dell-esrt.conf"
"fwupd/remotes.d/lvfs-testing.conf"
"fwupd/remotes.d/lvfs.conf"
"fwupd/remotes.d/vendor.conf"
"fwupd/remotes.d/vendor-directory.conf"
+ "fwupd/thunderbolt.conf"
+ # "fwupd/uefi.conf" # already created by the module
"pki/fwupd/GPG-KEY-Hughski-Limited"
"pki/fwupd/GPG-KEY-Linux-Foundation-Firmware"
"pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service"
@@ -267,7 +281,7 @@ stdenv.mkDerivation rec {
};
meta = with stdenv.lib; {
- homepage = https://fwupd.org/;
+ homepage = "https://fwupd.org/";
maintainers = with maintainers; [ jtojnar ];
license = [ licenses.gpl2 ];
platforms = platforms.linux;
diff --git a/pkgs/os-specific/linux/firmware/fwupd/fix-paths.patch b/pkgs/os-specific/linux/firmware/fwupd/fix-paths.patch
index 9efd7b8d6abd..474b250097d0 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/fix-paths.patch
+++ b/pkgs/os-specific/linux/firmware/fwupd/fix-paths.patch
@@ -6,14 +6,3 @@ index c7a430c0..e69de29b 100644
-install_data('README.md',
- install_dir : join_paths(localstatedir, 'lib', 'fwupd', 'builder')
-)
-diff --git a/meson_post_install.sh b/meson_post_install.sh
-index 0cbb6f41..d757a81a 100755
---- a/meson_post_install.sh
-+++ b/meson_post_install.sh
-@@ -11,6 +11,4 @@ LOCALSTATEDIR=$2
- echo 'Updating systemd deps'
- mkdir -p ${DESTDIR}${SYSTEMDUNITDIR}/system-update.target.wants
- ln -sf ../fwupd-offline-update.service ${DESTDIR}${SYSTEMDUNITDIR}/system-update.target.wants/fwupd-offline-update.service
-- echo 'Creating stateful directory'
-- mkdir -p ${DESTDIR}${LOCALSTATEDIR}/lib/fwupd
- #fi
diff --git a/pkgs/os-specific/linux/firmware/fwupd/no-which.patch b/pkgs/os-specific/linux/firmware/fwupd/no-which.patch
new file mode 100644
index 000000000000..c0c65e42539d
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/fwupd/no-which.patch
@@ -0,0 +1,31 @@
+--- a/plugins/uefi/efi/generate_binary.sh
++++ b/plugins/uefi/efi/generate_binary.sh
+@@ -1,9 +1,9 @@
+ #!/bin/sh
+ output=$2
+-objcopy_cmd=$(which objcopy)
+-genpeimg_cmd=$(which genpeimg)
++objcopy_cmd=$(command -v objcopy)
++genpeimg_cmd=$(command -v genpeimg)
+
+-$objcopy_cmd -j .text \
++"$objcopy_cmd" -j .text \
+ -j .sdata \
+ -j .data \
+ -j .dynamic \
+@@ -11,7 +11,7 @@
+ -j .rel \
+ -j .rela \
+ -j .reloc \
+- $*
++ "$@"
+
+ if [ -n "${genpeimg_cmd}" ]; then
+ $genpeimg_cmd -d \
+@@ -20,5 +20,5 @@
+ +n \
+ -d \
+ +s \
+- $output
++ "$output"
+ fi
diff --git a/pkgs/os-specific/linux/targetcli/default.nix b/pkgs/os-specific/linux/targetcli/default.nix
index b8990484cb98..aa670aba7271 100644
--- a/pkgs/os-specific/linux/targetcli/default.nix
+++ b/pkgs/os-specific/linux/targetcli/default.nix
@@ -2,17 +2,22 @@
python.pkgs.buildPythonApplication rec {
pname = "targetcli";
- version = "2.1.fb49";
+ version = "2.1.51";
src = fetchFromGitHub {
owner = "open-iscsi";
repo = "${pname}-fb";
rev = "v${version}";
- sha256 = "093dmwc5g6yz4cdgpbfszmc97i7nd286w4x447dvg22hvwvjwqhh";
+ sha256 = "07i9kyr525hlk32amzgycirwgwykdbjy5fmw6ji0nnhvk2jh4arn";
};
propagatedBuildInputs = with python.pkgs; [ configshell rtslib ];
+ postInstall = ''
+ install -D targetcli.8 -t $out/share/man/man8/
+ install -D targetclid.8 -t $out/share/man/man8/
+ '';
+
meta = with stdenv.lib; {
description = "A command shell for managing the Linux LIO kernel target";
homepage = https://github.com/open-iscsi/targetcli-fb;
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 044acbe17207..f92c5aaa2100 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -20,11 +20,11 @@ with lib;
stdenv.mkDerivation rec {
pname = "samba";
- version = "4.10.8";
+ version = "4.10.10";
src = fetchurl {
url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz";
- sha256 = "1x0hlhb674fndfkmimjicnzs543n3i8465a5ifcmjwvzavxha7y4";
+ sha256 = "19b653rr2i9snvapik58phbqj38cxjdlyx6nl3m2y3k1a55p633h";
};
outputs = [ "out" "dev" "man" ];
diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
index 05fd405dbe6c..5946b8f5ec32 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pg_auto_failover";
- version = "1.0.4";
+ version = "1.0.5";
src = fetchFromGitHub {
owner = "citusdata";
repo = pname;
rev = "v${version}";
- sha256 = "0v4fj83zifcqhihc5myh0qv2396n5kw4sa8ix6jljmp6wh036z9j";
+ sha256 = "1idlgqazr2qra5x702f2yjcl99zwm1i5fi84paplfy98i5jjmxm1";
};
buildInputs = [ postgresql openssl zlib readline ];
diff --git a/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/pkgs/servers/sql/postgresql/ext/pg_hll.nix
index 9a61e3c835da..deac1072e65c 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_hll.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_hll.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "pg_hll";
- version = "2.12";
+ version = "2.14";
buildInputs = [ postgresql ];
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "citusdata";
repo = "postgresql-hll";
rev = "refs/tags/v${version}";
- sha256 = "1jdc9gjqc3dkjxv855q1p594j0awhrrymrcqnl5vw5vx2ny3bpgn";
+ sha256 = "13vphxkc9pn4bkpgab560bgdbl99li2b3p1n2rm5a78wswlsbsps";
};
installPhase = ''
diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
index 296e7e0a41a4..0427de60aa52 100644
--- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix
+++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
@@ -8,7 +8,7 @@
stdenv.mkDerivation rec {
pname = "timescaledb";
- version = "1.5.0";
+ version = "1.5.1";
nativeBuildInputs = [ cmake ];
buildInputs = [ postgresql openssl ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
owner = "timescale";
repo = "timescaledb";
rev = "refs/tags/${version}";
- sha256 = "0qw7yp2vh3fkx43zlnj8xsvd0d68rcmdcl3p9jpmr97hyl376xf2";
+ sha256 = "1mgmkc42nksfsmjg463v03rj1v8gybwlzzi515gxz6ijx8604w4c";
};
cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" ];
diff --git a/pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix b/pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix
new file mode 100644
index 000000000000..452419bf8b09
--- /dev/null
+++ b/pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix
@@ -0,0 +1,30 @@
+{ stdenvNoCC, lib, fetchFromGitHub }:
+
+stdenvNoCC.mkDerivation rec {
+ pname = "zsh-fast-syntax-highlighting";
+ version = "1.54";
+
+ src = fetchFromGitHub {
+ owner = "zdharma";
+ repo = "fast-syntax-highlighting";
+ rev = "v${version}";
+ sha256 = "019hda2pj8lf7px4h1z07b9l6icxx4b2a072jw36lz9bh6jahp32";
+ };
+
+ dontConfigure = true;
+ dontBuild = true;
+
+ installPhase = ''
+ plugindir="$out/share/zsh/site-functions"
+
+ mkdir -p "$plugindir"
+ cp -r -- {,_,-}fast-* chroma themes "$plugindir"/
+ '';
+
+ meta = with lib; {
+ description = "Syntax-highlighting for Zshell";
+ homepage = "https://github.com/zdharma/fast-syntax-highlighting";
+ license = licenses.bsd3;
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/python-modules/elasticsearch-curator/default.nix b/pkgs/tools/admin/elasticsearch-curator/default.nix
similarity index 54%
rename from pkgs/development/python-modules/elasticsearch-curator/default.nix
rename to pkgs/tools/admin/elasticsearch-curator/default.nix
index 5c5329656a90..8d8f90704999 100644
--- a/pkgs/development/python-modules/elasticsearch-curator/default.nix
+++ b/pkgs/tools/admin/elasticsearch-curator/default.nix
@@ -1,27 +1,29 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, boto3
-, click
-, certifi
-, requests-aws4auth
-, voluptuous
-, pyyaml
-, elasticsearch
-, nosexcover
-, coverage
-, nose
-, mock
-, funcsigs
-} :
+{ lib, fetchFromGitHub, python }:
-buildPythonPackage rec {
+let
+py = python.override {
+ packageOverrides = self: super: {
+ click = super.click.overridePythonAttrs (oldAttrs: rec {
+ version = "6.7";
+ src = oldAttrs.src.override {
+ inherit version;
+ sha256 = "f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b";
+ };
+ });
+ };
+};
+in
+
+with py.pkgs;
+buildPythonApplication rec {
pname = "elasticsearch-curator";
version = "5.8.1";
- src = fetchPypi {
- inherit pname version;
- sha256 = "f0eec9ad043a30bc2e2232637111960139a1bda38232241bdd2f0c253a3584df";
+ src = fetchFromGitHub {
+ owner = "elastic";
+ repo = "curator";
+ rev = "v${version}";
+ sha256 = "1shr9jslirjnbvma3p19djsnamxl7f3m9c8zrlclk57zv8rnwpkr";
};
# The test hangs so we disable it.
@@ -31,6 +33,7 @@ buildPythonPackage rec {
click
certifi
requests-aws4auth
+ pyopenssl
voluptuous
pyyaml
elasticsearch
@@ -46,10 +49,15 @@ buildPythonPackage rec {
];
postPatch = ''
- sed -i s/pyyaml==3.12/pyyaml==${pyyaml.version}/ setup.cfg setup.py
+ sed -i s/pyyaml==3.13/pyyaml/g setup.cfg setup.py
+ sed -i s/pyyaml==3.12/pyyaml/g setup.cfg setup.py
+ substituteInPlace setup.py \
+ --replace "urllib3>=1.24.2,<1.25" "urllib3"
+ substituteInPlace setup.cfg \
+ --replace "urllib3>=1.24.2,<1.25" "urllib3"
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://github.com/elastic/curator;
description = "Curate, or manage, your Elasticsearch indices and snapshots";
license = licenses.asl20;
@@ -68,6 +76,6 @@ buildPythonPackage rec {
maintainers = with maintainers; [ basvandijk ];
# https://github.com/elastic/curator/pull/1280
- broken = versionAtLeast click.version "7.0";
+ #broken = versionAtLeast click.version "7.0";
};
}
diff --git a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix
index 8a1fce780378..9d067359c44a 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix
@@ -19,7 +19,6 @@ buildPythonApplication rec {
propagatedBuildInputs = [ urlgrabber ];
checkPhase = ''
- export PYTHONPATH="$PYTHONPATH:."
${python}/bin/${python.executable} tests/baseclass.py -vv
'';
diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index 1d77bfe42500..9b7c40107911 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -1,74 +1,74 @@
-{stdenv, fetchurl, fetchpatch
- , freeglut, ghostscriptX, imagemagick, fftw
- , boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv
- , python, zlib, perl, texLive, texinfo, xz
+{ stdenv, fetchFromGitHub, fetchurl
+, autoreconfHook, bison, glm, yacc, flex
+, freeglut, ghostscriptX, imagemagick, fftw
+, boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv
+, python3Packages
+, zlib, perl
+, texLive, texinfo
, darwin
}:
-let
- s = # Generated upstream information
- rec {
- baseName="asymptote";
- version="2.47";
- name="${baseName}-${version}";
- hash="0zc24n2vwzxdfmcppqfk3fkqlb4jmvswzi3bz232kxl7dyiyb971";
- url="https://freefr.dl.sourceforge.net/project/asymptote/2.47/asymptote-2.47.src.tgz";
- sha256="0zc24n2vwzxdfmcppqfk3fkqlb4jmvswzi3bz232kxl7dyiyb971";
- };
- buildInputs = [
- ghostscriptX imagemagick fftw
- boehmgc ncurses readline gsl libsigsegv
- python zlib perl texLive texinfo xz ]
- ++ stdenv.lib.optionals stdenv.isLinux
- [ freeglut libGLU libGL mesa.osmesa ]
- ++ stdenv.lib.optionals stdenv.isDarwin
- (with darwin.apple_sdk.frameworks; [ OpenGL GLUT Cocoa ])
- ;
-in
-stdenv.mkDerivation {
- inherit (s) name version;
- inherit buildInputs;
+stdenv.mkDerivation rec {
+ version = "2.60";
+ pname = "asymptote";
- src = fetchurl {
- inherit (s) url sha256;
+ src = fetchFromGitHub {
+ owner = "vectorgraphics";
+ repo = pname;
+ rev = version;
+ sha256 = "1sr31r80jfswlx9a0p5bn85p6h7mq28fw8ihhnlbhphii6w8z2j9";
};
- patches = [
- # Remove when updating from 2.47 to 2.48
- # Compatibility with BoehmGC 7.6.8
- (fetchpatch {
- url = "https://github.com/vectorgraphics/asymptote/commit/38a59370dc5ac720c29e1424614a10f7384b943f.patch";
- sha256 = "0c3d11hzxxaqh24kfw9y8zvlid54kk40rx2zajx7jwl12gga05s1";
- })
+ nativeBuildInputs = [
+ autoreconfHook
+ bison
+ flex
+ yacc
+ texinfo
];
+ buildInputs = [
+ ghostscriptX imagemagick fftw
+ boehmgc ncurses readline gsl libsigsegv
+ zlib perl
+ texLive
+ ] ++ (with python3Packages; [
+ python
+ pyqt5
+ ]);
+
+ propagatedBuildInputs = [
+ glm
+ ] ++ stdenv.lib.optionals stdenv.isLinux [
+ freeglut libGLU libGL mesa.osmesa
+ ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+ OpenGL GLUT Cocoa
+ ]);
+
preConfigure = ''
- export HOME="$PWD"
- patchShebangs .
- sed -e 's@epswrite@eps2write@g' -i runlabel.in
- xz -d < ${texinfo.src} | tar --wildcards -x texinfo-'*'/doc/texinfo.tex
- cp texinfo-*/doc/texinfo.tex doc/
- rm *.tar.gz
- configureFlags="$configureFlags --with-latex=$out/share/texmf/tex/latex --with-context=$out/share/texmf/tex/context/third"
+ HOME=$TMP
'';
+ configureFlags = [
+ "--with-latex=$out/share/texmf/tex/latex"
+ "--with-context=$out/share/texmf/tex/context/third"
+ ];
+
NIX_CFLAGS_COMPILE = [ "-I${boehmgc.dev}/include/gc" ];
postInstall = ''
- mv -v "$out/share/info/asymptote/"*.info $out/share/info/
+ mv $out/share/info/asymptote/*.info $out/share/info/
sed -i -e 's|(asymptote/asymptote)|(asymptote)|' $out/share/info/asymptote.info
rmdir $out/share/info/asymptote
- rm $out/share/info/dir
+ rm -f $out/share/info/dir
- rm -rfv "$out"/share/texmf
- mkdir -pv "$out"/share/emacs/site-lisp/${s.name}
- mv -v "$out"/share/asymptote/*.el "$out"/share/emacs/site-lisp/${s.name}
+ rm -rf $out/share/texmf
+ install -Dt $out/share/emacs/site-lisp/${pname} $out/share/asymptote/*.el
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
- inherit (s) version;
description = "A tool for programming graphics intended to replace Metapost";
license = licenses.gpl3Plus;
maintainers = [ maintainers.raskin maintainers.peti ];
diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix
new file mode 100644
index 000000000000..8514b4b9b594
--- /dev/null
+++ b/pkgs/tools/misc/topgrade/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "topgrade";
+ version = "3.4.0";
+
+ src = fetchFromGitHub {
+ owner = "r-darwish";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "14p7lpdp85ay5p2r9npm2adp9njcssi47mb1fh2iyn8lp51d22bi";
+ };
+
+ cargoSha256 = "07h8d8fm20dp9xcz9vic63xnx2rbvanf2ivks1jiv32iy0kgz74p";
+
+ meta = with stdenv.lib; {
+ description = "Upgrade all the things";
+ homepage = "https://github.com/r-darwish/topgrade";
+ license = licenses.gpl3;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ filalex77 ];
+ };
+}
diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix
index dea4478581b6..9729f110bb74 100644
--- a/pkgs/tools/misc/watchexec/default.nix
+++ b/pkgs/tools/misc/watchexec/default.nix
@@ -1,20 +1,27 @@
-{ stdenv, rustPlatform, fetchFromGitHub, CoreServices }:
+{ stdenv, rustPlatform, fetchFromGitHub, CoreServices, installShellFiles }:
rustPlatform.buildRustPackage rec {
pname = "watchexec";
- version = "1.11.1";
+ version = "1.12.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "1iaib7yvxyn3l9kiys9x7wziixj13fmx1z3wgdy6h8c7jv6fpc0j";
+ sha256 = "03s9nsss4895x4lp90y65jajavk8c2nj1jjnmx0vbbwl210ghlv1";
};
- cargoSha256 = "101p0qj7ydfhqfz402mxy4bs48vq3rzgj513f1kwv0ba4hn1sxkv";
+ cargoSha256 = "07whi9w51ddh8s7v06c3k6n5q9gfx74rdkhgfysi180y2rgnbanj";
+
+ nativeBuildInputs = [ installShellFiles ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
+ postInstall = ''
+ installManPage doc/watchexec.1
+ installShellCompletion --zsh --name _watchexec completions/zsh
+ '';
+
meta = with stdenv.lib; {
description = "Executes commands in response to file modifications";
homepage = https://github.com/watchexec/watchexec;
diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix
index 5a63581a28d6..de664fe0b7d3 100644
--- a/pkgs/tools/networking/croc/default.nix
+++ b/pkgs/tools/networking/croc/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "croc";
- version = "6.2.3";
+ version = "6.4.1";
goPackagePath = "github.com/schollz/croc";
@@ -10,10 +10,10 @@ buildGoModule rec {
owner = "schollz";
repo = pname;
rev = "v${version}";
- sha256 = "13z3k0s7piwxxh87f04ldvxsd664jncwgmin397v5152bxadbgxp";
+ sha256 = "0sil1gxml4p4yysm8x6bpv5m0hvw4ss27b4c9wdag06lav0g4am0";
};
- modSha256 = "0d9xhlszgy839naj4v2l613sn3nckx87cwwz1sh1rjwxarp8gqa9";
+ modSha256 = "1w84xqnn9fnkakak6j069app4ybbxpwq79g8qypwvmqg5bhvzywg";
subPackages = [ "." ];
meta = with stdenv.lib; {
diff --git a/pkgs/tools/networking/tinyfecvpn/default.nix b/pkgs/tools/networking/tinyfecvpn/default.nix
new file mode 100644
index 000000000000..aab937c994ee
--- /dev/null
+++ b/pkgs/tools/networking/tinyfecvpn/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, pkgconfig }:
+
+stdenv.mkDerivation rec {
+ pname = "tinyfecvpn";
+ version = "20180820.0";
+
+ src = fetchFromGitHub {
+ owner = "wangyu-";
+ repo = pname;
+ rev = version;
+ sha256 = "1mbb9kzvy24na375dz0rlf5k93gan1vahamc9wzkn34mcx8i97cs";
+ fetchSubmodules = true;
+ };
+
+ enableParallelBuilding = true;
+ nativeBuildInputs = [ pkgconfig ];
+
+ patchPhase = ''
+ runHook prePatch
+ find . -type f -name "makefile" -exec sed "s/ -static/ -g/g" -i \{\} \;
+ runHook postPatch
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ install -Dm755 tinyvpn $out/bin/tinyvpn
+ runHook postInstall
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/wangyu-/tinyfecVPN";
+ description = "A VPN Designed for Lossy Links, with Build-in Forward Error Correction(FEC) Support";
+ license = licenses.mit;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ petabyteboy ];
+ };
+}
diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix
index d5f855e44cb0..0dc707ccf866 100644
--- a/pkgs/tools/package-management/nfpm/default.nix
+++ b/pkgs/tools/package-management/nfpm/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "nfpm";
- version = "1.1.0";
+ version = "1.1.5";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
- sha256 = "16wyn6dx7cs32a704zcyr6v26b9iw4b506nymgljghvqw4bhysr1";
+ sha256 = "0wgp4bana38r385qgcm83fhqd053y5i9swh5cmnmbqjibx85g5r2";
};
- modSha256 = "0a4r4msfniya6pby4bs3qvgammn95sr5nmjp4vv0cm74n81rk051";
+ modSha256 = "1d532nv76gzckq2a0nyr9xixbm3rr8d8vlzgdz6i61xsjakfm6ap";
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix
index 715c2787ef8f..809787508f6f 100644
--- a/pkgs/tools/security/vulnix/default.nix
+++ b/pkgs/tools/security/vulnix/default.nix
@@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "vulnix";
- version = "1.9.1";
+ version = "1.9.2";
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "0pcg90j3g3lxrkbxlnjakrgcx5iwnhka03510zmcf0zcpwkrqakb";
+ sha256 = "06mi4a80g6nzvqxj51c7lc0q0dpdr603ly2r77ksf5m3k4glb6dm";
};
outputs = [ "out" "doc" "man" ];
diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix
index e8e6a76a7a26..f8df49240a5e 100644
--- a/pkgs/tools/virtualization/cri-tools/default.nix
+++ b/pkgs/tools/virtualization/cri-tools/default.nix
@@ -2,19 +2,19 @@
buildGoPackage rec {
pname = "cri-tools";
- version = "1.15.0";
+ version = "1.16.1";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = pname;
rev = "v${version}";
- sha256 = "03fhddncwqrdyxz43m3bak9dlrsqzibqqja3p94nic4ydk2hry62";
+ sha256 = "1kpbs9dxwhlmqdqrmsqhp03qs4s7dl8b86lkmg066sicdaw433fn";
};
goPackagePath = "github.com/kubernetes-sigs/cri-tools";
buildPhase = ''
pushd go/src/${goPackagePath}
- make
+ make all install BINDIR=$bin/bin
'';
meta = with lib; {
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 840d02c51fcc..90ce0d2bb2ce 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -418,6 +418,8 @@ mapAliases ({
wireguard = wireguard-tools; # added 2018-05-19
morituri = whipper; # added 2018-09-13
xfceUnstable = xfce4-14; # added 2019-09-17
+ xfce4-14 = xfce;
+ xfce4-12 = xfce;
x11 = xlibsWrapper; # added 2015-09
xbmc = kodi; # added 2018-04-25
xbmcPlain = kodiPlain; # added 2018-04-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9702560d862c..fa353be07e8a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -559,6 +559,8 @@ in
airfield = callPackage ../tools/networking/airfield { };
+ apache-airflow = with python3.pkgs; toPythonApplication apache-airflow;
+
airsonic = callPackage ../servers/misc/airsonic { };
airspy = callPackage ../applications/radio/airspy { };
@@ -662,7 +664,7 @@ in
asciiquarium = callPackage ../applications/misc/asciiquarium {};
asymptote = callPackage ../tools/graphics/asymptote {
- texLive = texlive.combine { inherit (texlive) scheme-small epsf cm-super; };
+ texLive = texlive.combine { inherit (texlive) scheme-small epsf cm-super texinfo; };
gsl = gsl_1;
};
@@ -1251,6 +1253,8 @@ in
asciidoc = asciidoc-full;
};
+ buildpack = callPackage ../development/tools/buildpack { };
+
buildtorrent = callPackage ../tools/misc/buildtorrent { };
bustle = haskellPackages.bustle;
@@ -1830,7 +1834,7 @@ in
interlock = callPackage ../servers/interlock {};
- jellyfin = callPackage ../servers/jellyfin { };
+ jellyfin = callPackage ../servers/jellyfin { ffmpeg = ffmpeg_4; };
jotta-cli = callPackage ../applications/misc/jotta-cli { };
@@ -3012,18 +3016,9 @@ in
elasticsearch = elasticsearch7-oss;
};
- elasticsearch-curator = with (python3.override {
- packageOverrides = self: super: {
- click = super.click.overridePythonAttrs (oldAttrs: rec {
- version = "6.7";
- src = oldAttrs.src.override {
- inherit version;
- sha256 = "f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b";
- };
- });
- pyyaml = super.pyyaml_3;
- };
- }).pkgs; toPythonApplication elasticsearch-curator;
+ elasticsearch-curator = callPackage ../tools/admin/elasticsearch-curator {
+ python = python3;
+ };
embree2 = callPackage ../development/libraries/embree/2.x.nix { };
@@ -6678,6 +6673,8 @@ in
tinyemu = callPackage ../applications/virtualization/tinyemu { };
+ tinyfecvpn = callPackage ../tools/networking/tinyfecvpn {};
+
tinyprog = callPackage ../development/tools/misc/tinyprog { };
tinyproxy = callPackage ../tools/networking/tinyproxy {};
@@ -6714,6 +6711,8 @@ in
toml2nix = (callPackage ../tools/toml2nix { }).toml2nix { };
+ topgrade = callPackage ../tools/misc/topgrade { };
+
tor = callPackage ../tools/security/tor {
# remove this, when libevent's openssl is upgraded to 1_1_0 or newer.
libevent = libevent.override {
@@ -7462,6 +7461,8 @@ in
zsh-navigation-tools = callPackage ../tools/misc/zsh-navigation-tools { };
zsh-syntax-highlighting = callPackage ../shells/zsh/zsh-syntax-highlighting { };
+
+ zsh-fast-syntax-highlighting = callPackage ../shells/zsh/zsh-fast-syntax-highlighting { };
zsh-autosuggestions = callPackage ../shells/zsh/zsh-autosuggestions { };
@@ -9156,6 +9157,7 @@ in
python36Full = python36.override{x11Support=true;};
python37Full = python37.override{x11Support=true;};
python38Full = python38.override{x11Support=true;};
+ python39Full = python38.override{x11Support=true;};
# pythonPackages further below, but assigned here because they need to be in sync
pythonPackages = python.pkgs;
@@ -9163,7 +9165,7 @@ in
python3Packages = python3.pkgs;
pythonInterpreters = callPackage ./../development/interpreters/python {};
- inherit (pythonInterpreters) python27 python35 python36 python37 python38 python3Minimal pypy27 pypy36;
+ inherit (pythonInterpreters) python27 python35 python36 python37 python38 python39 python3Minimal pypy27 pypy36;
# Python package sets.
python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs);
@@ -9171,6 +9173,7 @@ in
python36Packages = python36.pkgs;
python37Packages = recurseIntoAttrs python37.pkgs;
python38Packages = recurseIntoAttrs python38.pkgs;
+ python39Packages = python39.pkgs;
pypyPackages = pypy.pkgs;
pypy2Packages = pypy2.pkgs;
pypy27Packages = pypy27.pkgs;
@@ -18687,6 +18690,8 @@ in
geany = callPackage ../applications/editors/geany { };
geany-with-vte = callPackage ../applications/editors/geany/with-vte.nix { };
+ geoipupdate = callPackage ../applications/misc/geoipupdate/default.nix { };
+
ghostwriter = libsForQt5.callPackage ../applications/editors/ghostwriter { };
gitweb = callPackage ../applications/version-management/git-and-tools/gitweb { };
@@ -19880,9 +19885,7 @@ in
mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { };
- # mediathekview needs JavaFX, which currently only is available inside OracleJRE
- # we might be able to get rid of it, as soon as we have an OpenJRE with OpenJFX included
- mediathekview = callPackage ../applications/video/mediathekview { jre = oraclejre; };
+ mediathekview = callPackage ../applications/video/mediathekview { jre = openjdk11; };
meteo = callPackage ../applications/networking/weather/meteo { };
@@ -23361,11 +23364,11 @@ in
plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { };
- redshift = callPackage ../applications/misc/redshift {
+ inherit (callPackages ../applications/misc/redshift {
inherit (python3Packages) python pygobject3 pyxdg wrapPython;
inherit (darwin.apple_sdk.frameworks) CoreLocation ApplicationServices Foundation Cocoa;
geoclue = geoclue2;
- };
+ }) redshift redshift-wlr;
redshift-plasma-applet = libsForQt5.callPackage ../applications/misc/redshift-plasma-applet { };
@@ -23401,10 +23404,7 @@ in
solarc-gtk-theme = callPackage ../misc/themes/solarc { };
- xfce = xfce4-12;
-
- xfce4-12 = recurseIntoAttrs (callPackage ../desktops/xfce { });
- xfce4-14 = recurseIntoAttrs (callPackage ../desktops/xfce4-14 { });
+ xfce = recurseIntoAttrs (callPackage ../desktops/xfce { });
xrandr-invert-colors = callPackage ../applications/misc/xrandr-invert-colors { };
@@ -24246,6 +24246,8 @@ in
fastjet = callPackage ../development/libraries/physics/fastjet { };
+ fastjet-contrib = callPackage ../development/libraries/physics/fastjet-contrib { };
+
fastnlo = callPackage ../development/libraries/physics/fastnlo { };
geant4 = libsForQt5.callPackage ../development/libraries/physics/geant4 { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7f1980d40daa..d0b22bf777d5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18,7 +18,7 @@ let
packages = ( self:
let
- inherit (python.passthru) isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPy38 isPy3k isPyPy pythonAtLeast pythonOlder;
+ inherit (python.passthru) isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder;
callPackage = pkgs.newScope self;
@@ -100,7 +100,7 @@ let
in {
- inherit (python.passthru) isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPy38 isPy3k isPyPy pythonAtLeast pythonOlder;
+ inherit (python.passthru) isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder;
inherit python bootstrapped-pip buildPythonPackage buildPythonApplication;
inherit fetchPypi callPackage;
inherit hasPythonModule requiredPythonModules makePythonPath disabledIf;
@@ -1436,8 +1436,12 @@ in {
antlr4-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime { antlr4 = pkgs.antlr4; };
+ apache-airflow = callPackage ../development/python-modules/apache-airflow { };
+
apipkg = callPackage ../development/python-modules/apipkg {};
+ apispec = callPackage ../development/python-modules/apispec {};
+
appdirs = callPackage ../development/python-modules/appdirs { };
appleseed = disabledIf isPy3k
@@ -1673,6 +1677,8 @@ in {
crc16 = callPackage ../development/python-modules/crc16 { };
+ croniter = callPackage ../development/python-modules/croniter { };
+
csscompressor = callPackage ../development/python-modules/csscompressor {};
csvs-to-sqlite = callPackage ../development/python-modules/csvs-to-sqlite { };
@@ -1848,8 +1854,6 @@ in {
cerberus = callPackage ../development/python-modules/cerberus { };
- cerberus11 = callPackage ../development/python-modules/cerberus11 { };
-
certifi = callPackage ../development/python-modules/certifi { };
characteristic = callPackage ../development/python-modules/characteristic { };
@@ -1974,6 +1978,8 @@ in {
jsonlines = callPackage ../development/python-modules/jsonlines { };
+ json-merge-patch = callPackage ../development/python-modules/json-merge-patch { };
+
jsonrpc-async = callPackage ../development/python-modules/jsonrpc-async { };
jsonrpc-base = callPackage ../development/python-modules/jsonrpc-base { };
@@ -2346,8 +2352,6 @@ in {
# alias
elasticsearchdsl = self.elasticsearch-dsl;
- elasticsearch-curator = callPackage ../development/python-modules/elasticsearch-curator { };
-
elementpath = callPackage ../development/python-modules/elementpath { };
entrypoints = callPackage ../development/python-modules/entrypoints { };
@@ -2454,6 +2458,8 @@ in {
gpy = callPackage ../development/python-modules/gpy { };
+ gpyopt = callPackage ../development/python-modules/gpyopt { };
+
gitdb = callPackage ../development/python-modules/gitdb { };
gitdb2 = callPackage ../development/python-modules/gitdb2 { };
@@ -3193,6 +3199,10 @@ in {
flask = callPackage ../development/python-modules/flask { };
+ flask-admin = callPackage ../development/python-modules/flask-admin { };
+
+ flask-appbuilder = callPackage ../development/python-modules/flask-appbuilder { };
+
flask-api = callPackage ../development/python-modules/flask-api { };
flask_assets = callPackage ../development/python-modules/flask-assets { };
@@ -3201,6 +3211,10 @@ in {
flask-babel = callPackage ../development/python-modules/flask-babel { };
+ flask-babelex = callPackage ../development/python-modules/flask-babelex { };
+
+ flask-bcrypt = callPackage ../development/python-modules/flask-bcrypt { };
+
flask-bootstrap = callPackage ../development/python-modules/flask-bootstrap { };
flask-caching = callPackage ../development/python-modules/flask-caching { };
@@ -3227,6 +3241,10 @@ in {
flask_migrate = callPackage ../development/python-modules/flask-migrate { };
+ flask-mongoengine = callPackage ../development/python-modules/flask-mongoengine { };
+
+ flask-openid = callPackage ../development/python-modules/flask-openid { };
+
flask-paginate = callPackage ../development/python-modules/flask-paginate { };
flask_principal = callPackage ../development/python-modules/flask-principal { };
@@ -3253,6 +3271,8 @@ in {
wtforms = callPackage ../development/python-modules/wtforms { };
+ wtf-peewee = callPackage ../development/python-modules/wtf-peewee { };
+
graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix {
inherit (pkgs) pkgconfig;
};
@@ -3824,6 +3844,8 @@ in {
marshmallow = callPackage ../development/python-modules/marshmallow { };
+ marshmallow-enum = callPackage ../development/python-modules/marshmallow-enum { };
+
marshmallow-sqlalchemy = callPackage ../development/python-modules/marshmallow-sqlalchemy { };
manuel = callPackage ../development/python-modules/manuel { };
@@ -4419,6 +4441,8 @@ in {
praw = if isPy3k then callPackage ../development/python-modules/praw { }
else callPackage ../development/python-modules/praw/6.3.nix { };
+
+ prance = callPackage ../development/python-modules/prance { };
prawcore = callPackage ../development/python-modules/prawcore { };
@@ -4478,6 +4502,8 @@ in {
mongodict = callPackage ../development/python-modules/mongodict { };
+ mongoengine = callPackage ../development/python-modules/mongoengine { };
+
repoze_who = callPackage ../development/python-modules/repoze_who { };
vobject = callPackage ../development/python-modules/vobject { };
@@ -5123,6 +5149,8 @@ in {
sqlalchemy = callPackage ../development/python-modules/sqlalchemy { };
+ sqlalchemy-citext = callPackage ../development/python-modules/sqlalchemy-citext { };
+
sqlalchemy_migrate = callPackage ../development/python-modules/sqlalchemy-migrate { };
sqlalchemy-utils = callPackage ../development/python-modules/sqlalchemy-utils { };
@@ -5839,6 +5867,8 @@ in {
toposort = callPackage ../development/python-modules/toposort { };
+ snakebite = callPackage ../development/python-modules/snakebite { };
+
snapperGUI = callPackage ../development/python-modules/snappergui { };
dm-sonnet = callPackage ../development/python-modules/dm-sonnet { };
@@ -6199,6 +6229,8 @@ in {
preggy = callPackage ../development/python-modules/preggy { };
+ prison = callPackage ../development/python-modules/prison { };
+
pytoml = callPackage ../development/python-modules/pytoml { };
pypandoc = callPackage ../development/python-modules/pypandoc { };