alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge branch 'master' into staging

Browse source 
Lots of rebuilds from master; at least some of them due to security.
This commit is contained in:
Vladimír Čunát 2017-11-04 10:26:13 +01:00
parent 2c822b16fb bb87d2c81a
commit eed6e0a946
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
323 changed files with 9008 additions and 21197 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
.github/CODEOWNERS vendored
View file

@ -8,51 +8,75 @@
# Mentioned users will get code review requests. # Mentioned users will get code review requests.
# This file # This file
.github/CODEOWNERS @edolstra /.github/CODEOWNERS @edolstra
# Boostraping and core infra # Boostraping and core infra
pkgs/stdenv/ @edolstra /pkgs/stdenv @edolstra
pkgs/build-support/cc-wrapper/ @edolstra /pkgs/build-support/cc-wrapper @edolstra
# Libraries # Libraries
lib/ @edolstra /lib @edolstra @nbp
# Nixpkgs Internals
/default.nix @nbp
/pkgs/top-level/default.nix @nbp
/pkgs/top-level/impure.nix @nbp
/pkgs/top-level/stage.nix @nbp
# NixOS Internals
/nixos/default.nix @nbp
/nixos/lib/from-env.nix @nbp
/nixos/lib/eval-config.nix @nbp
/nixos/doc/manual/configuration/abstractions.xml @nbp
/nixos/doc/manual/configuration/config-file.xml @nbp
/nixos/doc/manual/configuration/config-syntax.xml @nbp
/nixos/doc/manual/configuration/modularity.xml @nbp
/nixos/doc/manual/development/assertions.xml @nbp
/nixos/doc/manual/development/meta-attributes.xml @nbp
/nixos/doc/manual/development/option-declarations.xml @nbp
/nixos/doc/manual/development/option-def.xml @nbp
/nixos/doc/manual/development/option-types.xml @nbp
/nixos/doc/manual/development/replace-modules.xml @nbp
/nixos/doc/manual/development/writing-modules.xml @nbp
/nixos/doc/manual/man-nixos-option.xml @nbp
/nixos/modules/installer/tools/nixos-option.sh @nbp
# Python-related code and docs # Python-related code and docs
pkgs/top-level/python-packages.nix @FRidh /pkgs/top-level/python-packages.nix @FRidh
pkgs/development/interpreters/python/* @FRidh /pkgs/development/interpreters/python @FRidh
pkgs/development/python-modules/* @FRidh /pkgs/development/python-modules @FRidh
doc/languages-frameworks/python.md @FRidh /doc/languages-frameworks/python.md @FRidh
# Haskell # Haskell
pkgs/development/compilers/ghc @peti /pkgs/development/compilers/ghc @peti
pkgs/development/haskell-modules @peti /pkgs/development/haskell-modules @peti
pkgs/development/haskell-modules/default.nix @peti /pkgs/development/haskell-modules/default.nix @peti
pkgs/development/haskell-modules/generic-builder.nix @peti /pkgs/development/haskell-modules/generic-builder.nix @peti
pkgs/development/haskell-modules/hoogle.nix @peti /pkgs/development/haskell-modules/hoogle.nix @peti
# R # R
pkgs/applications/science/math/R @peti /pkgs/applications/science/math/R @peti
pkgs/development/r-modules @peti /pkgs/development/r-modules @peti
# Ruby # Ruby
pkgs/development/interpreters/ruby/* @zimbatm /pkgs/development/interpreters/ruby @zimbatm
pkgs/development/ruby-modules/* @zimbatm /pkgs/development/ruby-modules @zimbatm
# Darwin-related # Darwin-related
/pkgs/stdenv/darwin/ @org/darwin-maintainers /pkgs/stdenv/darwin @NixOS/darwin-maintainers
/pkgs/os-specific/darwin/ @org/darwin-maintainers /pkgs/os-specific/darwin @NixOS/darwin-maintainers
# Beam-related (Erlang, Elixir, LFE, etc) # Beam-related (Erlang, Elixir, LFE, etc)
pkgs/development/beam-modules/* @gleber /pkgs/development/beam-modules @gleber
pkgs/development/interpreters/erlang/* @gleber /pkgs/development/interpreters/erlang @gleber
pkgs/development/interpreters/lfe/* @gleber /pkgs/development/interpreters/lfe @gleber
pkgs/development/interpreters/elixir/* @gleber /pkgs/development/interpreters/elixir @gleber
pkgs/development/tools/build-managers/rebar/* @gleber /pkgs/development/tools/build-managers/rebar @gleber
pkgs/development/tools/build-managers/rebar3/* @gleber /pkgs/development/tools/build-managers/rebar3 @gleber
pkgs/development/tools/erlang/* @gleber /pkgs/development/tools/erlang @gleber
# Jetbrains # Jetbrains
pkgs/applications/editors/jetbrains @edwtjo /pkgs/applications/editors/jetbrains @edwtjo
# Eclipse # Eclipse
pkgs/applications/editors/eclipse @rycee /pkgs/applications/editors/eclipse @rycee

4
doc/configuration.xml
View file

@ -55,6 +55,10 @@ configuration file located at
</programlisting> </programlisting>
</para> </para>
<para>Note that we are not able to test or build unfree software on Hydra
due to policy. Most unfree licenses prohibit us from either executing or
distributing the software.</para>
<section xml:id="sec-allow-broken"> <section xml:id="sec-allow-broken">
<title>Installing broken packages</title> <title>Installing broken packages</title>

2
doc/languages-frameworks/python.md
View file

@ -165,7 +165,7 @@ run the script in the `python3` shell.
```py ```py
#! /usr/bin/env nix-shell #! /usr/bin/env nix-shell
#! nix-shell -i 'python3.withPackages(ps: [ps.numpy])' #! nix-shell -i python3 -p "python3.withPackages(ps: [ps.numpy])"
import numpy import numpy

30
doc/package-notes.xml
View file

@ -664,4 +664,34 @@ cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el
</section> </section>
<section xml:id="sec-weechat">
<title>Weechat</title>
<para>
Weechat can currently be configured to include your choice of plugins.
To make use of this functionality, install an expression that overrides its configuration such as
<programlisting>weechat.override {configure = {availablePlugins, ...}: {
plugins = with availablePlugins; [ python perl ];
}
}</programlisting>
</para>
<para>
The plugins currently available are <literal>python</literal>,
<literal>perl</literal>, <literal>ruby</literal>, <literal>guile</literal>,
<literal>tcl</literal> and <literal>lua</literal>.
</para>
<para>
The python plugin allows the addition of extra libraries. For instance,
the <literal>inotify.py</literal> script in weechat-scripts requires
D-Bus or libnotify, and the <literal>fish.py</literal> script requires
pycrypto. To use these scripts, use the <literal>python</literal>
plugin's <literal>withPackages</literal> attribute:
<programlisting>weechat.override {configure = {availablePlugins, ...}: {
plugins = with availablePlugins; [
(python.withPackages (ps: with ps; [ pycrypto python-dbus ]))
];
}
}
</programlisting>
</para>
</section>
</chapter> </chapter>

10
doc/stdenv.xml
View file

@ -698,8 +698,14 @@ nothing.</para>
<listitem><para>A list of strings passed as additional flags to <listitem><para>A list of strings passed as additional flags to
<command>make</command>. These flags are also used by the default <command>make</command>. These flags are also used by the default
install and check phase. For setting make flags specific to the install and check phase. For setting make flags specific to the
build phase, use <varname>buildFlags</varname> (see build phase, use <varname>buildFlags</varname> (see below).
below).</para></listitem>
<programlisting>
makeFlags = [ "PREFIX=$(out)" ];
</programlisting>
<note><para>The flags are quoted in bash, but environment variables can
be specified by using the make syntax.</para></note></para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>

4
lib/maintainers.nix
View file

@ -44,6 +44,7 @@
anderspapitto = "Anders Papitto <anderspapitto@gmail.com>"; anderspapitto = "Anders Papitto <anderspapitto@gmail.com>";
andir = "Andreas Rammhold <andreas@rammhold.de>"; andir = "Andreas Rammhold <andreas@rammhold.de>";
andres = "Andres Loeh <ksnixos@andres-loeh.de>"; andres = "Andres Loeh <ksnixos@andres-loeh.de>";
andrestylianos = "Andre S. Ramos <andre.stylianos@gmail.com>";
andrewrk = "Andrew Kelley <superjoe30@gmail.com>"; andrewrk = "Andrew Kelley <superjoe30@gmail.com>";
andsild = "Anders Sildnes <andsild@gmail.com>"; andsild = "Anders Sildnes <andsild@gmail.com>";
aneeshusa = "Aneesh Agrawal <aneeshusa@gmail.com>"; aneeshusa = "Aneesh Agrawal <aneeshusa@gmail.com>";
@ -443,7 +444,7 @@
nicknovitski = "Nick Novitski <nixpkgs@nicknovitski.com>"; nicknovitski = "Nick Novitski <nixpkgs@nicknovitski.com>";
nico202 = "Nicolò Balzarotti <anothersms@gmail.com>"; nico202 = "Nicolò Balzarotti <anothersms@gmail.com>";
NikolaMandic = "Ratko Mladic <nikola@mandic.email>"; NikolaMandic = "Ratko Mladic <nikola@mandic.email>";
nixy = "Andrew R. M. <andrewmiller237@gmail.com>"; nixy = "Andrew R. M. <nixy@nixy.moe>";
nocoolnametom = "Tom Doggett <nocoolnametom@gmail.com>"; nocoolnametom = "Tom Doggett <nocoolnametom@gmail.com>";
notthemessiah = "Brian Cohen <brian.cohen.88@gmail.com>"; notthemessiah = "Brian Cohen <brian.cohen.88@gmail.com>";
np = "Nicolas Pouillard <np.nix@nicolaspouillard.fr>"; np = "Nicolas Pouillard <np.nix@nicolaspouillard.fr>";
@ -585,6 +586,7 @@
snyh = "Xia Bin <snyh@snyh.org>"; snyh = "Xia Bin <snyh@snyh.org>";
solson = "Scott Olson <scott@solson.me>"; solson = "Scott Olson <scott@solson.me>";
sorpaas = "Wei Tang <hi@that.world>"; sorpaas = "Wei Tang <hi@that.world>";
sorki = "Richard Marko <srk@48.io>";
spacefrogg = "Michael Raitza <spacefrogg-nixos@meterriblecrew.net>"; spacefrogg = "Michael Raitza <spacefrogg-nixos@meterriblecrew.net>";
spencerjanssen = "Spencer Janssen <spencerjanssen@gmail.com>"; spencerjanssen = "Spencer Janssen <spencerjanssen@gmail.com>";
spinus = "Tomasz Czyż <tomasz.czyz@gmail.com>"; spinus = "Tomasz Czyż <tomasz.czyz@gmail.com>";

9
nixos/doc/manual/release-notes/rl-1803.xml
View file

@ -63,6 +63,15 @@ following incompatible changes:</para>
pass literal dollar signs through Postfix, double them. pass literal dollar signs through Postfix, double them.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
The <literal>postage</literal> package (for web-based PostgreSQL
administration) has been renamed to <literal>pgmanage</literal>. The
corresponding module has also been renamed. To migrate please rename all
<option>services.postage</option> options to
<option>services.pgmanage</option>.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>

2
nixos/modules/hardware/opengl.nix
View file

@ -93,7 +93,7 @@ in
hardware.opengl.extraPackages = mkOption { hardware.opengl.extraPackages = mkOption {
type = types.listOf types.package; type = types.listOf types.package;
default = []; default = [];
example = literalExample "with pkgs; [ vaapiIntel libvdpau-va-gl vaapiVdpau ]"; example = literalExample "with pkgs; [ vaapiIntel libvdpau-va-gl vaapiVdpau intel-ocl ]";
description = '' description = ''
Additional packages to add to OpenGL drivers. This can be used Additional packages to add to OpenGL drivers. This can be used
to add OpenCL drivers, VA-API/VDPAU drivers etc. to add OpenCL drivers, VA-API/VDPAU drivers etc.

1
nixos/modules/installer/tools/nixos-generate-config.pl
View file

@ -8,6 +8,7 @@ use File::Basename;
use File::Slurp; use File::Slurp;
use File::stat; use File::stat;
umask(0022);
sub uniq { sub uniq {
my %seen; my %seen;

2
nixos/modules/module-list.nix
View file

@ -185,7 +185,7 @@
./services/databases/neo4j.nix ./services/databases/neo4j.nix
./services/databases/openldap.nix ./services/databases/openldap.nix
./services/databases/opentsdb.nix ./services/databases/opentsdb.nix
./services/databases/postage.nix ./services/databases/pgmanage.nix
./services/databases/postgresql.nix ./services/databases/postgresql.nix
./services/databases/redis.nix ./services/databases/redis.nix
./services/databases/riak.nix ./services/databases/riak.nix

5
nixos/modules/programs/sway.nix
View file

@ -10,7 +10,7 @@ let
#! ${pkgs.stdenv.shell} #! ${pkgs.stdenv.shell}
${cfg.extraSessionCommands} ${cfg.extraSessionCommands}
PATH="${sway}/bin:$PATH" PATH="${sway}/bin:$PATH"
exec ${pkgs.dbus.dbus-launch} --exit-with-session "${sway}/bin/sway" exec ${pkgs.dbus.dbus-launch} --exit-with-session sway-setcap
''; '';
swayJoined = pkgs.symlinkJoin { swayJoined = pkgs.symlinkJoin {
name = "sway-wrapped"; name = "sway-wrapped";
@ -53,7 +53,8 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = [ swayJoined ] ++ cfg.extraPackages; environment.systemPackages = [ swayJoined ] ++ cfg.extraPackages;
security.wrappers.sway = { security.wrappers.sway = {
source = "${swayJoined}/bin/sway"; program = "sway-setcap";
source = "${sway}/bin/sway";
capabilities = "cap_sys_ptrace,cap_sys_tty_config=eip"; capabilities = "cap_sys_ptrace,cap_sys_tty_config=eip";
owner = "root"; owner = "root";
group = "sway"; group = "sway";

18
nixos/modules/security/acme.nix
View file

@ -139,6 +139,20 @@ in
''; '';
}; };
production = mkOption {
type = types.bool;
default = true;
description = ''
If set to true, use Let's Encrypt's production environment
instead of the staging environment. The main benefit of the
staging environment is to get much higher rate limits.
See
<literal>https://letsencrypt.org/docs/staging-environment</literal>
for more detail.
'';
};
certs = mkOption { certs = mkOption {
default = { }; default = { };
type = with types; attrsOf (submodule certOpts); type = with types; attrsOf (submodule certOpts);
@ -177,7 +191,9 @@ in
cmdline = [ "-v" "-d" domain "--default_root" data.webroot "--valid_min" cfg.validMin ] cmdline = [ "-v" "-d" domain "--default_root" data.webroot "--valid_min" cfg.validMin ]
++ optionals (data.email != null) [ "--email" data.email ] ++ optionals (data.email != null) [ "--email" data.email ]
++ concatMap (p: [ "-f" p ]) data.plugins ++ concatMap (p: [ "-f" p ]) data.plugins
++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains); ++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains)
++ (if cfg.production then []
else ["--server" "https://acme-staging.api.letsencrypt.org/directory"]);
acmeService = { acmeService = {
description = "Renew ACME Certificate for ${cert}"; description = "Renew ACME Certificate for ${cert}";
after = [ "network.target" "network-online.target" ]; after = [ "network.target" "network-online.target" ];

125
nixos/modules/services/databases/postage.nix → nixos/modules/services/databases/pgmanage.nix
View file

@ -3,16 +3,16 @@
with lib; with lib;
let let
cfg = config.services.postage; cfg = config.services.pgmanage;
confFile = pkgs.writeTextFile { confFile = pkgs.writeTextFile {
name = "postage.conf"; name = "pgmanage.conf";
text = '' text = ''
connection_file = ${postageConnectionsFile} connection_file = ${pgmanageConnectionsFile}
allow_custom_connections = ${builtins.toJSON cfg.allowCustomConnections} allow_custom_connections = ${builtins.toJSON cfg.allowCustomConnections}
postage_port = ${toString cfg.port} pgmanage_port = ${toString cfg.port}
super_only = ${builtins.toJSON cfg.superOnly} super_only = ${builtins.toJSON cfg.superOnly}
@ -20,7 +20,7 @@ let
login_timeout = ${toString cfg.loginTimeout} login_timeout = ${toString cfg.loginTimeout}
web_root = ${cfg.package}/etc/postage/web_root web_root = ${cfg.package}/etc/pgmanage/web_root
data_root = ${cfg.dataRoot} data_root = ${cfg.dataRoot}
@ -33,24 +33,23 @@ let
''; '';
}; };
postageConnectionsFile = pkgs.writeTextFile { pgmanageConnectionsFile = pkgs.writeTextFile {
name = "postage-connections.conf"; name = "pgmanage-connections.conf";
text = concatStringsSep "\n" text = concatStringsSep "\n"
(mapAttrsToList (name : conn : "${name}: ${conn}") cfg.connections); (mapAttrsToList (name : conn : "${name}: ${conn}") cfg.connections);
}; };
postage = "postage"; pgmanage = "pgmanage";
in {
options.services.postage = { pgmanageOptions = {
enable = mkEnableOption "PostgreSQL Administration for the web"; enable = mkEnableOption "PostgreSQL Administration for the web";
package = mkOption { package = mkOption {
type = types.package; type = types.package;
default = pkgs.postage; default = pkgs.pgmanage;
defaultText = "pkgs.postage"; defaultText = "pkgs.pgmanage";
description = '' description = ''
The postage package to use. The pgmanage package to use.
''; '';
}; };
@ -62,14 +61,14 @@ in {
"mini-server" = "hostaddr=127.0.0.1 port=5432 dbname=postgres sslmode=require"; "mini-server" = "hostaddr=127.0.0.1 port=5432 dbname=postgres sslmode=require";
}; };
description = '' description = ''
Postage requires at least one PostgreSQL server be defined. pgmanage requires at least one PostgreSQL server be defined.
</para><para> </para><para>
Detailed information about PostgreSQL connection strings is available at: Detailed information about PostgreSQL connection strings is available at:
<link xlink:href="http://www.postgresql.org/docs/current/static/libpq-connect.html"/> <link xlink:href="http://www.postgresql.org/docs/current/static/libpq-connect.html"/>
</para><para> </para><para>
Note that you should not specify your user name or password. That Note that you should not specify your user name or password. That
information will be entered on the login screen. If you specify a information will be entered on the login screen. If you specify a
username or password, it will be removed by Postage before attempting to username or password, it will be removed by pgmanage before attempting to
connect to a database. connect to a database.
''; '';
}; };
@ -78,7 +77,7 @@ in {
type = types.bool; type = types.bool;
default = false; default = false;
description = '' description = ''
This tells Postage whether or not to allow anyone to use a custom This tells pgmanage whether or not to allow anyone to use a custom
connection from the login screen. connection from the login screen.
''; '';
}; };
@ -87,7 +86,7 @@ in {
type = types.int; type = types.int;
default = 8080; default = 8080;
description = '' description = ''
This tells Postage what port to listen on for browser requests. This tells pgmanage what port to listen on for browser requests.
''; '';
}; };
@ -95,7 +94,7 @@ in {
type = types.bool; type = types.bool;
default = true; default = true;
description = '' description = ''
This tells Postage whether or not to set the listening socket to local This tells pgmanage whether or not to set the listening socket to local
addresses only. addresses only.
''; '';
}; };
@ -104,10 +103,10 @@ in {
type = types.bool; type = types.bool;
default = true; default = true;
description = '' description = ''
This tells Postage whether or not to only allow super users to This tells pgmanage whether or not to only allow super users to
login. The recommended value is true and will restrict users who are not login. The recommended value is true and will restrict users who are not
super users from logging in to any PostgreSQL instance through super users from logging in to any PostgreSQL instance through
Postage. Note that a connection will be made to PostgreSQL in order to pgmanage. Note that a connection will be made to PostgreSQL in order to
test if the user is a superuser. test if the user is a superuser.
''; '';
}; };
@ -116,8 +115,8 @@ in {
type = types.nullOr types.str; type = types.nullOr types.str;
default = null; default = null;
description = '' description = ''
This tells Postage to only allow users in a certain PostgreSQL group to This tells pgmanage to only allow users in a certain PostgreSQL group to
login to Postage. Note that a connection will be made to PostgreSQL in login to pgmanage. Note that a connection will be made to PostgreSQL in
order to test if the user is a member of the login group. order to test if the user is a member of the login group.
''; '';
}; };
@ -133,10 +132,10 @@ in {
dataRoot = mkOption { dataRoot = mkOption {
type = types.str; type = types.str;
default = "/var/lib/postage"; default = "/var/lib/pgmanage";
description = '' description = ''
This tells Postage where to put the SQL file history. All tabs are saved This tells pgmanage where to put the SQL file history. All tabs are saved
to this location so that if you get disconnected from Postage you to this location so that if you get disconnected from pgmanage you
don't lose your work. don't lose your work.
''; '';
}; };
@ -156,15 +155,15 @@ in {
}); });
default = null; default = null;
description = '' description = ''
These options tell Postage where the TLS Certificate and Key files These options tell pgmanage where the TLS Certificate and Key files
reside. If you use these options then you'll only be able to access reside. If you use these options then you'll only be able to access
Postage through a secure TLS connection. These options are only pgmanage through a secure TLS connection. These options are only
necessary if you wish to connect directly to Postage using a secure TLS necessary if you wish to connect directly to pgmanage using a secure TLS
connection. As an alternative, you can set up Postage in a reverse proxy connection. As an alternative, you can set up pgmanage in a reverse proxy
configuration. This allows your web server to terminate the secure configuration. This allows your web server to terminate the secure
connection and pass on the request to Postage. You can find help to set connection and pass on the request to pgmanage. You can find help to set
up this configuration in: up this configuration in:
<link xlink:href="https://github.com/workflowproducts/postage/blob/master/INSTALL_NGINX.md"/> <link xlink:href="https://github.com/pgManage/pgManage/blob/master/INSTALL_NGINX.md"/>
''; '';
}; };
@ -177,29 +176,47 @@ in {
}; };
}; };
config = mkIf cfg.enable {
systemd.services.postage = { in {
description = "postage - PostgreSQL Administration for the web";
wants = [ "postgresql.service" ]; options.services.pgmanage = pgmanageOptions;
after = [ "postgresql.service" ];
wantedBy = [ "multi-user.target" ]; # This is deprecated and should be removed for NixOS-18.03.
serviceConfig = { options.services.postage = pgmanageOptions;
User = postage;
Group = postage; config = mkMerge [
ExecStart = "${pkgs.postage}/sbin/postage -c ${confFile}" + { assertions = [
optionalString cfg.localOnly " --local-only=true"; { assertion = !config.services.postage.enable;
message =
"services.postage is deprecated in favour of pgmanage. " +
"They have the same options so just substitute postage for pgmanage." ;
}
];
}
(mkIf cfg.enable {
systemd.services.pgmanage = {
description = "pgmanage - PostgreSQL Administration for the web";
wants = [ "postgresql.service" ];
after = [ "postgresql.service" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
User = pgmanage;
Group = pgmanage;
ExecStart = "${pkgs.pgmanage}/sbin/pgmanage -c ${confFile}" +
optionalString cfg.localOnly " --local-only=true";
};
}; };
}; users = {
users = { users."${pgmanage}" = {
users."${postage}" = { name = pgmanage;
name = postage; group = pgmanage;
group = postage; home = cfg.dataRoot;
home = cfg.dataRoot; createHome = true;
createHome = true; };
groups."${pgmanage}" = {
name = pgmanage;
};
}; };
groups."${postage}" = { })
name = postage; ];
};
};
};
} }

19
nixos/modules/services/mail/postfix.nix
View file

@ -60,11 +60,11 @@ let
manpage_directory = "${pkgs.postfix}/share/man"; manpage_directory = "${pkgs.postfix}/share/man";
html_directory = "${pkgs.postfix}/share/postfix/doc/html"; html_directory = "${pkgs.postfix}/share/postfix/doc/html";
shlib_directory = false; shlib_directory = false;
relayhost = if cfg.lookupMX || cfg.relayHost == "" relayhost = if cfg.relayHost == "" then "" else
then cfg.relayHost if cfg.lookupMX
else then "${cfg.relayHost}:${toString cfg.relayPort}"
"[${cfg.relayHost}]" else "[${cfg.relayHost}]:${toString cfg.relayPort}";
+ optionalString (cfg.relayPort != null) ":${toString cfg.relayPort}";
mail_spool_directory = "/var/spool/mail/"; mail_spool_directory = "/var/spool/mail/";
setgid_group = setgidGroup; setgid_group = setgidGroup;
} }
@ -461,13 +461,10 @@ in
}; };
relayPort = mkOption { relayPort = mkOption {
type = types.nullOr types.int; type = types.int;
default = null; default = 25;
example = 587;
description = " description = "
Specify an optional port for outbound mail relay. (Note: SMTP port for relay mail relay.
only used if an explicit <option>relayHost</option> is
defined.)
"; ";
}; };

2
nixos/modules/services/networking/keybase.nix
View file

@ -28,7 +28,7 @@ in {
description = "Keybase service"; description = "Keybase service";
serviceConfig = { serviceConfig = {
ExecStart = '' ExecStart = ''
${pkgs.keybase}/bin/keybase -d service --auto-forked ${pkgs.keybase}/bin/keybase service --auto-forked
''; '';
Restart = "on-failure"; Restart = "on-failure";
PrivateTmp = true; PrivateTmp = true;

25
nixos/modules/services/networking/strongswan.nix
View file

@ -32,8 +32,10 @@ let
${caConf} ${caConf}
''; '';
strongswanConf = {setup, connections, ca, secrets}: toFile "strongswan.conf" '' strongswanConf = {setup, connections, ca, secrets, managePlugins, enabledPlugins}: toFile "strongswan.conf" ''
charon { charon {
${if managePlugins then "load_modular = no" else ""}
${if managePlugins then ("load = " + (concatStringsSep " " enabledPlugins)) else ""}
plugins { plugins {
stroke { stroke {
secrets_file = ${ipsecSecrets secrets} secrets_file = ${ipsecSecrets secrets}
@ -112,6 +114,25 @@ in
file. file.
''; '';
}; };
managePlugins = mkOption {
type = types.bool;
default = false;
description = ''
If set to true, this option will disable automatic plugin loading and
then tell strongSwan to enable the plugins specified in the
<option>enabledPlugins</option> option.
'';
};
enabledPlugins = mkOption {
type = types.listOf types.str;
default = [];
description = ''
A list of additional plugins to enable if
<option>managePlugins</option> is true.
'';
};
}; };
config = with cfg; mkIf enable { config = with cfg; mkIf enable {
@ -122,7 +143,7 @@ in
wants = [ "keys.target" ]; wants = [ "keys.target" ];
after = [ "network-online.target" "keys.target" ]; after = [ "network-online.target" "keys.target" ];
environment = { environment = {
STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secrets; }; STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secrets managePlugins enabledPlugins; };
}; };
serviceConfig = { serviceConfig = {
ExecStart = "${pkgs.strongswan}/sbin/ipsec start --nofork"; ExecStart = "${pkgs.strongswan}/sbin/ipsec start --nofork";

4
nixos/modules/services/networking/unbound.nix
View file

@ -8,9 +8,9 @@ let
stateDir = "/var/lib/unbound"; stateDir = "/var/lib/unbound";
access = concatMapStrings (x: " access-control: ${x} allow\n") cfg.allowedAccess; access = concatMapStringsSep "\n " (x: "access-control: ${x} allow") cfg.allowedAccess;
interfaces = concatMapStrings (x: " interface: ${x}\n") cfg.interfaces; interfaces = concatMapStringsSep "\n " (x: "interface: ${x}") cfg.interfaces;
isLocalAddress = x: substring 0 3 x == "::1" || substring 0 9 x == "127.0.0.1"; isLocalAddress = x: substring 0 3 x == "::1" || substring 0 9 x == "127.0.0.1";

2
nixos/modules/services/x11/desktop-managers/lxqt.nix
View file

@ -41,7 +41,7 @@ in
name = "lxqt"; name = "lxqt";
bgSupport = true; bgSupport = true;
start = '' start = ''
exec ${pkgs.lxqt.lxqt-common}/bin/startlxqt exec ${pkgs.lxqt.lxqt-session}/bin/startlxqt
''; '';
}; };

4
nixos/modules/virtualisation/containers.nix
View file

@ -537,7 +537,7 @@ in
type = types.bool; type = types.bool;
default = false; default = false;
description = '' description = ''
Wether the container is automatically started at boot-time. Whether the container is automatically started at boot-time.
''; '';
}; };
@ -596,6 +596,8 @@ in
{ config, pkgs, ... }: { config, pkgs, ... }:
{ services.postgresql.enable = true; { services.postgresql.enable = true;
services.postgresql.package = pkgs.postgresql96; services.postgresql.package = pkgs.postgresql96;
system.stateVersion = "17.03";
}; };
}; };
} }

1
nixos/release.nix
View file

@ -306,6 +306,7 @@ in rec {
#tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; }); #tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; });
tests.peerflix = callTest tests/peerflix.nix {}; tests.peerflix = callTest tests/peerflix.nix {};
tests.postgresql = callSubTests tests/postgresql.nix {}; tests.postgresql = callSubTests tests/postgresql.nix {};
tests.pgmanage = callTest tests/pgmanage.nix {};
tests.postgis = callTest tests/postgis.nix {}; tests.postgis = callTest tests/postgis.nix {};
#tests.pgjwt = callTest tests/pgjwt.nix {}; #tests.pgjwt = callTest tests/pgjwt.nix {};
tests.printing = callTest tests/printing.nix {}; tests.printing = callTest tests/printing.nix {};

39
nixos/tests/pgmanage.nix Normal file
View file

@ -0,0 +1,39 @@
import ./make-test.nix ({ pkgs, ... } :
let
role = "test";
password = "secret";
conn = "local";
in
{
name = "pgmanage";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ basvandijk ];
};
nodes = {
one = { config, pkgs, ... }: {
services = {
postgresql = {
enable = true;
initialScript = pkgs.writeText "pg-init-script" ''
CREATE ROLE ${role} SUPERUSER LOGIN PASSWORD '${password}';
'';
};
pgmanage = {
enable = true;
connections = {
"${conn}" = "hostaddr=127.0.0.1 port=${toString config.services.postgresql.port} dbname=postgres";
};
};
};
};
};
testScript = ''
startAll;
$one->waitForUnit("default.target");
$one->requireActiveUnit("pgmanage.service");
# Test if we can log in.
$one->waitUntilSucceeds("curl 'http://localhost:8080/pgmanage/auth' --data 'action=login&connname=${conn}&username=${role}&password=${password}' --fail");
'';
})

4
pkgs/applications/altcoins/dogecoin.nix
View file

@ -13,11 +13,11 @@ stdenv.mkDerivation rec {
owner = "dogecoin"; owner = "dogecoin";
repo = "dogecoin"; repo = "dogecoin";
rev = "v${version}"; rev = "v${version}";
sha256 = "16q3rldj04hkzzjd23h0knszqr5dgixizy4iyc129mz8wa8pbnvy"; sha256 = "04rddx20d4fps2w3h1jxa2j8iyqpjv2fh897z0z3r06qjvjzf7rr";
}; };
nativeBuildInputs = [ pkgconfig autoreconfHook ]; nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [ openssl db5 openssl utillinux buildInputs = [ openssl db5 openssl utillinux
protobuf boost zlib miniupnpc ] protobuf boost zlib miniupnpc ]
++ optionals withGui [ qt4 qrencode ]; ++ optionals withGui [ qt4 qrencode ];

4
pkgs/applications/audio/audacious/default.nix
View file

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

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

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

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

@ -7,12 +7,12 @@
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.1.3"; version = "2.2.0";
name = "audacity-${version}"; name = "audacity-${version}";
src = fetchurl { src = fetchurl {
url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"; url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz";
sha256 = "11mx7gb4dbqrgfp7hm0154x3m76ddnmhf2675q5zkxn7jc5qfc6b"; sha256 = "09xpr4bjnainz1xmc35v3qg3dadjr9wv8bmn1p4y91aqyihnhjry";
}; };
patches = [ patches = [
(fetchpatch { (fetchpatch {

69
pkgs/applications/audio/groovebasin/default.nix
View file

@ -1,69 +0,0 @@
{ stdenv, fetchFromGitHub, makeWrapper, callPackage, libgroove, python, utillinux, nodejs }:
with stdenv.lib;
let
nodePackages = callPackage (import ../../../top-level/node-packages.nix) {
inherit nodejs;
neededNatives = [ libgroove python utillinux ];
self = nodePackages;
generated = ./package.nix;
};
in nodePackages.buildNodePackage rec {
version = "1.5.1";
name = "groovebasin-${version}";
src = fetchFromGitHub {
owner = "andrewrk";
repo = "groovebasin";
rev = "${version}";
sha256 = "1g7v0qhvgzpb050hf45pibp68qd67hnnry5npw58f4dvaxdd8yhd";
};
deps = (filter (v: nixType v == "derivation") (attrValues nodePackages));
buildInputs = [ makeWrapper ];
postInstall = ''
mkdir -p "$out/lib/node_modules/groovebasin/public"
stylus -o "$out/lib/node_modules/groovebasin/public/" -c --include-css "$out/lib/node_modules/groovebasin/src/client/styles"
browserify-lite "$out/lib/node_modules/groovebasin/src/client/app.js" --outfile "$out/lib/node_modules/groovebasin/public/app.js"
wrapProgram "$out/bin/groovebasin" --set NODE_PATH "$out/lib/node_modules/groovebasin/node_modules/"
'';
passthru.names = ["groovebasin"];
meta = {
description = "Music player server with a web-based user interface";
homepage = http://groovebasin.com/;
license = licenses.mit;
platforms = platforms.unix;
maintainers = [ maintainers.andrewrk ];
longDescription = ''
Groove Basin runs on a server optionally connected to speakers. Guests can
control the music player by connecting with a laptop, tablet, or smart phone.
Further, users can stream their music libraries remotely.
Groove Basin comes with a fast, responsive web interface that supports keyboard
shortcuts and drag drop. It also provides the ability to upload songs,
download songs, and import songs by URL, including YouTube URLs.
Groove Basin supports Dynamic Mode which automatically queues random songs,
favoring songs that have not been queued recently.
Groove Basin automatically performs ReplayGain scanning on every song using
the EBU R128 loudness standard, and automatically switches between track
and album mode.
Groove Basin supports the MPD protocol, which means it is compatible with MPD
clients. There is also a more powerful Groove Basin protocol which you can
use if the MPD protocol does not meet your needs.
Groove Basin supports Last.fm scrobbling.
'';
# groovebasin was built with nodejs 0.10 which reached end of LTS
# in October 216, it doesn't built with nodejs 4.x
broken = true;
};
}

4396
pkgs/applications/audio/groovebasin/package.nix
View file

File diff suppressed because it is too large Load diff

4
pkgs/applications/audio/mopidy-iris/default.nix
View file

@ -2,12 +2,12 @@
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
name = "mopidy-iris-${version}"; name = "mopidy-iris-${version}";
version = "3.4.9"; version = "3.6.1";
src = pythonPackages.fetchPypi { src = pythonPackages.fetchPypi {
inherit version; inherit version;
pname = "Mopidy-Iris"; pname = "Mopidy-Iris";
sha256 = "0acr8ss5d0jgcy1qsjb12h0n6kr6qdp9zrbbk9vv3m3s6kcm8vgb"; sha256 = "1mfi3qx7pvfq4rz0py39lnbzv7sq703b6k6mypzhj1gdzbisfn46";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

27
pkgs/applications/audio/puddletag/default.nix
View file

@ -1,20 +1,19 @@
{ stdenv, fetchFromGitHub, python2Packages, makeWrapper, chromaprint }: { stdenv, fetchFromGitHub, python2Packages, makeWrapper, chromaprint }:
let python2Packages.buildPythonApplication rec {
pname = "puddletag"; name = "puddletag-${version}";
in python2Packages.buildPythonApplication rec {
name = "${pname}-${version}";
version = "1.2.0"; version = "1.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "keithgg"; owner = "keithgg";
repo = pname; repo = "puddletag";
rev = "v${version}"; rev = "v${version}";
sha256 = "1g6wa91awy17z5b704yi9kfynnvfm9lkrvpfvwccscr1h8s3qmiz"; sha256 = "1g6wa91awy17z5b704yi9kfynnvfm9lkrvpfvwccscr1h8s3qmiz";
}; };
sourceRoot = "${pname}-v${version}-src/source"; setSourceRoot = ''
sourceRoot=$(echo */source)
'';
disabled = python2Packages.isPy3k; # work to support python 3 has not begun disabled = python2Packages.isPy3k; # work to support python 3 has not begun
@ -29,17 +28,21 @@ in python2Packages.buildPythonApplication rec {
dontStrip = true; # we are not generating any binaries dontStrip = true; # we are not generating any binaries
installPhase = '' installPhase = ''
runHook preInstall
siteDir=$(toPythonPath $out) siteDir=$(toPythonPath $out)
mkdir -p $siteDir mkdir -p $siteDir
PYTHONPATH=$PYTHONPATH:$siteDir PYTHONPATH=$PYTHONPATH:$siteDir
${python2Packages.python.interpreter} setup.py install --prefix $out ${python2Packages.python.interpreter} setup.py install --prefix $out
runHook postInstall
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://puddletag.net; homepage = https://puddletag.net;
description = "An audio tag editor similar to the Windows program, Mp3tag"; description = "An audio tag editor similar to the Windows program, Mp3tag";
license = licenses.gpl3; license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ peterhoeg ]; maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.linux;
}; };
} }

