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

Merge remote-tracking branch 'channels/nixpkgs-unstable' into ericson2314-cross-base

Browse Source
This commit is contained in:
John Ericson 2017-11-05 17:09:56 -05:00
commit a8f3d7215c
579 changed files with 15379 additions and 26627 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
.github/CODEOWNERS vendored
View File

@ -8,47 +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
/pkgs/development/interpreters/ruby @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

11
.github/CONTRIBUTING.md vendored
View File

@ -32,11 +32,14 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license.
The old config generation system used impure shell scripts and could break in specific circumstances (see #1234). The old config generation system used impure shell scripts and could break in specific circumstances (see #1234).
* `meta.description` should: * `meta.description` should:
* Be capitalized * Be capitalized.
* Not start with the package name * Not start with the package name.
* Not have a dot at the end * Not have a period at the end.
* `meta.license` must be set and fit the upstream license.
* If there is no upstream license, `meta.license` should default to `stdenv.lib.licenses.unfree`.
* `meta.maintainers` must be set.
See the nixpkgs manual for more details on how to [Submit changes to nixpkgs](https://nixos.org/nixpkgs/manual/#chap-submitting-changes). See the nixpkgs manual for more details on [standard meta-attributes](https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes) and on how to [submit changes to nixpkgs](https://nixos.org/nixpkgs/manual/#chap-submitting-changes).
## Writing good commit messages ## Writing good commit messages

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>

11
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>";
@ -66,7 +67,7 @@
aycanirican = "Aycan iRiCAN <iricanaycan@gmail.com>"; aycanirican = "Aycan iRiCAN <iricanaycan@gmail.com>";
bachp = "Pascal Bach <pascal.bach@nextrem.ch>"; bachp = "Pascal Bach <pascal.bach@nextrem.ch>";
badi = "Badi' Abdul-Wahid <abdulwahidc@gmail.com>"; badi = "Badi' Abdul-Wahid <abdulwahidc@gmail.com>";
balajisivaraman = "Balaji Sivaraman<sivaraman.balaji@gmail.com>"; balajisivaraman = "Balaji Sivaraman <sivaraman.balaji@gmail.com>";
barrucadu = "Michael Walker <mike@barrucadu.co.uk>"; barrucadu = "Michael Walker <mike@barrucadu.co.uk>";
basvandijk = "Bas van Dijk <v.dijk.bas@gmail.com>"; basvandijk = "Bas van Dijk <v.dijk.bas@gmail.com>";
Baughn = "Svein Ove Aas <sveina@gmail.com>"; Baughn = "Svein Ove Aas <sveina@gmail.com>";
@ -116,6 +117,7 @@
christopherpoole = "Christopher Mark Poole <mail@christopherpoole.net>"; christopherpoole = "Christopher Mark Poole <mail@christopherpoole.net>";
ciil = "Simon Lackerbauer <simon@lackerbauer.com>"; ciil = "Simon Lackerbauer <simon@lackerbauer.com>";
ckampka = "Christian Kampka <christian@kampka.net>"; ckampka = "Christian Kampka <christian@kampka.net>";
ckauhaus = "Christian Kauhaus <christian@kauhaus.de>";
cko = "Christine Koppelt <christine.koppelt@gmail.com>"; cko = "Christine Koppelt <christine.koppelt@gmail.com>";
cleverca22 = "Michael Bishop <cleverca22@gmail.com>"; cleverca22 = "Michael Bishop <cleverca22@gmail.com>";
cmcdragonkai = "Roger Qiu <roger.qiu@matrix.ai>"; cmcdragonkai = "Roger Qiu <roger.qiu@matrix.ai>";
@ -135,6 +137,7 @@
cryptix = "Henry Bubert <cryptix@riseup.net>"; cryptix = "Henry Bubert <cryptix@riseup.net>";
CrystalGamma = "Jona Stubbe <nixos@crystalgamma.de>"; CrystalGamma = "Jona Stubbe <nixos@crystalgamma.de>";
cstrahan = "Charles Strahan <charles@cstrahan.com>"; cstrahan = "Charles Strahan <charles@cstrahan.com>";
csingley = "Christopher Singley <csingley@gmail.com>";
cwoac = "Oliver Matthews <oliver@codersoffortune.net>"; cwoac = "Oliver Matthews <oliver@codersoffortune.net>";
DamienCassou = "Damien Cassou <damien@cassou.me>"; DamienCassou = "Damien Cassou <damien@cassou.me>";
danbst = "Danylo Hlynskyi <abcz2.uprola@gmail.com>"; danbst = "Danylo Hlynskyi <abcz2.uprola@gmail.com>";
@ -161,6 +164,7 @@
dgonyeo = "Derek Gonyeo <derek@gonyeo.com>"; dgonyeo = "Derek Gonyeo <derek@gonyeo.com>";
dipinhora = "Dipin Hora <dipinhora+github@gmail.com>"; dipinhora = "Dipin Hora <dipinhora+github@gmail.com>";
disassembler = "Samuel Leathers <disasm@gmail.com>"; disassembler = "Samuel Leathers <disasm@gmail.com>";
dizfer = "David Izquierdo <david@izquierdofernandez.com>";
dmalikov = "Dmitry Malikov <malikov.d.y@gmail.com>"; dmalikov = "Dmitry Malikov <malikov.d.y@gmail.com>";
DmitryTsygankov = "Dmitry Tsygankov <dmitry.tsygankov@gmail.com>"; DmitryTsygankov = "Dmitry Tsygankov <dmitry.tsygankov@gmail.com>";
dmjio = "David Johnson <djohnson.m@gmail.com>"; dmjio = "David Johnson <djohnson.m@gmail.com>";
@ -268,6 +272,7 @@
htr = "Hugo Tavares Reis <hugo@linux.com>"; htr = "Hugo Tavares Reis <hugo@linux.com>";
iand675 = "Ian Duncan <ian@iankduncan.com>"; iand675 = "Ian Duncan <ian@iankduncan.com>";
ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>"; ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>";
iblech = "Ingo Blechschmidt <iblech@speicherleck.de>";
igsha = "Igor Sharonov <igor.sharonov@gmail.com>"; igsha = "Igor Sharonov <igor.sharonov@gmail.com>";
ikervagyok = "Balázs Lengyel <ikervagyok@gmail.com>"; ikervagyok = "Balázs Lengyel <ikervagyok@gmail.com>";
infinisil = "Silvan Mosberger <infinisil@icloud.com>"; infinisil = "Silvan Mosberger <infinisil@icloud.com>";
@ -439,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>";
@ -548,6 +553,7 @@
ryneeverett = "Ryne Everett <ryneeverett@gmail.com>"; ryneeverett = "Ryne Everett <ryneeverett@gmail.com>";
rzetterberg = "Richard Zetterberg <richard.zetterberg@gmail.com>"; rzetterberg = "Richard Zetterberg <richard.zetterberg@gmail.com>";
s1lvester = "Markus Silvester <s1lvester@bockhacker.me>"; s1lvester = "Markus Silvester <s1lvester@bockhacker.me>";
samdroid-apps = "Sam Parkinson <sam@sam.today>";
samuelrivas = "Samuel Rivas <samuelrivas@gmail.com>"; samuelrivas = "Samuel Rivas <samuelrivas@gmail.com>";
sander = "Sander van der Burg <s.vanderburg@tudelft.nl>"; sander = "Sander van der Burg <s.vanderburg@tudelft.nl>";
sargon = "Daniel Ehlers <danielehlers@mindeye.net>"; sargon = "Daniel Ehlers <danielehlers@mindeye.net>";
@ -580,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>";

13
lib/types.nix
View File

@ -288,8 +288,17 @@ rec {
}).config; }).config;
getSubOptions = prefix: (evalModules getSubOptions = prefix: (evalModules
{ modules = opts'; inherit prefix; { modules = opts'; inherit prefix;
# FIXME: hack to get shit to evaluate. # This is a work-around due to the fact that some sub-modules,
args = { name = ""; }; }).options; # such as the one included in an attribute set, expects a "args"
# attribute to be given to the sub-module. As the option
# evaluation does not have any specific attribute name, we
# provide a default one for the documentation.
#
# This is mandatory as some option declaration might use the
# "name" attribute given as argument of the submodule and use it
# as the default of option declarations.
args.name = "&lt;name&gt;";
}).options;
getSubModules = opts'; getSubModules = opts';
substSubModules = m: submodule m; substSubModules = m: submodule m;
functor = (defaultFunctor name) // { functor = (defaultFunctor name) // {

8
nixos/doc/manual/installation/installing.xml
View File

@ -16,7 +16,8 @@
hardware.</para></listitem> hardware.</para></listitem>
<listitem><para>The NixOS manual is available on virtual console 8 <listitem><para>The NixOS manual is available on virtual console 8
(press Alt+F8 to access).</para></listitem> (press Alt+F8 to access) or by running <command>nixos-help</command>.
</para></listitem>
<listitem><para>You get logged in as <literal>root</literal> <listitem><para>You get logged in as <literal>root</literal>
(with empty password).</para></listitem> (with empty password).</para></listitem>
@ -139,6 +140,11 @@
the GRUB boot loader is to be installed. Without it, NixOS cannot the GRUB boot loader is to be installed. Without it, NixOS cannot
boot.</para> boot.</para>
<para>If there are other operating systems running on the machine before
installing NixOS, the
<option>boot.loader.grub.useOSProber</option> option can be set to
<literal>true</literal> to automatically add them to the grub menu.</para>
<para>Another critical option is <option>fileSystems</option>, <para>Another critical option is <option>fileSystems</option>,
specifying the file systems that need to be mounted by NixOS. specifying the file systems that need to be mounted by NixOS.
However, you typically don’t need to set it yourself, because However, you typically don’t need to set it yourself, because

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;

3
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
@ -328,6 +328,7 @@
./services/misc/parsoid.nix ./services/misc/parsoid.nix
./services/misc/phd.nix ./services/misc/phd.nix
./services/misc/plex.nix ./services/misc/plex.nix
./services/misc/plexpy.nix
./services/misc/pykms.nix ./services/misc/pykms.nix
./services/misc/radarr.nix ./services/misc/radarr.nix
./services/misc/redmine.nix ./services/misc/redmine.nix

4
nixos/modules/programs/ssh.nix
View File