6
pkgs/applications/display-managers/lightdm/default.nix
View file

@ -7,15 +7,15 @@
with stdenv.lib; with stdenv.lib;
let let
ver_branch = "1.22"; ver_branch = "1.24";
version = "1.22.0"; version = "1.24.0";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "lightdm-${version}"; name = "lightdm-${version}";
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz"; url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz";
sha256 = "0a5bvfl2h7r873al6q7c819h0kg564k9fh51rl6489z6lyvazfg4"; sha256 = "18j33bm54i8k7ncxcs69zqi4105s62n58jrydqn3ikrb71s9nl6d";
}; };
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig intltool ];

4
pkgs/applications/editors/atom/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "atom-${version}"; name = "atom-${version}";
version = "1.21.1"; version = "1.21.2";
src = fetchurl { src = fetchurl {
url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
sha256 = "13mpj3wvcgsxz9q6lai36lkfgd7rabcjrrih1j5309kd1dqaswnn"; sha256 = "0snhhp8rjmk750snyzkqzwvi7f915pbc6qpa3vf0f57syf47m7vl";
name = "${name}.deb"; name = "${name}.deb";
}; };

33
pkgs/applications/editors/eclipse/plugins.nix
View file

@ -106,16 +106,16 @@ rec {
anyedittools = buildEclipsePlugin rec { anyedittools = buildEclipsePlugin rec {
name = "anyedit-${version}"; name = "anyedit-${version}";
version = "2.7.0.201705171641"; version = "2.7.1.201709201439";
srcFeature = fetchurl { srcFeature = fetchurl {
url = "http://andrei.gmxhome.de/eclipse/features/AnyEditTools_${version}.jar"; url = "http://andrei.gmxhome.de/eclipse/features/AnyEditTools_${version}.jar";
sha256 = "07k029nw5ibxpjc0siy06ihylbqrxllf59yz8c544gra8lc079c9"; sha256 = "1wqzl7wq85m9gil8rnvly45ps0a2m0svw613pg6djs5i7amhnayh";
}; };
srcPlugin = fetchurl { srcPlugin = fetchurl {
url = "https://github.com/iloveeclipse/anyedittools/releases/download/2.7.0/de.loskutov.anyedit.AnyEditTools_${version}.jar"; url = "https://github.com/iloveeclipse/anyedittools/releases/download/2.7.1/de.loskutov.anyedit.AnyEditTools_${version}.jar";
sha256 = "0wbm8zfjh7gxrw5sy9m3siddiazh5czgxp7zyzxwzkdqyqzqs70h"; sha256 = "03iyb6j2srq74iigmg7dk098c2svyv0ygdfql5jqr44a32n07k8q";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
@ -394,7 +394,7 @@ rec {
sha256 = "1xfj4j27d1h4bdf2v7f78zi8lz4zkkj7s9kskmsqx5jcs2d459yp"; sha256 = "1xfj4j27d1h4bdf2v7f78zi8lz4zkkj7s9kskmsqx5jcs2d459yp";
extraPostFetch = extraPostFetch =
'' ''
mv "$out/${repo}-${rev}/releases/local-repo"/* "$out/" mv "$out/${repo}-${rev}/releases/local-repo/"* "$out/"
''; '';
}; };
@ -424,6 +424,29 @@ rec {
}; };
}; };
spotbugs = buildEclipsePlugin rec {
name = "spotbugs-${version}";
version = "3.1.0.r201710241414-11c9895";
srcFeature = fetchurl {
url = "https://spotbugs.github.io/eclipse/features/com.github.spotbugs.plugin.eclipse_${version}.jar";
sha256 = "084dj2bid5issh28j32hi5w9vx5xs829h7d5lbz5hqj1fyn9h6bs";
};
srcPlugin = fetchurl {
url = "https://spotbugs.github.io/eclipse/plugins/com.github.spotbugs.plugin.eclipse_${version}.jar";
sha256 = "1mqpl3gx06f54w13jm01qd8fbniab3x989mi3lysx078vrp23jas";
};
meta = with stdenv.lib; {
homepage = https://spotbugs.github.io/;
description = "Plugin that uses static analysis to look for bugs in Java code";
license = licenses.lgpl21;
platforms = platforms.all;
maintainers = [ maintainers.rycee ];
};
};
testng = buildEclipsePlugin rec { testng = buildEclipsePlugin rec {
name = "testng-${version}"; name = "testng-${version}";
version = "6.9.13.201609291640"; version = "6.9.13.201609291640";

24
pkgs/applications/editors/emacs-modes/elpa-generated.nix
View file

@ -95,10 +95,10 @@
ahungry-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: ahungry-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild { elpaBuild {
pname = "ahungry-theme"; pname = "ahungry-theme";
version = "1.6.0"; version = "1.8.0";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/ahungry-theme-1.6.0.tar"; url = "https://elpa.gnu.org/packages/ahungry-theme-1.8.0.tar";
sha256 = "1b0x7g753gn7mym8286b937zmxv50jgdish2h6wc05w1g1lygwsz"; sha256 = "14dhnrlbjzrxk5ligf0z2im5bgnxpjqqzqcrmqg5355xrgpbpb7v";
}; };
packageRequires = [ emacs ]; packageRequires = [ emacs ];
meta = { meta = {
@ -700,10 +700,10 @@
ebdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }: ebdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }:
elpaBuild { elpaBuild {
pname = "ebdb"; pname = "ebdb";
version = "0.3.4"; version = "0.4.1";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/ebdb-0.3.4.tar"; url = "https://elpa.gnu.org/packages/ebdb-0.4.1.tar";
sha256 = "1jj7s0646wqg9ykmpi52cc6m6m0gk2inqc2h6h7cr7gr4v7n2l00"; sha256 = "0gv1q1xkhjab0l77c92znn6x0dfdbnj6hc48axmrx6a7zwbm3g2r";
}; };
packageRequires = [ cl-lib emacs seq ]; packageRequires = [ cl-lib emacs seq ];
meta = { meta = {
@ -945,10 +945,10 @@
gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild { elpaBuild {
pname = "gnorb"; pname = "gnorb";
version = "1.3.0"; version = "1.3.1";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/gnorb-1.3.0.tar"; url = "https://elpa.gnu.org/packages/gnorb-1.3.1.tar";
sha256 = "0c256473llp7ahl1wbm6m236cj2lhp9ms1clmxpsfv51ds27ljqv"; sha256 = "1g6xldkc6l6zlzd1slqizbbd5b9k4pbr66nrf5svidgiy7mlifw5";
}; };
packageRequires = [ cl-lib ]; packageRequires = [ cl-lib ];
meta = { meta = {
@ -1556,10 +1556,10 @@
}) {}; }) {};
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org"; pname = "org";
version = "20171016"; version = "20171030";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/org-20171016.tar"; url = "https://elpa.gnu.org/packages/org-20171030.tar";
sha256 = "1196kv83p953nd9c5gxkn8ndw2kmm2kfw34dldap6m89khqflz5a"; sha256 = "1lszws6b5s4r7w871cyigs433dflf6w0y33fj6rzrq8240d5092i";
}; };
packageRequires = []; packageRequires = [];
meta = { meta = {

37
pkgs/applications/editors/emacs-modes/icicles/default.nix
View file

@ -2,27 +2,28 @@
let let
modules = [ modules = [
{ name = "icicles.el"; sha256 = "175g8w620vy73pp3zyasfjspgljk6g0lki71kdnvw5z88w3s9d1n"; } { name = "icicles.el"; sha256 = "10w1lghh9jqxxm5cszi2qyk24vnvazfywmyyz1v7zf6cyiwbndrz"; }
{ name = "icicles-chg.el"; sha256 = "1bx5xdhirvnrjqk4pk0sjp9bpj1syymsjnckklsw04gv6y0x8zik"; } { name = "icicles-chg.el"; sha256 = "020yg4hv120mcy7qvn76j85q6hl7mfcfv66w55c6izc9lbrvvnv8"; }
{ name = "icicles-cmd1.el"; sha256 = "1ff0mndin9zxrswwwq3a7b1s879rr6gy8rzxanr7kxg1ppciafad"; } { name = "icicles-cmd1.el"; sha256 = "1715x1vkiax93890gfjbzslxsn4swsv37spvyx7chy4s1mym9kfw"; }
{ name = "icicles-cmd2.el"; sha256 = "1a44l86jacp9nsy4z260azz6y672drjw3w5a0jsc8w26fgsrnx1k"; } { name = "icicles-cmd2.el"; sha256 = "187k0gmn34fn6w1dw9hjf4i788y01vk47z7ac11ar4bddwh97ddx"; }
{ name = "icicles-doc1.el"; sha256 = "0s3r4z3y06hd1nxp18wd0b8b88z2a7ryy0j8sx5fzibbmp58ars1"; } { name = "icicles-doc1.el"; sha256 = "1bw5dkymn2xdrfrp80am0gqi0szs0xihny4qmgzgx6hfbng351qh"; }
{ name = "icicles-doc2.el"; sha256 = "0c10jg91qxyrg1zwiyi4m57dbw3yf43jdrpi4nnby3pkzh6i37ic"; } { name = "icicles-doc2.el"; sha256 = "0zd94m1a8mwwbrbcrahxxx8q34w8cg5lna4yww4m1gliyklww86s"; }
{ name = "icicles-face.el"; sha256 = "0n0vcbhwgd2lyj7anq1zpwja28xry018qxbm8sprxkh6y3vlw8d2"; } { name = "icicles-face.el"; sha256 = "1mlz8dq7bgzp2cf5j37i25yw90ry657d2m8r93rdj67h7l4wyxhj"; }
{ name = "icicles-fn.el"; sha256 = "1i10593a7hp465bxd86h7h7gwrdyqxx0d13in53z4jnab8icp3d4"; } { name = "icicles-fn.el"; sha256 = "1cdghvgsr0b7pdq4lmnfm6kwwcqbk4wqf168kf2sjajbpa24ix96"; }
{ name = "icicles-mac.el"; sha256 = "1piq0jk8nz0hz9wwci7dkxnfxscdpygjzpj5zg3310vs22l7rrsz"; } { name = "icicles-mac.el"; sha256 = "1w5sgzbp8hyjzrmqd8bwivszaayzh8dkyqa0d751adiwjfs9sq9m"; }
{ name = "icicles-mcmd.el"; sha256 = "0c4325yp84i46605nlxmjm6n0f4fh69shsihvd0wb9ryg0a8qa65"; } { name = "icicles-mcmd.el"; sha256 = "1lf2galn3g52hfz61avlr4ifyn5b42dfbmyq78cpzlq7hzc928v2"; }
{ name = "icicles-mode.el"; sha256 = "069wx5clqpsq2c9aavgd9xihvlad3g00iwwrc3cpl47v64dvlipq"; } { name = "icicles-mode.el"; sha256 = "0gci04j6vx0vqsh4skarznklam1xibj7pjvy67kaip8b6a4zx9ip"; }
{ name = "icicles-opt.el"; sha256 = "16487l3361ca8l6il2c0z892843sc5l9v4gr7lx5fxbmrlsswvvn"; } { name = "icicles-opt.el"; sha256 = "17g35ancml0mvywagzhjrgmlr4rhm1wgb5wg3fsqhhldib9qlz56"; }
{ name = "icicles-var.el"; sha256 = "1a9cwxpi10x44fngxa7qnrg8hqfvdjb8s8k47gnn1rbh63blkkry"; } { name = "icicles-var.el"; sha256 = "0ydixg41h09yncp8g2nv8zsyv8avg1hj2f3mgrmd2kf0n27bw2nv"; }
]; ];
forAll = f: map f modules; forAll = f: map f modules;
in in
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "icicles-2014-11-06"; version = "2017-10-28";
name = "icicles-${version}";
srcs = forAll ({name, sha256}: fetchurl { url = "http://www.emacswiki.org/emacs-en/download/${name}"; inherit sha256; }); srcs = forAll ({name, sha256}: fetchurl { url = "http://www.emacswiki.org/emacs/download/${name}"; inherit sha256; });
buildInputs = [ emacs ]; buildInputs = [ emacs ];
@ -30,11 +31,13 @@ stdenv.mkDerivation {
buildPhase = "emacs --batch -L . -f batch-byte-compile *.el"; buildPhase = "emacs --batch -L . -f batch-byte-compile *.el";
installPhase = "mkdir -p $out/share/emacs/site-lisp; cp *.el *.elc $out/share/emacs/site-lisp/"; installPhase = "mkdir -p $out/share/emacs/site-lisp/emacswiki/${name}/; cp *.el *.elc $out/share/emacs/site-lisp/emacswiki/${name}/";
meta = { meta = {
homepage = http://www.emacswiki.org/emacs/Icicles; homepage = http://www.emacswiki.org/emacs/Icicles;
description = "Enhance Emacs minibuffer input with cycling and powerful completion"; description = "Enhance Emacs minibuffer input with cycling and powerful completion";
license = stdenv.lib.licenses.gpl2Plus; license = stdenv.lib.licenses.gpl2Plus;
platforms = emacs.meta.platforms;
maintainers = with stdenv.lib.maintainers; [ scolobb ];
}; };
} }

1663
pkgs/applications/editors/emacs-modes/melpa-generated.nix
View file

File diff suppressed because it is too large Load diff

365
pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
View file

@ -548,12 +548,12 @@
ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild { melpaBuild {
pname = "ac-php"; pname = "ac-php";
version = "1.8"; version = "1.8.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xcwen"; owner = "xcwen";
repo = "ac-php"; repo = "ac-php";
rev = "7a50b7debd149a30b84f0e2e57a4662926d96a24"; rev = "317ad1d023db6b2fe67444a2c075e656c35f5094";
sha256 = "15kmzkkgrhwind66kiyc2kpl27jrbzcs79i3w5s7fzzjjg9h18lb"; sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@ -569,12 +569,12 @@
ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
melpaBuild { melpaBuild {
pname = "ac-php-core"; pname = "ac-php-core";
version = "1.8"; version = "1.8.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xcwen"; owner = "xcwen";
repo = "ac-php"; repo = "ac-php";
rev = "7a50b7debd149a30b84f0e2e57a4662926d96a24"; rev = "317ad1d023db6b2fe67444a2c075e656c35f5094";
sha256 = "15kmzkkgrhwind66kiyc2kpl27jrbzcs79i3w5s7fzzjjg9h18lb"; sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@ -989,12 +989,12 @@
aes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: aes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "aes"; pname = "aes";
version = "0.8"; version = "0.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Sauermann"; owner = "Sauermann";
repo = "emacs-aes"; repo = "emacs-aes";
rev = "d78796facc034b09f379cda5f27090f3139305ec"; rev = "b7d5da89c3443292e4f0b1c9d254d459933cf5af";
sha256 = "1y9bw2vkl952pha2dsi18swyr94mihgwlcg5m8hg4d5bfg2fzcb2"; sha256 = "0nz1lf77qr3vm90rm02d4inw8glav722rxsiqds76m4xsjrq02m7";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/33ca3106852f82624b36c7e3f03f5c0c620f304f/recipes/aes"; url = "https://raw.githubusercontent.com/milkypostman/melpa/33ca3106852f82624b36c7e3f03f5c0c620f304f/recipes/aes";
@ -1073,12 +1073,12 @@
ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "ahungry-theme"; pname = "ahungry-theme";
version = "1.6.0"; version = "1.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ahungry"; owner = "ahungry";
repo = "color-theme-ahungry"; repo = "color-theme-ahungry";
rev = "2b06d75096d6a1c06682b70e229f2c932e9eac2c"; rev = "32ce7765c95559f6a0552cdaeedb6eb97bb7a476";
sha256 = "1jxss4gnlg2vkgf10v1kj1c7isbh7vh040iqrzjkrhclf4qiag5d"; sha256 = "0c1xwqknhjx6y29fwca949r8d2fqb17mca5qc79pdxdlp3l606fg";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme"; url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme";
@ -3331,6 +3331,27 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
build-status = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "build-status";
version = "0.0.2";
src = fetchFromGitHub {
owner = "sshaw";
repo = "build-status";
rev = "c29a0146c5d0be274f5e17921e01698f572c23a1";
sha256 = "03f0h7sp0sr9kjyhvcx7i34lvc26f5x8nikfidihgzhrqpprv2b6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/23bbe012f313cf0cf4c45a66eb0bee9361ced564/recipes/build-status";
sha256 = "0ckyf0asll50gifx1v0qqzpimjms8i1rgw9bnqiyj861qn5hch92";
name = "build-status";
};
packageRequires = [ cl-lib ];
meta = {
homepage = "https://melpa.org/#/build-status";
license = lib.licenses.free;
};
}) {};
bundler = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: bundler = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "bundler"; pname = "bundler";
@ -3670,12 +3691,12 @@
caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "caml"; pname = "caml";
version = "4.6.0beta2"; version = "4.6.0pre1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ocaml"; owner = "ocaml";
repo = "ocaml"; repo = "ocaml";
rev = "817604da4d38362b6b2bd4c7787a5add6741cd21"; rev = "500625015d40f716e19278209faaa44216dcff58";
sha256 = "1d49kiv9nfr624924qwmf0mfsvja28mvliipaylfbslyb3f7jpkl"; sha256 = "1s10wirx080yl0gd2n09lw5kj8yy1mbiipmcr8gpfyc8dq7kfjna";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml";
@ -4235,12 +4256,12 @@
circadian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: circadian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "circadian"; pname = "circadian";
version = "0.2.3"; version = "0.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "GuidoSchmidt"; owner = "GuidoSchmidt";
repo = "circadian.el"; repo = "circadian.el";
rev = "0034de1551de9f420f42267f3ec081351c2b5d7f"; rev = "feec308591b43e7869d7a018d5c6fc7e943d53ee";
sha256 = "1khczk5lsiicyjra7g5m3dcl1rc6g43zbypigkj3izx2dsa47n5d"; sha256 = "0j8an9ny3jk9nmlpi360n064m20nhah9p8rj6wb9xbvnfrri5zjk";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/circadian"; url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/circadian";
@ -4667,12 +4688,12 @@
cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "cmake-mode"; pname = "cmake-mode";
version = "3.10.0pre3"; version = "3.10.0pre4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Kitware"; owner = "Kitware";
repo = "CMake"; repo = "CMake";
rev = "319622a49fb300cd8a7efd8378421a32204510de"; rev = "45da558742bad36be518e8d95dee0d0ec3793a64";
sha256 = "19n0s0kd051xh3av9nd5ncpccx6bmvay6115g0kqgmi8wbw7587q"; sha256 = "0qq7dhwcl290ymza5imc16cg3f9crxym1q6b4i7w9fax8x2vlc1m";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@ -5294,6 +5315,27 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
company-lsp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }:
melpaBuild {
pname = "company-lsp";
version = "1.0.0";
src = fetchFromGitHub {
owner = "tigersoldier";
repo = "company-lsp";
rev = "86fda23d29b732ba3987bf20901034da1515b077";
sha256 = "068lg2yrpnzq8cg73irnx7i41giww7m0ysnl2inc7hikhmm3a95y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp";
sha256 = "09nbi6vxw8l26gfgsc1k3bx4m8i1px1b0jxaywszky5bv4fdy03l";
name = "company-lsp";
};
packageRequires = [ company emacs lsp-mode s ];
meta = {
homepage = "https://melpa.org/#/company-lsp";
license = lib.licenses.free;
};
}) {};
company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }: company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }:
melpaBuild { melpaBuild {
pname = "company-math"; pname = "company-math";
@ -5360,12 +5402,12 @@
company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "company-php"; pname = "company-php";
version = "1.8"; version = "1.8.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xcwen"; owner = "xcwen";
repo = "ac-php"; repo = "ac-php";
rev = "7a50b7debd149a30b84f0e2e57a4662926d96a24"; rev = "317ad1d023db6b2fe67444a2c075e656c35f5094";
sha256 = "15kmzkkgrhwind66kiyc2kpl27jrbzcs79i3w5s7fzzjjg9h18lb"; sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@ -5660,12 +5702,12 @@
conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
melpaBuild { melpaBuild {
pname = "conda"; pname = "conda";
version = "0.0.7"; version = "0.0.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "necaris"; owner = "necaris";
repo = "conda.el"; repo = "conda.el";
rev = "6ba9ef5d72ef613f478e07e2ebf57b47066beee7"; rev = "526be691824f4a32299f560a883913697bc4d847";
sha256 = "0mp6jzyvz3m41vb4kwwikyvcjgc8qgryyx71n1m50jr2i23s9nk2"; sha256 = "1jix3md6b02fypjm4y05av7acjkqryd1vqqz9wgxyinydlagrvh7";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda"; url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda";
@ -6329,6 +6371,27 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
cwl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }:
melpaBuild {
pname = "cwl-mode";
version = "0.2.4";
src = fetchFromGitHub {
owner = "tom-tan";
repo = "cwl-mode";
rev = "c5110c1e035535a1133a7107c0d2d55e5fe3c5b9";
sha256 = "088998r78bpy77pb2rhbr6a2fks5mcy3qyvyzlqwwl0v2gnscl59";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2309764cd56d9631dd97981a78b50b9fe793a280/recipes/cwl-mode";
sha256 = "0x8akxxmphpgsc2m78h6b0fs6vvcfvmi1q2jrz8hwlmai8f7zi9j";
name = "cwl-mode";
};
packageRequires = [ emacs yaml-mode ];
meta = {
homepage = "https://melpa.org/#/cwl-mode";
license = lib.licenses.free;
};
}) {};
cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "cyberpunk-theme"; pname = "cyberpunk-theme";
@ -6374,12 +6437,12 @@
cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "cython-mode"; pname = "cython-mode";
version = "0.27.1"; version = "0.27.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cython"; owner = "cython";
repo = "cython"; repo = "cython";
rev = "32538fc162be830bf01ff96e43a020bc4924a1ee"; rev = "41b4a28d7c7c505d58502c9cf69bde2e33091de0";
sha256 = "03v4ig9zlh8dz9s0c31f5hz2wfpvjydiidb0zgghnrshlqacpyj3"; sha256 = "04k534xyr8816821y0lf2dq24bzvb40v99ijdwgy5qhv4rjxbr18";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@ -8057,15 +8120,36 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
eacl = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "eacl";
version = "1.0.2";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "eacl";
rev = "c7a8d705295dc51cc306cb4c2d8773e24c4c74f4";
sha256 = "1f3liqrw55v9wnf7g475iabx4pf7gbg2x82mqrf22hhkvxzi2b2b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8223bec7eed97f0bad300af9caa4c8207322d39a/recipes/eacl";
sha256 = "16afsf3diz498jb63q85lm5ifvm487clfl838qzagl1l4aywhlwr";
name = "eacl";
};
packageRequires = [ emacs ivy ];
meta = {
homepage = "https://melpa.org/#/eacl";
license = lib.licenses.free;
};
}) {};
easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "easy-hugo"; pname = "easy-hugo";
version = "2.0.15"; version = "2.0.16";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "masasam"; owner = "masasam";
repo = "emacs-easy-hugo"; repo = "emacs-easy-hugo";
rev = "0b55c207c6552223857de03bf8aec8be3344ed26"; rev = "d55472bdb08850fb3b2b27a373630c68f6cd2ac0";
sha256 = "103ivy1gmb22xacxj2b99zmilqy20nbzmwvmg5i6aqnya1vs97q0"; sha256 = "168wz1638arypqz6i0mzj1pw6mzgp6x10i2wz2vpgkw5p79zw46i";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@ -9139,12 +9223,12 @@
elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
melpaBuild { melpaBuild {
pname = "elpy"; pname = "elpy";
version = "1.16.1"; version = "1.17.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jorgenschaefer"; owner = "jorgenschaefer";
repo = "elpy"; repo = "elpy";
rev = "1e65cb6e988df088c299572464335b6f149addcd"; rev = "99f0b6401bff25d40b9f58123533271f7870a286";
sha256 = "01mfrn6mn8h9fkpkqg2shp21864ffjr7q5h3rpbnk6wpa3pmjc1m"; sha256 = "06n0vr8y5s8y7q9v96z030l1i9n29p622p36biyi5cjcmgf5h09j";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@ -9440,12 +9524,12 @@
embrace = callPackage ({ cl-lib ? null, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }: embrace = callPackage ({ cl-lib ? null, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "embrace"; pname = "embrace";
version = "0.1.3"; version = "0.1.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cute-jumper"; owner = "cute-jumper";
repo = "embrace.el"; repo = "embrace.el";
rev = "a57b4be5d60daf8c176f9bd35770540c2d3963c9"; rev = "dd5da196e5bcc5e6d87e1937eca0c21da4334ef2";
sha256 = "0sn81a7f8g5i4q74byfkj0jlg4aj0rxpfvx9sqv8azcg6wq2f65l"; sha256 = "1m0qyipkp5ydgcav8d0m58fbj1gilipbj7g8mg40iajr8wfqcjdc";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e8f07e3b5ba4ec4b0b79fba5a2cca5a3986218b6/recipes/embrace"; url = "https://raw.githubusercontent.com/milkypostman/melpa/e8f07e3b5ba4ec4b0b79fba5a2cca5a3986218b6/recipes/embrace";
@ -9479,20 +9563,21 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
emms = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { emms = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emms"; pname = "emms";
version = "4.3"; version = "4.4";
src = fetchgit { src = fetchgit {
url = "https://git.savannah.gnu.org/git/emms.git"; url = "https://git.savannah.gnu.org/git/emms.git";
rev = "4cb3ae341847e8e8586373a95a458a453469812d"; rev = "88fecd0234da595843ce6be4d3f9f2b755ff612d";
sha256 = "0bmxlrk2p51bw5lgh2arkcz1v9bw6rpflwk778rdzn0rhzhvhp5b"; sha256 = "0ycm2lggljhzrb10r3c322c7bb580gk125x9nvpvjrvsp74p8im0";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms"; url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms";
sha256 = "1xpry8h96gvjnc0v8x0vk5dnmlq1r7m3ljpampdwv9pfwl95fh94"; sha256 = "1xpry8h96gvjnc0v8x0vk5dnmlq1r7m3ljpampdwv9pfwl95fh94";
name = "emms"; name = "emms";
}; };
packageRequires = []; packageRequires = [ cl-lib ];
meta = { meta = {
homepage = "https://melpa.org/#/emms"; homepage = "https://melpa.org/#/emms";
license = lib.licenses.free; license = lib.licenses.free;
@ -10064,12 +10149,12 @@
erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "erlang"; pname = "erlang";
version = "20.1.2"; version = "20.1.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "erlang"; owner = "erlang";
repo = "otp"; repo = "otp";
rev = "919ef5de2858e606d4a9be3e0e995b0802c76e33"; rev = "a98379d0519c28f9bc9b673ed2c09fb1ad52456e";
sha256 = "0y76ci80wmzrxvj90bhiz6cvwbis34kcc6dzas9xxsj92b6sh7sk"; sha256 = "1672yqqh7ql88c6ifv555wvqrj8nyn5a2nph43n2nc43h7hhz17c";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@ -12585,6 +12670,27 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
flycheck-nimsuggest = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, nim-mode }:
melpaBuild {
pname = "flycheck-nimsuggest";
version = "0.8.1";
src = fetchFromGitHub {
owner = "yuutayamada";
repo = "flycheck-nimsuggest";
rev = "8b1c69e9aa924368bc4dadd4cde818ff158cd3f0";
sha256 = "0vnwy7b3xs2smbr6ah6yk8hq7vvsciq7d6m1qr91nfnazdgvxmvg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cb4170f002dbcd1906e81836f3ce035b1e81c379/recipes/flycheck-nimsuggest";
sha256 = "099mlzramm6z66zyjb6ypn7qb0hpvwbbgk9ydsanj8sni0dd66hv";
name = "flycheck-nimsuggest";
};
packageRequires = [ emacs flycheck nim-mode ];
meta = {
homepage = "https://melpa.org/#/flycheck-nimsuggest";
license = lib.licenses.free;
};
}) {};
flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "flycheck-objc-clang"; pname = "flycheck-objc-clang";
@ -19471,12 +19577,12 @@
import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }: import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "import-js"; pname = "import-js";
version = "1.0.0"; version = "2.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Galooshi"; owner = "Galooshi";
repo = "emacs-import-js"; repo = "emacs-import-js";
rev = "15d395126f57408d770a72db2e5f43271f90fa52"; rev = "0a1032894445062b87dbe4e2c8cdba35ac25c250";
sha256 = "1ipbfacjx9vqqhvsf9sgfci8vqx0plks510w1gsjj0xwrpqn1f6l"; sha256 = "0vx2k4k8ig1k74ifxaxvhbkmfmba683qza7f9pp08daa43mgr1r3";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/import-js"; url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/import-js";
@ -19992,6 +20098,27 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
iter2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "iter2";
version = "0.9.4";
src = fetchFromGitHub {
owner = "doublep";
repo = "iter2";
rev = "a0e41b2f55d50c08c59ffcc6e83a977c141bcc55";
sha256 = "0ccr9qjhc35wi07yckd9y26synihhsg8zwkxgqyzkx7avxkqfyhn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d94316660051ee0ba0c12e380e6203986440368f/recipes/iter2";
sha256 = "0kl3z2wwpvk2ddsb3798g41pv0xycsf9dclhv00snpzsr61d9v65";
name = "iter2";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/iter2";
license = lib.licenses.free;
};
}) {};
ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "ivy"; pname = "ivy";
@ -20452,6 +20579,27 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
jetbrains = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "jetbrains";
version = "0.0.2";
src = fetchFromGitHub {
owner = "emacs-php";
repo = "jetbrains.el";
rev = "38e136079f3f2ddbe0e8b7dec01cf6b515e897d8";
sha256 = "1ji64qip5raf0lbv7fv36rd4fwa33zn0xi7sa0zrgf0kcsr0qasb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/00dd4626e261d9831fc62d866d50b7257ee418c4/recipes/jetbrains";
sha256 = "0254dkzf2x5dj3j549xjash0lsadkn0bdcyjkjlrv8hqvdr1f1m7";
name = "jetbrains";
};
packageRequires = [ cl-lib emacs f ];
meta = {
homepage = "https://melpa.org/#/jetbrains";
license = lib.licenses.free;
};
}) {};
jinja2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: jinja2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "jinja2-mode"; pname = "jinja2-mode";
@ -20518,12 +20666,12 @@
js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "js-auto-format-mode"; pname = "js-auto-format-mode";
version = "1.0.1"; version = "1.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ybiquitous"; owner = "ybiquitous";
repo = "js-auto-format-mode"; repo = "js-auto-format-mode";
rev = "705e300a2c880f6dbfa830d6c69818b7a3a95c09"; rev = "e0b7ae9d1d70fa74abd91bb6f901bd46db5a22eb";
sha256 = "1a3dwcknjydaxnyhaycgbmlncj92qkp3m5flmi6fyqjx11lz26ag"; sha256 = "1z5vi8681afm7jsqwifnb35sja1s4b2j123b3pn0bv1j6b8iaq9j";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode"; url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode";
@ -20956,24 +21104,24 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "kaolin-theme"; pname = "kaolin-themes";
version = "0.9"; version = "1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ogdenwebb"; owner = "ogdenwebb";
repo = "kaolin-theme"; repo = "emacs-kaolin-themes";
rev = "d43ba0e8e6b13b08e4d74de20c6e594ebb225501"; rev = "720762a42ad4cb4b325f78a9d41af380b8783501";
sha256 = "0gg19rh5q1gl6ylwrmjq0dqh6p5fkms1av6bbgry6fqv8220xf8n"; sha256 = "104prgkjqnnv1bqgpcl0di1q9sqkfnj4ibqvrk6ls32hw75shvdh";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a67c2a3ad82efcb32ba4943c7ac10fe2768d9d51/recipes/kaolin-theme"; url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes";
sha256 = "009064hhn39f9w9qxa3m0kwqhj5a12j7hg4916j9hslpwy5ghc0c"; sha256 = "1pd2v54d578f1wbwvqzplkdz1qvy8w8s6na511b0v5y9sksgm2xw";
name = "kaolin-theme"; name = "kaolin-themes";
}; };
packageRequires = [ emacs ]; packageRequires = [ autothemer cl-lib emacs ];
meta = { meta = {
homepage = "https://melpa.org/#/kaolin-theme"; homepage = "https://melpa.org/#/kaolin-themes";
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
@ -24629,6 +24777,27 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "nim-mode";
version = "0.4.1";
src = fetchFromGitHub {
owner = "nim-lang";
repo = "nim-mode";
rev = "86abed21b9b718ac65cc167f208e0bd5b92c79ed";
sha256 = "0h1paf9z6xvkay97ns74w2w9plwi46md5f2kik4jvjy74p57gxal";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode";
sha256 = "1kzn3kkkj7jzs7fqhvib196sl3vp7kbhb4icqzmvvmv366lkaib6";
name = "nim-mode";
};
packageRequires = [ commenter emacs epc flycheck let-alist ];
meta = {
homepage = "https://melpa.org/#/nim-mode";
license = lib.licenses.free;
};
}) {};
ninja-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: ninja-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "ninja-mode"; pname = "ninja-mode";
@ -24682,8 +24851,8 @@
sha256 = "1zpqpq6hd83prk80921nbjrvcmk0dykqrrr1mw3b29ppjma5zjiz"; sha256 = "1zpqpq6hd83prk80921nbjrvcmk0dykqrrr1mw3b29ppjma5zjiz";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4c885d9d9f1a37f05c715f89fae51efb580faced/recipes/nix-mode"; url = "https://raw.githubusercontent.com/milkypostman/melpa/e1870d786dbfac3b14386c8030e06f2d13ab9da6/recipes/nix-mode";
sha256 = "15xgqgrkypcplnfvl5j6w8abayzz8q0nw2wav01sdyx39ym005k3"; sha256 = "10f3ly4860lkxzykw4fbvhn3i0c2hgj77jfjbhlk2c1jz9x4yyy5";
name = "nix-mode"; name = "nix-mode";
}; };
packageRequires = [ emacs ]; packageRequires = [ emacs ];
@ -25472,8 +25641,8 @@
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "OmniSharp"; owner = "OmniSharp";
repo = "omnisharp-emacs"; repo = "omnisharp-emacs";
rev = "d7a63cd5f592c131615a3b6523fc2b2a04a9f00a"; rev = "906e29a702237f039f24c215fdb561a728a3df1b";
sha256 = "0cvsys9jyb0zbkj5q01q2fgjmcqvb12dxgfy049fl7a2gd9n55fj"; sha256 = "1l1rzl7y5j2wmlgx7ivivwvwvbn4h7pg5s7yqsk65n9kb59ha8s8";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@ -26109,12 +26278,12 @@
org-mru-clock = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: org-mru-clock = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "org-mru-clock"; pname = "org-mru-clock";
version = "0.1.1"; version = "0.1.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "unhammer"; owner = "unhammer";
repo = "org-mru-clock"; repo = "org-mru-clock";
rev = "096a7c514ab8487ec63def6281cf4dce24e3a626"; rev = "10f6a7021c82dc6795f4020e89889a5a72eb8832";
sha256 = "1hmyqvi1dj5yrlish8kw4sdh3yy0b0w33smw4cbjagp4rs29p3fp"; sha256 = "00f4l5w6p0l1x5ghpvbp5934m9m012fabvzb7apazwdr5c7xbd7q";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock"; url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock";
@ -27136,12 +27305,12 @@
ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild { melpaBuild {
pname = "ox-hugo"; pname = "ox-hugo";
version = "0.3.1"; version = "0.4.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kaushalmodi"; owner = "kaushalmodi";
repo = "ox-hugo"; repo = "ox-hugo";
rev = "16cf5d595644ee4e05b05b351e0c4fdd5df0ac44"; rev = "c32359c71e7926c7f13039069d8d7481dfb9bc82";
sha256 = "1n5xbgwv9x2b9zmv7nw0x64qbll4ycjf2dp09rdj3m4bmcg2gv42"; sha256 = "1nw2dp6rn3hnnzzffvpr6yz7c154338h9i5ixxgh5vjxm9phzdml";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo";
@ -28705,12 +28874,12 @@
pocket-reader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, org-web-tools, ov, pocket-lib, rainbow-identifiers, s }: pocket-reader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, org-web-tools, ov, pocket-lib, rainbow-identifiers, s }:
melpaBuild { melpaBuild {
pname = "pocket-reader"; pname = "pocket-reader";
version = "0.1"; version = "0.1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "alphapapa"; owner = "alphapapa";
repo = "pocket-reader.el"; repo = "pocket-reader.el";
rev = "93ef3a0737e93fb2e73f230fbb38f0b9f6f9d9bd"; rev = "e65a7e7529ece4fb7a738c062e73d5c07ace9574";
sha256 = "02l1yd0s7dnq6wj7lldbbxqq1libdcczygc2lzx4rdc5jnr4lnsh"; sha256 = "0bqxsvhmwvf0gpjmmh7pmzyw4lpcarj2prm52bgncch8x1f0gvnp";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/835a7bf2f72987183e9d15ada7ae747fb5715c11/recipes/pocket-reader"; url = "https://raw.githubusercontent.com/milkypostman/melpa/835a7bf2f72987183e9d15ada7ae747fb5715c11/recipes/pocket-reader";
@ -30957,22 +31126,22 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }: rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild { melpaBuild {
pname = "rg"; pname = "rg";
version = "1.3.1"; version = "1.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dajva"; owner = "dajva";
repo = "rg.el"; repo = "rg.el";
rev = "081685a8c624220ece68d6dca8d60016585b04ff"; rev = "5de611eae7787ecbc285fe7e31e412b9281a4e14";
sha256 = "094fy48h0mmih3g9dq7xhhdqq3dx3jbrg1x9qcq2szl3danndl6z"; sha256 = "18mhcipj5yywd5648pwm955wx3ipsnp9nwjyyl270qnn56hwkb6g";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
sha256 = "0i78qvqdznh1z3b0mnzihv07j8b9r86dc1lsa1qlzacv6a2i9sbm"; sha256 = "0i78qvqdznh1z3b0mnzihv07j8b9r86dc1lsa1qlzacv6a2i9sbm";
name = "rg"; name = "rg";
}; };
packageRequires = [ cl-lib emacs s seq ]; packageRequires = [ cl-lib emacs s ];
meta = { meta = {
homepage = "https://melpa.org/#/rg"; homepage = "https://melpa.org/#/rg";
license = lib.licenses.free; license = lib.licenses.free;
@ -33457,12 +33626,12 @@
sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "sparql-mode"; pname = "sparql-mode";
version = "2.1.1"; version = "3.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ljos"; owner = "ljos";
repo = "sparql-mode"; repo = "sparql-mode";
rev = "262c46a282ce54ca4745b863cf323d9bf69e2faa"; rev = "e220a0c0c478fee0be3622442651981cdd82090c";
sha256 = "02ai86c15x0fbgg2bw6a9k3k825gkhl3hy9abq62dfgdwc0cqxmn"; sha256 = "1k1ih6y9yq1fx13863yacx69v6f77b8xhkrx5i2dpm4h7wki1dg4";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode"; url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode";
@ -35135,12 +35304,12 @@
tickscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: tickscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "tickscript-mode"; pname = "tickscript-mode";
version = "0.3.1"; version = "0.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "msherry"; owner = "msherry";
repo = "tickscript-mode"; repo = "tickscript-mode";
rev = "eb6eafee2df253a0f1356f260cc7f435ab68aea2"; rev = "9acf389dd055ae77c92170802769838810472490";
sha256 = "04pd1dvvs914f98yaq5n0nv1jbjr2sjgi3a288vpismrmxfybcch"; sha256 = "1v60y244papzrirwqk9c2wcwgz4qp9h7m3887kvgr5ffn5imjss8";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c60ee1839f728c5041bde1fe4fa62c4d41c746ef/recipes/tickscript-mode"; url = "https://raw.githubusercontent.com/milkypostman/melpa/c60ee1839f728c5041bde1fe4fa62c4d41c746ef/recipes/tickscript-mode";
@ -37237,22 +37406,22 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
winum = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: winum = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "winum"; pname = "winum";
version = "1.0.2"; version = "2.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "deb0ch"; owner = "deb0ch";
repo = "emacs-winum"; repo = "emacs-winum";
rev = "8e886302c7e1d8fd521a95e0f00d6efab295a883"; rev = "c56d1cdb8d1723eb4c0d7a7eb3ecd2697739146c";
sha256 = "19rf806v3yv6qy6p8mf54g1whdrh7vc107z31kqaqdwq681fhi37"; sha256 = "09jd5srlnd4060hs719qil84ssmnvq196bz7ywaswgapv1gs1h6r";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c1caa7a54a910a44322fdee300e8cce6ddcde071/recipes/winum"; url = "https://raw.githubusercontent.com/milkypostman/melpa/c1caa7a54a910a44322fdee300e8cce6ddcde071/recipes/winum";
sha256 = "0yyvjmvqif6glh9ri6049nxcmgib9mxdhy6816kjhsaqr570f9pw"; sha256 = "0yyvjmvqif6glh9ri6049nxcmgib9mxdhy6816kjhsaqr570f9pw";
name = "winum"; name = "winum";
}; };
packageRequires = [ cl-lib ]; packageRequires = [ cl-lib dash ];
meta = { meta = {
homepage = "https://melpa.org/#/winum"; homepage = "https://melpa.org/#/winum";
license = lib.licenses.free; license = lib.licenses.free;
@ -38018,8 +38187,8 @@
version = "1.80"; version = "1.80";
src = fetchhg { src = fetchhg {
url = "https://www.yatex.org/hgrepos/yatex/"; url = "https://www.yatex.org/hgrepos/yatex/";
rev = "ca7cf34e959c"; rev = "16763e5b7481";
sha256 = "19pczpzl0wvkdassskcssq5qrpica0bffqxxi8sqp1j35px6v4ma"; sha256 = "1mrcc9amz0kflm570bd2cprhin0z8lr668k2s56mj6shixb61dwh";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex"; url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex";
@ -38276,12 +38445,12 @@
zoom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: zoom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "zoom"; pname = "zoom";
version = "0.1.0"; version = "0.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cyrus-and"; owner = "cyrus-and";
repo = "zoom"; repo = "zoom";
rev = "ed8aca43820678ff6e7b8ed697cba8dbb3a6136e"; rev = "d92ea444df6f6bb6cae92242f3269582d1b8ab40";
sha256 = "1na1syvbayqwbsvd1d0ajyzjvhg8q3s3mqrx82ffcbxr0ijyzzj8"; sha256 = "08riz3dd19c1dixm3c6j5dkkwjpgcib05pxq611w8z0mgsn0hsc5";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe094c99756ad29eda9bc51f31bb70c4ddc4131/recipes/zoom"; url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe094c99756ad29eda9bc51f31bb70c4ddc4131/recipes/zoom";

12
pkgs/applications/editors/emacs-modes/org-generated.nix
View file

@ -1,10 +1,10 @@
{ callPackage }: { { callPackage }: {
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org"; pname = "org";
version = "20171016"; version = "20171030";
src = fetchurl { src = fetchurl {
url = "http://orgmode.org/elpa/org-20171016.tar"; url = "http://orgmode.org/elpa/org-20171030.tar";
sha256 = "1v89wl8xlxavvv2kdd5vms0rwpqaw2x73q0162ybxmrzf4a5f5mw"; sha256 = "1g2dyzy1844lli2hhfjnbskn1mskccgaaf0mxb1cm0zhhas8bnfd";
}; };
packageRequires = []; packageRequires = [];
meta = { meta = {
@ -14,10 +14,10 @@
}) {}; }) {};
org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org-plus-contrib"; pname = "org-plus-contrib";
version = "20171016"; version = "20171030";
src = fetchurl { src = fetchurl {
url = "http://orgmode.org/elpa/org-plus-contrib-20171016.tar"; url = "http://orgmode.org/elpa/org-plus-contrib-20171030.tar";
sha256 = "0xy2xrndlhs4kyvh6mmv24dnh3fn5p63d2gaimnrypf1p8znwzh4"; sha256 = "0pq2hs5d2i6s036pcs0jn6ld2p1ap08dmbjf17hsh899741mg9cj";
}; };
packageRequires = []; packageRequires = [];
meta = { meta = {

4
pkgs/applications/editors/vim/common.nix
View file

@ -1,12 +1,12 @@
{ lib, fetchFromGitHub }: { lib, fetchFromGitHub }:
rec { rec {
version = "8.0.1150"; version = "8.0.1257";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vim"; owner = "vim";
repo = "vim"; repo = "vim";
rev = "v${version}"; rev = "v${version}";
sha256 = "1k1qkmb2jbymqikrp99q1yjagdf508xzabrw7b08dlh926b2v23j"; sha256 = "1y4c7wn5gr7n4c2ni36kadr26aldydxlf06yj7nsmw22ywwg78ig";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

54
pkgs/applications/graphics/autotrace/default.nix
View file

@ -66,5 +66,59 @@ stdenv.mkDerivation rec {
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ hodapp ]; maintainers = with maintainers; [ hodapp ];
license = licenses.gpl2; license = licenses.gpl2;
knownVulnerabilities = [
"CVE-2013-1953"
"CVE-2016-7392"
"CVE-2017-9151"
"CVE-2017-9152"
"CVE-2017-9153"
"CVE-2017-9154"
"CVE-2017-9155"
"CVE-2017-9156"
"CVE-2017-9157"
"CVE-2017-9158"
"CVE-2017-9159"
"CVE-2017-9160"
"CVE-2017-9161"
"CVE-2017-9162"
"CVE-2017-9163"
"CVE-2017-9164"
"CVE-2017-9165"
"CVE-2017-9166"
"CVE-2017-9167"
"CVE-2017-9168"
"CVE-2017-9169"
"CVE-2017-9170"
"CVE-2017-9171"
"CVE-2017-9172"
"CVE-2017-9173"
"CVE-2017-9174"
"CVE-2017-9175"
"CVE-2017-9176"
"CVE-2017-9177"
"CVE-2017-9178"
"CVE-2017-9179"
"CVE-2017-9180"
"CVE-2017-9181"
"CVE-2017-9182"
"CVE-2017-9183"
"CVE-2017-9184"
"CVE-2017-9185"
"CVE-2017-9186"
"CVE-2017-9187"
"CVE-2017-9188"
"CVE-2017-9189"
"CVE-2017-9190"
"CVE-2017-9191"
"CVE-2017-9192"
"CVE-2017-9193"
"CVE-2017-9194"
"CVE-2017-9195"
"CVE-2017-9196"
"CVE-2017-9197"
"CVE-2017-9198"
"CVE-2017-9199"
"CVE-2017-9200"
];
}; };
} }

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

@ -30,7 +30,9 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
sourceRoot = "${name}-src/ImageLounge"; setSourceRoot = ''
sourceRoot=$(echo */ImageLounge)
'';
patches = [./fix-appdata-install.patch]; patches = [./fix-appdata-install.patch];

4
pkgs/applications/graphics/screencloud/default.nix
View file

@ -43,7 +43,9 @@ stdenv.mkDerivation rec {
"-DCONSUMER_SECRET_SCREENCLOUD=${consumerSecret}" "-DCONSUMER_SECRET_SCREENCLOUD=${consumerSecret}"
]; ];
sourceRoot = "screencloud-v${version}-src/screencloud"; setSourceRoot = ''
sourceRoot=$(echo */screencloud)
'';
preConfigure = '' preConfigure = ''
# This needs to be set in preConfigure instead of cmakeFlags in order to # This needs to be set in preConfigure instead of cmakeFlags in order to

2
pkgs/applications/kde/ark/default.nix
View file

@ -27,7 +27,7 @@ mkDerivation {
lib.makeBinPath lib.makeBinPath
([ p7zip unzip zip ] ++ lib.optional unfreeEnableUnrar unrar); ([ p7zip unzip zip ] ++ lib.optional unfreeEnableUnrar unrar);
in '' in ''
wrapProgram "$out/bin/ark" --prefix PATH: "${PATH}" wrapProgram "$out/bin/ark" --prefix PATH : "${PATH}"
''; '';
meta = { meta = {
license = with lib.licenses; license = with lib.licenses;

2
pkgs/applications/kde/fetch.sh
View file

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/applications/17.08.1/ -A '*.tar.xz' ) WGET_ARGS=( https://download.kde.org/stable/applications/17.08.2/ -A '*.tar.xz' )

2232
pkgs/applications/kde/srcs.nix
View file

File diff suppressed because it is too large Load diff

33
pkgs/applications/misc/ipmicfg/default.nix Normal file
View file

@ -0,0 +1,33 @@
{ stdenv, fetchzip }:
stdenv.mkDerivation rec {
name = "ipmicfg-${version}";
version = "1.27.0";
buildVersion = "170620";
src = fetchzip {
url = "ftp://ftp.supermicro.com/utility/IPMICFG/IPMICFG_${version}_build.${buildVersion}.zip";
sha256 = "0jr2vih4hzymb62mbqyykwcrjhbhazf6wr1g0cq8ji586i3z3vw5";
};
installPhase = ''
mkdir -p "$out/bin" "$out/opt/ipmicfg"
cp Linux/64bit/* "$out/opt/ipmicfg"
patchelf "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}"
ln -s "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" "$out/bin/ipmicfg"
'';
dontPatchShebangs = true; # There are no scripts and it complains about null bytes.
meta = with stdenv.lib; {
description = "Supermicro IPMI configuration tool";
homepage = "http://www.supermicro.com/products/nfo/ipmi.cfm";
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ sorki ];
};
}

4
pkgs/applications/misc/josm/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "josm-${version}"; name = "josm-${version}";
version = "12921"; version = "13053";
src = fetchurl { src = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
sha256 = "1fp6mpl8fa91dhdf3hw5hk8xsp1imj7558adjnjkb6n4vmrbszhm"; sha256 = "0czsmx0gsml3vqzx6940jw2xpmh16idypydw0d4147k4fi9gzyz6";
}; };
buildInputs = [ jre8 makeWrapper ]; buildInputs = [ jre8 makeWrapper ];

16
pkgs/applications/misc/postage/default.nix → pkgs/applications/misc/pgmanage/default.nix
View file

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, runCommand, postgresql, openssl } : { stdenv, fetchFromGitHub, runCommand, postgresql, openssl } :
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "postage-${version}"; name = "pgmanage-${version}";
version = "3.2.18"; version = "10.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "workflowproducts"; owner = "pgManage";
repo = "postage"; repo = "pgManage";
rev = "eV${version}"; rev = "v${version}";
sha256 = "1kdg8pw2vxwkxw3b6dim4s740s60j3iyrh96524wi3lqkkq98krn"; sha256 = "0g9kvhs9b6kc1s7j90fqv71amiy9v0w5p906yfvl0j7pf3ayq35a";
}; };
buildInputs = [ postgresql openssl ]; buildInputs = [ postgresql openssl ];
@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
the style of NGINX and Node.js. This heart makes Postage as fast as any the style of NGINX and Node.js. This heart makes Postage as fast as any
PostgreSQL interface can hope to be. PostgreSQL interface can hope to be.
''; '';
homepage = http://www.workflowproducts.com/postage.html; homepage = https://github.com/pgManage/pgManage;
license = licenses.asl20; license = licenses.postgresql;
maintainers = [ maintainers.basvandijk ]; maintainers = [ maintainers.basvandijk ];
}; };
} }

2
pkgs/applications/misc/quicksynergy/default.nix
View file

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
Remember to open port 24800 (used by synergys program) if you want to Remember to open port 24800 (used by synergys program) if you want to
host mouse and keyboard."; host mouse and keyboard.";
homepage = https://code.google.com/p/quicksynergy/; homepage = https://sourceforge.net/projects/quicksynergy/;
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.spinus ]; maintainers = [ stdenv.lib.maintainers.spinus ];
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;

5
pkgs/applications/misc/terminal-notifier/default.nix
View file

@ -3,11 +3,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "terminal-notifier-${version}"; name = "terminal-notifier-${version}";
version = "1.5.0"; version = "2.0.0";
src = fetchzip { src = fetchzip {
url = "https://github.com/alloy/terminal-notifier/releases/download/${version}/terminal-notifier-${version}.zip"; url = "https://github.com/alloy/terminal-notifier/releases/download/${version}/terminal-notifier-${version}.zip";
sha256 = "09x7vl0kddivqq3pyrk6sg1f0sv5l7nj0bmblq222zk3b09bgg8p"; sha256 = "0gi54v92hi1fkryxlz3k5s5d8h0s66cc57ds0vbm1m1qk3z4xhb0";
stripRoot = false;
}; };
dontBuild = true; dontBuild = true;

14
pkgs/applications/networking/browsers/arora/default.nix
View file

@ -1,21 +1,25 @@
{ stdenv, fetchurl, qt4, qmake4Hook }: { stdenv, fetchFromGitHub, qt4, qmake4Hook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "arora-${version}"; name = "arora-${version}";
version = "0.11.0"; version = "0.11.0";
src = fetchurl { src = fetchFromGitHub {
url = "http://arora.googlecode.com/files/${name}.tar.gz"; owner = "Arora";
sha256 = "1ffkranxi93lrg5r7a90pix9j8xqmf0z1mb1m8579v9m34cyypvg"; repo = "arora";
rev = version;
sha256 = "0wmivgx3mw51rghi6q8fgivpkqc98z2mqmllf7c98ln0wd8rkf3c";
}; };
buildInputs = [ qt4 ]; buildInputs = [ qt4 ];
nativeBuildInputs = [ qmake4Hook ]; nativeBuildInputs = [ qmake4Hook ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
platforms = qt4.meta.platforms; platforms = qt4.meta.platforms;
maintainers = [ maintainers.phreedom ]; maintainers = [ maintainers.phreedom ];
description = "A cross-platform Qt4 Webkit browser"; description = "A cross-platform Qt4 Webkit browser";
homepage = http://arora.googlecode.com; homepage = https://github.com/Arora/arora;
}; };
} }

762
pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
View file

File diff suppressed because it is too large Load diff

772
pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
View file

File diff suppressed because it is too large Load diff

10
pkgs/applications/networking/browsers/firefox/packages.nix
View file

@ -54,8 +54,7 @@ rec {
unpackPhase = '' unpackPhase = ''
# fetchFromGitHub produces ro sources, root dir gets a name that # fetchFromGitHub produces ro sources, root dir gets a name that
# is too long for shebangs. fixing # is too long for shebangs. fixing
cp -a $src . cp -a $src tor-browser
mv *-src tor-browser
chmod -R +w tor-browser chmod -R +w tor-browser
cd tor-browser cd tor-browser
@ -106,9 +105,10 @@ in rec {
# FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SLNOS"; owner = "SLNOS";
repo = "tor-browser"; repo = "tor-browser";
rev = "tor-browser-45.8.0esr-6.5-2"; # branch "tor-browser-45.8.0esr-6.5-2"
sha256 = "0vbcp1qlxjlph0dqibylsyvb8iah3lnzdxc56hllpvbn51vrp39j"; rev = "e4140ea01b9906934f0347e95f860cec207ea824";
sha256 = "0a1qk3a9a3xxrl56bp4zbknbchv5x17k1w5kgcf4j3vklcv6av60";
}; };
} // commonAttrs) { } // commonAttrs) {
stdenv = overrideCC stdenv gcc5; stdenv = overrideCC stdenv gcc5;

6
pkgs/applications/networking/cluster/kops/default.nix
View file

@ -2,7 +2,7 @@
buildGoPackage rec { buildGoPackage rec {
name = "kops-${version}"; name = "kops-${version}";
version = "1.6.2"; version = "1.7.1";
goPackagePath = "k8s.io/kops"; goPackagePath = "k8s.io/kops";
@ -10,7 +10,7 @@ buildGoPackage rec {
rev = version; rev = version;
owner = "kubernetes"; owner = "kubernetes";
repo = "kops"; repo = "kops";
sha256 = "0bxknjhzj9xiws6sjw9knwqma3fjh496vnm90skl766bk4pafq9l"; sha256 = "0wii6w6hs9hjz3vvgqwa5ilwdi8a3qknmqsg3izazmgmnhl712wd";
}; };
buildInputs = [go-bindata]; buildInputs = [go-bindata];
@ -39,7 +39,7 @@ buildGoPackage rec {
description = "Easiest way to get a production Kubernetes up and running"; description = "Easiest way to get a production Kubernetes up and running";
homepage = https://github.com/kubernetes/kops; homepage = https://github.com/kubernetes/kops;
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [offline]; maintainers = with maintainers; [offline zimbatm];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

148
pkgs/applications/networking/dropbox/default.nix
View file

@ -1,57 +1,23 @@
{ mkDerivation, stdenv, lib, fetchurl, makeDesktopItem { stdenv, lib, buildFHSUserEnv, writeScript, makeDesktopItem }:
, makeWrapper, patchelf
, dbus_libs, fontconfig, freetype, gcc, glib
, libdrm, libffi, libICE, libSM
, libX11, libXcomposite, libXext, libXmu, libXrender, libxcb
, libxml2, libxslt, ncurses, zlib
, qtbase, qtdeclarative, qtwebkit, wmctrl
}:
# this package contains the daemon version of dropbox let platforms = [ "i686-linux" "x86_64-linux" ]; in
# it's unfortunately closed source
#
# note: the resulting program has to be invoced as
# 'dropbox' because the internal python engine takes
# uses the name of the program as starting point.
# Dropbox ships with its own copies of some libraries. assert lib.elem stdenv.system platforms;
# Unfortunately, upstream makes changes to the source of
# some libraries, rendering them incompatible with the
# open-source versions. Wherever possible, we must try
# to make the bundled libraries work, rather than replacing
# them with our own.
# Dropbox client to bootstrap installation.
# The client is self-updating, so the actual version may be newer.
let let
## Prefetch commands to run after update, from this directory: version = "38.4.27";
## e.g. with Emacs: C-u M-x shell-command
# nix-prefetch-url ../../../../ -A dropbox.src
# nix-prefetch-url ../../../../ -A pkgsi686Linux.dropbox.src
# NOTE: When updating, please also update in current stable,
# as older versions stop working
version = "37.4.29";
sha256 = {
"x86_64-linux" = "0ymy8gb57bjq2mq35n52q2viww6am7wy0vskyvypliicggga8iaj";
"i686-linux" = "0a7zir6x7z3ad71fj1iljc2l6x09f4wi40jfaiinf8ykx85cldw6";
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
arch = { arch = {
"x86_64-linux" = "x86_64"; "x86_64-linux" = "x86_64";
"i686-linux" = "x86"; "i686-linux" = "x86";
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); }.${stdenv.system};
# relative location where the dropbox libraries are stored installer = "https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.${arch}-${version}.tar.gz";
appdir = "opt/dropbox"; in
libs = [
dbus_libs fontconfig freetype gcc.cc glib libdrm libffi libICE libSM
libX11 libXcomposite libXext libXmu libXrender libxcb libxml2 libxslt
ncurses zlib
qtbase qtdeclarative qtwebkit
];
ldpath = stdenv.lib.makeLibraryPath libs;
let
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = "dropbox"; name = "dropbox";
exec = "dropbox"; exec = "dropbox";
@ -61,93 +27,37 @@ let
categories = "Network;FileTransfer;"; categories = "Network;FileTransfer;";
startupNotify = "false"; startupNotify = "false";
}; };
in
in mkDerivation { buildFHSUserEnv {
name = "dropbox-${version}"; name = "dropbox";
src = fetchurl {
name = "dropbox-${version}.tar.gz";
url = "https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.${arch}-${version}.tar.gz";
inherit sha256;
};
sourceRoot = ".dropbox-dist"; targetPkgs = pkgs: with pkgs; with xlibs; [
libICE libSM libX11 libXcomposite libXdamage libXext libXfixes libXrender
nativeBuildInputs = [ makeWrapper patchelf ]; libXxf86vm libxcb
buildInputs = libs; curl dbus fontconfig freetype gcc glib gnutar libxml2 libxslt zlib
dontStrip = true; # already done ];
installPhase = ''
runHook preInstall
mkdir -p "$out/${appdir}"
cp -r --no-preserve=mode "dropbox-lnx.${arch}-${version}"/* "$out/${appdir}/"
# Vendored libraries interact poorly with our graphics drivers
rm "$out/${appdir}/libdrm.so.2"
rm "$out/${appdir}/libffi.so.6"
rm "$out/${appdir}/libGL.so.1"
rm "$out/${appdir}/libX11-xcb.so.1"
# Cannot use vendored Qt libraries due to problem with xkbcommon
rm "$out/${appdir}/"libQt5*.so.5
rm "$out/${appdir}/qt.conf"
rm -fr "$out/${appdir}/plugins"
extraInstallCommands = ''
mkdir -p "$out/share/applications" mkdir -p "$out/share/applications"
cp "${desktopItem}/share/applications/"* $out/share/applications cp "${desktopItem}/share/applications/"* $out/share/applications
mkdir -p "$out/share/icons"
ln -s "$out/${appdir}/images/hicolor" "$out/share/icons/hicolor"
mkdir -p "$out/bin"
RPATH="${ldpath}:$out/${appdir}"
chmod 755 $out/${appdir}/dropbox
makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \
--prefix LD_LIBRARY_PATH : "$RPATH"
rm $out/${appdir}/wmctrl
ln -s ${wmctrl}/bin/wmctrl $out/${appdir}/wmctrl
runHook postInstall
''; '';
preFixup = '' runScript = writeScript "install-and-start-dropbox" ''
INTERP=$(cat $NIX_CC/nix-support/dynamic-linker) if ! [ -d "$HOME/.dropbox-dist" ]; then
RPATH="${ldpath}:$out/${appdir}" # Dropbox is not installed.
getType='s/ *Type: *\([A-Z]*\) (.*/\1/' # Download and unpack the client. If a newer version is available,
find "$out/${appdir}" -type f -print | while read obj; do # the client will update itself when run.
dynamic=$(readelf -S "$obj" 2>/dev/null | grep "DYNAMIC" || true) curl '${installer}' | tar -C "$HOME" -x -z
if [[ -n "$dynamic" ]]; then fi
exec "$HOME/.dropbox-dist/dropboxd"
if readelf -l "$obj" 2>/dev/null | grep "INTERP" >/dev/null; then
echo "patching interpreter path in $type $obj"
patchelf --set-interpreter "$INTERP" "$obj"
fi
type=$(readelf -h "$obj" 2>/dev/null | grep 'Type:' | sed -e "$getType")
if [ "$type" == "EXEC" ] || [ "$type" == "DYN" ]; then
echo "patching RPATH in $type $obj"
oldRPATH=$(patchelf --print-rpath "$obj")
patchelf --set-rpath "''${oldRPATH:+$oldRPATH:}$RPATH" "$obj"
else
echo "unknown ELF type \"$type\"; not patching $obj"
fi
fi
done
paxmark m $out/${appdir}/dropbox
''; '';
meta = with lib; { meta = with lib; {
description = "Online stored folders (daemon version)"; description = "Online stored folders (daemon version)";
homepage = http://www.dropbox.com; homepage = http://www.dropbox.com/;
maintainers = with maintainers; [ ttuegel ];
license = licenses.unfree; license = licenses.unfree;
maintainers = with maintainers; [ ttuegel ];
platforms = [ "i686-linux" "x86_64-linux" ]; platforms = [ "i686-linux" "x86_64-linux" ];
}; };
} }

35
pkgs/applications/networking/gmailieer/default.nix Normal file
View file

@ -0,0 +1,35 @@
{ stdenv, fetchFromGitHub, python3Packages }:
python3Packages.buildPythonApplication rec {
name = "gmailieer";
version = "0.3";
src = fetchFromGitHub {
owner = "gauteh";
repo = "gmailieer";
rev = "v${version}";
sha256 = "1app783gf0p9p196nqsgbyl6s1bp304dfav86fqiq86h1scld787";
};
propagatedBuildInputs = with python3Packages; [
notmuch
oauth2client
google_api_python_client
tqdm
];
meta = with stdenv.lib; {
description = "Fast email-fetching and two-way tag synchronization between notmuch and GMail";
longDescription = ''
This program can pull email and labels (and changes to labels)
from your GMail account and store them locally in a maildir with
the labels synchronized with a notmuch database. The changes to
tags in the notmuch database may be pushed back remotely to your
GMail account.
'';
homepage = https://github.com/gauteh/gmailieer;
repositories.git = https://github.com/gauteh/gmailieer.git;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ kaiha ];
};
}

7
pkgs/applications/networking/instant-messengers/franz/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeDesktopItem { stdenv, fetchurl, makeDesktopItem, makeWrapper
, xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig , xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig
, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify }: , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:
let let
bits = if stdenv.system == "x86_64-linux" then "x64" bits = if stdenv.system == "x86_64-linux" then "x64"
@ -39,6 +39,8 @@ in stdenv.mkDerivation rec {
# don't remove runtime deps # don't remove runtime deps
dontPatchELF = true; dontPatchELF = true;
buildInputs = [ makeWrapper ];
unpackPhase = '' unpackPhase = ''
tar xzf $src tar xzf $src
''; '';
@ -59,6 +61,7 @@ in stdenv.mkDerivation rec {
postFixup = '' postFixup = ''
paxmark m $out/opt/franz/Franz paxmark m $out/opt/franz/Franz
wrapProgram $out/opt/franz/Franz --prefix PATH : ${xdg_utils}/bin
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

4
pkgs/applications/networking/instant-messengers/hipchat/default.nix
View file

@ -4,7 +4,7 @@
let let
version = "4.29.4.1662"; version = "4.30.0.1663";
rpath = stdenv.lib.makeLibraryPath [ rpath = stdenv.lib.makeLibraryPath [
xdg_utils xdg_utils
@ -44,7 +44,7 @@ let
if stdenv.system == "x86_64-linux" then if stdenv.system == "x86_64-linux" then
fetchurl { fetchurl {
url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb";
sha256 = "1cz9zv9aj8xdrjs6dgi7fpm4q9l9find4m8l0nmvac2s4r60vw6y"; sha256 = "13mh49nx75pvaygzi70sg96iad3mn9ym0p4p3ja46amkxbdkq7h7";
} }
else else
throw "HipChat is not supported on ${stdenv.system}"; throw "HipChat is not supported on ${stdenv.system}";

11
pkgs/applications/networking/instant-messengers/mikutter/Gemfile
View file

@ -11,13 +11,13 @@ group :default do
gem 'oauth', '>= 0.5.1' gem 'oauth', '>= 0.5.1'
gem 'json_pure', '~> 1.8' gem 'json_pure', '~> 1.8'
gem 'addressable', '~> 2.3' gem 'addressable', '~> 2.3'
gem 'memoist', '~> 0.14' gem 'memoist', '>= 0.16', '< 0.17'
gem 'ruby-hmac', '~> 0.4' gem 'ruby-hmac', '~> 0.4'
gem 'typed-array', '~> 0.1' gem 'typed-array', '~> 0.1'
gem 'delayer', '~> 0.0' gem 'delayer', '~> 0.0'
gem 'pluggaloid', '>= 1.1.1', '< 2.0' gem 'pluggaloid', '>= 1.1.1', '< 2.0'
gem 'delayer-deferred', '>= 1.0.4', '< 2.0' gem 'delayer-deferred', '>= 1.0.4', '< 1.1'
gem 'twitter-text', '1.14.2' gem 'twitter-text', '>= 1.14.6'
end end
group :test do group :test do
@ -31,7 +31,10 @@ end
group :plugin do group :plugin do
Dir.glob(File.expand_path(File.join(File.dirname(__FILE__), "core/plugin/*/Gemfile"))){ |path| Dir.glob(File.expand_path(File.join(__dir__, 'core/plugin/*/Gemfile'))){ |path|
eval File.open(path).read
}
Dir.glob(File.join(File.expand_path(ENV['MIKUTTER_CONFROOT'] || '~/.mikutter'), 'plugin/*/Gemfile')){ |path|
eval File.open(path).read eval File.open(path).read
} }
end end

85
pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock
View file

@ -1,67 +1,72 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
addressable (2.5.1) addressable (2.5.2)
public_suffix (~> 2.0, >= 2.0.2) public_suffix (>= 2.0.2, < 4.0)
atk (3.1.1) atk (3.1.9)
glib2 (= 3.1.1) glib2 (= 3.1.9)
cairo (1.15.7) cairo (1.15.10)
native-package-installer native-package-installer (>= 1.0.3)
pkg-config (>= 1.1.5) pkg-config (>= 1.2.2)
cairo-gobject (3.1.9)
cairo
glib2 (= 3.1.9)
crack (0.4.3) crack (0.4.3)
safe_yaml (~> 1.0.0) safe_yaml (~> 1.0.0)
delayer (0.0.2) delayer (0.0.2)
delayer-deferred (1.1.1) delayer-deferred (1.0.4)
delayer (>= 0.0.2, < 0.1) delayer (>= 0.0.2, < 0.1)
gdk_pixbuf2 (3.1.1) gdk_pixbuf2 (3.1.9)
gio2 (= 3.1.1) gio2 (= 3.1.9)
gettext (3.0.9) gettext (3.0.9)
locale (>= 2.0.5) locale (>= 2.0.5)
text text
gio2 (3.1.1) gio2 (3.1.9)
glib2 (= 3.1.1) glib2 (= 3.1.9)
gobject-introspection (= 3.1.1) gobject-introspection (= 3.1.9)
glib2 (3.1.1) glib2 (3.1.9)
pkg-config native-package-installer (>= 1.0.3)
gobject-introspection (3.1.1) pkg-config (>= 1.2.2)
glib2 (= 3.1.1) gobject-introspection (3.1.9)
gtk2 (3.1.1) glib2 (= 3.1.9)
atk (= 3.1.1) gtk2 (3.1.9)
gdk_pixbuf2 (= 3.1.1) atk (= 3.1.9)
pango (= 3.1.1) gdk_pixbuf2 (= 3.1.9)
hashdiff (0.3.4) pango (= 3.1.9)
hashdiff (0.3.7)
httpclient (2.8.3) httpclient (2.8.3)
instance_storage (1.0.0) instance_storage (1.0.0)
json_pure (1.8.6) json_pure (1.8.6)
locale (2.1.2) locale (2.1.2)
memoist (0.15.0) memoist (0.16.0)
metaclass (0.0.4) metaclass (0.0.4)
mini_portile2 (2.1.0) mini_portile2 (2.3.0)
mocha (0.14.0) mocha (0.14.0)
metaclass (~> 0.0.1) metaclass (~> 0.0.1)
moneta (1.0.0) moneta (1.0.0)
native-package-installer (1.0.1) native-package-installer (1.0.4)
nokogiri (1.7.2) nokogiri (1.8.1)
mini_portile2 (~> 2.1.0) mini_portile2 (~> 2.3.0)
oauth (0.5.1) oauth (0.5.3)
pango (3.1.1) pango (3.1.9)
cairo (>= 1.14.0) cairo (>= 1.14.0)
glib2 (= 3.1.1) cairo-gobject (= 3.1.9)
pkg-config (1.2.0) gobject-introspection (= 3.1.9)
pkg-config (1.2.8)
pluggaloid (1.1.1) pluggaloid (1.1.1)
delayer delayer
instance_storage (>= 1.0.0, < 2.0.0) instance_storage (>= 1.0.0, < 2.0.0)
power_assert (1.0.2) power_assert (1.1.1)
public_suffix (2.0.5) public_suffix (3.0.0)
rake (10.5.0) rake (10.5.0)
ruby-hmac (0.4.0) ruby-hmac (0.4.0)
ruby-prof (0.16.2) ruby-prof (0.16.2)
safe_yaml (1.0.4) safe_yaml (1.0.4)
test-unit (3.2.3) test-unit (3.2.6)
power_assert power_assert
text (1.3.1) text (1.3.1)
totoridipjp (0.1.0) totoridipjp (0.1.0)
twitter-text (1.14.2) twitter-text (1.14.7)
unf (~> 0.1.0) unf (~> 0.1.0)
typed-array (0.1.2) typed-array (0.1.2)
unf (0.1.4) unf (0.1.4)
@ -79,12 +84,12 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
addressable (~> 2.3) addressable (~> 2.3)
delayer (~> 0.0) delayer (~> 0.0)
delayer-deferred (>= 1.0.4, < 2.0) delayer-deferred (>= 1.0.4, < 1.1)
gettext (~> 3.0.1) gettext (~> 3.0.1)
gtk2 (= 3.1.1) gtk2 (= 3.1.9)
httpclient httpclient
json_pure (~> 1.8) json_pure (~> 1.8)
memoist (~> 0.14) memoist (>= 0.16, < 0.17)
mocha (~> 0.14) mocha (~> 0.14)
moneta moneta
nokogiri nokogiri
@ -95,10 +100,10 @@ DEPENDENCIES
ruby-prof ruby-prof
test-unit (~> 3.0) test-unit (~> 3.0)
totoridipjp totoridipjp
twitter-text (= 1.14.2) twitter-text (>= 1.14.6)
typed-array (~> 0.1) typed-array (~> 0.1)
watch (~> 0.1) watch (~> 0.1)
webmock (~> 1.17) webmock (~> 1.17)
BUNDLED WITH BUNDLED WITH
1.14.4 1.14.6

2
pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile
View file

@ -1,3 +1,3 @@
source 'https://rubygems.org' source 'https://rubygems.org'
gem 'gtk2', '3.1.1' gem 'gtk2', '3.1.9'

5
pkgs/applications/networking/instant-messengers/mikutter/default.nix
View file

@ -5,11 +5,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mikutter-${version}"; name = "mikutter-${version}";
version = "3.5.7"; version = "3.5.13";
src = fetchurl { src = fetchurl {
url = "https://mikutter.hachune.net/bin/mikutter.${version}.tar.gz"; url = "https://mikutter.hachune.net/bin/mikutter.${version}.tar.gz";
sha256 = "1vh5ap92q869j69hmmbznailaflmdp0km4sqdv06cpq7v8pwm28w"; sha256 = "2e01cd6cfe0caad663a381e5263f6d8030f0fb7cd8d4f858d320166516c7c320";
}; };
env = bundlerEnv { env = bundlerEnv {
@ -54,7 +54,6 @@ stdenv.mkDerivation rec {
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
broken = true;
description = "An extensible Twitter client"; description = "An extensible Twitter client";
homepage = https://mikutter.hachune.net; homepage = https://mikutter.hachune.net;
maintainers = with maintainers; [ midchildan ]; maintainers = with maintainers; [ midchildan ];

97
pkgs/applications/networking/instant-messengers/mikutter/gemset.nix
View file

@ -3,28 +3,37 @@
dependencies = ["public_suffix"]; dependencies = ["public_suffix"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1i8q32a4gr0zghxylpyy7jfqwxvwrivsxflg9mks6kx92frh75mh"; sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
type = "gem"; type = "gem";
}; };
version = "2.5.1"; version = "2.5.2";
}; };
atk = { atk = {
dependencies = ["glib2"]; dependencies = ["glib2"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "17x88g596s3pqfxplm5ia7anpcmd9kxs4nzmpf2h74bqwkbq2jrz"; sha256 = "18l99gv6828rn59q8k6blxg146b025fj44klrcisffw6h9s9qqxm";
type = "gem"; type = "gem";
}; };
version = "3.1.1"; version = "3.1.9";
}; };
cairo = { cairo = {
dependencies = ["native-package-installer" "pkg-config"]; dependencies = ["native-package-installer" "pkg-config"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "115ksrswbs7pg7kdfi2w8bi9xxv9gzmfvcjj8qj4dxy8dkvp3k4d"; sha256 = "1f0n057cj6cjz7f38pwnflrkbwkl8pm3g9ssa51flyxr7lcpcw7c";
type = "gem"; type = "gem";
}; };
version = "1.15.7"; version = "1.15.10";
};
cairo-gobject = {
dependencies = ["cairo" "glib2"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1qnsd9203qc6hl2i4hfzngr8v06rfk4vxfn6sbr8b4c1q4n0lq26";
type = "gem";
};
version = "3.1.9";
}; };
crack = { crack = {
dependencies = ["safe_yaml"]; dependencies = ["safe_yaml"];
@ -47,19 +56,19 @@
dependencies = ["delayer"]; dependencies = ["delayer"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1bw48i6qbxmjf2al4a0mw23nlkcrjrwsrdrabbwz62v8sdmdynpc"; sha256 = "1rp2hpik8gs1kzwwq831jwj1iv5bhfwd3dmm9nvizy3nqpz1gvvb";
type = "gem"; type = "gem";
}; };
version = "1.1.1"; version = "1.0.4";
}; };
gdk_pixbuf2 = { gdk_pixbuf2 = {
dependencies = ["gio2"]; dependencies = ["gio2"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0x9fzsazfi6f3iq7zkqc0vjl6311876dvff0000vg41rajv3rhh1"; sha256 = "0x7vna77qw26479dydzfs1sq7xmq31xfly2pn5fvh35wg0q4y07d";
type = "gem"; type = "gem";
}; };
version = "3.1.1"; version = "3.1.9";
}; };
gettext = { gettext = {
dependencies = ["locale" "text"]; dependencies = ["locale" "text"];
@ -74,45 +83,45 @@
dependencies = ["glib2" "gobject-introspection"]; dependencies = ["glib2" "gobject-introspection"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0ki9yxp860xk5cf04hrgvh386n93bkr0pf4c0kl3fx6pnwr4w3v0"; sha256 = "1dxyaxp32m19mynw20x39vkb50wa4jcxczwmbkq7pcg55j76wwhm";
type = "gem"; type = "gem";
}; };
version = "3.1.1"; version = "3.1.9";
}; };
glib2 = { glib2 = {
dependencies = ["pkg-config"]; dependencies = ["native-package-installer" "pkg-config"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "131jd26n2wwp2lrkyyfq5nb3qriasaym1zpygm991qzcaq79i444"; sha256 = "1y1ws895345a88wikqil1x87cpd7plmwfi635piam7il6vsb4h73";
type = "gem"; type = "gem";
}; };
version = "3.1.1"; version = "3.1.9";
}; };
gobject-introspection = { gobject-introspection = {
dependencies = ["glib2"]; dependencies = ["glib2"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0fbi1pxyq73d674cwznya6kda38yjp4ahc2xgxi9shsdqmqcx3vs"; sha256 = "04gla6z9y8g0d69wlwl0wr7pwyzqg132pfs1n9fq6fgkjb6l7sm3";
type = "gem"; type = "gem";
}; };
version = "3.1.1"; version = "3.1.9";
}; };
gtk2 = { gtk2 = {
dependencies = ["atk" "gdk_pixbuf2" "pango"]; dependencies = ["atk" "gdk_pixbuf2" "pango"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "00cbfl306xkglk0cc758vsvv1saaa24gvwh0m2jnzwgfwxk7mc5w"; sha256 = "1mshgsw2x0w5wfcp17qnsja50aafbjxy2g42kvk5sr19l0chkkkq";
type = "gem"; type = "gem";
}; };
version = "3.1.1"; version = "3.1.9";
}; };
hashdiff = { hashdiff = {
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1n6hj7k7b9hazac0j48ypbak2nqi5wy4nh5cjra6xl3a92r8db0a"; sha256 = "0yj5l2rw8i8jc725hbcpc4wks0qlaaimr3dpaqamfjkjkxl0hjp9";
type = "gem"; type = "gem";
}; };
version = "0.3.4"; version = "0.3.7";
}; };
httpclient = { httpclient = {
source = { source = {
@ -149,10 +158,10 @@
memoist = { memoist = {
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0yd3rd7bnbhn9n47qlhcii5z89liabdjhy3is3h6gq77gyfk4f5q"; sha256 = "0pq8fhqh8w25qcw9v3vzfb0i6jp0k3949ahxc3wrwz2791dpbgbh";
type = "gem"; type = "gem";
}; };
version = "0.15.0"; version = "0.16.0";
}; };
metaclass = { metaclass = {
source = { source = {
@ -165,10 +174,10 @@
mini_portile2 = { mini_portile2 = {
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1y25adxb1hgg1wb2rn20g3vl07qziq6fz364jc5694611zz863hb"; sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
type = "gem"; type = "gem";
}; };
version = "2.1.0"; version = "2.3.0";
}; };
mocha = { mocha = {
dependencies = ["metaclass"]; dependencies = ["metaclass"];
@ -190,44 +199,44 @@
native-package-installer = { native-package-installer = {
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1zh5x87y9dr16ic7vif2c3rnpr5k5wfs6kihpy4dnb9s0mqyqhsj"; sha256 = "0svj2sg7y7izl90qrvzd2fcb1rkq8bv3bd6lr9sh1ml18v3w882a";
type = "gem"; type = "gem";
}; };
version = "1.0.1"; version = "1.0.4";
}; };
nokogiri = { nokogiri = {
dependencies = ["mini_portile2"]; dependencies = ["mini_portile2"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0jd8q3pr5rkrxx1vklvhcqcgl8kmfv5c8ny36ni3z5mirw6cm70c"; sha256 = "105xh2zkr8nsyfaj2izaisarpnkrrl9000y3nyflg9cbzrfxv021";
type = "gem"; type = "gem";
}; };
version = "1.7.2"; version = "1.8.1";
}; };
oauth = { oauth = {
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1awhy8ddhixch44y68lail3h1d214rnl3y1yzk0msq5g4z2l62ky"; sha256 = "1a5cfg9pm3mxsmlk1slj652vza8nha2lpbpbmf3rrk0lh6zi4d0b";
type = "gem"; type = "gem";
}; };
version = "0.5.1"; version = "0.5.3";
}; };
pango = { pango = {
dependencies = ["cairo" "glib2"]; dependencies = ["cairo" "cairo-gobject" "gobject-introspection"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "18cc24lz4dmb7pavfspivbhbsypf40fhcbdzj8885zs0zr0dknby"; sha256 = "0swld0s01djjlqrari0ib75703mb7qr4ydn00cqfhdr7xim66hjk";
type = "gem"; type = "gem";
}; };
version = "3.1.1"; version = "3.1.9";
}; };
pkg-config = { pkg-config = {
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0fklf2dnk354ahxma3iki5cx7b8yn9khby162pz17z6f1f3xk84g"; sha256 = "056qb6cwbw2l9riq376wazx4kwd67cdilyclpa6j38mfsswpmzws";
type = "gem"; type = "gem";
}; };
version = "1.2.0"; version = "1.2.8";
}; };
pluggaloid = { pluggaloid = {
dependencies = ["delayer" "instance_storage"]; dependencies = ["delayer" "instance_storage"];
@ -241,18 +250,18 @@
power_assert = { power_assert = {
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "168ac459nv45a2lhdf86zv35lv9nr569ny5nh3kfnglnxyzyx0kr"; sha256 = "0h0s1clasynlbk3782801c61yx24pdv959fpw53g5yl8gxqj34iz";
type = "gem"; type = "gem";
}; };
version = "1.0.2"; version = "1.1.1";
}; };
public_suffix = { public_suffix = {
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q"; sha256 = "0snaj1gxfib4ja1mvy3dzmi7am73i0mkqr0zkz045qv6509dhj5f";
type = "gem"; type = "gem";
}; };
version = "2.0.5"; version = "3.0.0";
}; };
rake = { rake = {
source = { source = {
@ -290,10 +299,10 @@
dependencies = ["power_assert"]; dependencies = ["power_assert"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1kngxp21sqbm7kv7wnxfqk99ik3wv1bjab519vcbj8xj30a5y4py"; sha256 = "1gl5b2d6bysnm0a1zx54qn6iwd67f6gsjy0c7zb68ag0453rqcnv";
type = "gem"; type = "gem";
}; };
version = "3.2.3"; version = "3.2.6";
}; };
text = { text = {
source = { source = {
@ -315,10 +324,10 @@
dependencies = ["unf"]; dependencies = ["unf"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0lld6d8rzj1zrgs6b227mp675bn8ds56f1c9w9wvx321f6ibn6np"; sha256 = "1732h7hy1k152w8wfvjsx7b79alk45i5imwd37ia4qcx8hfm3gvg";
type = "gem"; type = "gem";
}; };
version = "1.14.2"; version = "1.14.7";
}; };
typed-array = { typed-array = {
source = { source = {

1
pkgs/applications/networking/instant-messengers/mikutter/shell.nix
View file

@ -8,6 +8,7 @@ pkgs.stdenv.mkDerivation {
]; ];
shellHook = '' shellHook = ''
export MIKUTTER_CONFROOT="/homeless-shelter"
truncate --size 0 Gemfile.lock truncate --size 0 Gemfile.lock
bundle lock bundle lock
bundle package --path=vendor/bundle --no-install bundle package --path=vendor/bundle --no-install

4
pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
View file

@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "1lxpz316jmns6i143v4j6sd6k0a4a54alw08rvwjckf2rig57lj2"; sha256 = "1lxpz316jmns6i143v4j6sd6k0a4a54alw08rvwjckf2rig57lj2";
}; };
sourceRoot = "skype4pidgin-${version}-src/skypeweb"; setSourceRoot = ''
sourceRoot=$(echo */skypeweb)
'';
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ pidgin json_glib ]; buildInputs = [ pidgin json_glib ];

13
pkgs/applications/networking/instant-messengers/rambox/default.nix
View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, dpkg { stdenv, fetchurl, dpkg, makeWrapper
, xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig , xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig
, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify }: , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:
let let
bits = if stdenv.system == "x86_64-linux" then "x64" bits = if stdenv.system == "x86_64-linux" then "x64"
else "ia32"; else "ia32";
version = "0.5.12"; version = "0.5.13";
runtimeDeps = [ runtimeDeps = [
udev libnotify udev libnotify
@ -23,14 +23,14 @@ in stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox_${version}-${bits}.deb"; url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox_${version}-${bits}.deb";
sha256 = if bits == "x64" then sha256 = if bits == "x64" then
"1jlvpq7wryz4vf6xlsb9c38jrhjiv18rdf2ndlv76png60wl8418" else "0bn562fr1wsnn3xsd4q2rrxi6c56vckrkfmjl2dqb30hpmj2vn0d" else
"063j3gcpp18wdvspy7d43cgv7i5v8c42hn2zpp083jixw9ddsqwa"; "180ndvkil5mk5idwnn7spfygnhhll6pjc342pfzgmzk46a723qs4";
}; };
# don't remove runtime deps # don't remove runtime deps
dontPatchELF = true; dontPatchELF = true;
buildInputs = [ dpkg ]; buildInputs = [ dpkg makeWrapper ];
unpackPhase = "dpkg-deb -x $src ."; unpackPhase = "dpkg-deb -x $src .";
@ -50,6 +50,7 @@ in stdenv.mkDerivation rec {
postFixup = '' postFixup = ''
paxmark m $out/opt/Rambox/rambox paxmark m $out/opt/Rambox/rambox
wrapProgram $out/opt/Rambox/rambox --prefix PATH : ${xdg_utils}/bin
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

4
pkgs/applications/networking/instant-messengers/slack/default.nix
View file

@ -4,7 +4,7 @@
let let
version = "2.8.0"; version = "2.8.2";
rpath = stdenv.lib.makeLibraryPath [ rpath = stdenv.lib.makeLibraryPath [
alsaLib alsaLib
@ -46,7 +46,7 @@ let
if stdenv.system == "x86_64-linux" then if stdenv.system == "x86_64-linux" then
fetchurl { fetchurl {
url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb"; url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb";
sha256 = "02khqi0qf8ryj6bkfla95mr3scvb99zrhihwdprdjqpgvy06wqhm"; sha256 = "019gzij6m1y9bv561nhbhgf2njp2svjqi5hs907pdjf7xwciwrkm";
} }
else else
throw "Slack is not supported on ${stdenv.system}"; throw "Slack is not supported on ${stdenv.system}";

14
pkgs/applications/networking/instant-messengers/utox/default.nix
View file

@ -1,26 +1,26 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, libtoxcore, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l { stdenv, fetchFromGitHub, cmake, pkgconfig, libtoxcore, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l
, libXrender, fontconfig, libXext, libXft, utillinux, git, libsodium }: , libXrender, fontconfig, libXext, libXft, utillinux, git, libsodium, libopus, check }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "utox-${version}"; name = "utox-${version}";
# >= 0.14 should have unit tests and dbus support
version = "0.13.1"; version = "0.16.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "uTox"; owner = "uTox";
repo = "uTox"; repo = "uTox";
rev = "v${version}"; rev = "v${version}";
sha256 = "07aa92isknxf7531jr9kgk89wl5rvv34jrvir043fs9xvim5zq99"; sha256 = "0ak10925v67yaga2pw9yzp0xkb5j1181srfjdyqpd29v8mi9j828";
}; };
buildInputs = [ buildInputs = [
libtoxcore dbus libvpx libX11 openal freetype libtoxcore dbus libvpx libX11 openal freetype
libv4l libXrender fontconfig libXext libXft filter-audio libv4l libXrender fontconfig libXext libXft filter-audio
libsodium libsodium libopus
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
cmake git pkgconfig cmake git pkgconfig check
]; ];
cmakeFlags = [ cmakeFlags = [
@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
doCheck = false; doCheck = false;
checkTarget = "test";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Lightweight Tox client"; description = "Lightweight Tox client";
homepage = https://github.com/uTox/uTox; homepage = https://github.com/uTox/uTox;

172
pkgs/applications/networking/irc/weechat/default.nix
View file

@ -1,81 +1,129 @@
{ stdenv, fetchurl, ncurses, openssl, aspell, gnutls { stdenv, fetchurl, fetchpatch, lib
, zlib, curl , pkgconfig, libgcrypt , ncurses, openssl, aspell, gnutls
, zlib, curl, pkgconfig, libgcrypt
, cmake, makeWrapper, libobjc, libresolv, libiconv , cmake, makeWrapper, libobjc, libresolv, libiconv
, writeScriptBin, symlinkJoin # for withPlugins
, asciidoctor # manpages , asciidoctor # manpages
, guileSupport ? true, guile , guileSupport ? true, guile
, luaSupport ? true, lua5 , luaSupport ? true, lua5
, perlSupport ? true, perl , perlSupport ? true, perl
, pythonPackages , pythonSupport ? true, pythonPackages
, rubySupport ? true, ruby , rubySupport ? true, ruby
, tclSupport ? true, tcl , tclSupport ? true, tcl
, extraBuildInputs ? [] }: , extraBuildInputs ? []
, configure ? null
assert guileSupport -> guile != null; , runCommand }:
assert luaSupport -> lua5 != null;
assert perlSupport -> perl != null;
assert rubySupport -> ruby != null;
assert tclSupport -> tcl != null;
let let
inherit (pythonPackages) python pycrypto pync; inherit (pythonPackages) python pycrypto pync;
in plugins = [
{ name = "perl"; enabled = perlSupport; cmakeFlag = "ENABLE_PERL"; buildInputs = [ perl ]; }
{ name = "tcl"; enabled = tclSupport; cmakeFlag = "ENABLE_TCL"; buildInputs = [ tcl ]; }
{ name = "ruby"; enabled = rubySupport; cmakeFlag = "ENABLE_RUBY"; buildInputs = [ ruby ]; }
{ name = "guile"; enabled = guileSupport; cmakeFlag = "ENABLE_GUILE"; buildInputs = [ guile ]; }
{ name = "lua"; enabled = luaSupport; cmakeFlag = "ENABLE_LUA"; buildInputs = [ lua5 ]; }
{ name = "python"; enabled = pythonSupport; cmakeFlag = "ENABLE_PYTHON"; buildInputs = [ python ]; }
];
enabledPlugins = builtins.filter (p: p.enabled) plugins;
stdenv.mkDerivation rec { weechat =
version = "1.9.1"; assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
name = "weechat-${version}"; stdenv.mkDerivation rec {
version = "1.9.1";
name = "weechat-${version}";
src = fetchurl { src = fetchurl {
url = "http://weechat.org/files/src/weechat-${version}.tar.bz2"; url = "http://weechat.org/files/src/weechat-${version}.tar.bz2";
sha256 = "1kgi079bq4n0wb7hc7mz8p7ay1b2m0a4wpvb92sfsxrnh10qr5m1"; sha256 = "1kgi079bq4n0wb7hc7mz8p7ay1b2m0a4wpvb92sfsxrnh10qr5m1";
}; };
outputs = [ "out" "man" ]; patches = [
# TODO: Remove this patch when weechat is updated to a release that
# incorporates weechat/weechat#971
(fetchpatch {
url = https://github.com/lheckemann/weechat/commit/45a4f0565cc745b9c6e943f20199015185696df0.patch;
sha256 = "0x7vv7g0k3b2hj444x2cinyv1mq5bkr6m18grfnyy6swbymzc9bj";
})
];
enableParallelBuilding = true; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;
cmakeFlags = with stdenv.lib; [
"-DENABLE_MAN=ON"
"-DENABLE_DOC=ON"
]
++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib" "-DCMAKE_FIND_FRAMEWORK=LAST"]
++ optional (!guileSupport) "-DENABLE_GUILE=OFF"
++ optional (!luaSupport) "-DENABLE_LUA=OFF"
++ optional (!perlSupport) "-DENABLE_PERL=OFF"
++ optional (!rubySupport) "-DENABLE_RUBY=OFF"
++ optional (!tclSupport) "-DENABLE_TCL=OFF"
;
buildInputs = with stdenv.lib; [ enableParallelBuilding = true;
ncurses python openssl aspell gnutls zlib curl pkgconfig cmakeFlags = with stdenv.lib; [
libgcrypt pycrypto makeWrapper "-DENABLE_MAN=ON"
cmake "-DENABLE_DOC=ON"
asciidoctor
] ]
++ optionals stdenv.isDarwin [ pync libobjc libresolv ] ++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib" "-DCMAKE_FIND_FRAMEWORK=LAST"]
++ optional guileSupport guile ++ map (p: "-D${p.cmakeFlag}=" + (if p.enabled then "ON" else "OFF")) plugins
++ optional luaSupport lua5 ;
++ optional perlSupport perl
++ optional rubySupport ruby
++ optional tclSupport tcl
++ extraBuildInputs;
NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}" buildInputs = with stdenv.lib; [
# Fix '_res_9_init: undefined symbol' error ncurses openssl aspell gnutls zlib curl pkgconfig
+ (stdenv.lib.optionalString stdenv.isDarwin "-DBIND_8_COMPAT=1 -lresolv"); libgcrypt makeWrapper cmake asciidoctor
]
++ optionals stdenv.isDarwin [ libobjc libresolv ]
++ concatMap (p: p.buildInputs) enabledPlugins
++ extraBuildInputs;
postInstall = with stdenv.lib; '' NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}"
NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages" # Fix '_res_9_init: undefined symbol' error
wrapProgram "$out/bin/weechat" \ + (stdenv.lib.optionalString stdenv.isDarwin "-DBIND_8_COMPAT=1 -lresolv");
${optionalString perlSupport "--prefix PATH : ${perl}/bin"} \
--prefix PATH : ${pythonPackages.python}/bin \
--prefix PYTHONPATH : "$PYTHONPATH" \
--prefix PYTHONPATH : "$NIX_PYTHONPATH"
'';
meta = { postInstall = with stdenv.lib; ''
homepage = http://www.weechat.org/; for p in ${concatMapStringsSep " " (p: p.name) enabledPlugins}; do
description = "A fast, light and extensible chat client"; from=$out/lib/weechat/plugins/$p.so
license = stdenv.lib.licenses.gpl3; to=''${!p}/lib/weechat/plugins/$p.so
maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny ]; mkdir -p $(dirname $to)
platforms = stdenv.lib.platforms.unix; mv $from $to
}; done
} '';
meta = {
homepage = http://www.weechat.org/;
description = "A fast, light and extensible chat client";
license = stdenv.lib.licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny lheckemann ];
platforms = stdenv.lib.platforms.unix;
};
};
in if configure == null then weechat else
let
perlInterpreter = perl;
config = configure {
availablePlugins = let
simplePlugin = name: {pluginFile = "${weechat.${name}}/lib/weechat/plugins/${name}.so";};
in rec {
python = {
pluginFile = "${weechat.python}/lib/weechat/plugins/python.so";
withPackages = pkgsFun: (python // {
extraEnv = ''
export PYTHONHOME="${pythonPackages.python.withPackages pkgsFun}"
'';
});
};
perl = (simplePlugin "perl") // {
extraEnv = ''
export PATH="${perlInterpreter}/bin:$PATH"
'';
};
tcl = simplePlugin "tcl";
ruby = simplePlugin "ruby";
guile = simplePlugin "guile";
lua = simplePlugin "lua";
};
};
inherit (config) plugins;
pluginsDir = runCommand "weechat-plugins" {} ''
mkdir -p $out/plugins
for plugin in ${lib.concatMapStringsSep " " (p: p.pluginFile) plugins} ; do
ln -s $plugin $out/plugins
done
'';
in writeScriptBin "weechat" ''
#!${stdenv.shell}
export WEECHAT_EXTRA_LIBDIR=${pluginsDir}
${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins}
exec ${weechat}/bin/weechat "$@"
''