@ -148,11 +148,11 @@ in
[ [
{ {
hostNames = [ "myhost" "myhost.mydomain.com" "10.10.1.4" ]; hostNames = [ "myhost" "myhost.mydomain.com" "10.10.1.4" ];
publicKeyFile = "./pubkeys/myhost_ssh_host_dsa_key.pub"; publicKeyFile = ./pubkeys/myhost_ssh_host_dsa_key.pub;
} }
{ {
hostNames = [ "myhost2" ]; hostNames = [ "myhost2" ];
publicKeyFile = "./pubkeys/myhost2_ssh_host_dsa_key.pub"; publicKeyFile = ./pubkeys/myhost2_ssh_host_dsa_key.pub;
} }
] ]
''; '';

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" ];

3
nixos/modules/security/acme.xml
View File

@ -89,8 +89,5 @@ services.nginx = {
}; };
} }
</programlisting> </programlisting>
<para>At the moment you still have to restart Nginx after the ACME
certs arrive.</para>
</section> </section>
</chapter> </chapter>

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.)
"; ";
}; };

6
nixos/modules/services/misc/gitlab.nix
View File

@ -572,7 +572,7 @@ in {
rm -rf ${cfg.statePath}/config ${cfg.statePath}/shell/hooks rm -rf ${cfg.statePath}/config ${cfg.statePath}/shell/hooks
mkdir -p ${cfg.statePath}/config mkdir -p ${cfg.statePath}/config
tr -dc A-Za-z0-9 < /dev/urandom | head -c 32 > ${cfg.statePath}/config/gitlab_shell_secret ${pkgs.openssl}/bin/openssl rand -hex 32 > ${cfg.statePath}/config/gitlab_shell_secret
# The uploads directory is hardcoded somewhere deep in rails. It is # The uploads directory is hardcoded somewhere deep in rails. It is
# symlinked in the gitlab package to /run/gitlab/uploads to make it # symlinked in the gitlab package to /run/gitlab/uploads to make it
@ -619,7 +619,7 @@ in {
fi fi
# enable required pg_trgm extension for gitlab # enable required pg_trgm extension for gitlab
${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql gitlab -c "CREATE EXTENSION IF NOT EXISTS pg_trgm" ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql ${cfg.databaseName} -c "CREATE EXTENSION IF NOT EXISTS pg_trgm"
# Always do the db migrations just to be sure the database is up-to-date # Always do the db migrations just to be sure the database is up-to-date
${gitlab-rake}/bin/gitlab-rake db:migrate RAILS_ENV=production ${gitlab-rake}/bin/gitlab-rake db:migrate RAILS_ENV=production
@ -634,7 +634,7 @@ in {
# The gitlab:shell:create_hooks task seems broken for fixing links # The gitlab:shell:create_hooks task seems broken for fixing links
# so we instead delete all the hooks and create them anew # so we instead delete all the hooks and create them anew
rm ${cfg.statePath}/repositories/**/*.git/hooks rm -f ${cfg.statePath}/repositories/**/*.git/hooks
${gitlab-rake}/bin/gitlab-rake gitlab:shell:create_hooks RAILS_ENV=production ${gitlab-rake}/bin/gitlab-rake gitlab:shell:create_hooks RAILS_ENV=production
# Change permissions in the last step because some of the # Change permissions in the last step because some of the

5
nixos/modules/services/misc/nixos-manual.nix
View File

@ -135,8 +135,9 @@ in
}; };
}; };
services.mingetty.helpLine = mkIf cfg.showManual services.mingetty.helpLine = "\nRun `nixos-help` "
"\nPress <Alt-F${toString cfg.ttyNumber}> for the NixOS manual."; + lib.optionalString cfg.showManual "or press <Alt-F${toString cfg.ttyNumber}> "
+ "for the NixOS manual.";
}; };

81
nixos/modules/services/misc/plexpy.nix Normal file
View File

@ -0,0 +1,81 @@
{ config, pkgs, lib, ... }:
with lib;
let
cfg = config.services.plexpy;
in
{
options = {
services.plexpy = {
enable = mkEnableOption "PlexPy Plex Monitor";
dataDir = mkOption {
type = types.str;
default = "/var/lib/plexpy";
description = "The directory where PlexPy stores its data files.";
};
configFile = mkOption {
type = types.str;
default = "/var/lib/plexpy/config.ini";
description = "The location of PlexPy's config file.";
};
port = mkOption {
type = types.int;
default = 8181;
description = "TCP port where PlexPy listens.";
};
user = mkOption {
type = types.str;
default = "plexpy";
description = "User account under which PlexPy runs.";
};
group = mkOption {
type = types.str;
default = "nogroup";
description = "Group under which PlexPy runs.";
};
package = mkOption {
type = types.package;
default = pkgs.plexpy;
defaultText = "pkgs.plexpy";
description = ''
The PlexPy package to use.
'';
};
};
};
config = mkIf cfg.enable {
systemd.services.plexpy = {
description = "PlexPy Plex Monitor";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
preStart = ''
test -d "${cfg.dataDir}" || {
echo "Creating initial PlexPy data directory in \"${cfg.dataDir}\"."
mkdir -p "${cfg.dataDir}"
chown ${cfg.user}:${cfg.group} "${cfg.dataDir}"
}
'';
serviceConfig = {
Type = "simple";
User = cfg.user;
Group = cfg.group;
PermissionsStartOnly = "true";
GuessMainPID = "false";
ExecStart = "${cfg.package}/bin/plexpy --datadir ${cfg.dataDir} --config ${cfg.configFile} --port ${toString cfg.port} --pidfile ${cfg.dataDir}/plexpy.pid --nolaunch";
Restart = "on-failure";
};
};
users.extraUsers = mkIf (cfg.user == "plexpy") {
plexpy = { group = cfg.group; uid = config.ids.uids.plexpy; };
};
};
}