12
pkgs/applications/office/abiword/default.nix
View file

@ -5,15 +5,19 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "abiword-${version}"; name = "abiword-${version}";
version = "3.0.1"; version = "3.0.2";
src = fetchurl { src = fetchurl {
url = "http://www.abisource.org/downloads/abiword/${version}/source/${name}.tar.gz"; url = "http://www.abisource.com/downloads/abiword/${version}/source/${name}.tar.gz";
sha256 = "1ik591rx15nn3n1297cwykl8wvrlgj78i528id9wbidgy3xzd570"; sha256 = "08imry821g81apdwym3gcs4nss0l9j5blqk31j5rv602zmcd9gxg";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
patches = [
./patches/fix-13791.patch
];
buildInputs = buildInputs =
[ pkgconfig gtk3 libglade librsvg bzip2 libgnomecanvas fribidi libpng popt [ pkgconfig gtk3 libglade librsvg bzip2 libgnomecanvas fribidi libpng popt
libgsf enchant wv libjpeg perl boost libxslt goffice makeWrapper iconTheme libgsf enchant wv libjpeg perl boost libxslt goffice makeWrapper iconTheme
@ -29,6 +33,6 @@ stdenv.mkDerivation rec {
homepage = http://www.abisource.com/; homepage = http://www.abisource.com/;
license = licenses.gpl3; license = licenses.gpl3;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ pSub ]; maintainers = with maintainers; [ pSub ylwghst ];
}; };
} }