4
nixos/modules/services/monitoring/graphite.nix
View File

@ -22,8 +22,8 @@ let
); );
graphiteApiConfig = pkgs.writeText "graphite-api.yaml" '' graphiteApiConfig = pkgs.writeText "graphite-api.yaml" ''
time_zone: ${config.time.timeZone}
search_index: ${dataDir}/index search_index: ${dataDir}/index
${optionalString (!isNull config.time.timeZone) ''time_zone: ${config.time.timeZone}''}
${optionalString (cfg.api.finders != []) ''finders:''} ${optionalString (cfg.api.finders != []) ''finders:''}
${concatMapStringsSep "\n" (f: " - " + f.moduleName) cfg.api.finders} ${concatMapStringsSep "\n" (f: " - " + f.moduleName) cfg.api.finders}
${optionalString (cfg.api.functions != []) ''functions:''} ${optionalString (cfg.api.functions != []) ''functions:''}
@ -536,7 +536,7 @@ in {
environment = { environment = {
PYTHONPATH = let PYTHONPATH = let
aenv = pkgs.python.buildEnv.override { aenv = pkgs.python.buildEnv.override {
extraLibs = [ cfg.api.package pkgs.cairo ] ++ cfg.api.finders; extraLibs = [ cfg.api.package pkgs.cairo pkgs.pythonPackages.cffi ] ++ cfg.api.finders;
}; };
in "${aenv}/${pkgs.python.sitePackages}"; in "${aenv}/${pkgs.python.sitePackages}";
GRAPHITE_API_CONFIG = graphiteApiConfig; GRAPHITE_API_CONFIG = graphiteApiConfig;

2
nixos/modules/services/networking/dnschain.nix
View File

@ -158,7 +158,7 @@ in
serviceConfig = { serviceConfig = {
User = "dnschain"; User = "dnschain";
Restart = "on-failure"; Restart = "on-failure";
ExecStart = "${pkgs.dnschain}/bin/dnschain"; ExecStart = "${pkgs.nodePackages.dnschain}/bin/dnschain";
}; };
preStart = '' preStart = ''

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";

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

@ -676,6 +676,7 @@ in
'' ''
; Needed for PHP's mail() function. ; Needed for PHP's mail() function.
sendmail_path = sendmail -t -i sendmail_path = sendmail -t -i
'' + optionalString (!isNull config.time.timeZone) ''
; Apparently PHP doesn't use $TZ. ; Apparently PHP doesn't use $TZ.
date.timezone = "${config.time.timeZone}" date.timezone = "${config.time.timeZone}"

1
nixos/modules/services/web-servers/apache-httpd/wordpress.nix
View File

@ -13,6 +13,7 @@ let
define('DB_HOST', '${config.dbHost}'); define('DB_HOST', '${config.dbHost}');
define('DB_CHARSET', 'utf8'); define('DB_CHARSET', 'utf8');
$table_prefix = '${config.tablePrefix}'; $table_prefix = '${config.tablePrefix}';
define('AUTOMATIC_UPDATER_DISABLED', true);
${config.extraConfig} ${config.extraConfig}
if ( !defined('ABSPATH') ) if ( !defined('ABSPATH') )
define('ABSPATH', dirname(__FILE__) . '/'); define('ABSPATH', dirname(__FILE__) . '/');

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
''; '';
}; };

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

@ -125,6 +125,7 @@ in
"getty@tty1.service" "getty@tty1.service"
]; ];
systemd.services."getty@tty1".enable = false;
systemd.services.display-manager.conflicts = [ "getty@tty1.service" ]; systemd.services.display-manager.conflicts = [ "getty@tty1.service" ];
systemd.services.display-manager.serviceConfig = { systemd.services.display-manager.serviceConfig = {
# Restart = "always"; - already defined in xserver.nix # Restart = "always"; - already defined in xserver.nix

3
nixos/modules/tasks/network-interfaces-scripted.nix
View File

@ -93,6 +93,7 @@ let
after = [ "network-pre.target" "systemd-udevd.service" "systemd-sysctl.service" ]; after = [ "network-pre.target" "systemd-udevd.service" "systemd-sysctl.service" ];
before = [ "network.target" "shutdown.target" ]; before = [ "network.target" "shutdown.target" ];
wants = [ "network.target" ]; wants = [ "network.target" ];
partOf = map (i: "network-addresses-${i.name}.service") interfaces;
conflicts = [ "shutdown.target" ]; conflicts = [ "shutdown.target" ];
wantedBy = [ "multi-user.target" ] ++ optional hasDefaultGatewaySet "network-online.target"; wantedBy = [ "multi-user.target" ] ++ optional hasDefaultGatewaySet "network-online.target";
@ -171,8 +172,6 @@ let
"network-link-${i.name}.service" "network-link-${i.name}.service"
"network.target" "network.target"
]; ];
# propagate stop and reload from network-setup
partOf = [ "network-setup.service" ];
# order before network-setup because the routes that are configured # order before network-setup because the routes that are configured
# there may need ip addresses configured # there may need ip addresses configured
before = [ "network-setup.service" ]; before = [ "network-setup.service" ];

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 {};