161
pkgs/applications/office/abiword/patches/fix-13791.patch Normal file
View file

@ -0,0 +1,161 @@
From 46388f407c893123d9b3824a7570b050fc3b049b Mon Sep 17 00:00:00 2001
From: James Cameron <quozl@laptop.org>
Date: Thu, 17 Aug 2017 15:05:39 +1000
Subject: [PATCH] Fix flickering
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- in GR_Caret::s_blink_timeout, avoid repeated calls by stopping the
timer, it will be restarted when needed,
- in GR_Caret::s_enable, avoid extra unnecessary _blink calls when blink
is enabled, as they serve no purpose,
- in XAP_UnixFrameImpl::_fe::expose, use the Cairo clip rectangle
instead of the expose event area, thanks to Hubert Figuière in
865c1dda7e13deff04573ffc42028b71fee07f9c,
- in XAP_UnixFrameImpl::_fe::expose, do not return FALSE, as other
handlers will need to handle the draw event,
- in GR_UnixCairoGraphics::flush, fix excessive draw events;
gtk_widget_queue_draw only marks the widget as needing redrawing,
which causes a draw event for each call to flush, therefore every
caret blink, so use gdk_flush instead,
Fixes AbiSource #13791.
Fixes Debian #851052.
Fixes Fedora #1287835.
Fixes Ubuntu LP: #1574278.
Fixes Sugar Labs #4915.
Signed-off-by: James Cameron <quozl@laptop.org>
---
src/af/gr/gtk/gr_UnixCairoGraphics.cpp | 4 +---
src/af/gr/xp/gr_Caret.cpp | 13 ++++---------
src/af/xap/gtk/xap_UnixFrameImpl.cpp | 27 ++++++++++++++++++---------
src/af/xap/gtk/xap_UnixFrameImpl.h | 2 +-
4 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/src/af/gr/gtk/gr_UnixCairoGraphics.cpp b/src/af/gr/gtk/gr_UnixCairoGraphics.cpp
index 509bd37..7c3c06f 100644
--- a/src/af/gr/gtk/gr_UnixCairoGraphics.cpp
+++ b/src/af/gr/gtk/gr_UnixCairoGraphics.cpp
@@ -577,9 +577,7 @@ void GR_UnixCairoGraphics::_endPaint()
void GR_UnixCairoGraphics::flush(void)
{
- if (m_Widget) {
- gtk_widget_queue_draw(m_Widget);
- }
+ gdk_flush();
}
bool GR_UnixCairoGraphics::queryProperties(GR_Graphics::Properties gp) const
diff --git a/src/af/gr/xp/gr_Caret.cpp b/src/af/gr/xp/gr_Caret.cpp
index 5d5d116..a8aa451 100644
--- a/src/af/gr/xp/gr_Caret.cpp
+++ b/src/af/gr/xp/gr_Caret.cpp
@@ -155,22 +155,17 @@ void GR_Caret::s_enable(UT_Worker * _w)
{
GR_Caret * c = static_cast<GR_Caret *>(_w->getInstanceData());
+ c->m_enabler->stop();
c->m_worker->stop();
- c->_blink(true);
- if (!c->m_bCursorIsOn)
- c->_blink(true); // blink again
- else
- {
- c->_blink(true); // ?? - MARCM
- c->_blink(true);
- }
c->m_worker->start();
- c->m_enabler->stop();
+ c->_blink(true);
}
void GR_Caret::s_blink_timeout(UT_Worker * _w)
{
GR_Caret * c = static_cast<GR_Caret *>(_w->getInstanceData());
+
+ c->m_blinkTimeout->stop();
if (c->isEnabled())
c->disable();
}
diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.cpp b/src/af/xap/gtk/xap_UnixFrameImpl.cpp
index 780000e..e81961a 100644
--- a/src/af/xap/gtk/xap_UnixFrameImpl.cpp
+++ b/src/af/xap/gtk/xap_UnixFrameImpl.cpp
@@ -1208,15 +1208,23 @@ gint XAP_UnixFrameImpl::_fe::delete_event(GtkWidget * w, GdkEvent * /*event*/, g
}
#if GTK_CHECK_VERSION(3,0,0)
-gint XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
+gboolean XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
#else
gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
#endif
{
XAP_UnixFrameImpl * pUnixFrameImpl = static_cast<XAP_UnixFrameImpl *>(g_object_get_data(G_OBJECT(w), "user_data"));
FV_View * pView = static_cast<FV_View *>(pUnixFrameImpl->getFrame()->getCurrentView());
+ double x, y, width, height;
#if GTK_CHECK_VERSION(3,0,0)
- GdkEventExpose *pExposeEvent = reinterpret_cast<GdkEventExpose *>(gtk_get_current_event());
+ cairo_clip_extents (cr, &x, &y, &width, &height);
+ width -= x;
+ height -= y;
+#else
+ x = pExposeEvent->area.x;
+ y = pExposeEvent->area.y;
+ width = pExposeEvent->area.width;
+ height = pExposeEvent->area.height;
#endif
/* Jean: commenting out next lines since the zoom update code does draw only
* part of what needs to be updated. */
@@ -1230,20 +1238,21 @@ gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
UT_Rect rClip;
if (pGr->getPaintCount () > 0)
return TRUE;
- xxx_UT_DEBUGMSG(("Expose area: x %d y %d width %d height %d \n",pExposeEvent->area.x,pExposeEvent->area.y,pExposeEvent->area.width,pExposeEvent->area.height));
- rClip.left = pGr->tlu(pExposeEvent->area.x);
- rClip.top = pGr->tlu(pExposeEvent->area.y);
- rClip.width = pGr->tlu(pExposeEvent->area.width)+1;
- rClip.height = pGr->tlu(pExposeEvent->area.height)+1;
-#if GTK_CHECK_VERSION(3,0,0)
+ rClip.left = pGr->tlu(x);
+ rClip.top = pGr->tlu(y);
+ #if GTK_CHECK_VERSION(3,0,0)
+ rClip.width = pGr->tlu(width);
+ rClip.height = pGr->tlu(height);
static_cast<GR_CairoGraphics *>(pGr)->setCairo(cr);
pView->draw(&rClip);
static_cast<GR_CairoGraphics *>(pGr)->setCairo(NULL);
#else
+ rClip.width = pGr->tlu(width)+1;
+ rClip.height = pGr->tlu(height)+1;
pView->draw(&rClip);
#endif
}
- return FALSE;
+ return TRUE;
}
static bool bScrollWait = false;
diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.h b/src/af/xap/gtk/xap_UnixFrameImpl.h
index 30ee5d8..26fbb2e 100644
--- a/src/af/xap/gtk/xap_UnixFrameImpl.h
+++ b/src/af/xap/gtk/xap_UnixFrameImpl.h
@@ -152,7 +152,7 @@ protected:
static gint key_release_event(GtkWidget* w, GdkEventKey* e);
static gint delete_event(GtkWidget * w, GdkEvent * /*event*/, gpointer /*data*/);
#if GTK_CHECK_VERSION(3,0,0)
- static gint draw(GtkWidget * w, cairo_t * cr);
+ static gboolean draw(GtkWidget * w, cairo_t * cr);
#else
static gint expose(GtkWidget * w, GdkEventExpose* pExposeEvent);
#endif
--
2.11.0

47
pkgs/applications/office/wordgrinder/default.nix Normal file
View file

@ -0,0 +1,47 @@
{ stdenv, fetchFromGitHub, pkgconfig, makeWrapper
, lua52Packages, libXft, ncurses, readline, zlib }:
stdenv.mkDerivation rec {
name = "wordgrinder-${version}";
version = "0.6-db14181";
src = fetchFromGitHub {
repo = "wordgrinder";
owner = "davidgiven";
rev = "db141815e8bd1da6e684a1142a59492e516f3041";
sha256 = "1l1jqzcqiwnc8r1igfi7ay4pzzhdhss81znnmfr4rc1ia8bpdjc2";
};
makeFlags = [
"PREFIX=$(out)"
"LUA_INCLUDE=${lua52Packages.lua}/include"
"LUA_LIB=${lua52Packages.lua}/lib/liblua.so"
];
nativeBuildInputs = [ pkgconfig makeWrapper ];
buildInputs = [
libXft
lua52Packages.lua
ncurses
readline
zlib
];
# To be able to find <Xft.h>
NIX_CFLAGS_COMPILE = "-I${libXft.dev}/include/X11";
# Binaries look for LuaFileSystem library (lfs.so) at runtime
postInstall = ''
wrapProgram $out/bin/wordgrinder --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so";
wrapProgram $out/bin/xwordgrinder --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so";
'';
meta = with stdenv.lib; {
description = "Text-based word processor";
homepage = https://cowlark.com/wordgrinder;
license = licenses.mit;
maintainers = with maintainers; [ matthiasbeyer ];
platforms = with stdenv.lib.platforms; linux;
};
}