16
nixos/tests/graphite.nix
View File

@ -4,22 +4,28 @@ import ./make-test.nix ({ pkgs, ...} :
nodes = { nodes = {
one = one =
{ config, pkgs, ... }: { { config, pkgs, ... }: {
time.timeZone = "UTC";
services.graphite = { services.graphite = {
web = { web.enable = true;
api = {
enable = true; enable = true;
port = 8082;
}; };
carbon = { carbon.enableCache = true;
enableCache = true; seyren.enable = true;
}; pager.enable = true;
}; };
}; };
}; };
testScript = '' testScript = ''
startAll; startAll;
$one->waitForUnit("default.target"); $one->waitForUnit("default.target");
$one->requireActiveUnit("graphiteWeb.service"); $one->requireActiveUnit("graphiteWeb.service");
$one->requireActiveUnit("graphiteApi.service");
$one->requireActiveUnit("graphitePager.service");
$one->requireActiveUnit("carbonCache.service"); $one->requireActiveUnit("carbonCache.service");
$one->requireActiveUnit("seyren.service");
$one->succeed("echo \"foo 1 `date +%s`\" | nc -q0 localhost 2003"); $one->succeed("echo \"foo 1 `date +%s`\" | nc -q0 localhost 2003");
$one->waitUntilSucceeds("curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo") $one->waitUntilSucceeds("curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo")
''; '';

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");
'';
})

2
pkgs/applications/altcoins/bitcoin-unlimited.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
owner = "bitcoinunlimited"; owner = "bitcoinunlimited";
repo = "bitcoinunlimited"; repo = "bitcoinunlimited";
rev = "v${version}"; rev = "v${version}";
sha256 = "0rhk6xvzvzyfppg0pgq72nqgm2rmkiw0nhg3rwnzcvvj90nrz3da"; sha256 = "17cmyns1908s2rqs0zwr05f3541nqm2pg08n2xn97g2k3yimdg5q";
}; };
nativeBuildInputs = [ pkgconfig autoreconfHook ]; nativeBuildInputs = [ pkgconfig autoreconfHook ];

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 {

23
pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch Normal file
View File

@ -0,0 +1,23 @@
From 184c64718ee68b2738647f4a106b260c47f00437 Mon Sep 17 00:00:00 2001
From: Sam Parkinson <sam@sam.today>
Date: Thu, 26 Oct 2017 14:50:13 +1100
Subject: [PATCH] Remove post-install script that hardcodes paths
---
meson.build | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 25f3e1a..18b43bd 100644
--- a/meson.build
+++ b/meson.build
@@ -21,4 +21,5 @@ subdir('src')
# subdir('tests')
# TODO: unit tests
-meson.add_install_script('meson_post_install.sh')
+# This does not work for nixos; it hard-codes paths
+# meson.add_install_script('meson_post_install.sh')
--
2.14.2

72
pkgs/applications/audio/gradio/default.nix Normal file
View File

@ -0,0 +1,72 @@
{ stdenv, fetchFromGitHub, pkgconfig
, gcc
, python3
, gsettings_desktop_schemas
, desktop_file_utils
, glib
, gtk3
, intltool
, libsoup
, json_glib
, wrapGAppsHook
, meson
, ninja
, vala
, sqlite
, gst_all_1
, gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ]
}:
let
version = "6.0.2";
in stdenv.mkDerivation rec {
name = "gradio-${version}";
src = fetchFromGitHub {
owner = "haecker-felix";
repo = "gradio";
rev = "v${version}";
sha256 = "05hg26yr7splgpkl8wjxcsdks9sm1is3hcnp7f5mjnp2ch0nn57s";
};
nativeBuildInputs = [
pkgconfig
meson
ninja
vala
python3
];
buildInputs = [
sqlite
glib
intltool
libsoup
json_glib
gtk3
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
wrapGAppsHook
desktop_file_utils
gsettings_desktop_schemas
] ++ gst_plugins;
enableParallelBuilding = true;
postInstall = ''
${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
'';
patches = [ ./0001-Remove-post-install-script-that-hardcodes-paths.patch ];
meta = with stdenv.lib; {
homepage = https://github.com/haecker-felix/gradio;
description = "A GTK3 app for finding and listening to internet radio stations";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = [ maintainers.samdroid-apps ];
};
}

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 = {

20
pkgs/applications/editors/emacs-modes/gn/default.nix Normal file
View File

@ -0,0 +1,20 @@
{ stdenv, fetchgit, emacs }:
stdenv.mkDerivation {
name = "gn-mode-2017-09-21";
src = fetchgit {
url = "https://chromium.googlesource.com/chromium/src/tools/gn";
rev = "34f2780efb3fe14fe361ec161ad58440de5a6b36";
sha256 = "10cisqz3l6ny3471yi7y1z8v622lpl65zh0liqr6absvmy63g866";
};
buildInputs = [ emacs ];
buildPhase = ''
emacs --batch -f batch-byte-compile misc/emacs/gn-mode.el
'';
installPhase = ''
mkdir -p $out/share/emacs/site-lisp/
cp misc/emacs/gn-mode.el* $out/share/emacs/site-lisp/
'';
}

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;

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

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ahoviewer-${version}"; name = "ahoviewer-${version}";
version = "1.4.8"; version = "1.4.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ahodesuka"; owner = "ahodesuka";
repo = "ahoviewer"; repo = "ahoviewer";
rev = version; rev = version;
sha256 = "0fsak22hpi2r8zqysswdyngaf3n635qvclqh1p0g0wrkfza4dbc4"; sha256 = "194h3k5zvd8gjrbs91qba7d9h7i30yh4rjk4w3aa1vwvv0qm2amx";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/ahodesuka/ahoviewer; homepage = https://github.com/ahodesuka/ahoviewer;
description = "A GTK2 image viewer, manga reader, and booru browser"; description = "A GTK2 image viewer, manga reader, and booru browser";
maintainers = [ maintainers.skrzyp ]; maintainers = with maintainers; [ skrzyp xzfc ];
license = licenses.mit; license = licenses.mit;
platforms = platforms.allBut [ "darwin" "cygwin" ]; platforms = platforms.allBut [ "darwin" "cygwin" ];
}; };

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"
];
}; };
} }

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