2
pkgs/applications/science/electronics/ngspice/default.nix
View file

@ -10,7 +10,7 @@ stdenv.mkDerivation {
buildInputs = [ readline libX11 flex bison libICE libXaw libXext ]; buildInputs = [ readline libX11 flex bison libICE libXaw libXext ];
configureFlags = [ "--enable-x" "--with-x" "--with-readline" "--enable-xspice" "--enable-cider" ]; configureFlags = [ "--enable-x" "--with-x" "--with-readline" "--enable-xspice" "--enable-cider" "--with-ngshared" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "The Next Generation Spice (Electronic Circuit Simulator)"; description = "The Next Generation Spice (Electronic Circuit Simulator)";

4
pkgs/applications/science/misc/golly/default.nix
View file

@ -20,7 +20,9 @@ stdenv.mkDerivation rec {
inherit (s) url sha256; inherit (s) url sha256;
}; };
sourceRoot="${name}-src/gui-wx/configure"; setSourceRoot = ''
sourceRoot=$(echo */gui-wx/configure)
'';
# Link against Python explicitly as it is needed for scripts # Link against Python explicitly as it is needed for scripts
makeFlags=[ makeFlags=[

2
pkgs/applications/version-management/gource/default.nix
View file

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
"-std=c++11"; # fix build with glm >= 0.9.6.0 "-std=c++11"; # fix build with glm >= 0.9.6.0
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://code.google.com/p/gource/; homepage = http://gource.io/;
description = "A Software version control visualization tool"; description = "A Software version control visualization tool";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
longDescription = '' longDescription = ''

15
pkgs/applications/virtualization/virt-manager/qt.nix
View file

@ -1,17 +1,17 @@
{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig { mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig
, qtbase, qtmultimedia, qtsvg , qtbase, qtmultimedia, qtsvg
, lxqt, libvncserver, libvirt, pixman, spice_gtk, spice_protocol , lxqt, libvncserver, libvirt, pcre, pixman, spice_gtk, spice_protocol
}: }:
mkDerivation rec { mkDerivation rec {
name = "virt-manager-qt-${version}"; name = "virt-manager-qt-${version}";
version = "0.43.72"; version = "0.45.75";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "F1ash"; owner = "F1ash";
repo = "qt-virt-manager"; repo = "qt-virt-manager";
rev = "${version}"; rev = "${version}";
sha256 = "0m8aqs58wnk404z2hav5j4yjsy8f0vfsm771pm0gprsfbx4sm3qg"; sha256 = "1s59g7kkz8481y8yyf89f549xwbg1978zj9ds61iy94mwz80b38n";
}; };
cmakeFlags = [ cmakeFlags = [
@ -19,21 +19,24 @@ mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
qtbase qtmultimedia qtsvg lxqt.qtermwidget # virt-manager-qt currently does not compile with qtermwidget-0.8.0
qtbase qtmultimedia qtsvg lxqt.qtermwidget_0_7_1
libvirt libvncserver pixman spice_gtk spice_protocol libvirt libvncserver pixman spice_gtk spice_protocol
]; ];
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
enableParallelBuilding = true;
meta = with lib; { meta = with lib; {
homepage = http://f1ash.github.io/qt-virt-manager; homepage = https://f1ash.github.io/qt-virt-manager;
description = "Desktop user interface for managing virtual machines (QT)"; description = "Desktop user interface for managing virtual machines (QT)";
longDescription = '' longDescription = ''
The virt-manager application is a desktop user interface for managing The virt-manager application is a desktop user interface for managing
virtual machines through libvirt. It primarily targets KVM VMs, but also virtual machines through libvirt. It primarily targets KVM VMs, but also
manages Xen and LXC (linux containers). manages Xen and LXC (linux containers).
''; '';
license = licenses.gpl2; license = licenses.gpl2;
maintainers = with maintainers; [ peterhoeg ]; maintainers = with maintainers; [ peterhoeg ];
}; };
} }

2
pkgs/applications/window-managers/wmii-hg/default.nix
View file

@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
makeFlags = "WMII_HGVERSION=hg${rev}"; makeFlags = "WMII_HGVERSION=hg${rev}";
meta = { meta = {
homepage = https://code.google.com/archive/p/wmii/; homepage = https://suckless.org/; # https://wmii.suckless.org/ does not exist anymore
description = "A small window manager controlled by a 9P filesystem"; description = "A small window manager controlled by a 9P filesystem";
maintainers = with stdenv.lib.maintainers; [ kovirobi ]; maintainers = with stdenv.lib.maintainers; [ kovirobi ];
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;

3
pkgs/build-support/build-pecl.nix
View file

@ -2,6 +2,7 @@
{ name { name
, buildInputs ? [] , buildInputs ? []
, nativeBuildInputs ? []
, makeFlags ? [] , makeFlags ? []
, src ? fetchurl { , src ? fetchurl {
url = "http://pecl.php.net/get/${name}.tgz"; url = "http://pecl.php.net/get/${name}.tgz";
@ -15,7 +16,7 @@ stdenv.mkDerivation (args // {
inherit src; inherit src;
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ] ++ nativeBuildInputs;
buildInputs = [ php ] ++ buildInputs; buildInputs = [ php ] ++ buildInputs;
makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ makeFlags; makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ makeFlags;

30
pkgs/data/fonts/iwona/default.nix Normal file
View file

@ -0,0 +1,30 @@
{ stdenv, fetchzip }:
stdenv.mkDerivation rec {
name = "iwona-${version}";
version = "0_995";
src = fetchzip {
url = "http://jmn.pl/pliki/Iwona-otf-${version}.zip";
sha256 = "1wj5bxbxpz5a8p3rhw708cyjc0lgqji8g0iv6brmmbrrkpb3jq2s";
};
installPhase = ''
install -m 444 -D -t $out/share/fonts/opentype/ *.otf
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "1dcpn13bd31dw7ir0s722bv3nk136dy6qsab0kznjbzfqd7agswa";
meta = with stdenv.lib; {
description = "A two-element sans-serif typeface, created by Małgorzata Budyta";
homepage = http://jmn.pl/en/kurier-i-iwona/;
# "[...] GUST Font License (GFL), which is a free license, legally
# equivalent to the LaTeX Project Public # License (LPPL), version 1.3c or
# later." - GUST website
license = licenses.lppl13c;
maintainers = with maintainers; [ siddharthist ];
platforms = platforms.all;
};
}

6
pkgs/data/misc/tzdata/default.nix
View file

@ -2,16 +2,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "tzdata-${version}"; name = "tzdata-${version}";
version = "2016j"; version = "2017c";
srcs = srcs =
[ (fetchurl { [ (fetchurl {
url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz"; url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz";
sha256 = "1j4xycpwhs57qnkcxwh3np8wnf3km69n3cf4w6p2yv2z247lxvpm"; sha256 = "02yrrfj0p7ar885ja41ylijzbr8wc6kz6kzlw8c670i9m693ym6n";
}) })
(fetchurl { (fetchurl {
url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz"; url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz";
sha256 = "1dxhrk4z0n2di8p0yd6q00pa6bwyz5xqbrfbasiz8785ni7zrvxr"; sha256 = "1dvrq0b2hz7cjqdyd7x21wpy4qcng3rvysr61ij0c2g64fyb9s41";
}) })
]; ];

4
pkgs/desktops/lxqt/base/liblxqt/default.nix
View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "liblxqt"; pname = "liblxqt";
version = "0.11.1"; version = "0.12.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0dcsgj0qr4589wsibs6fdza4ncqavrhykd05d25rs78pa94lvvh5"; sha256 = "1852vfbkbpw49i8ad682jhqmnskmc9a90qwpalipgak7m64azg3j";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

10
pkgs/desktops/lxqt/base/libqtxdg/default.nix
View file

@ -2,24 +2,28 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libqtxdg-${version}"; name = "libqtxdg-${version}";
version = "2.0.0"; version = "3.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = "libqtxdg"; repo = "libqtxdg";
rev = version; rev = version;
sha256 = "1s5jw4q6gcivk7mc95ir9q2nry4yyhfwy039ddf5ymh79nynv8vy"; sha256 = "03kdrx5sgrl93yband87n30i0k2mv6dknwdw2adz45j5z9rhd3z6";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ qt5.qtbase qt5.qtsvg ]; buildInputs = [ qt5.qtbase qt5.qtsvg ];
preConfigure = ''
cmakeFlags+=" -DQTXDGX_ICONENGINEPLUGIN_INSTALL_PATH=$out/$qtPluginPrefix"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Qt implementation of freedesktop.org xdg specs"; description = "Qt implementation of freedesktop.org xdg specs";
homepage = https://github.com/lxde/libqtxdg; homepage = https://github.com/lxde/libqtxdg;
license = licenses.lgpl21; license = licenses.lgpl21;
maintainers = with maintainers; [ romildo ];
platforms = with platforms; unix; platforms = with platforms; unix;
maintainers = with maintainers; [ romildo ];
}; };
} }

4
pkgs/desktops/lxqt/base/libsysstat/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libsysstat-${version}"; name = "libsysstat-${version}";
version = "0.3.3"; version = "0.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = "libsysstat"; repo = "libsysstat";
rev = version; rev = version;
sha256 = "1rkbh6jj69wsf8a7w7cq8psqw08vqf9rq5pdnv4xxqb036r4bi31"; sha256 = "0yl20dj553z1ijkfxl9n45qvkzxyl9rqw12vb4v6zj3ch6hzbzsx";
}; };
nativeBuildInputs = [ cmake lxqt.lxqt-build-tools ]; nativeBuildInputs = [ cmake lxqt.lxqt-build-tools ];

10
pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix
View file

@ -1,17 +1,19 @@
{ stdenv, fetchFromGitHub, cmake, qt5 }: { stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "lxqt-build-tools-${version}"; name = "lxqt-build-tools-${version}";
version = "0.3.2"; version = "0.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = "lxqt-build-tools"; repo = "lxqt-build-tools";
rev = version; rev = version;
sha256 = "1awd70ifbbi67pklhldjw968c1fw1lcif9nh4qbrjqmlg1gn3kmv"; sha256 = "0i3pzgyd80n73dnqs8f6axinaji7biflgqsi33baxn4r1hy58ym1";
}; };
nativeBuildInputs = [ cmake qt5.qtbase ]; nativeBuildInputs = [ cmake pkgconfig pcre qt5.qtbase ];
preConfigure = ''cmakeFlags+=" -DLXQT_ETC_XDG_DIR=$out/etc/xdg"'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Various packaging tools and scripts for LXQt applications"; description = "Various packaging tools and scripts for LXQt applications";

11
pkgs/desktops/lxqt/core/libfm-qt/default.nix
View file

@ -1,19 +1,19 @@
{ {
stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools,
xorg, libfm, menu-cache, pcre, libexif, xorg, libfm, menu-cache,
qtx11extras, qttools qtx11extras, qttools
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "libfm-qt"; pname = "libfm-qt";
version = "0.11.2"; version = "0.12.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0k2g6bkz7bvawqkjzykbxi18wqsnhbxklqy6aqqkclpzcw45vk5v"; sha256 = "0932yl098pc5rwgy9irrc3ys47jx64m3wm702dvs8yy15alv6x4i";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -23,6 +23,11 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
pcre
libexif
xorg.libpthreadstubs
xorg.libxcb
xorg.libXdmcp
qtx11extras qtx11extras
qttools qttools
libfm libfm

10
pkgs/desktops/lxqt/core/lxqt-about/default.nix
View file

@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, standardPatch, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg }: { stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "lxqt-about"; pname = "lxqt-about";
version = "0.11.1"; version = "0.12.0";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1pa68pr0iwvh34lippagc8kxdfd0l2071m0vh7dnvfqbnwly29dk"; sha256 = "13knjxbnq0mh9jgkllarf6rjxkvj2c93l0srnlrqp3939gcpwxh3";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -28,8 +28,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = standardPatch;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Dialogue window providing information about LXQt and the system it's running on"; description = "Dialogue window providing information about LXQt and the system it's running on";
homepage = https://github.com/lxde/lxqt-about; homepage = https://github.com/lxde/lxqt-about;

10
pkgs/desktops/lxqt/core/lxqt-admin/default.nix
View file

@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, standardPatch, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit }: { stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "lxqt-admin"; pname = "lxqt-admin";
version = "0.11.1"; version = "0.12.0";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "12c1wdciqgiifsk5aslw3990pk9ylk9jhgwnrxvh798rr48hhflr"; sha256 = "0dg3gm5m19dc4jarh8xcn0mcnpgxzz7nhy5dzm8chddaa6pdm7vi";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -29,8 +29,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = standardPatch;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "LXQt system administration tool"; description = "LXQt system administration tool";
homepage = https://github.com/lxde/lxqt-admin; homepage = https://github.com/lxde/lxqt-admin;

40
pkgs/desktops/lxqt/core/lxqt-common/default.nix
View file

@ -1,40 +0,0 @@
{ stdenv, fetchFromGitHub, cmake, qt5, lxqt, hicolor_icon_theme, xmessage }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-common";
version = "0.11.2";
src = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
sha256 = "07ih2w9ksbxqwy36xvgb9b31740nhkm7ap70wvv8q6x0wyhn71gn";
};
nativeBuildInputs = [
cmake
lxqt.lxqt-build-tools
];
buildInputs = [
qt5.qtsvg
hicolor_icon_theme
xmessage
];
postPatch = lxqt.standardPatch
+ ''
substituteInPlace ./startlxqt.in \
--replace "cp " "cp --no-preserve=mode " \
--replace xmessage "${xmessage}"/bin/xmessage
'';
meta = with stdenv.lib; {
description = "Common files for LXQt";
homepage = https://github.com/lxde/lxqt-common;
license = licenses.lgpl21;
platforms = with platforms; unix;
maintainers = with maintainers; [ romildo ];
};
}