@ -1,4 +1,4 @@
{ mkDerivation, lib, fetchurl, cmake, extra-cmake-modules, wrapGAppsHook { mkDerivation, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook
# For `digitaglinktree` # For `digitaglinktree`
, perl, sqlite , perl, sqlite
@ -33,8 +33,8 @@
, liblqr1 , liblqr1
, libqtav , libqtav
, libusb1 , libusb1
, mesa
, marble , marble
, mesa
, mysql , mysql
, opencv3 , opencv3
, pcre , pcre
@ -53,11 +53,11 @@ mkDerivation rec {
version = "5.7.0"; version = "5.7.0";
src = fetchurl { src = fetchurl {
url = "http://download.kde.org/stable/digikam/${name}.tar.xz"; url = "mirror://kde/stable/digikam/${name}.tar.xz";
sha256 = "1xah079g47fih8l9qy1ifppfvmq5yms5y1z54nvxdyz8nsszy19n"; sha256 = "1xah079g47fih8l9qy1ifppfvmq5yms5y1z54nvxdyz8nsszy19n";
}; };
nativeBuildInputs = [ cmake extra-cmake-modules kdoctools wrapGAppsHook ]; nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ];
buildInputs = [ buildInputs = [
bison bison

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

@ -5,11 +5,11 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "hugin-2016.2.0"; name = "hugin-2017.0.0";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/hugin/${name}.tar.bz2"; url = "mirror://sourceforge/hugin/${name}.tar.bz2";
sha256 = "058zd63vx29yrx2pphbbll7kzcxkai22q26lpw13rn4lvp41pasl"; sha256 = "02a6rlwp20jdn5jdsyg3c7liljr10c3jfdkxiv9mkf9jgyi6wr46";
}; };
buildInputs = [ buildInputs = [

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

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

@ -8,12 +8,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "${major}.${minor}"; version = "${major}.${minor}";
major = "0.27"; major = "0.27";
minor = "0"; minor = "1";
name = "shotwell-${version}"; name = "shotwell-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/shotwell/${major}/${name}.tar.xz"; url = "mirror://gnome/sources/shotwell/${major}/${name}.tar.xz";
sha256 = "03vwp314kckr67p7shrysqpr95hc3326lk3bv40g11i9clsik1a2"; sha256 = "1jav7qv0s1v6wvd7x2ri85hjqnbswq883pnd228qhd6bhjbryp89";
}; };
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";

5
pkgs/applications/graphics/sxiv/default.nix
View File

@ -23,6 +23,11 @@ stdenv.mkDerivation rec {
buildInputs = [ libX11 imlib2 giflib libexif ]; buildInputs = [ libX11 imlib2 giflib libexif ];
postInstall = ''
mkdir -p $out/share/applications/
cp -v sxiv.desktop $out/share/applications/
'';
meta = { meta = {
description = "Simple X Image Viewer"; description = "Simple X Image Viewer";
homepage = https://github.com/muennich/sxiv; homepage = https://github.com/muennich/sxiv;

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' )

24
pkgs/applications/kde/kde-locale-5.nix
View File

@ -1,24 +0,0 @@
name: args:
{ mkDerivation, cmake, extra-cmake-modules, gettext, kdoctools }:
mkDerivation (args // {
sname = "kde-l10n-${name}";
name = "kde-l10n-${name}-qt5";
outputs = [ "out" ];
nativeBuildInputs =
[ cmake extra-cmake-modules gettext kdoctools ]
++ (args.nativeBuildInputs or []);
preConfigure = ''
sed -e 's/add_subdirectory(4)//' -i CMakeLists.txt
${args.preConfigure or ""}
'';
preFixup = ''
propagatedBuildInputs=
propagatedNativeBuildInputs=
'';
})

1
pkgs/applications/kde/l10n.nix
View File

@ -3,7 +3,6 @@
let let
kdeLocale4 = import ./kde-locale-4.nix; kdeLocale4 = import ./kde-locale-4.nix;
kdeLocale5 = import ./kde-locale-5.nix;
in in

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

File diff suppressed because it is too large Load Diff

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

@ -1,14 +1,14 @@
{ stdenv, python3, fetchFromGitHub }: { stdenv, python3, fetchFromGitHub }:
with python3.pkgs; buildPythonApplication rec { with python3.pkgs; buildPythonApplication rec {
version = "3.3.1"; version = "3.4";
name = "buku-${version}"; name = "buku-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jarun"; owner = "jarun";
repo = "buku"; repo = "buku";
rev = "v${version}"; rev = "v${version}";
sha256 = "1byq8jgv1rb67ygibk0vzgz5ri1il4q4hpg23z5q0ml27fif9hw3"; sha256 = "0v0wvsxw78g6yl606if25k1adghr5764chwy1kl7dsxvchqwvmg0";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/applications/misc/cli-visualizer/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, fftw, ncurses5, libpulseaudio, makeWrapper }: { stdenv, fetchFromGitHub, fftw, ncurses5, libpulseaudio, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.5"; version = "1.6";
name = "cli-visualizer-${version}"; name = "cli-visualizer-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dpayne"; owner = "dpayne";
repo = "cli-visualizer"; repo = "cli-visualizer";
rev = version; rev = version;
sha256 = "18qv4ya64qmczq94dnynrnzn7pwhmzbn14r05qcvbbwv7r8gclzs"; sha256 = "0mirp8bk398di5xyq95iprmdyvplfghxqmrfj7jdnpy554vx7ppc";
}; };
postPatch = '' postPatch = ''

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

@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3; license = licenses.gpl3;
maintainers = with maintainers; [ viric ]; maintainers = with maintainers; [ viric ];
platforms = platforms.linux; platforms = platforms.linux;
hydraPlatforms = []; broken = true;
}; };
} }

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