21
pkgs/desktops/lxqt/core/lxqt-config/default.nix
View file

@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, lxqt-build-tools, standardPatch, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, libpthreadstubs, xorg }: { stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, lxqt-build-tools, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, libpthreadstubs, xorg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "lxqt-config"; pname = "lxqt-config";
version = "0.11.1"; version = "0.12.0";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0mqvv93djsw49n0gxpws3hrwimnyf9kzvc2vhjkzrjfxpabk2axx"; sha256 = "1ccxkdfhgf40jxiy0132yr9b28skvs9yr8j75w663hnqi6ccn377";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -36,7 +36,10 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = standardPatch; postPatch = ''
substituteInPlace src/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Tools to configure LXQt and the underlying operating system"; description = "Tools to configure LXQt and the underlying operating system";
@ -46,12 +49,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ romildo ]; maintainers = with maintainers; [ romildo ];
}; };
patches = [
# Fixes a FTBFS with CMake v3.8
(fetchpatch {
url = https://github.com/lxde/lxqt-config/commit/bca652a75f8a497a69b1fbc1c7eaa353f6b4eef8.patch;
sha256 = "17k26xj97ks9gvcjhiwc5y39fciria4xyxrzcz67zj0flqm3cmrf";
})
];
} }

15
pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix
View file

@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, standardPatch, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }: { stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "lxqt-globalkeys"; pname = "lxqt-globalkeys";
version = "0.11.1"; version = "0.12.0";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1kwibll2azi4pafk7crfgibk5a54rnsia3c4cz680iny7xz1wy6h"; sha256 = "14icyik9x47wi3gfkmkyhag26a2ivyc42f4f8qwdgbr3dcg10b9a";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -29,7 +29,12 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = standardPatch; postPatch = ''
for dir in autostart xdg; do
substituteInPlace $dir/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
done
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Daemon used to register global keyboard shortcuts"; description = "Daemon used to register global keyboard shortcuts";

4
pkgs/desktops/lxqt/core/lxqt-l10n/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "lxqt-l10n-${version}"; name = "lxqt-l10n-${version}";
version = "0.11.2"; version = "0.12.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = "lxqt-l10n"; repo = "lxqt-l10n";
rev = version; rev = version;
sha256 = "1vk4q98kraq0lba50n9z6jwiapc7nz2b143b4ldlmrz4wscd867h"; sha256 = "025zg5y9f286p74rab4yxyz4cqlh4hqjq43xxpi76ma2fy2s03a4";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

14
pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix
View file

@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-common, qtx11extras }: { stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, qtx11extras }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "lxqt-notificationd"; pname = "lxqt-notificationd";
version = "0.11.1"; version = "0.12.0";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1n39zjczzhqn73vfyjngybmk9w8j1z3vjkaq80rf2hk89vwsm0wc"; sha256 = "0pmpdqgnb2dfxw5lirh89j8hnrwwcn2zc64byg4zi0xdvq6qms43";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -17,6 +17,11 @@ stdenv.mkDerivation rec {
lxqt-build-tools lxqt-build-tools
]; ];
postPatch = ''
substituteInPlace autostart/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
'';
buildInputs = [ buildInputs = [
qtbase qtbase
qttools qttools
@ -24,7 +29,6 @@ stdenv.mkDerivation rec {
kwindowsystem kwindowsystem
liblxqt liblxqt
libqtxdg libqtxdg
lxqt-common
qtx11extras qtx11extras
]; ];

6
pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix
View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "lxqt-openssh-askpass"; pname = "lxqt-openssh-askpass";
version = "0.11.1"; version = "0.12.0";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "030pzys86s7rpgl35kl4b3y7gmv9982j3blmg8927nq4pw61gfj9"; sha256 = "16xcw4yll6i9vij16kdb10s4aq2s57x4yjlwv6d8r75y5gq9iiw6";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

31
pkgs/desktops/lxqt/core/lxqt-panel/default.nix
View file

@ -1,22 +1,22 @@
{ {
stdenv, fetchFromGitHub, fetchpatch, standardPatch, stdenv, fetchFromGitHub,
cmake, pkgconfig, lxqt-build-tools, cmake, pkgconfig, lxqt-build-tools,
qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid, qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid,
kguiaddons, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys, libsysstat, kguiaddons, liblxqt, libqtxdg, lxqt-globalkeys, libsysstat,
xorg, libstatgrab, lm_sensors, libpulseaudio, alsaLib, menu-cache, xorg, libstatgrab, lm_sensors, libpulseaudio, alsaLib, menu-cache,
lxmenu-data lxmenu-data, pcre
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "lxqt-panel"; pname = "lxqt-panel";
version = "0.11.1"; version = "0.12.0";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "097rivly61i99v0w9a3dgbwbc4c5x9nh3jl0n94dix1qgd4w983y"; sha256 = "01xmnb17jpydyfvxwaa6kymzdasnyd94z62gjah8y4pzsmykcr4x";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -36,7 +36,6 @@ stdenv.mkDerivation rec {
kguiaddons kguiaddons
liblxqt liblxqt
libqtxdg libqtxdg
lxqt-common
lxqt-globalkeys lxqt-globalkeys
libsysstat libsysstat
xorg.libpthreadstubs xorg.libpthreadstubs
@ -47,19 +46,19 @@ stdenv.mkDerivation rec {
alsaLib alsaLib
menu-cache menu-cache
lxmenu-data lxmenu-data
]; pcre
patches = [
(fetchpatch {
url = https://github.com/lxde/lxqt-panel/commit/ec62109e0fa678875a9b10fc6f1975267432712d.patch;
name = "fix-compile-explicit-keyword.patch";
sha256 = "1grda0dw175kbsfq90lr5qaf79akwikzxw85jhd5f339nnramp81";
})
]; ];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = standardPatch; postPatch = ''
for dir in autostart menu; do
substituteInPlace $dir/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
done
substituteInPlace panel/CMakeLists.txt \
--replace "DESTINATION \''${LXQT_ETC_XDG_DIR}" "DESTINATION etc/xdg"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "The LXQt desktop panel"; description = "The LXQt desktop panel";

14
pkgs/desktops/lxqt/core/lxqt-policykit/default.nix
View file

@ -1,19 +1,19 @@
{ {
stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools,
qtbase, qttools, qtx11extras, qtsvg, polkit-qt, kwindowsystem, liblxqt, qtbase, qttools, qtx11extras, qtsvg, polkit-qt, kwindowsystem, liblxqt,
libqtxdg, libqtxdg, pcre
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "lxqt-policykit"; pname = "lxqt-policykit";
version = "0.11.1"; version = "0.12.0";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0sf8wj152z1xid1i2x5g1zpgh7lwq8f0rbrk3r9shyksxqcj2d8p"; sha256 = "1hxz5bxxi118g255aqb3da767va0wd25y671lk2w9r1641j8zf2d";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -31,10 +31,16 @@ stdenv.mkDerivation rec {
kwindowsystem kwindowsystem
liblxqt liblxqt
libqtxdg libqtxdg
pcre
]; ];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = ''
substituteInPlace autostart/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "The LXQt PolicyKit agent"; description = "The LXQt PolicyKit agent";
homepage = https://github.com/lxde/lxqt-policykit; homepage = https://github.com/lxde/lxqt-policykit;

11
pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix
View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "lxqt-powermanagement"; pname = "lxqt-powermanagement";
version = "0.11.1"; version = "0.12.0";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0rcjq20ap6kc3m1f2glb8c62qhsx8qh0rkzlj3rykdj6n4hc0x79"; sha256 = "1fxklxmvjaykdpf0nj6cpgwx4yf52087g25k1zdak9n0l9n7hm8d";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -31,6 +31,11 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = ''
substituteInPlace autostart/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Power management module for LXQt"; description = "Power management module for LXQt";
homepage = https://github.com/lxde/lxqt-powermanagement; homepage = https://github.com/lxde/lxqt-powermanagement;

18
pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix
View file

@ -1,19 +1,19 @@
{ {
stdenv, fetchFromGitHub, standardPatch, stdenv, fetchFromGitHub,
cmake, lxqt-build-tools, cmake, lxqt-build-tools,
qtbase, qtx11extras, qttools, qtsvg, libdbusmenu, libqtxdg, qtbase, qtx11extras, qttools, qtsvg, libdbusmenu, libqtxdg, libfm-qt
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "lxqt-qtplugin"; pname = "lxqt-qtplugin";
version = "0.11.1"; version = "0.12.0";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "12hyw7rk3zx51n6g2bazlqv70xap0lygm9v21ibxgy1aw0j6iy02"; sha256 = "1i1rga0pg764ccwhq7acdsckxpl1apxwj4lv4gygxxmpkrg62zkv";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -28,11 +28,13 @@ stdenv.mkDerivation rec {
qtsvg qtsvg
libdbusmenu libdbusmenu
libqtxdg libqtxdg
libfm-qt
]; ];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; postPatch = ''
substituteInPlace src/CMakeLists.txt \
postPatch = standardPatch; --replace "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"$qtPluginPrefix"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "LXQt Qt platform integration plugin"; description = "LXQt Qt platform integration plugin";

17
pkgs/desktops/lxqt/core/lxqt-runner/default.nix
View file

@ -1,16 +1,16 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys, qtx11extras, { stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-globalkeys, qtx11extras,
menu-cache, muparser }: menu-cache, muparser, pcre }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "lxqt-runner"; pname = "lxqt-runner";
version = "0.11.1"; version = "0.12.0";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1nsxm0fplwrzz3vccd5fm82lpl4fqss6kv558zj44vzpsl13l954"; sha256 = "1354vdaskhch1n8v3kdy15nszgqb1092csr84nbhymzgrhrq1093";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -27,14 +27,19 @@ stdenv.mkDerivation rec {
kwindowsystem kwindowsystem
liblxqt liblxqt
libqtxdg libqtxdg
lxqt-common
lxqt-globalkeys lxqt-globalkeys
menu-cache menu-cache
muparser muparser
pcre
]; ];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = ''
substituteInPlace autostart/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Tool used to launch programs quickly by typing their names"; description = "Tool used to launch programs quickly by typing their names";
homepage = https://github.com/lxde/lxqt-runner; homepage = https://github.com/lxde/lxqt-runner;

16
pkgs/desktops/lxqt/core/lxqt-session/default.nix
View file

@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg, lxqt-common, xorg, xdg-user-dirs }: { stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg, xorg, xdg-user-dirs }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "lxqt-session"; pname = "lxqt-session";
version = "0.11.1"; version = "0.12.0";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "14ahgix5jsv7fkmvz1imw9a12ygxccqrdxp9yfbpin1az9q1n1qv"; sha256 = "03gi9svxqsfjhk5ifbaalq9i44ggx8afwms1hb312czqn82wrszb";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
kwindowsystem kwindowsystem
liblxqt liblxqt
libqtxdg libqtxdg
lxqt-common
xorg.libpthreadstubs xorg.libpthreadstubs
xorg.libXdmcp xorg.libXdmcp
xdg-user-dirs xdg-user-dirs
@ -34,6 +33,13 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = ''
for dir in autostart config; do
substituteInPlace $dir/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
done
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "An alternative session manager ported from the original razor-session"; description = "An alternative session manager ported from the original razor-session";
homepage = https://github.com/lxde/lxqt-session; homepage = https://github.com/lxde/lxqt-session;

6
pkgs/desktops/lxqt/core/lxqt-sudo/default.nix
View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "lxqt-sudo"; pname = "lxqt-sudo";
version = "0.11.1"; version = "0.12.0";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0imy4cs51im81rd0wa03wy418cdv9gqqgmwkc7v58cip7h665pyk"; sha256 = "0ql436yb51qwbnj5gbzvqi4rqx4zkmja5rdjs6yavb1x8ggn1jv6";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

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