@ -1,7 +1,7 @@
{ stdenv, fetchurl, readline, ncurses }: { stdenv, fetchurl, readline, ncurses }:
let let
version = "1.22"; version = "1.23";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://github.com/dvorka/hstr/releases/download/${version}/hh-${version}-src.tgz"; url = "https://github.com/dvorka/hstr/releases/download/${version}/hh-${version}-src.tgz";
sha256 = "09rh510x8qc5jbpnfzazbv9wc3bqmf5asydcl2wijpqm5bi21iqp"; sha256 = "1hnira256p7sdilx34mnkji7gi2jcl98zz4izqxsqmnzj8ghhzkv";
}; };
buildInputs = [ readline ncurses ]; buildInputs = [ readline ncurses ];

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 ];

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "kanboard-${version}"; name = "kanboard-${version}";
version = "1.0.46"; version = "1.0.48";
src = fetchzip { src = fetchzip {
url = "https://kanboard.net/${name}.zip"; url = "https://github.com/kanboard/kanboard/releases/download/v${version}/${name}.zip";
sha256 = "00fzzijibj7x8pz8xwc601fcrzvdwz5fv45f2zzmbygl86khp82a"; sha256 = "0ipyijlfcnfqlz9n20wcnaf9pw404a675x404pm9h2n4ld8x6m5v";
}; };
dontBuild = true; dontBuild = true;

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

@ -5,11 +5,11 @@ with python3Packages;
buildPythonApplication rec { buildPythonApplication rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "khal"; pname = "khal";
version = "0.9.7"; version = "0.9.8";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0x1p62ff7ggb172rjr6sbdrjh1gl3ck3bwxsqlsix8i5wycwvnmv"; sha256 = "1blx3gxnv7sj302biqphfw7i6ilzl2xlmvzp130n3113scg9w17y";
}; };
LC_ALL = "en_US.UTF-8"; LC_ALL = "en_US.UTF-8";

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

@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
homepage = http://mupdf.com; homepage = http://mupdf.com;
repositories.git = git://git.ghostscript.com/mupdf.git; repositories.git = git://git.ghostscript.com/mupdf.git;
description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C";
license = licenses.gpl3Plus; license = licenses.agpl3Plus;
maintainers = with maintainers; [ viric vrthra fpletz ]; maintainers = with maintainers; [ viric vrthra fpletz ];
platforms = platforms.linux; platforms = platforms.linux;
}; };

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;

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

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
}; };
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = "Robo3T"; name = "robo3t";
exec = "robo3t"; exec = "robo3t";
icon = icon; icon = icon;
comment = "Query GUI for mongodb"; comment = "Query GUI for mongodb";

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;
}; };
} }

10
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -60,10 +60,13 @@ let
in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs));
gnSystemLibraries = [ gnSystemLibraries = [
"flac" "harfbuzz-ng" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng" "zlib" "flac" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng" "zlib"
# "libjpeg" # fails with multiple undefined references to chromium_jpeg_* # "libjpeg" # fails with multiple undefined references to chromium_jpeg_*
# "re2" # fails with linker errors # "re2" # fails with linker errors
# "ffmpeg" # https://crbug.com/731766 # "ffmpeg" # https://crbug.com/731766
] ++ optionals (versionRange "62" "63") [
"harfbuzz-ng" # in versions over 63 harfbuzz and freetype are being built together
# so we can't build with one from system and other from source
]; ];
opusWithCustomModes = libopus.override { opusWithCustomModes = libopus.override {
@ -76,7 +79,10 @@ let
libpng libcap libpng libcap
xdg_utils yasm minizip libwebp xdg_utils yasm minizip libwebp
libusb1 re2 zlib libusb1 re2 zlib
ffmpeg harfbuzz-icu libxslt libxml2 ffmpeg libxslt libxml2
] ++ optionals (versionRange "62" "63") [
harfbuzz-icu # in versions over 63 harfbuzz and freetype are being built together
# so we can't build with one from system and other from source
]; ];
# build paths and release info # build paths and release info

18
pkgs/applications/networking/browsers/chromium/upstream-info.nix
View File

@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory. # This file is autogenerated from update.sh in the same directory.
{ {
beta = { beta = {
sha256 = "0qn3pjq5n3ri3qh25wg5gd2as5a8wlkncqvi975xsab771833pz8"; sha256 = "1ljpr7xkbg6hznpq9kph5xvrc6dwnp7y9ydirjawqvyhcmy6b8zj";
sha256bin64 = "10d1v9sa0wnnhjz6ria315aml20v1jl2bnkhcqi125rqk5fw9wrq"; sha256bin64 = "1ca9p82k7a9h416vwldzy84ww5psv3kbvh5xdys3j3cwaxxa0b4q";
version = "62.0.3202.62"; version = "63.0.3239.18";
}; };
dev = { dev = {
sha256 = "0dx9n9j1apngs4gc1n0kyccczm58045l342jr06azaw5yamsk8xb"; sha256 = "1ljpr7xkbg6hznpq9kph5xvrc6dwnp7y9ydirjawqvyhcmy6b8zj";
sha256bin64 = "1syqi1fx3kkn7865m6ldicg9cxcg1pfy9l1fr2k5mcqxsdblcyyv"; sha256bin64 = "1hq3qz7b5nmnck5sfbaa8d25khv88ylnq10dhbp76ahz4ixn9f7k";
version = "63.0.3239.9"; version = "63.0.3239.18";
}; };
stable = { stable = {
sha256 = "0qn3pjq5n3ri3qh25wg5gd2as5a8wlkncqvi975xsab771833pz8"; sha256 = "0k4hvmhaspw3f2scjjcam9dwnkrrzzibnx9sq5b1p56bgd2zxka9";
sha256bin64 = "1ijpv76wbxgwcvgr3nd9ciyyf26z56gxw4caga4x6600pa2lm8wq"; sha256bin64 = "0c4g2h1kcpksx0whf784hs7w62xbgsvq42fvzs0lfjgs11s8fm0x";
version = "62.0.3202.62"; version = "62.0.3202.75";
}; };
} }

1
pkgs/applications/networking/browsers/falkon/default.nix
View File

@ -40,5 +40,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3; license = licenses.gpl3;
maintainers = with maintainers; [ peterhoeg ]; maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.unix; platforms = platforms.unix;
broken = true;
}; };
} }

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/browsers/tor-browser-bundle-bin/default.nix
View File

@ -98,7 +98,7 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source # Upstream source
version = "7.0.8"; version = "7.0.9";
lang = "en-US"; lang = "en-US";
@ -108,7 +108,7 @@ let
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
]; ];
sha256 = "0bi4l4ma40ifsajvjpwv6ixphijqvb7yrci2jcyykh3j41ndfjf2"; sha256 = "0ykbpp0qr3glygmnnc6ac41kkvrxn52472z6kbpf7i6qzvk4ba0d";
}; };
"i686-linux" = fetchurl { "i686-linux" = fetchurl {
@ -116,7 +116,7 @@ let
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
]; ];
sha256 = "182q1gb8jnk92wxr7m977yxcksa8d3zg90qbsja1raym2vhqaf73"; sha256 = "02alpzmvm3ldlp51sqppz41d12lx93n5qj6i3gqz6din96swm7j8";
}; };
}; };
in in

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;
}; };
} }

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

@ -3,14 +3,14 @@
, glib_networking }: , glib_networking }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.6"; version = "1.7.1";
name = "corebird-${version}"; name = "corebird-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "baedert"; owner = "baedert";
repo = "corebird"; repo = "corebird";
rev = version; rev = version;
sha256 = "1bxjlamdy5d2j3xdahmxf6lwc7f6xdfxbzi712ppvh1dwggw654v"; sha256 = "1g6wkzrl6j0mmgafpv0jpqa906s1x7p5hmiqdgs9qwm7q2wlwrqd";
}; };
preConfigure = '' preConfigure = ''

143
pkgs/applications/networking/dropbox/default.nix
View File

@ -1,52 +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
# NOTE: When updating, please also update in current stable, version = "38.4.27";
# 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";
@ -56,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'

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