Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-09-07 12:01:13 +00:00 committed by GitHub
commit fbefda3466
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
46 changed files with 3651 additions and 1949 deletions

View File

@ -75,7 +75,7 @@ mediator_lua,,,,,,
mpack,,,,,,
moonscript,,,,,,arobyn
nvim-client,https://github.com/neovim/lua-client.git,,,,,
penlight,https://github.com/Tieske/Penlight.git,,,,,
penlight,https://github.com/lunarmodules/Penlight.git,,,,,alerque
plenary.nvim,https://github.com/nvim-lua/plenary.nvim.git,,,,lua5_1,
rapidjson,https://github.com/xpol/lua-rapidjson.git,,,,,
readline,,,,,,

1 name src ref server version luaversion maintainers
75 mpack
76 moonscript arobyn
77 nvim-client https://github.com/neovim/lua-client.git
78 penlight https://github.com/Tieske/Penlight.git https://github.com/lunarmodules/Penlight.git alerque
79 plenary.nvim https://github.com/nvim-lua/plenary.nvim.git lua5_1
80 rapidjson https://github.com/xpol/lua-rapidjson.git
81 readline

View File

@ -0,0 +1,74 @@
# Building Specific Parts of NixOS {#sec-building-parts}
With the command `nix-build`, you can build specific parts of your NixOS
configuration. This is done as follows:
```ShellSession
$ cd /path/to/nixpkgs/nixos
$ nix-build -A config.option
```
where `option` is a NixOS option with type "derivation" (i.e. something
that can be built). Attributes of interest include:
`system.build.toplevel`
: The top-level option that builds the entire NixOS system. Everything
else in your configuration is indirectly pulled in by this option.
This is what `nixos-rebuild` builds and what `/run/current-system`
points to afterwards.
A shortcut to build this is:
```ShellSession
$ nix-build -A system
```
`system.build.manual.manualHTML`
: The NixOS manual.
`system.build.etc`
: A tree of symlinks that form the static parts of `/etc`.
`system.build.initialRamdisk` , `system.build.kernel`
: The initial ramdisk and kernel of the system. This allows a quick
way to test whether the kernel and the initial ramdisk boot
correctly, by using QEMU's `-kernel` and `-initrd` options:
```ShellSession
$ nix-build -A config.system.build.initialRamdisk -o initrd
$ nix-build -A config.system.build.kernel -o kernel
$ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/null
```
`system.build.nixos-rebuild` , `system.build.nixos-install` , `system.build.nixos-generate-config`
: These build the corresponding NixOS commands.
`systemd.units.unit-name.unit`
: This builds the unit with the specified name. Note that since unit
names contain dots (e.g. `httpd.service`), you need to put them
between quotes, like this:
```ShellSession
$ nix-build -A 'config.systemd.units."httpd.service".unit'
```
You can also test individual units, without rebuilding the whole
system, by putting them in `/run/systemd/system`:
```ShellSession
$ cp $(nix-build -A 'config.systemd.units."httpd.service".unit')/httpd.service \
/run/systemd/system/tmp-httpd.service
# systemctl daemon-reload
# systemctl start tmp-httpd.service
```
Note that the unit must not have the same name as any unit in
`/etc/systemd/system` since those take precedence over
`/run/systemd/system`. That's why the unit is installed as
`tmp-httpd.service` here.

View File

@ -1,121 +0,0 @@
<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-building-parts">
<title>Building Specific Parts of NixOS</title>
<para>
With the command <command>nix-build</command>, you can build specific parts
of your NixOS configuration. This is done as follows:
<screen>
<prompt>$ </prompt>cd <replaceable>/path/to/nixpkgs/nixos</replaceable>
<prompt>$ </prompt>nix-build -A config.<replaceable>option</replaceable></screen>
where <replaceable>option</replaceable> is a NixOS option with type
“derivation” (i.e. something that can be built). Attributes of interest
include:
<variablelist>
<varlistentry>
<term>
<varname>system.build.toplevel</varname>
</term>
<listitem>
<para>
The top-level option that builds the entire NixOS system. Everything else
in your configuration is indirectly pulled in by this option. This is
what <command>nixos-rebuild</command> builds and what
<filename>/run/current-system</filename> points to afterwards.
</para>
<para>
A shortcut to build this is:
<screen>
<prompt>$ </prompt>nix-build -A system</screen>
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<varname>system.build.manual.manualHTML</varname>
</term>
<listitem>
<para>
The NixOS manual.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<varname>system.build.etc</varname>
</term>
<listitem>
<para>
A tree of symlinks that form the static parts of
<filename>/etc</filename>.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<varname>system.build.initialRamdisk</varname>
</term>
<term>
<varname>system.build.kernel</varname>
</term>
<listitem>
<para>
The initial ramdisk and kernel of the system. This allows a quick way to
test whether the kernel and the initial ramdisk boot correctly, by using
QEMUs <option>-kernel</option> and <option>-initrd</option> options:
<screen>
<prompt>$ </prompt>nix-build -A config.system.build.initialRamdisk -o initrd
<prompt>$ </prompt>nix-build -A config.system.build.kernel -o kernel
<prompt>$ </prompt>qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/null
</screen>
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<varname>system.build.nixos-rebuild</varname>
</term>
<term>
<varname>system.build.nixos-install</varname>
</term>
<term>
<varname>system.build.nixos-generate-config</varname>
</term>
<listitem>
<para>
These build the corresponding NixOS commands.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<varname>systemd.units.<replaceable>unit-name</replaceable>.unit</varname>
</term>
<listitem>
<para>
This builds the unit with the specified name. Note that since unit names
contain dots (e.g. <literal>httpd.service</literal>), you need to put
them between quotes, like this:
<screen>
<prompt>$ </prompt>nix-build -A 'config.systemd.units."httpd.service".unit'
</screen>
You can also test individual units, without rebuilding the whole system,
by putting them in <filename>/run/systemd/system</filename>:
<screen>
<prompt>$ </prompt>cp $(nix-build -A 'config.systemd.units."httpd.service".unit')/httpd.service \
/run/systemd/system/tmp-httpd.service
<prompt># </prompt>systemctl daemon-reload
<prompt># </prompt>systemctl start tmp-httpd.service
</screen>
Note that the unit must not have the same name as any unit in
<filename>/etc/systemd/system</filename> since those take precedence over
<filename>/run/systemd/system</filename>. Thats why the unit is
installed as <filename>tmp-httpd.service</filename> here.
</para>
</listitem>
</varlistentry>
</variablelist>
</para>
</chapter>

View File

@ -9,11 +9,11 @@
This chapter describes how you can modify and extend NixOS.
</para>
</partintro>
<xi:include href="sources.xml" />
<xi:include href="../from_md/development/sources.chapter.xml" />
<xi:include href="writing-modules.xml" />
<xi:include href="building-parts.xml" />
<xi:include href="writing-documentation.xml" />
<xi:include href="../from_md/development/building-parts.chapter.xml" />
<xi:include href="../from_md/development/writing-documentation.chapter.xml" />
<xi:include href="../from_md/development/building-nixos.chapter.xml" />
<xi:include href="nixos-tests.xml" />
<xi:include href="testing-installer.xml" />
<xi:include href="../from_md/development/testing-installer.chapter.xml" />
</part>

View File

@ -0,0 +1,77 @@
# Getting the Sources {#sec-getting-sources}
By default, NixOS's `nixos-rebuild` command uses the NixOS and Nixpkgs
sources provided by the `nixos` channel (kept in
`/nix/var/nix/profiles/per-user/root/channels/nixos`). To modify NixOS,
however, you should check out the latest sources from Git. This is as
follows:
```ShellSession
$ git clone https://github.com/NixOS/nixpkgs
$ cd nixpkgs
$ git remote update origin
```
This will check out the latest Nixpkgs sources to `./nixpkgs` the NixOS
sources to `./nixpkgs/nixos`. (The NixOS source tree lives in a
subdirectory of the Nixpkgs repository.) The `nixpkgs` repository has
branches that correspond to each Nixpkgs/NixOS channel (see
[](#sec-upgrading) for more information about channels). Thus, the
Git branch `origin/nixos-17.03` will contain the latest built and tested
version available in the `nixos-17.03` channel.
It's often inconvenient to develop directly on the master branch, since
if somebody has just committed (say) a change to GCC, then the binary
cache may not have caught up yet and you'll have to rebuild everything
from source. So you may want to create a local branch based on your
current NixOS version:
```ShellSession
$ nixos-version
17.09pre104379.6e0b727 (Hummingbird)
$ git checkout -b local 6e0b727
```
Or, to base your local branch on the latest version available in a NixOS
channel:
```ShellSession
$ git remote update origin
$ git checkout -b local origin/nixos-17.03
```
(Replace `nixos-17.03` with the name of the channel you want to use.)
You can use `git merge` or `git
rebase` to keep your local branch in sync with the channel, e.g.
```ShellSession
$ git remote update origin
$ git merge origin/nixos-17.03
```
You can use `git cherry-pick` to copy commits from your local branch to
the upstream branch.
If you want to rebuild your system using your (modified) sources, you
need to tell `nixos-rebuild` about them using the `-I` flag:
```ShellSession
# nixos-rebuild switch -I nixpkgs=/my/sources/nixpkgs
```
If you want `nix-env` to use the expressions in `/my/sources`, use
`nix-env -f
/my/sources/nixpkgs`, or change the default by adding a symlink in
`~/.nix-defexpr`:
```ShellSession
$ ln -s /my/sources/nixpkgs ~/.nix-defexpr/nixpkgs
```
You may want to delete the symlink `~/.nix-defexpr/channels_root` to
prevent root's NixOS channel from clashing with your own tree (this may
break the command-not-found utility though). If you want to go back to
the default state, you may just remove the `~/.nix-defexpr` directory
completely, log out and log in again and it should have been recreated
with a link to the root channels.

View File

@ -1,85 +0,0 @@
<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-getting-sources">
<title>Getting the Sources</title>
<para>
By default, NixOSs <command>nixos-rebuild</command> command uses the NixOS
and Nixpkgs sources provided by the <literal>nixos</literal> channel (kept in
<filename>/nix/var/nix/profiles/per-user/root/channels/nixos</filename>). To
modify NixOS, however, you should check out the latest sources from Git. This
is as follows:
<screen>
<prompt>$ </prompt>git clone https://github.com/NixOS/nixpkgs
<prompt>$ </prompt>cd nixpkgs
<prompt>$ </prompt>git remote update origin
</screen>
This will check out the latest Nixpkgs sources to
<filename>./nixpkgs</filename> the NixOS sources to
<filename>./nixpkgs/nixos</filename>. (The NixOS source tree lives in a
subdirectory of the Nixpkgs repository.) The
<literal>nixpkgs</literal> repository has branches that correspond
to each Nixpkgs/NixOS channel (see <xref linkend="sec-upgrading"/> for more
information about channels). Thus, the Git branch
<literal>origin/nixos-17.03</literal> will contain the latest built and
tested version available in the <literal>nixos-17.03</literal> channel.
</para>
<para>
Its often inconvenient to develop directly on the master branch, since if
somebody has just committed (say) a change to GCC, then the binary cache may
not have caught up yet and youll have to rebuild everything from source.
So you may want to create a local branch based on your current NixOS version:
<screen>
<prompt>$ </prompt>nixos-version
17.09pre104379.6e0b727 (Hummingbird)
<prompt>$ </prompt>git checkout -b local 6e0b727
</screen>
Or, to base your local branch on the latest version available in a NixOS
channel:
<screen>
<prompt>$ </prompt>git remote update origin
<prompt>$ </prompt>git checkout -b local origin/nixos-17.03
</screen>
(Replace <literal>nixos-17.03</literal> with the name of the channel you want
to use.) You can use <command>git merge</command> or <command>git
rebase</command> to keep your local branch in sync with the channel, e.g.
<screen>
<prompt>$ </prompt>git remote update origin
<prompt>$ </prompt>git merge origin/nixos-17.03
</screen>
You can use <command>git cherry-pick</command> to copy commits from your
local branch to the upstream branch.
</para>
<para>
If you want to rebuild your system using your (modified) sources, you need to
tell <command>nixos-rebuild</command> about them using the
<option>-I</option> flag:
<screen>
<prompt># </prompt>nixos-rebuild switch -I nixpkgs=<replaceable>/my/sources</replaceable>/nixpkgs
</screen>
</para>
<para>
If you want <command>nix-env</command> to use the expressions in
<replaceable>/my/sources</replaceable>, use <command>nix-env -f
<replaceable>/my/sources</replaceable>/nixpkgs</command>, or change the
default by adding a symlink in <filename>~/.nix-defexpr</filename>:
<screen>
<prompt>$ </prompt>ln -s <replaceable>/my/sources</replaceable>/nixpkgs ~/.nix-defexpr/nixpkgs
</screen>
You may want to delete the symlink
<filename>~/.nix-defexpr/channels_root</filename> to prevent roots NixOS
channel from clashing with your own tree (this may break the
command-not-found utility though). If you want to go back to the default
state, you may just remove the <filename>~/.nix-defexpr</filename> directory
completely, log out and log in again and it should have been recreated with a
link to the root channels.
</para>
<!-- FIXME: not sure what this means.
<para>You should not pass the base directory
<filename><replaceable>/my/sources</replaceable></filename>
to <command>nix-env</command>, as it will break after interpreting expressions
in <filename>nixos/</filename> as packages.</para>
-->
</chapter>

View File

@ -0,0 +1,18 @@
# Testing the Installer {#ch-testing-installer}
Building, burning, and booting from an installation CD is rather
tedious, so here is a quick way to see if the installer works properly:
```ShellSession
# mount -t tmpfs none /mnt
# nixos-generate-config --root /mnt
$ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-install
# ./result/bin/nixos-install
```
To start a login shell in the new NixOS installation in `/mnt`:
```ShellSession
$ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-enter
# ./result/bin/nixos-enter
```

View File

@ -1,22 +0,0 @@
<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="ch-testing-installer">
<title>Testing the Installer</title>
<para>
Building, burning, and booting from an installation CD is rather tedious, so
here is a quick way to see if the installer works properly:
<screen>
<prompt># </prompt>mount -t tmpfs none /mnt
<prompt># </prompt>nixos-generate-config --root /mnt
<prompt>$ </prompt>nix-build '&lt;nixpkgs/nixos>' -A config.system.build.nixos-install
<prompt># </prompt>./result/bin/nixos-install</screen>
To start a login shell in the new NixOS installation in
<filename>/mnt</filename>:
<screen>
<prompt>$ </prompt>nix-build '&lt;nixpkgs/nixos>' -A config.system.build.nixos-enter
<prompt># </prompt>./result/bin/nixos-enter
</screen>
</para>
</chapter>

View File

@ -0,0 +1,93 @@
# Writing NixOS Documentation {#sec-writing-documentation}
As NixOS grows, so too does the need for a catalogue and explanation of
its extensive functionality. Collecting pertinent information from
disparate sources and presenting it in an accessible style would be a
worthy contribution to the project.
## Building the Manual {#sec-writing-docs-building-the-manual}
The DocBook sources of the [](#book-nixos-manual) are in the
[`nixos/doc/manual`](https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual)
subdirectory of the Nixpkgs repository.
You can quickly validate your edits with `make`:
```ShellSession
$ cd /path/to/nixpkgs/nixos/doc/manual
$ nix-shell
nix-shell$ make
```
Once you are done making modifications to the manual, it\'s important to
build it before committing. You can do that as follows:
```ShellSession
nix-build nixos/release.nix -A manual.x86_64-linux
```
When this command successfully finishes, it will tell you where the
manual got generated. The HTML will be accessible through the `result`
symlink at `./result/share/doc/nixos/index.html`.
## Editing DocBook XML {#sec-writing-docs-editing-docbook-xml}
For general information on how to write in DocBook, see [DocBook 5: The
Definitive Guide](http://www.docbook.org/tdg5/en/html/docbook.html).
Emacs nXML Mode is very helpful for editing DocBook XML because it
validates the document as you write, and precisely locates errors. To
use it, see [](#sec-emacs-docbook-xml).
[Pandoc](http://pandoc.org) can generate DocBook XML from a multitude of
formats, which makes a good starting point. Here is an example of Pandoc
invocation to convert GitHub-Flavoured MarkDown to DocBook 5 XML:
```ShellSession
pandoc -f markdown_github -t docbook5 docs.md -o my-section.md
```
Pandoc can also quickly convert a single `section.xml` to HTML, which is
helpful when drafting.
Sometimes writing valid DocBook is simply too difficult. In this case,
submit your documentation updates in a [GitHub
Issue](https://github.com/NixOS/nixpkgs/issues/new) and someone will
handle the conversion to XML for you.
## Creating a Topic {#sec-writing-docs-creating-a-topic}
You can use an existing topic as a basis for the new topic or create a
topic from scratch.
Keep the following guidelines in mind when you create and add a topic:
- The NixOS [`book`](http://www.docbook.org/tdg5/en/html/book.html)
element is in `nixos/doc/manual/manual.xml`. It includes several
[`parts`](http://www.docbook.org/tdg5/en/html/book.html) which are in
subdirectories.
- Store the topic file in the same directory as the `part` to which it
belongs. If your topic is about configuring a NixOS module, then the
XML file can be stored alongside the module definition `nix` file.
- If you include multiple words in the file name, separate the words
with a dash. For example: `ipv6-config.xml`.
- Make sure that the `xml:id` value is unique. You can use abbreviations
if the ID is too long. For example: `nixos-config`.
- Determine whether your topic is a chapter or a section. If you are
unsure, open an existing topic file and check whether the main
element is chapter or section.
## Adding a Topic to the Book {#sec-writing-docs-adding-a-topic}
Open the parent XML file and add an `xi:include` element to the list of
chapters with the file name of the topic that you created. If you
created a `section`, you add the file to the `chapter` file. If you created
a `chapter`, you add the file to the `part` file.
If the topic is about configuring a NixOS module, it can be
automatically included in the manual by using the `meta.doc` attribute.
See [](#sec-meta-attributes) for an explanation.

View File

@ -1,150 +0,0 @@
<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-writing-documentation">
<title>Writing NixOS Documentation</title>
<para>
As NixOS grows, so too does the need for a catalogue and explanation of its
extensive functionality. Collecting pertinent information from disparate
sources and presenting it in an accessible style would be a worthy
contribution to the project.
</para>
<section xml:id="sec-writing-docs-building-the-manual">
<title>Building the Manual</title>
<para>
The DocBook sources of the <xref linkend="book-nixos-manual"/> are in the
<link xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual"><filename>nixos/doc/manual</filename></link>
subdirectory of the Nixpkgs repository.
</para>
<para>
You can quickly validate your edits with <command>make</command>:
</para>
<screen>
<prompt>$ </prompt>cd /path/to/nixpkgs/nixos/doc/manual
<prompt>$ </prompt>nix-shell
<prompt>nix-shell$ </prompt>make
</screen>
<para>
Once you are done making modifications to the manual, it's important to
build it before committing. You can do that as follows:
</para>
<screen>nix-build nixos/release.nix -A manual.x86_64-linux</screen>
<para>
When this command successfully finishes, it will tell you where the manual
got generated. The HTML will be accessible through the
<filename>result</filename> symlink at
<filename>./result/share/doc/nixos/index.html</filename>.
</para>
</section>
<section xml:id="sec-writing-docs-editing-docbook-xml">
<title>Editing DocBook XML</title>
<para>
For general information on how to write in DocBook, see
<link xlink:href="http://www.docbook.org/tdg5/en/html/docbook.html"> DocBook
5: The Definitive Guide</link>.
</para>
<para>
Emacs nXML Mode is very helpful for editing DocBook XML because it validates
the document as you write, and precisely locates errors. To use it, see
<xref linkend="sec-emacs-docbook-xml"/>.
</para>
<para>
<link xlink:href="http://pandoc.org">Pandoc</link> can generate DocBook XML
from a multitude of formats, which makes a good starting point.
<example xml:id="ex-pandoc-xml-conv">
<title>Pandoc invocation to convert GitHub-Flavoured MarkDown to DocBook 5 XML</title>
<screen>pandoc -f markdown_github -t docbook5 docs.md -o my-section.md</screen>
</example>
Pandoc can also quickly convert a single <filename>section.xml</filename> to
HTML, which is helpful when drafting.
</para>
<para>
Sometimes writing valid DocBook is simply too difficult. In this case,
submit your documentation updates in a
<link
xlink:href="https://github.com/NixOS/nixpkgs/issues/new">GitHub
Issue</link> and someone will handle the conversion to XML for you.
</para>
</section>
<section xml:id="sec-writing-docs-creating-a-topic">
<title>Creating a Topic</title>
<para>
You can use an existing topic as a basis for the new topic or create a topic
from scratch.
</para>
<para>
Keep the following guidelines in mind when you create and add a topic:
<itemizedlist>
<listitem>
<para>
The NixOS
<link xlink:href="http://www.docbook.org/tdg5/en/html/book.html"><tag>book</tag></link>
element is in <filename>nixos/doc/manual/manual.xml</filename>. It
includes several
<link xlink:href="http://www.docbook.org/tdg5/en/html/book.html"><tag>part</tag>s</link>
which are in subdirectories.
</para>
</listitem>
<listitem>
<para>
Store the topic file in the same directory as the <tag>part</tag> to
which it belongs. If your topic is about configuring a NixOS module, then
the XML file can be stored alongside the module definition
<filename>nix</filename> file.
</para>
</listitem>
<listitem>
<para>
If you include multiple words in the file name, separate the words with a
dash. For example: <filename>ipv6-config.xml</filename>.
</para>
</listitem>
<listitem>
<para>
Make sure that the <tag>xml:id</tag> value is unique. You can use
abbreviations if the ID is too long. For example:
<varname>nixos-config</varname>.
</para>
</listitem>
<listitem>
<para>
Determine whether your topic is a chapter or a section. If you are
unsure, open an existing topic file and check whether the main element is
chapter or section.
</para>
</listitem>
</itemizedlist>
</para>
</section>
<section xml:id="sec-writing-docs-adding-a-topic">
<title>Adding a Topic to the Book</title>
<para>
Open the parent XML file and add an <varname>xi:include</varname> element to
the list of chapters with the file name of the topic that you created. If
you created a <tag>section</tag>, you add the file to the <tag>chapter</tag>
file. If you created a <tag>chapter</tag>, you add the file to the
<tag>part</tag> file.
</para>
<para>
If the topic is about configuring a NixOS module, it can be automatically
included in the manual by using the <varname>meta.doc</varname> attribute.
See <xref
linkend="sec-meta-attributes"/> for an explanation.
</para>
</section>
</chapter>

View File

@ -0,0 +1,124 @@
<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-building-parts">
<title>Building Specific Parts of NixOS</title>
<para>
With the command <literal>nix-build</literal>, you can build
specific parts of your NixOS configuration. This is done as follows:
</para>
<programlisting>
$ cd /path/to/nixpkgs/nixos
$ nix-build -A config.option
</programlisting>
<para>
where <literal>option</literal> is a NixOS option with type
<quote>derivation</quote> (i.e. something that can be built).
Attributes of interest include:
</para>
<variablelist>
<varlistentry>
<term>
<literal>system.build.toplevel</literal>
</term>
<listitem>
<para>
The top-level option that builds the entire NixOS system.
Everything else in your configuration is indirectly pulled in
by this option. This is what <literal>nixos-rebuild</literal>
builds and what <literal>/run/current-system</literal> points
to afterwards.
</para>
<para>
A shortcut to build this is:
</para>
<programlisting>
$ nix-build -A system
</programlisting>
</listitem>
</varlistentry>
<varlistentry>
<term>
<literal>system.build.manual.manualHTML</literal>
</term>
<listitem>
<para>
The NixOS manual.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<literal>system.build.etc</literal>
</term>
<listitem>
<para>
A tree of symlinks that form the static parts of
<literal>/etc</literal>.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<literal>system.build.initialRamdisk</literal> ,
<literal>system.build.kernel</literal>
</term>
<listitem>
<para>
The initial ramdisk and kernel of the system. This allows a
quick way to test whether the kernel and the initial ramdisk
boot correctly, by using QEMUs <literal>-kernel</literal> and
<literal>-initrd</literal> options:
</para>
<programlisting>
$ nix-build -A config.system.build.initialRamdisk -o initrd
$ nix-build -A config.system.build.kernel -o kernel
$ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/null
</programlisting>
</listitem>
</varlistentry>
<varlistentry>
<term>
<literal>system.build.nixos-rebuild</literal> ,
<literal>system.build.nixos-install</literal> ,
<literal>system.build.nixos-generate-config</literal>
</term>
<listitem>
<para>
These build the corresponding NixOS commands.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<literal>systemd.units.unit-name.unit</literal>
</term>
<listitem>
<para>
This builds the unit with the specified name. Note that since
unit names contain dots (e.g.
<literal>httpd.service</literal>), you need to put them
between quotes, like this:
</para>
<programlisting>
$ nix-build -A 'config.systemd.units.&quot;httpd.service&quot;.unit'
</programlisting>
<para>
You can also test individual units, without rebuilding the
whole system, by putting them in
<literal>/run/systemd/system</literal>:
</para>
<programlisting>
$ cp $(nix-build -A 'config.systemd.units.&quot;httpd.service&quot;.unit')/httpd.service \
/run/systemd/system/tmp-httpd.service
# systemctl daemon-reload
# systemctl start tmp-httpd.service
</programlisting>
<para>
Note that the unit must not have the same name as any unit in
<literal>/etc/systemd/system</literal> since those take
precedence over <literal>/run/systemd/system</literal>. Thats
why the unit is installed as
<literal>tmp-httpd.service</literal> here.
</para>
</listitem>
</varlistentry>
</variablelist>
</chapter>

View File

@ -0,0 +1,90 @@
<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-getting-sources">
<title>Getting the Sources</title>
<para>
By default, NixOSs <literal>nixos-rebuild</literal> command uses
the NixOS and Nixpkgs sources provided by the
<literal>nixos</literal> channel (kept in
<literal>/nix/var/nix/profiles/per-user/root/channels/nixos</literal>).
To modify NixOS, however, you should check out the latest sources
from Git. This is as follows:
</para>
<programlisting>
$ git clone https://github.com/NixOS/nixpkgs
$ cd nixpkgs
$ git remote update origin
</programlisting>
<para>
This will check out the latest Nixpkgs sources to
<literal>./nixpkgs</literal> the NixOS sources to
<literal>./nixpkgs/nixos</literal>. (The NixOS source tree lives in
a subdirectory of the Nixpkgs repository.) The
<literal>nixpkgs</literal> repository has branches that correspond
to each Nixpkgs/NixOS channel (see <xref linkend="sec-upgrading" />
for more information about channels). Thus, the Git branch
<literal>origin/nixos-17.03</literal> will contain the latest built
and tested version available in the <literal>nixos-17.03</literal>
channel.
</para>
<para>
Its often inconvenient to develop directly on the master branch,
since if somebody has just committed (say) a change to GCC, then the
binary cache may not have caught up yet and youll have to rebuild
everything from source. So you may want to create a local branch
based on your current NixOS version:
</para>
<programlisting>
$ nixos-version
17.09pre104379.6e0b727 (Hummingbird)
$ git checkout -b local 6e0b727
</programlisting>
<para>
Or, to base your local branch on the latest version available in a
NixOS channel:
</para>
<programlisting>
$ git remote update origin
$ git checkout -b local origin/nixos-17.03
</programlisting>
<para>
(Replace <literal>nixos-17.03</literal> with the name of the channel
you want to use.) You can use <literal>git merge</literal> or
<literal>git rebase</literal> to keep your local branch in sync with
the channel, e.g.
</para>
<programlisting>
$ git remote update origin
$ git merge origin/nixos-17.03
</programlisting>
<para>
You can use <literal>git cherry-pick</literal> to copy commits from
your local branch to the upstream branch.
</para>
<para>
If you want to rebuild your system using your (modified) sources,
you need to tell <literal>nixos-rebuild</literal> about them using
the <literal>-I</literal> flag:
</para>
<programlisting>
# nixos-rebuild switch -I nixpkgs=/my/sources/nixpkgs
</programlisting>
<para>
If you want <literal>nix-env</literal> to use the expressions in
<literal>/my/sources</literal>, use
<literal>nix-env -f /my/sources/nixpkgs</literal>, or change the
default by adding a symlink in <literal>~/.nix-defexpr</literal>:
</para>
<programlisting>
$ ln -s /my/sources/nixpkgs ~/.nix-defexpr/nixpkgs
</programlisting>
<para>
You may want to delete the symlink
<literal>~/.nix-defexpr/channels_root</literal> to prevent roots
NixOS channel from clashing with your own tree (this may break the
command-not-found utility though). If you want to go back to the
default state, you may just remove the
<literal>~/.nix-defexpr</literal> directory completely, log out and
log in again and it should have been recreated with a link to the
root channels.
</para>
</chapter>

View File

@ -0,0 +1,22 @@
<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ch-testing-installer">
<title>Testing the Installer</title>
<para>
Building, burning, and booting from an installation CD is rather
tedious, so here is a quick way to see if the installer works
properly:
</para>
<programlisting>
# mount -t tmpfs none /mnt
# nixos-generate-config --root /mnt
$ nix-build '&lt;nixpkgs/nixos&gt;' -A config.system.build.nixos-install
# ./result/bin/nixos-install
</programlisting>
<para>
To start a login shell in the new NixOS installation in
<literal>/mnt</literal>:
</para>
<programlisting>
$ nix-build '&lt;nixpkgs/nixos&gt;' -A config.system.build.nixos-enter
# ./result/bin/nixos-enter
</programlisting>
</chapter>

View File

@ -0,0 +1,144 @@
<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-writing-documentation">
<title>Writing NixOS Documentation</title>
<para>
As NixOS grows, so too does the need for a catalogue and explanation
of its extensive functionality. Collecting pertinent information
from disparate sources and presenting it in an accessible style
would be a worthy contribution to the project.
</para>
<section xml:id="sec-writing-docs-building-the-manual">
<title>Building the Manual</title>
<para>
The DocBook sources of the <xref linkend="book-nixos-manual" />
are in the
<link xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual"><literal>nixos/doc/manual</literal></link>
subdirectory of the Nixpkgs repository.
</para>
<para>
You can quickly validate your edits with <literal>make</literal>:
</para>
<programlisting>
$ cd /path/to/nixpkgs/nixos/doc/manual
$ nix-shell
nix-shell$ make
</programlisting>
<para>
Once you are done making modifications to the manual, it's
important to build it before committing. You can do that as
follows:
</para>
<programlisting>
nix-build nixos/release.nix -A manual.x86_64-linux
</programlisting>
<para>
When this command successfully finishes, it will tell you where
the manual got generated. The HTML will be accessible through the
<literal>result</literal> symlink at
<literal>./result/share/doc/nixos/index.html</literal>.
</para>
</section>
<section xml:id="sec-writing-docs-editing-docbook-xml">
<title>Editing DocBook XML</title>
<para>
For general information on how to write in DocBook, see
<link xlink:href="http://www.docbook.org/tdg5/en/html/docbook.html">DocBook
5: The Definitive Guide</link>.
</para>
<para>
Emacs nXML Mode is very helpful for editing DocBook XML because it
validates the document as you write, and precisely locates errors.
To use it, see <xref linkend="sec-emacs-docbook-xml" />.
</para>
<para>
<link xlink:href="http://pandoc.org">Pandoc</link> can generate
DocBook XML from a multitude of formats, which makes a good
starting point. Here is an example of Pandoc invocation to convert
GitHub-Flavoured MarkDown to DocBook 5 XML:
</para>
<programlisting>
pandoc -f markdown_github -t docbook5 docs.md -o my-section.md
</programlisting>
<para>
Pandoc can also quickly convert a single
<literal>section.xml</literal> to HTML, which is helpful when
drafting.
</para>
<para>
Sometimes writing valid DocBook is simply too difficult. In this
case, submit your documentation updates in a
<link xlink:href="https://github.com/NixOS/nixpkgs/issues/new">GitHub
Issue</link> and someone will handle the conversion to XML for
you.
</para>
</section>
<section xml:id="sec-writing-docs-creating-a-topic">
<title>Creating a Topic</title>
<para>
You can use an existing topic as a basis for the new topic or
create a topic from scratch.
</para>
<para>
Keep the following guidelines in mind when you create and add a
topic:
</para>
<itemizedlist>
<listitem>
<para>
The NixOS
<link xlink:href="http://www.docbook.org/tdg5/en/html/book.html"><literal>book</literal></link>
element is in <literal>nixos/doc/manual/manual.xml</literal>.
It includes several
<link xlink:href="http://www.docbook.org/tdg5/en/html/book.html"><literal>parts</literal></link>
which are in subdirectories.
</para>
</listitem>
<listitem>
<para>
Store the topic file in the same directory as the
<literal>part</literal> to which it belongs. If your topic is
about configuring a NixOS module, then the XML file can be
stored alongside the module definition <literal>nix</literal>
file.
</para>
</listitem>
<listitem>
<para>
If you include multiple words in the file name, separate the
words with a dash. For example:
<literal>ipv6-config.xml</literal>.
</para>
</listitem>
<listitem>
<para>
Make sure that the <literal>xml:id</literal> value is unique.
You can use abbreviations if the ID is too long. For example:
<literal>nixos-config</literal>.
</para>
</listitem>
<listitem>
<para>
Determine whether your topic is a chapter or a section. If you
are unsure, open an existing topic file and check whether the
main element is chapter or section.
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-writing-docs-adding-a-topic">
<title>Adding a Topic to the Book</title>
<para>
Open the parent XML file and add an <literal>xi:include</literal>
element to the list of chapters with the file name of the topic
that you created. If you created a <literal>section</literal>, you
add the file to the <literal>chapter</literal> file. If you
created a <literal>chapter</literal>, you add the file to the
<literal>part</literal> file.
</para>
<para>
If the topic is about configuring a NixOS module, it can be
automatically included in the manual by using the
<literal>meta.doc</literal> attribute. See
<xref linkend="sec-meta-attributes" /> for an explanation.
</para>
</section>
</chapter>

View File

@ -120,6 +120,24 @@ in
'';
};
man.manualPages = mkOption {
type = types.path;
default = pkgs.buildEnv {
name = "man-paths";
paths = config.environment.systemPackages;
pathsToLink = [ "/share/man" ];
extraOutputsToInstall = ["man"];
ignoreCollisions = true;
};
defaultText = "all man pages in config.environment.systemPackages";
description = ''
The manual pages to generate caches for if <option>generateCaches</option>
is enabled. Must be a path to a directory with man pages under
<literal>/share/man</literal>; see the source for an example.
Advanced users can make this a content-addressed derivation to save a few rebuilds.
'';
};
info.enable = mkOption {
type = types.bool;
default = true;
@ -207,16 +225,8 @@ in
environment.extraOutputsToInstall = [ "man" ] ++ optional cfg.dev.enable "devman";
environment.etc."man_db.conf".text =
let
manualPages = pkgs.buildEnv {
name = "man-paths";
paths = config.environment.systemPackages;
pathsToLink = [ "/share/man" ];
extraOutputsToInstall = ["man"];
ignoreCollisions = true;
};
manualCache = pkgs.runCommandLocal "man-cache" { }
''
echo "MANDB_MAP ${manualPages}/share/man $out" > man.conf
manualCache = pkgs.runCommandLocal "man-cache" { } ''
echo "MANDB_MAP ${cfg.man.manualPages}/share/man $out" > man.conf
${pkgs.man-db}/bin/mandb -C man.conf -psc >/dev/null 2>&1
'';
in

View File

@ -18,7 +18,8 @@ in
environment.variables =
{ NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix";
PAGER = mkDefault "less -R";
PAGER = mkDefault "less";
LESS = mkDefault "-R";
EDITOR = mkDefault "nano";
XDG_CONFIG_DIRS = [ "/etc/xdg" ]; # needs to be before profile-relative paths to allow changes through environment.etc
};

View File

@ -4,7 +4,7 @@ with lib;
let cfg = config.nix.sshServe;
command =
if cfg.protocol == "ssh"
then "nix-store --serve"
then "nix-store --serve ${lib.optionalString cfg.write "--write"}"
else "nix-daemon --stdio";
in {
options = {
@ -17,6 +17,12 @@ in {
description = "Whether to enable serving the Nix store as a remote store via SSH.";
};
write = mkOption {
type = types.bool;
default = false;
description = "Whether to enable writing to the Nix store as a remote store via SSH. Note: the sshServe user is named nix-ssh and is not a trusted-user. nix-ssh should be added to the nix.trustedUsers option in most use cases, such as allowing remote building of derivations.";
};
keys = mkOption {
type = types.listOf types.str;
default = [];

View File

@ -6,12 +6,15 @@ let
cfg = config.services.gnunet;
homeDir = "/var/lib/gnunet";
stateDir = "/var/lib/gnunet";
configFile = with cfg; pkgs.writeText "gnunetd.conf"
configFile = with cfg;
''
[PATHS]
SERVICEHOME = ${homeDir}
GNUNET_HOME = ${stateDir}
GNUNET_RUNTIME_DIR = /run/gnunet
GNUNET_USER_RUNTIME_DIR = /run/gnunet
GNUNET_DATA_HOME = ${stateDir}/data
[ats]
WAN_QUOTA_IN = ${toString load.maxNetDownBandwidth} b
@ -137,8 +140,6 @@ in
users.users.gnunet = {
group = "gnunet";
description = "GNUnet User";
home = homeDir;
createHome = true;
uid = config.ids.uids.gnunet;
};
@ -148,17 +149,20 @@ in
# so install them globally.
environment.systemPackages = [ cfg.package ];
environment.etc."gnunet.conf".text = configFile;
systemd.services.gnunet = {
description = "GNUnet";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
restartTriggers = [ configFile ];
path = [ cfg.package pkgs.miniupnpc ];
environment.TMPDIR = "/tmp";
serviceConfig.PrivateTmp = true;
serviceConfig.ExecStart = "${cfg.package}/lib/gnunet/libexec/gnunet-service-arm -c ${configFile}";
serviceConfig.ExecStart = "${cfg.package}/lib/gnunet/libexec/gnunet-service-arm -c /etc/gnunet.conf";
serviceConfig.User = "gnunet";
serviceConfig.UMask = "0007";
serviceConfig.WorkingDirectory = homeDir;
serviceConfig.WorkingDirectory = stateDir;
serviceConfig.RuntimeDirectory = "gnunet";
serviceConfig.StateDirectory = "gnunet";
};
};

View File

@ -234,10 +234,10 @@
elpaBuild {
pname = "auctex";
ename = "auctex";
version = "13.0.13";
version = "13.0.14";
src = fetchurl {
url = "https://elpa.gnu.org/packages/auctex-13.0.13.tar";
sha256 = "06cb9jphqd0nysc60b4x24zmdryljb168cw66adl7b2x7sdzpkmn";
url = "https://elpa.gnu.org/packages/auctex-13.0.14.tar";
sha256 = "1gmqdcg9s6xf8kvzh1j27nbimakd5cy8pwsn0il19l026kxjimr8";
};
packageRequires = [ emacs ];
meta = {
@ -707,6 +707,21 @@
license = lib.licenses.free;
};
}) {};
crdt = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "crdt";
ename = "crdt";
version = "0.1.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/crdt-0.1.4.tar";
sha256 = "1qqfjvkajwhdhz0jhqixdn68l1rl02pn2fmxizzsv0as20v0ay0r";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/crdt.html";
license = lib.licenses.free;
};
}) {};
crisp = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "crisp";
@ -726,10 +741,10 @@
elpaBuild {
pname = "csharp-mode";
ename = "csharp-mode";
version = "1.0.0";
version = "1.0.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/csharp-mode-1.0.0.tar";
sha256 = "0vhm443fkcjsj95r4rs9r0mz9vzfk92883nxhyi35d3jaf112gm1";
url = "https://elpa.gnu.org/packages/csharp-mode-1.0.2.tar";
sha256 = "1xddnd6g6qz3xnzl6dmd38qvzvm32acdyhmm27hfdpqcbg6isfad";
};
packageRequires = [ emacs ];
meta = {
@ -786,10 +801,10 @@
elpaBuild {
pname = "dash";
ename = "dash";
version = "2.19.0";
version = "2.19.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/dash-2.19.0.tar";
sha256 = "0qszjs60xxqjiqf5f2bgmnbx5jiqii4ghcydwg500za0n2j0f5sx";
url = "https://elpa.gnu.org/packages/dash-2.19.1.tar";
sha256 = "0c11lm7wpgmqk8zbdcpmyas12ylml5yhp99mj9h1wqqw0p33xaiw";
};
packageRequires = [ emacs ];
meta = {
@ -1026,10 +1041,10 @@
elpaBuild {
pname = "ebdb";
ename = "ebdb";
version = "0.8.2";
version = "0.8.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ebdb-0.8.2.tar";
sha256 = "1idwih5v287q9vdhsnr1bsibdv4h61vmy3b82svf2x9aik1a7vir";
url = "https://elpa.gnu.org/packages/ebdb-0.8.4.tar";
sha256 = "0n811af83fqpzq9513gf240gnz7qkwrjw07qs4sra4069q0pwnjr";
};
packageRequires = [ emacs seq ];
meta = {
@ -1220,6 +1235,21 @@
license = lib.licenses.free;
};
}) {};
engrave-faces = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "engrave-faces";
ename = "engrave-faces";
version = "0.2.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/engrave-faces-0.2.0.tar";
sha256 = "1d0hsfg3wvwbs82gjyvfjvy1sszcm7qa50bch1b6jy05kbc543ip";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/engrave-faces.html";
license = lib.licenses.free;
};
}) {};
enwc = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "enwc";
@ -3752,6 +3782,21 @@
license = lib.licenses.free;
};
}) {};
taxy = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "taxy";
ename = "taxy";
version = "0.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/taxy-0.4.tar";
sha256 = "1iy1761v2q0i020x8ch4z3vljx2v62pcy5bifxq8gw5qx0115576";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/taxy.html";
license = lib.licenses.free;
};
}) {};
temp-buffer-browse = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "temp-buffer-browse";
@ -3820,10 +3865,10 @@
elpaBuild {
pname = "tramp";
ename = "tramp";
version = "2.5.1.1";
version = "2.5.1.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/tramp-2.5.1.1.tar";
sha256 = "0v3rvvhjcnyvg6l4vyxz6513mxzvv9n0skkmr62ry8yi5x9wnqp1";
url = "https://elpa.gnu.org/packages/tramp-2.5.1.2.tar";
sha256 = "0p8m8prxrvrr455ahb626c1dry04m80y017h16ngr4i5ais0r85g";
};
packageRequires = [ emacs ];
meta = {
@ -3990,6 +4035,21 @@
license = lib.licenses.free;
};
}) {};
vc-backup = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "vc-backup";
ename = "vc-backup";
version = "1.0.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/vc-backup-1.0.0.tar";
sha256 = "0vcrbb4s1rzar9q882kfcslycxvycp61923sg82i29b7yd0yrgdr";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/vc-backup.html";
license = lib.licenses.free;
};
}) {};
vc-hgcmd = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "vc-hgcmd";
@ -4379,10 +4439,10 @@
elpaBuild {
pname = "xref";
ename = "xref";
version = "1.1.0";
version = "1.2.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/xref-1.1.0.tar";
sha256 = "1s7pwk09bry4nqr4bc78a3mbwyrxagai2gpsd49x47czy2x7m3ax";
url = "https://elpa.gnu.org/packages/xref-1.2.2.tar";
sha256 = "14kdy8blhs6lwg349l9lmv0bbpybgi9nsg2iic3v87j4jyi41ljm";
};
packageRequires = [ emacs ];
meta = {

View File

@ -6,7 +6,7 @@ To update the list of packages from MELPA,
1. Run `./update-elpa`.
2. Check for evaluation errors:
`nix-instantiate ../../../../../ -A emacs.pkgs.elpaPackages`.
env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate ../../../../../ -A emacs.pkgs.elpaPackages
3. Run `git commit -m "elpa-packages $(date -Idate)" -- elpa-generated.nix`
## Update from overlay

View File

@ -1,20 +1,598 @@
{ callPackage }:
{
caml = callPackage ({ elpaBuild, fetchurl, lib }:
apache-mode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "caml";
ename = "caml";
version = "4.7.1";
pname = "apache-mode";
ename = "apache-mode";
version = "2.2.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/caml-4.7.1.tar";
sha256 = "1bv2fscy7zg7r1hyg4rpvh3991vmhy4zid7bv1qbhxa95m9c49j3";
url = "https://elpa.nongnu.org/nongnu/apache-mode-2.2.0.tar";
sha256 = "022s7rw7ary1cx3riszzvb7wi0y078vixkcyggjdg5j2ckjpc8gb";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/apache-mode.html";
license = lib.licenses.free;
};
}) {};
arduino-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib, spinner }:
elpaBuild {
pname = "arduino-mode";
ename = "arduino-mode";
version = "1.3.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/arduino-mode-1.3.0.tar";
sha256 = "1270mbjgj0kmmjqqblwaipmd2667yp31mgspib3c5d7d6acs1bfx";
};
packageRequires = [ emacs spinner ];
meta = {
homepage = "https://elpa.gnu.org/packages/arduino-mode.html";
license = lib.licenses.free;
};
}) {};
bison-mode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "bison-mode";
ename = "bison-mode";
version = "0.4";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/bison-mode-0.4.tar";
sha256 = "19n9kz1ycjpxngd3clzr8lzrnnw19l8sfvlx1yqn35hk7017z7ab";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/bison-mode.html";
license = lib.licenses.free;
};
}) {};
caml = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "caml";
ename = "caml";
version = "4.8";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/caml-4.8.tar";
sha256 = "02wzjdd1ig8ajy65rf87zaysfddjbhyswifwlcs52ly7p84q72wk";
};
packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/caml.html";
license = lib.licenses.free;
};
}) {};
clojure-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "clojure-mode";
ename = "clojure-mode";
version = "5.13.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.13.0.tar";
sha256 = "16xll0sp7mqzwldfsihp7j3dlm6ps1l1awi122ff8w7xph7b0wfh";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/clojure-mode.html";
license = lib.licenses.free;
};
}) {};
crux = callPackage ({ elpaBuild, fetchurl, lib, seq }:
elpaBuild {
pname = "crux";
ename = "crux";
version = "0.4.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/crux-0.4.0.tar";
sha256 = "01yg54s2l3zr4h7h3nw408bqzrr4yds9rfgc575b76006v5d3ciy";
};
packageRequires = [ seq ];
meta = {
homepage = "https://elpa.gnu.org/packages/crux.html";
license = lib.licenses.free;
};
}) {};
d-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "d-mode";
ename = "d-mode";
version = "202003130913";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/d-mode-202003130913.tar";
sha256 = "1pad0ib8l1zkjmh97n1pkwph1xdbcqidnicm3nwmcbmbi61lddsx";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/d-mode.html";
license = lib.licenses.free;
};
}) {};
dart-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "dart-mode";
ename = "dart-mode";
version = "1.0.7";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/dart-mode-1.0.7.tar";
sha256 = "13n0fmnxgnq8vjw0n5vwgdgfm5lznvrm3xkak4snkdw7w3rd3a20";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/dart-mode.html";
license = lib.licenses.free;
};
}) {};
editorconfig = callPackage ({ cl-lib ? null
, elpaBuild
, emacs
, fetchurl
, lib
, nadvice }:
elpaBuild {
pname = "editorconfig";
ename = "editorconfig";
version = "0.8.2";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/editorconfig-0.8.2.tar";
sha256 = "1ff8hwyzb249lf78j023sbibgfmimmk6mxkjmcnqqnk1jafprk02";
};
packageRequires = [ cl-lib emacs nadvice ];
meta = {
homepage = "https://elpa.gnu.org/packages/editorconfig.html";
license = lib.licenses.free;
};
}) {};
evil = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "evil";
ename = "evil";
version = "1.14.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/evil-1.14.0.tar";
sha256 = "11hzx3ya1119kr8dwlg264biixiqgvi7zwxxksql0a9hqp57rdpx";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/evil.html";
license = lib.licenses.free;
};
}) {};
geiser = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "geiser";
ename = "geiser";
version = "0.16";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/geiser-0.16.tar";
sha256 = "1mhngb1ik3qsc3w466cs61rbz3nn08ag29m5vfbd6adk60xmhnfk";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/geiser.html";
license = lib.licenses.free;
};
}) {};
geiser-chez = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }:
elpaBuild {
pname = "geiser-chez";
ename = "geiser-chez";
version = "0.16";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/geiser-chez-0.16.tar";
sha256 = "016b7n5rv7fyrw4lqcprhhf2rai5vvmmc8a13l4w3a30rwcgm7cd";
};
packageRequires = [ emacs geiser ];
meta = {
homepage = "https://elpa.gnu.org/packages/geiser-chez.html";
license = lib.licenses.free;
};
}) {};
geiser-chibi = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }:
elpaBuild {
pname = "geiser-chibi";
ename = "geiser-chibi";
version = "0.16";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/geiser-chibi-0.16.tar";
sha256 = "0j9dgg2q01ya6yawpfc15ywrfykd5gzbh118k1x4mghfkfnqn1zi";
};
packageRequires = [ emacs geiser ];
meta = {
homepage = "https://elpa.gnu.org/packages/geiser-chibi.html";
license = lib.licenses.free;
};
}) {};
geiser-chicken = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }:
elpaBuild {
pname = "geiser-chicken";
ename = "geiser-chicken";
version = "0.16";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/geiser-chicken-0.16.tar";
sha256 = "1zmb8c86akrd5f1v59s4xkbpgsqbdcbc6d5f9h6kxa55ylc4dn6a";
};
packageRequires = [ emacs geiser ];
meta = {
homepage = "https://elpa.gnu.org/packages/geiser-chicken.html";
license = lib.licenses.free;
};
}) {};
geiser-gambit = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }:
elpaBuild {
pname = "geiser-gambit";
ename = "geiser-gambit";
version = "0.16";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/geiser-gambit-0.16.tar";
sha256 = "0bc38qlqj7a3cnrcnqrb6m3jvjh2ia5iby9i50vcn0jbs52rfsnz";
};
packageRequires = [ emacs geiser ];
meta = {
homepage = "https://elpa.gnu.org/packages/geiser-gambit.html";
license = lib.licenses.free;
};
}) {};
geiser-gauche = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }:
elpaBuild {
pname = "geiser-gauche";
ename = "geiser-gauche";
version = "0.0.2";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/geiser-gauche-0.0.2.tar";
sha256 = "0wd0yddasryy36ms5ghf0gs8wf80sgdxci2hd8k0fvnyi7c3wnj5";
};
packageRequires = [ emacs geiser ];
meta = {
homepage = "https://elpa.gnu.org/packages/geiser-gauche.html";
license = lib.licenses.free;
};
}) {};
geiser-guile = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }:
elpaBuild {
pname = "geiser-guile";
ename = "geiser-guile";
version = "0.17";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.17.tar";
sha256 = "0g4982rfxjp08qi6nxz73lsbdwf388fx511394yw4s7ml6v1m4kd";
};
packageRequires = [ emacs geiser ];
meta = {
homepage = "https://elpa.gnu.org/packages/geiser-guile.html";
license = lib.licenses.free;
};
}) {};
geiser-kawa = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }:
elpaBuild {
pname = "geiser-kawa";
ename = "geiser-kawa";
version = "0.0.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/geiser-kawa-0.0.1.tar";
sha256 = "1qh4qr406ahk4k8g46nzkiic1fidhni0a5zv4i84cdypv1c4473p";
};
packageRequires = [ emacs geiser ];
meta = {
homepage = "https://elpa.gnu.org/packages/geiser-kawa.html";
license = lib.licenses.free;
};
}) {};
geiser-mit = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }:
elpaBuild {
pname = "geiser-mit";
ename = "geiser-mit";
version = "0.13";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/geiser-mit-0.13.tar";
sha256 = "1y2cgrcvdp358x7lpcz8x8nw5g1y4h03d9gbkbd6k85643cwrkbi";
};
packageRequires = [ emacs geiser ];
meta = {
homepage = "https://elpa.gnu.org/packages/geiser-mit.html";
license = lib.licenses.free;
};
}) {};
geiser-racket = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }:
elpaBuild {
pname = "geiser-racket";
ename = "geiser-racket";
version = "0.16";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/geiser-racket-0.16.tar";
sha256 = "0lf2lbgpl8pvx7yhiydb7j5hk3kdx34zvhva4zqnzya6zf30w257";
};
packageRequires = [ emacs geiser ];
meta = {
homepage = "https://elpa.gnu.org/packages/geiser-racket.html";
license = lib.licenses.free;
};
}) {};
geiser-stklos = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }:
elpaBuild {
pname = "geiser-stklos";
ename = "geiser-stklos";
version = "1.3";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/geiser-stklos-1.3.tar";
sha256 = "1wkhnkdhdrhrh0vipgnlmyimi859za6jhf2ldpwfmk8r2aj8ywan";
};
packageRequires = [ emacs geiser ];
meta = {
homepage = "https://elpa.gnu.org/packages/geiser-stklos.html";
license = lib.licenses.free;
};
}) {};
git-commit = callPackage ({ dash
, elpaBuild
, emacs
, fetchurl
, lib
, transient
, with-editor }:
elpaBuild {
pname = "git-commit";
ename = "git-commit";
version = "3.2.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/git-commit-3.2.1.tar";
sha256 = "1jndc8ppj4r2s62idabygj4q0qbpk4gwifn8jrd6pa61d7dlvp28";
};
packageRequires = [ dash emacs transient with-editor ];
meta = {
homepage = "https://elpa.gnu.org/packages/git-commit.html";
license = lib.licenses.free;
};
}) {};
gnuplot = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "gnuplot";
ename = "gnuplot";
version = "0.8.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/gnuplot-0.8.0.tar";
sha256 = "1f27y18ivcdwlkgr3ql4qcbgzdp6vk1bkw2wlryrclpydbb1nya3";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/gnuplot.html";
license = lib.licenses.free;
};
}) {};
go-mode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "go-mode";
ename = "go-mode";
version = "1.5.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/go-mode-1.5.0.tar";
sha256 = "0v4lw5dkijajpxyigin4cd5q4ldrabljaz65zr5f7mgqn5sizj3q";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/go-mode.html";
license = lib.licenses.free;
};
}) {};
goto-chg = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "goto-chg";
ename = "goto-chg";
version = "1.7.4";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/goto-chg-1.7.4.tar";
sha256 = "1sg2gp48b83gq0j821lk241lwyxkhqr6w5d1apbnkm3qf08qjwba";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/goto-chg.html";
license = lib.licenses.free;
};
}) {};
guru-mode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "guru-mode";
ename = "guru-mode";
version = "1.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/guru-mode-1.0.tar";
sha256 = "18vz80yc7nv6dgyyxmlxslwim7qpb1dx2y5382c2wbdqp0icg41g";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/guru-mode.html";
license = lib.licenses.free;
};
}) {};
haskell-mode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "haskell-mode";
ename = "haskell-mode";
version = "4.7.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/haskell-mode-4.7.1.tar";
sha256 = "07x7440xi8dkv1zpzwi7p96jy3zd6pdv1mhs066l8bp325516wyb";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/haskell-mode.html";
license = lib.licenses.free;
};
}) {};
highlight-parentheses = callPackage ({ elpaBuild
, emacs
, fetchurl
, lib }:
elpaBuild {
pname = "highlight-parentheses";
ename = "highlight-parentheses";
version = "2.1.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/highlight-parentheses-2.1.0.tar";
sha256 = "1rsixbvglar0k0x24xkxw80sx9i85q48jdzx6wbyjz2clz974ja5";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/highlight-parentheses.html";
license = lib.licenses.free;
};
}) {};
htmlize = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "htmlize";
ename = "htmlize";
version = "1.57";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/htmlize-1.57.tar";
sha256 = "1k4maqkcicvpl4yxkx6ha98x36ppcfdp2clcdg4fjx945yamx80s";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/htmlize.html";
license = lib.licenses.free;
};
}) {};
idris-mode = callPackage ({ cl-lib ? null
, elpaBuild
, emacs
, fetchurl
, lib
, prop-menu }:
elpaBuild {
pname = "idris-mode";
ename = "idris-mode";
version = "0.9.18";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/idris-mode-0.9.18.tar";
sha256 = "1z4wsqzxsmn1vdqp44b32m4wzs4bbnsyzv09v9ggr4l4h2j4c3x5";
};
packageRequires = [ cl-lib emacs prop-menu ];
meta = {
homepage = "https://elpa.gnu.org/packages/idris-mode.html";
license = lib.licenses.free;
};
}) {};
inf-clojure = callPackage ({ clojure-mode
, elpaBuild
, emacs
, fetchurl
, lib }:
elpaBuild {
pname = "inf-clojure";
ename = "inf-clojure";
version = "3.1.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/inf-clojure-3.1.0.tar";
sha256 = "0jw6rzplicbv2l7si46naspzp5lqwj20b1nmfs9zal58z1gx6zjk";
};
packageRequires = [ clojure-mode emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/inf-clojure.html";
license = lib.licenses.free;
};
}) {};
j-mode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "j-mode";
ename = "j-mode";
version = "1.1.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/j-mode-1.1.1.tar";
sha256 = "0l0l71z5i725dnw4l9w2cfjhrijwx9z8mgyf2dfcbly1cl2nvnx2";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/j-mode.html";
license = lib.licenses.free;
};
}) {};
julia-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "julia-mode";
ename = "julia-mode";
version = "0.4";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/julia-mode-0.4.tar";
sha256 = "1qi6z6007q2jgcb96iy34m87jsg9ss3jhzlnl2cl8dn26yqmdky4";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/julia-mode.html";
license = lib.licenses.free;
};
}) {};
lua-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "lua-mode";
ename = "lua-mode";
version = "20210802";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/lua-mode-20210802.tar";
sha256 = "1yarwai9a0w4yywd0ajdkif4g26z98zw91lg1z78qw0k61qjmnh6";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/lua-mode.html";
license = lib.licenses.free;
};
}) {};
macrostep = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "macrostep";
ename = "macrostep";
version = "0.9";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/macrostep-0.9.tar";
sha256 = "10crvq9xww4nvrswqq888y9ah3fl4prj0ha865aqbyrhhbpg18gd";
};
packageRequires = [ cl-lib ];
meta = {
homepage = "https://elpa.gnu.org/packages/macrostep.html";
license = lib.licenses.free;
};
}) {};
magit = callPackage ({ dash
, elpaBuild
, emacs
, fetchurl
, git-commit
, lib
, magit-section
, transient
, with-editor }:
elpaBuild {
pname = "magit";
ename = "magit";
version = "3.2.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/magit-3.2.1.tar";
sha256 = "0yyf16605bp5q8jl2vbljxx04ja0ljvs775dnnawlc3mvn13zd9n";
};
packageRequires = [
dash
emacs
git-commit
magit-section
transient
with-editor
];
meta = {
homepage = "https://elpa.gnu.org/packages/magit.html";
license = lib.licenses.free;
};
}) {};
magit-section = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "magit-section";
ename = "magit-section";
version = "3.2.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/magit-section-3.2.1.tar";
sha256 = "1ppinys8rfa38ac8grcx16hlaw33p03pif4ya6bbw280kq8c73rv";
};
packageRequires = [ dash emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/magit-section.html";
license = lib.licenses.free;
};
}) {};
markdown-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "markdown-mode";
@ -30,6 +608,51 @@
license = lib.licenses.free;
};
}) {};
multiple-cursors = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "multiple-cursors";
ename = "multiple-cursors";
version = "1.4.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/multiple-cursors-1.4.0.tar";
sha256 = "0f7rk8vw42bgdf5yb4qpnrc3bxvbaafmdqd7kiiqnj5m029yr14f";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/multiple-cursors.html";
license = lib.licenses.free;
};
}) {};
nasm-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "nasm-mode";
ename = "nasm-mode";
version = "1.1.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/nasm-mode-1.1.1.tar";
sha256 = "1smndl3mbiaaphy173zc405zg4wv0mv041vzy11fr74r5w4p232j";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/nasm-mode.html";
license = lib.licenses.free;
};
}) {};
nginx-mode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "nginx-mode";
ename = "nginx-mode";
version = "1.1.9";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/nginx-mode-1.1.9.tar";
sha256 = "04jy0zx058hj37ab2n6wwbbwyycsbsb2fj8s4a5f1is2in35nqy0";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/nginx-mode.html";
license = lib.licenses.free;
};
}) {};
org-contrib = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }:
elpaBuild {
pname = "org-contrib";
@ -45,6 +668,51 @@
license = lib.licenses.free;
};
}) {};
php-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "php-mode";
ename = "php-mode";
version = "1.24.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/php-mode-1.24.0.tar";
sha256 = "158850zdmz5irjy6cjai1i8j7qs1vwp95a2dli9f341lbpv2jvzp";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/php-mode.html";
license = lib.licenses.free;
};
}) {};
projectile = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "projectile";
ename = "projectile";
version = "2.5.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/projectile-2.5.0.tar";
sha256 = "09gsm6xbqj3357vlshs1w7ygfm004gpgs0pqrvwl6xmccxpqzmi0";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/projectile.html";
license = lib.licenses.free;
};
}) {};
prop-menu = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "prop-menu";
ename = "prop-menu";
version = "0.1.2";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/prop-menu-0.1.2.tar";
sha256 = "1csx5aycl478v4hia6lyrdb32hs1haf9n39ngfrbx9ysp7gkj0va";
};
packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/prop-menu.html";
license = lib.licenses.free;
};
}) {};
request = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "request";
@ -60,6 +728,85 @@
license = lib.licenses.free;
};
}) {};
rubocop = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "rubocop";
ename = "rubocop";
version = "0.6.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/rubocop-0.6.0.tar";
sha256 = "1gw30ya6xyi359k9fihjx75h7ahs067i9bvkyla0rbhmc5xdz6ww";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/rubocop.html";
license = lib.licenses.free;
};
}) {};
rust-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "rust-mode";
ename = "rust-mode";
version = "0.5.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/rust-mode-0.5.0.tar";
sha256 = "03z1nsq1s3awaczirlxixq4gwhz9bf1x5zwd5xfb88ay4kzcmjwc";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/rust-mode.html";
license = lib.licenses.free;
};
}) {};
sass-mode = callPackage ({ cl-lib ? null
, elpaBuild
, fetchurl
, haml-mode
, lib }:
elpaBuild {
pname = "sass-mode";
ename = "sass-mode";
version = "3.0.16";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/sass-mode-3.0.16.tar";
sha256 = "1nkp7cvsc2dbxkfv346hwsly34nhv1hhc8lgcs470xzdxi908p61";
};
packageRequires = [ cl-lib haml-mode ];
meta = {
homepage = "https://elpa.gnu.org/packages/sass-mode.html";
license = lib.licenses.free;
};
}) {};
scala-mode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "scala-mode";
ename = "scala-mode";
version = "0.23";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/scala-mode-0.23.tar";
sha256 = "0dmyh5x519f5b9h034a1yjgmr1ai8pd22a032x31zgdkwl2xyrfd";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/scala-mode.html";
license = lib.licenses.free;
};
}) {};
slime = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, macrostep }:
elpaBuild {
pname = "slime";
ename = "slime";
version = "2.26.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/slime-2.26.1.tar";
sha256 = "0f7absmq0nnhhq0i8nfgn2862ydvwlqyzhcq4s6m91mn72d7dw5i";
};
packageRequires = [ cl-lib macrostep ];
meta = {
homepage = "https://elpa.gnu.org/packages/slime.html";
license = lib.licenses.free;
};
}) {};
sly = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "sly";
@ -75,6 +822,51 @@
license = lib.licenses.free;
};
}) {};
smartparens = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "smartparens";
ename = "smartparens";
version = "4.7.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/smartparens-4.7.1.tar";
sha256 = "0si9wb7j760c4vdv7p049bgppppw5crrh50038bsh8sghq2gdld8";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/smartparens.html";
license = lib.licenses.free;
};
}) {};
swift-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }:
elpaBuild {
pname = "swift-mode";
ename = "swift-mode";
version = "8.3.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/swift-mode-8.3.0.tar";
sha256 = "1bsyv0dl7c2m3f690g7fij7g4937skxjin456vfrgbzb219pdkcs";
};
packageRequires = [ emacs seq ];
meta = {
homepage = "https://elpa.gnu.org/packages/swift-mode.html";
license = lib.licenses.free;
};
}) {};
systemd = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "systemd";
ename = "systemd";
version = "1.6";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/systemd-1.6.tar";
sha256 = "1khfnx2qmg1i4m6axyya0xbzr3c9j136b8pzmqdnd6jamxh43wcg";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/systemd.html";
license = lib.licenses.free;
};
}) {};
tuareg = callPackage ({ caml, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "tuareg";
@ -90,4 +882,94 @@
license = lib.licenses.free;
};
}) {};
web-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "web-mode";
ename = "web-mode";
version = "17.0.4";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/web-mode-17.0.4.tar";
sha256 = "0ji40fcw3y2n4dw0cklbvsybv04wmfqfnqnykgp05aai388rp3j1";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/web-mode.html";
license = lib.licenses.free;
};
}) {};
wgrep = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "wgrep";
ename = "wgrep";
version = "2.3.3";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/wgrep-2.3.3.tar";
sha256 = "12w9vsawqnd0rvsahx8vdiabds8rl1zkpmspmcqn28jprbql734r";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/wgrep.html";
license = lib.licenses.free;
};
}) {};
with-editor = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "with-editor";
ename = "with-editor";
version = "3.0.4";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/with-editor-3.0.4.tar";
sha256 = "032i954rzn8sg1qp6vjhz6j8j1fl6mpvhfnmd3va8k9q9m27k4an";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/with-editor.html";
license = lib.licenses.free;
};
}) {};
yaml-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "yaml-mode";
ename = "yaml-mode";
version = "0.0.15";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/yaml-mode-0.0.15.tar";
sha256 = "19r2kc894dd59f0r3q4gx52iw5cwj5gi1jjkmi8r9y0dya50rzfx";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/yaml-mode.html";
license = lib.licenses.free;
};
}) {};
yasnippet-snippets = callPackage ({ elpaBuild, fetchurl, lib, yasnippet }:
elpaBuild {
pname = "yasnippet-snippets";
ename = "yasnippet-snippets";
version = "0.2";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/yasnippet-snippets-0.2.tar";
sha256 = "1xhlx2n2sdpcc82cba9r7nbd0gwi7m821p7vk0vnw84dhwy863ic";
};
packageRequires = [ yasnippet ];
meta = {
homepage = "https://elpa.gnu.org/packages/yasnippet-snippets.html";
license = lib.licenses.free;
};
}) {};
zig-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "zig-mode";
ename = "zig-mode";
version = "0.0.8";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/zig-mode-0.0.8.tar";
sha256 = "1v9qpc86n9zg765cy93365hj942z0gndkz6grjl2pk31087n3axy";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/zig-mode.html";
license = lib.licenses.free;
};
}) {};
}

View File

@ -5,8 +5,9 @@
To update the list of packages from nongnu (ELPA),
1. Run `./update-nongnu`.
2. Check for evaluation errors: `nix-instantiate ../../../../.. -A emacs.pkgs.nongnuPackages`.
3. Run `git commit -m "org-packages $(date -Idate)" -- nongnu-generated.nix`
2. Check for evaluation errors:
env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate ../../../../.. -A emacs.pkgs.nongnuPackages
3. Run `git commit -m "nongnu-packages $(date -Idate)" -- nongnu-generated.nix`
*/

View File

@ -4,10 +4,10 @@
elpaBuild {
pname = "org";
ename = "org";
version = "20210823";
version = "20210906";
src = fetchurl {
url = "https://orgmode.org/elpa/org-20210823.tar";
sha256 = "0yd2ydkkfy9lmlnb0lpsm8ywbk88sq9n4i7dasfzslv7czgccyh7";
url = "https://orgmode.org/elpa/org-20210906.tar";
sha256 = "04aqniwix4w0iap38dsdskndknhw9k6apkmkrc79yfs3c4jcsszq";
};
packageRequires = [];
meta = {
@ -19,10 +19,10 @@
elpaBuild {
pname = "org-plus-contrib";
ename = "org-plus-contrib";
version = "20210823";
version = "20210906";
src = fetchurl {
url = "https://orgmode.org/elpa/org-plus-contrib-20210823.tar";
sha256 = "17lyhsi22wg3l3j4k67glvq9p12r3nlc7fs6ka5jr2xrvfypb5aj";
url = "https://orgmode.org/elpa/org-plus-contrib-20210906.tar";
sha256 = "1v0yy92x8shwp36qfyzmvk8ayz9amkdis967gqacq5jxcyq7mhbn";
};
packageRequires = [];
meta = {

View File

@ -5,7 +5,8 @@
To update the list of packages from Org (ELPA),
1. Run `./update-org`.
2. Check for evaluation errors: `nix-instantiate ../../../../.. -A emacs.pkgs.orgPackages`.
2. Check for evaluation errors:
env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate ../../../../.. -A emacs.pkgs.orgPackages
3. Run `git commit -m "org-packages $(date -Idate)" -- org-generated.nix`
*/

View File

@ -21,13 +21,13 @@
mkDerivation rec {
pname = "nextcloud-client";
version = "3.3.2";
version = "3.3.3";
src = fetchFromGitHub {
owner = "nextcloud";
repo = "desktop";
rev = "v${version}";
sha256 = "sha256-sqoOppq0QdLcA2IFZYnixMNnFWb3x83tqTp6hqqVU14=";
sha256 = "sha256-QE6F+L1uy2Tmsf/DI8eUF5Ck+oE8CXDTpZS3xg2tiSs=";
};
patches = [

View File

@ -1,26 +1,38 @@
{ lib, stdenv, fetchFromGitHub, which, git, ronn, perlPackages }:
{ lib, stdenv
, fetchurl
, makeWrapper
, pkg-config
, git
, perlPackages
}:
stdenv.mkDerivation {
version = "1.20170915"; # date of commit we're pulling
stdenv.mkDerivation rec {
pname = "vcsh";
version = "2.0.2";
src = fetchFromGitHub {
owner = "RichiH";
repo = "vcsh";
rev = "eadb8df6aa71a76e5be36492edcadb118bd862ac";
sha256 = "1wfzp8167lcq6akdpbi8fikjv0z3h1i5minh3423dljc04q0klm1";
src = fetchurl {
url = "https://github.com/RichiH/vcsh/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "0qdd4f6rm5rhnym9f114pcj9vafhjjpg962c4g420rn78fxhpz1z";
};
buildInputs = [ which git ronn ]
++ (with perlPackages; [ perl ShellCommand TestMost TestDifferences TestDeep TestException TestWarn ]);
nativeBuildInputs = [
pkg-config
makeWrapper
];
installPhase = "make install PREFIX=$out";
buildInputs = [ git ];
checkInputs = []
++ (with perlPackages; [ perl ShellCommand TestMost ]);
outputs = [ "out" "doc" "man" ];
meta = with lib; {
description = "Version Control System for $HOME";
homepage = "https://github.com/RichiH/vcsh";
changelog = "https://github.com/RichiH/vcsh/blob/v${version}/changelog";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ttuegel ];
maintainers = with maintainers; [ ttuegel alerque ];
platforms = platforms.unix;
};
}

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "cppzmq";
version = "4.7.1";
version = "4.8.0";
src = fetchFromGitHub {
owner = "zeromq";
repo = "cppzmq";
rev = "v${version}";
sha256 = "00lb3pv923nbpaf7ric2cv6lbpspknj0pxj6yj5jyah7r3zw692m";
sha256 = "sha256-4ZyTp0TOKqDbziqBTkeUs3J+f3stFyUVpkzk4Jx6CDc=";
};
nativeBuildInputs = [ cmake ];

View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "faudio";
version = "21.08";
version = "21.09";
src = fetchFromGitHub {
owner = "FNA-XNA";
repo = "FAudio";
rev = version;
sha256 = "sha256-zgXIho1jmoOCVcjvDwiq+J1jOzsPgxvvaWN8NfszEdA=";
sha256 = "sha256-/hc++LEqH7vg2IK/x6sVP5864QF+3xd++HK/tIp0IRA=";
};
nativeBuildInputs = [cmake];

View File

@ -0,0 +1,26 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "fn";
version = "20171019-git";
description = "Some macros for lambda brevity";
deps = [ args."named-readtables" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/fn/2017-10-19/fn-20171019-git.tgz";
sha256 = "0r062ffn31sc7313xlfaa9pwnf2wdkiq4spqlr1lk5r8isvdnzz8";
};
packageName = "fn";
asdFilesToKeep = ["fn.asd"];
overrides = x: x;
}
/* (SYSTEM fn DESCRIPTION Some macros for lambda brevity SHA256
0r062ffn31sc7313xlfaa9pwnf2wdkiq4spqlr1lk5r8isvdnzz8 URL
http://beta.quicklisp.org/archive/fn/2017-10-19/fn-20171019-git.tgz MD5
0e1cfe5f19ceec8966baa3037772d31e NAME fn FILENAME fn DEPS
((NAME named-readtables FILENAME named-readtables)) DEPENDENCIES
(named-readtables) VERSION 20171019-git SIBLINGS NIL PARASITES NIL) */

View File

@ -0,0 +1,28 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "glsl-docs";
version = "glsl-spec-release-quicklisp-f04476f7-git";
description = "The official docs for all the symbols in glsl-symbols";
deps = [ args."glsl-symbols" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz";
sha256 = "0vdxx5asra0r58qpk35ncmyh418szzzvby8bpkrb052g00nzqgj7";
};
packageName = "glsl-docs";
asdFilesToKeep = ["glsl-docs.asd"];
overrides = x: x;
}
/* (SYSTEM glsl-docs DESCRIPTION
The official docs for all the symbols in glsl-symbols SHA256
0vdxx5asra0r58qpk35ncmyh418szzzvby8bpkrb052g00nzqgj7 URL
http://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz
MD5 52760939a269acce6b2cba8dbde81ef7 NAME glsl-docs FILENAME glsl-docs DEPS
((NAME glsl-symbols FILENAME glsl-symbols)) DEPENDENCIES (glsl-symbols)
VERSION glsl-spec-release-quicklisp-f04476f7-git SIBLINGS
(glsl-spec glsl-symbols) PARASITES NIL) */

View File

@ -0,0 +1,26 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "glsl-spec";
version = "release-quicklisp-f04476f7-git";
description = "The GLSL Spec as a datastructure";
deps = [ ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz";
sha256 = "0vdxx5asra0r58qpk35ncmyh418szzzvby8bpkrb052g00nzqgj7";
};
packageName = "glsl-spec";
asdFilesToKeep = ["glsl-spec.asd"];
overrides = x: x;
}
/* (SYSTEM glsl-spec DESCRIPTION The GLSL Spec as a datastructure SHA256
0vdxx5asra0r58qpk35ncmyh418szzzvby8bpkrb052g00nzqgj7 URL
http://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz
MD5 52760939a269acce6b2cba8dbde81ef7 NAME glsl-spec FILENAME glsl-spec DEPS
NIL DEPENDENCIES NIL VERSION release-quicklisp-f04476f7-git SIBLINGS
(glsl-docs glsl-symbols) PARASITES NIL) */

View File

@ -0,0 +1,27 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "glsl-symbols";
version = "glsl-spec-release-quicklisp-f04476f7-git";
description = "Lispy versions of all glsl names as symbols";
deps = [ ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz";
sha256 = "0vdxx5asra0r58qpk35ncmyh418szzzvby8bpkrb052g00nzqgj7";
};
packageName = "glsl-symbols";
asdFilesToKeep = ["glsl-symbols.asd"];
overrides = x: x;
}
/* (SYSTEM glsl-symbols DESCRIPTION Lispy versions of all glsl names as symbols
SHA256 0vdxx5asra0r58qpk35ncmyh418szzzvby8bpkrb052g00nzqgj7 URL
http://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz
MD5 52760939a269acce6b2cba8dbde81ef7 NAME glsl-symbols FILENAME
glsl-symbols DEPS NIL DEPENDENCIES NIL VERSION
glsl-spec-release-quicklisp-f04476f7-git SIBLINGS (glsl-docs glsl-spec)
PARASITES NIL) */

View File

@ -0,0 +1,26 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "lisp-unit";
version = "20170124-git";
description = "Common Lisp library that supports unit testing.";
deps = [ ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/lisp-unit/2017-01-24/lisp-unit-20170124-git.tgz";
sha256 = "00bc19r7vr76rpk8lh8z7qln0glpf66mzqxw215488zwz3nwcq4m";
};
packageName = "lisp-unit";
asdFilesToKeep = ["lisp-unit.asd"];
overrides = x: x;
}
/* (SYSTEM lisp-unit DESCRIPTION
Common Lisp library that supports unit testing. SHA256
00bc19r7vr76rpk8lh8z7qln0glpf66mzqxw215488zwz3nwcq4m URL
http://beta.quicklisp.org/archive/lisp-unit/2017-01-24/lisp-unit-20170124-git.tgz
MD5 2c55342cb8af18b290bb6a28c75deac5 NAME lisp-unit FILENAME lisp-unit DEPS
NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS NIL PARASITES NIL) */

View File

@ -0,0 +1,30 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "parse-float";
version = "20200218-git";
parasites = [ "parse-float-tests" ];
description = "Parse floating point values in strings.";
deps = [ args."alexandria" args."lisp-unit" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/parse-float/2020-02-18/parse-float-20200218-git.tgz";
sha256 = "02rhgn79hhv0p5ysj4gwk5bhmr2sj6cvkacbqzzw24qrzgcpdnfw";
};
packageName = "parse-float";
asdFilesToKeep = ["parse-float.asd"];
overrides = x: x;
}
/* (SYSTEM parse-float DESCRIPTION Parse floating point values in strings.
SHA256 02rhgn79hhv0p5ysj4gwk5bhmr2sj6cvkacbqzzw24qrzgcpdnfw URL
http://beta.quicklisp.org/archive/parse-float/2020-02-18/parse-float-20200218-git.tgz
MD5 149e40a8c5fd6ab0e43242cb898d66bf NAME parse-float FILENAME parse-float
DEPS
((NAME alexandria FILENAME alexandria) (NAME lisp-unit FILENAME lisp-unit))
DEPENDENCIES (alexandria lisp-unit) VERSION 20200218-git SIBLINGS NIL
PARASITES (parse-float-tests)) */

View File

@ -0,0 +1,39 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "varjo";
version = "release-quicklisp-92f9c75b-git";
description = "Common Lisp -> GLSL Compiler";
deps = [ args."alexandria" args."cl-ppcre" args."documentation-utils" args."fn" args."glsl-docs" args."glsl-spec" args."glsl-symbols" args."named-readtables" args."parse-float" args."trivial-indent" args."uiop" args."vas-string-metrics" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/varjo/2021-01-24/varjo-release-quicklisp-92f9c75b-git.tgz";
sha256 = "0xxi2ivjz3fqgw2nxzshf9m7ppvzv7wdg20lr0krq14i8j5gf5jy";
};
packageName = "varjo";
asdFilesToKeep = ["varjo.asd"];
overrides = x: x;
}
/* (SYSTEM varjo DESCRIPTION Common Lisp -> GLSL Compiler SHA256
0xxi2ivjz3fqgw2nxzshf9m7ppvzv7wdg20lr0krq14i8j5gf5jy URL
http://beta.quicklisp.org/archive/varjo/2021-01-24/varjo-release-quicklisp-92f9c75b-git.tgz
MD5 78a3b8021885ebfab4015e20b885cdcf NAME varjo FILENAME varjo DEPS
((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre)
(NAME documentation-utils FILENAME documentation-utils)
(NAME fn FILENAME fn) (NAME glsl-docs FILENAME glsl-docs)
(NAME glsl-spec FILENAME glsl-spec)
(NAME glsl-symbols FILENAME glsl-symbols)
(NAME named-readtables FILENAME named-readtables)
(NAME parse-float FILENAME parse-float)
(NAME trivial-indent FILENAME trivial-indent) (NAME uiop FILENAME uiop)
(NAME vas-string-metrics FILENAME vas-string-metrics))
DEPENDENCIES
(alexandria cl-ppcre documentation-utils fn glsl-docs glsl-spec
glsl-symbols named-readtables parse-float trivial-indent uiop
vas-string-metrics)
VERSION release-quicklisp-92f9c75b-git SIBLINGS (varjo.import varjo.tests)
PARASITES NIL) */

View File

@ -0,0 +1,27 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "vas-string-metrics";
version = "20160208-git";
description = "Jaro-Winkler and Levenshtein string distance algorithms.";
deps = [ ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/vas-string-metrics/2016-02-08/vas-string-metrics-20160208-git.tgz";
sha256 = "1s9a9bgc2ibknjr6mlbr4gsxcwpjivz5hbl1wz57fsh4n0w8h7ch";
};
packageName = "vas-string-metrics";
asdFilesToKeep = ["vas-string-metrics.asd"];
overrides = x: x;
}
/* (SYSTEM vas-string-metrics DESCRIPTION
Jaro-Winkler and Levenshtein string distance algorithms. SHA256
1s9a9bgc2ibknjr6mlbr4gsxcwpjivz5hbl1wz57fsh4n0w8h7ch URL
http://beta.quicklisp.org/archive/vas-string-metrics/2016-02-08/vas-string-metrics-20160208-git.tgz
MD5 5f38d4ee241c11286be6147f481e7fd0 NAME vas-string-metrics FILENAME
vas-string-metrics DEPS NIL DEPENDENCIES NIL VERSION 20160208-git SIBLINGS
(test.vas-string-metrics) PARASITES NIL) */

View File

@ -11,7 +11,6 @@ blackbird
bordeaux-threads
calispel
caveman
cl-custom-hash-table
cffi
cffi-grovel
cffi-uffi-compat
@ -19,8 +18,7 @@ chanl
chipz
chunga
circular-streams
clack
clack-v1-compat
cl+ssl
cl-annot
cl-ansi-text
cl-async
@ -35,6 +33,7 @@ cl-containers
cl-cookie
cl-css
cl-csv
cl-custom-hash-table
cl-dbi
cl-dot
cl-emb
@ -44,8 +43,8 @@ cl-fuse-meta-fs
cl-gobject-introspection
cl-hooks
cl-html-diff
cl-html5-parser
cl-html-parse
cl-html5-parser
cl-interpol
cl-jpeg
cl-json
@ -54,9 +53,6 @@ cl-libuv
cl-locale
cl-markup
cl-mysql
closer-mop
closure-common
closure-html
cl-paths-ttf
cl-pdf
cl-ppcre
@ -67,30 +63,34 @@ cl-protobufs
cl-qprint
cl-reexport
cl-slice
cl-speedy-queue
cl-smtp
cl-syslog
clsql
clsql-postgresql
clsql-postgresql-socket
clsql-sqlite3
clss
cl+ssl
cl-speedy-queue
cl-store
cl-syntax
cl-syntax-annot
cl-syntax-anonfun
cl-syntax-markup
cl-syslog
cl-test-more
cl-typesetting
clump
cl-unicode
cl-unification
cl-utilities
cl-vectors
cl-webkit2
cl-who
clack
clack-v1-compat
clfswm
closer-mop
closure-common
closure-html
clsql
clsql-postgresql
clsql-postgresql-socket
clsql-sqlite3
clss
clump
clx
collectors
command-line-arguments
@ -209,6 +209,7 @@ usocket
utilities.print-items
utilities.print-tree
uuid
varjo
woo
wookie
xembed

View File

@ -6,6 +6,14 @@ let quicklisp-to-nix-packages = rec {
buildLispPackage = callPackage ./define-package.nix;
qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {};
"lisp-unit" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."lisp-unit" or (x: {}))
(import ./quicklisp-to-nix-output/lisp-unit.nix {
inherit fetchurl;
}));
"pythonic-string-reader" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."pythonic-string-reader" or (x: {}))
@ -74,6 +82,58 @@ let quicklisp-to-nix-packages = rec {
}));
"vas-string-metrics" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."vas-string-metrics" or (x: {}))
(import ./quicklisp-to-nix-output/vas-string-metrics.nix {
inherit fetchurl;
}));
"parse-float" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."parse-float" or (x: {}))
(import ./quicklisp-to-nix-output/parse-float.nix {
inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria";
"lisp-unit" = quicklisp-to-nix-packages."lisp-unit";
}));
"glsl-symbols" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."glsl-symbols" or (x: {}))
(import ./quicklisp-to-nix-output/glsl-symbols.nix {
inherit fetchurl;
}));
"glsl-spec" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."glsl-spec" or (x: {}))
(import ./quicklisp-to-nix-output/glsl-spec.nix {
inherit fetchurl;
}));
"glsl-docs" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."glsl-docs" or (x: {}))
(import ./quicklisp-to-nix-output/glsl-docs.nix {
inherit fetchurl;
"glsl-symbols" = quicklisp-to-nix-packages."glsl-symbols";
}));
"fn" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."fn" or (x: {}))
(import ./quicklisp-to-nix-output/fn.nix {
inherit fetchurl;
"named-readtables" = quicklisp-to-nix-packages."named-readtables";
}));
"mgl-pax" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."mgl-pax" or (x: {}))
@ -709,14 +769,6 @@ let quicklisp-to-nix-packages = rec {
}));
"cl-aa" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-aa" or (x: {}))
(import ./quicklisp-to-nix-output/cl-aa.nix {
inherit fetchurl;
}));
"clump-binary-tree" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."clump-binary-tree" or (x: {}))
@ -735,14 +787,6 @@ let quicklisp-to-nix-packages = rec {
}));
"cl-anonfun" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-anonfun" or (x: {}))
(import ./quicklisp-to-nix-output/cl-anonfun.nix {
inherit fetchurl;
}));
"clsql-uffi" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."clsql-uffi" or (x: {}))
@ -753,6 +797,14 @@ let quicklisp-to-nix-packages = rec {
}));
"cl-aa" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-aa" or (x: {}))
(import ./quicklisp-to-nix-output/cl-aa.nix {
inherit fetchurl;
}));
"global-vars" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."global-vars" or (x: {}))
@ -761,6 +813,14 @@ let quicklisp-to-nix-packages = rec {
}));
"cl-anonfun" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-anonfun" or (x: {}))
(import ./quicklisp-to-nix-output/cl-anonfun.nix {
inherit fetchurl;
}));
"clunit" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."clunit" or (x: {}))
@ -1476,6 +1536,26 @@ let quicklisp-to-nix-packages = rec {
}));
"varjo" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."varjo" or (x: {}))
(import ./quicklisp-to-nix-output/varjo.nix {
inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria";
"cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
"documentation-utils" = quicklisp-to-nix-packages."documentation-utils";
"fn" = quicklisp-to-nix-packages."fn";
"glsl-docs" = quicklisp-to-nix-packages."glsl-docs";
"glsl-spec" = quicklisp-to-nix-packages."glsl-spec";
"glsl-symbols" = quicklisp-to-nix-packages."glsl-symbols";
"named-readtables" = quicklisp-to-nix-packages."named-readtables";
"parse-float" = quicklisp-to-nix-packages."parse-float";
"trivial-indent" = quicklisp-to-nix-packages."trivial-indent";
"uiop" = quicklisp-to-nix-packages."uiop";
"vas-string-metrics" = quicklisp-to-nix-packages."vas-string-metrics";
}));
"uuid" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."uuid" or (x: {}))
@ -3060,6 +3140,105 @@ let quicklisp-to-nix-packages = rec {
}));
"clump" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."clump" or (x: {}))
(import ./quicklisp-to-nix-output/clump.nix {
inherit fetchurl;
"acclimation" = quicklisp-to-nix-packages."acclimation";
"clump-2-3-tree" = quicklisp-to-nix-packages."clump-2-3-tree";
"clump-binary-tree" = quicklisp-to-nix-packages."clump-binary-tree";
}));
"clss" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."clss" or (x: {}))
(import ./quicklisp-to-nix-output/clss.nix {
inherit fetchurl;
"array-utils" = quicklisp-to-nix-packages."array-utils";
"documentation-utils" = quicklisp-to-nix-packages."documentation-utils";
"plump" = quicklisp-to-nix-packages."plump";
"trivial-indent" = quicklisp-to-nix-packages."trivial-indent";
}));
"clsql-sqlite3" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."clsql-sqlite3" or (x: {}))
(import ./quicklisp-to-nix-output/clsql-sqlite3.nix {
inherit fetchurl;
"clsql" = quicklisp-to-nix-packages."clsql";
"clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi";
"uffi" = quicklisp-to-nix-packages."uffi";
}));
"clsql-postgresql-socket" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."clsql-postgresql-socket" or (x: {}))
(import ./quicklisp-to-nix-output/clsql-postgresql-socket.nix {
inherit fetchurl;
"clsql" = quicklisp-to-nix-packages."clsql";
"md5" = quicklisp-to-nix-packages."md5";
"uffi" = quicklisp-to-nix-packages."uffi";
}));
"clsql-postgresql" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."clsql-postgresql" or (x: {}))
(import ./quicklisp-to-nix-output/clsql-postgresql.nix {
inherit fetchurl;
"clsql" = quicklisp-to-nix-packages."clsql";
"clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi";
"uffi" = quicklisp-to-nix-packages."uffi";
}));
"clsql" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."clsql" or (x: {}))
(import ./quicklisp-to-nix-output/clsql.nix {
inherit fetchurl;
"uffi" = quicklisp-to-nix-packages."uffi";
}));
"closure-html" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."closure-html" or (x: {}))
(import ./quicklisp-to-nix-output/closure-html.nix {
inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria";
"babel" = quicklisp-to-nix-packages."babel";
"closure-common" = quicklisp-to-nix-packages."closure-common";
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
"trivial-features" = quicklisp-to-nix-packages."trivial-features";
"trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
}));
"closure-common" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."closure-common" or (x: {}))
(import ./quicklisp-to-nix-output/closure-common.nix {
inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria";
"babel" = quicklisp-to-nix-packages."babel";
"trivial-features" = quicklisp-to-nix-packages."trivial-features";
"trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
}));
"closer-mop" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."closer-mop" or (x: {}))
(import ./quicklisp-to-nix-output/closer-mop.nix {
inherit fetchurl;
}));
"clfswm" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."clfswm" or (x: {}))
@ -3069,6 +3248,88 @@ let quicklisp-to-nix-packages = rec {
}));
"clack-v1-compat" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."clack-v1-compat" or (x: {}))
(import ./quicklisp-to-nix-output/clack-v1-compat.nix {
inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria";
"babel" = quicklisp-to-nix-packages."babel";
"bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
"cffi" = quicklisp-to-nix-packages."cffi";
"cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
"cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
"chipz" = quicklisp-to-nix-packages."chipz";
"chunga" = quicklisp-to-nix-packages."chunga";
"circular-streams" = quicklisp-to-nix-packages."circular-streams";
"cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl";
"cl-annot" = quicklisp-to-nix-packages."cl-annot";
"cl-base64" = quicklisp-to-nix-packages."cl-base64";
"cl-cookie" = quicklisp-to-nix-packages."cl-cookie";
"cl-fad" = quicklisp-to-nix-packages."cl-fad";
"cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
"cl-reexport" = quicklisp-to-nix-packages."cl-reexport";
"cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
"cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
"cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
"clack" = quicklisp-to-nix-packages."clack";
"clack-handler-hunchentoot" = quicklisp-to-nix-packages."clack-handler-hunchentoot";
"clack-socket" = quicklisp-to-nix-packages."clack-socket";
"clack-test" = quicklisp-to-nix-packages."clack-test";
"dexador" = quicklisp-to-nix-packages."dexador";
"dissect" = quicklisp-to-nix-packages."dissect";
"fast-http" = quicklisp-to-nix-packages."fast-http";
"fast-io" = quicklisp-to-nix-packages."fast-io";
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
"http-body" = quicklisp-to-nix-packages."http-body";
"hunchentoot" = quicklisp-to-nix-packages."hunchentoot";
"ironclad" = quicklisp-to-nix-packages."ironclad";
"jonathan" = quicklisp-to-nix-packages."jonathan";
"lack" = quicklisp-to-nix-packages."lack";
"lack-component" = quicklisp-to-nix-packages."lack-component";
"lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace";
"lack-util" = quicklisp-to-nix-packages."lack-util";
"local-time" = quicklisp-to-nix-packages."local-time";
"marshal" = quicklisp-to-nix-packages."marshal";
"md5" = quicklisp-to-nix-packages."md5";
"named-readtables" = quicklisp-to-nix-packages."named-readtables";
"proc-parse" = quicklisp-to-nix-packages."proc-parse";
"quri" = quicklisp-to-nix-packages."quri";
"rfc2388" = quicklisp-to-nix-packages."rfc2388";
"rove" = quicklisp-to-nix-packages."rove";
"smart-buffer" = quicklisp-to-nix-packages."smart-buffer";
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
"static-vectors" = quicklisp-to-nix-packages."static-vectors";
"trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
"trivial-features" = quicklisp-to-nix-packages."trivial-features";
"trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
"trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
"trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes";
"trivial-types" = quicklisp-to-nix-packages."trivial-types";
"uiop" = quicklisp-to-nix-packages."uiop";
"usocket" = quicklisp-to-nix-packages."usocket";
"xsubseq" = quicklisp-to-nix-packages."xsubseq";
}));
"clack" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."clack" or (x: {}))
(import ./quicklisp-to-nix-output/clack.nix {
inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria";
"bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
"ironclad" = quicklisp-to-nix-packages."ironclad";
"lack" = quicklisp-to-nix-packages."lack";
"lack-component" = quicklisp-to-nix-packages."lack-component";
"lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace";
"lack-util" = quicklisp-to-nix-packages."lack-util";
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
"uiop" = quicklisp-to-nix-packages."uiop";
"usocket" = quicklisp-to-nix-packages."usocket";
}));
"cl-who" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-who" or (x: {}))
@ -3138,17 +3399,6 @@ let quicklisp-to-nix-packages = rec {
}));
"clump" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."clump" or (x: {}))
(import ./quicklisp-to-nix-output/clump.nix {
inherit fetchurl;
"acclimation" = quicklisp-to-nix-packages."acclimation";
"clump-2-3-tree" = quicklisp-to-nix-packages."clump-2-3-tree";
"clump-binary-tree" = quicklisp-to-nix-packages."clump-binary-tree";
}));
"cl-typesetting" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-typesetting" or (x: {}))
@ -3176,6 +3426,22 @@ let quicklisp-to-nix-packages = rec {
}));
"cl-syslog" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-syslog" or (x: {}))
(import ./quicklisp-to-nix-output/cl-syslog.nix {
inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria";
"babel" = quicklisp-to-nix-packages."babel";
"cffi" = quicklisp-to-nix-packages."cffi";
"global-vars" = quicklisp-to-nix-packages."global-vars";
"local-time" = quicklisp-to-nix-packages."local-time";
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
"trivial-features" = quicklisp-to-nix-packages."trivial-features";
"usocket" = quicklisp-to-nix-packages."usocket";
}));
"cl-syntax-markup" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-syntax-markup" or (x: {}))
@ -3232,92 +3498,11 @@ let quicklisp-to-nix-packages = rec {
}));
"cl_plus_ssl" = buildLispPackage
"cl-speedy-queue" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl_plus_ssl" or (x: {}))
(import ./quicklisp-to-nix-output/cl_plus_ssl.nix {
(qlOverrides."cl-speedy-queue" or (x: {}))
(import ./quicklisp-to-nix-output/cl-speedy-queue.nix {
inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria";
"babel" = quicklisp-to-nix-packages."babel";
"bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
"cffi" = quicklisp-to-nix-packages."cffi";
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
"trivial-features" = quicklisp-to-nix-packages."trivial-features";
"trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
"trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
"uiop" = quicklisp-to-nix-packages."uiop";
"usocket" = quicklisp-to-nix-packages."usocket";
}));
"clss" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."clss" or (x: {}))
(import ./quicklisp-to-nix-output/clss.nix {
inherit fetchurl;
"array-utils" = quicklisp-to-nix-packages."array-utils";
"documentation-utils" = quicklisp-to-nix-packages."documentation-utils";
"plump" = quicklisp-to-nix-packages."plump";
"trivial-indent" = quicklisp-to-nix-packages."trivial-indent";
}));
"clsql-sqlite3" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."clsql-sqlite3" or (x: {}))
(import ./quicklisp-to-nix-output/clsql-sqlite3.nix {
inherit fetchurl;
"clsql" = quicklisp-to-nix-packages."clsql";
"clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi";
"uffi" = quicklisp-to-nix-packages."uffi";
}));
"clsql-postgresql-socket" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."clsql-postgresql-socket" or (x: {}))
(import ./quicklisp-to-nix-output/clsql-postgresql-socket.nix {
inherit fetchurl;
"clsql" = quicklisp-to-nix-packages."clsql";
"md5" = quicklisp-to-nix-packages."md5";
"uffi" = quicklisp-to-nix-packages."uffi";
}));
"clsql-postgresql" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."clsql-postgresql" or (x: {}))
(import ./quicklisp-to-nix-output/clsql-postgresql.nix {
inherit fetchurl;
"clsql" = quicklisp-to-nix-packages."clsql";
"clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi";
"uffi" = quicklisp-to-nix-packages."uffi";
}));
"clsql" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."clsql" or (x: {}))
(import ./quicklisp-to-nix-output/clsql.nix {
inherit fetchurl;
"uffi" = quicklisp-to-nix-packages."uffi";
}));
"cl-syslog" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-syslog" or (x: {}))
(import ./quicklisp-to-nix-output/cl-syslog.nix {
inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria";
"babel" = quicklisp-to-nix-packages."babel";
"cffi" = quicklisp-to-nix-packages."cffi";
"global-vars" = quicklisp-to-nix-packages."global-vars";
"local-time" = quicklisp-to-nix-packages."local-time";
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
"trivial-features" = quicklisp-to-nix-packages."trivial-features";
"usocket" = quicklisp-to-nix-packages."usocket";
}));
@ -3341,14 +3526,6 @@ let quicklisp-to-nix-packages = rec {
}));
"cl-speedy-queue" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-speedy-queue" or (x: {}))
(import ./quicklisp-to-nix-output/cl-speedy-queue.nix {
inherit fetchurl;
}));
"cl-slice" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-slice" or (x: {}))
@ -3460,40 +3637,6 @@ let quicklisp-to-nix-packages = rec {
}));
"closure-html" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."closure-html" or (x: {}))
(import ./quicklisp-to-nix-output/closure-html.nix {
inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria";
"babel" = quicklisp-to-nix-packages."babel";
"closure-common" = quicklisp-to-nix-packages."closure-common";
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
"trivial-features" = quicklisp-to-nix-packages."trivial-features";
"trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
}));
"closure-common" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."closure-common" or (x: {}))
(import ./quicklisp-to-nix-output/closure-common.nix {
inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria";
"babel" = quicklisp-to-nix-packages."babel";
"trivial-features" = quicklisp-to-nix-packages."trivial-features";
"trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
}));
"closer-mop" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."closer-mop" or (x: {}))
(import ./quicklisp-to-nix-output/closer-mop.nix {
inherit fetchurl;
}));
"cl-mysql" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-mysql" or (x: {}))
@ -3603,14 +3746,6 @@ let quicklisp-to-nix-packages = rec {
}));
"cl-html-parse" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-html-parse" or (x: {}))
(import ./quicklisp-to-nix-output/cl-html-parse.nix {
inherit fetchurl;
}));
"cl-html5-parser" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-html5-parser" or (x: {}))
@ -3623,6 +3758,14 @@ let quicklisp-to-nix-packages = rec {
}));
"cl-html-parse" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-html-parse" or (x: {}))
(import ./quicklisp-to-nix-output/cl-html-parse.nix {
inherit fetchurl;
}));
"cl-html-diff" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-html-diff" or (x: {}))
@ -3744,6 +3887,14 @@ let quicklisp-to-nix-packages = rec {
}));
"cl-custom-hash-table" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-custom-hash-table" or (x: {}))
(import ./quicklisp-to-nix-output/cl-custom-hash-table.nix {
inherit fetchurl;
}));
"cl-csv" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-csv" or (x: {}))
@ -3943,83 +4094,20 @@ let quicklisp-to-nix-packages = rec {
}));
"clack-v1-compat" = buildLispPackage
"cl_plus_ssl" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."clack-v1-compat" or (x: {}))
(import ./quicklisp-to-nix-output/clack-v1-compat.nix {
(qlOverrides."cl_plus_ssl" or (x: {}))
(import ./quicklisp-to-nix-output/cl_plus_ssl.nix {
inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria";
"babel" = quicklisp-to-nix-packages."babel";
"bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
"cffi" = quicklisp-to-nix-packages."cffi";
"cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
"cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
"chipz" = quicklisp-to-nix-packages."chipz";
"chunga" = quicklisp-to-nix-packages."chunga";
"circular-streams" = quicklisp-to-nix-packages."circular-streams";
"cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl";
"cl-annot" = quicklisp-to-nix-packages."cl-annot";
"cl-base64" = quicklisp-to-nix-packages."cl-base64";
"cl-cookie" = quicklisp-to-nix-packages."cl-cookie";
"cl-fad" = quicklisp-to-nix-packages."cl-fad";
"cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
"cl-reexport" = quicklisp-to-nix-packages."cl-reexport";
"cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
"cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
"cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
"clack" = quicklisp-to-nix-packages."clack";
"clack-handler-hunchentoot" = quicklisp-to-nix-packages."clack-handler-hunchentoot";
"clack-socket" = quicklisp-to-nix-packages."clack-socket";
"clack-test" = quicklisp-to-nix-packages."clack-test";
"dexador" = quicklisp-to-nix-packages."dexador";
"dissect" = quicklisp-to-nix-packages."dissect";
"fast-http" = quicklisp-to-nix-packages."fast-http";
"fast-io" = quicklisp-to-nix-packages."fast-io";
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
"http-body" = quicklisp-to-nix-packages."http-body";
"hunchentoot" = quicklisp-to-nix-packages."hunchentoot";
"ironclad" = quicklisp-to-nix-packages."ironclad";
"jonathan" = quicklisp-to-nix-packages."jonathan";
"lack" = quicklisp-to-nix-packages."lack";
"lack-component" = quicklisp-to-nix-packages."lack-component";
"lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace";
"lack-util" = quicklisp-to-nix-packages."lack-util";
"local-time" = quicklisp-to-nix-packages."local-time";
"marshal" = quicklisp-to-nix-packages."marshal";
"md5" = quicklisp-to-nix-packages."md5";
"named-readtables" = quicklisp-to-nix-packages."named-readtables";
"proc-parse" = quicklisp-to-nix-packages."proc-parse";
"quri" = quicklisp-to-nix-packages."quri";
"rfc2388" = quicklisp-to-nix-packages."rfc2388";
"rove" = quicklisp-to-nix-packages."rove";
"smart-buffer" = quicklisp-to-nix-packages."smart-buffer";
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
"static-vectors" = quicklisp-to-nix-packages."static-vectors";
"trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
"trivial-features" = quicklisp-to-nix-packages."trivial-features";
"trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
"trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
"trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes";
"trivial-types" = quicklisp-to-nix-packages."trivial-types";
"uiop" = quicklisp-to-nix-packages."uiop";
"usocket" = quicklisp-to-nix-packages."usocket";
"xsubseq" = quicklisp-to-nix-packages."xsubseq";
}));
"clack" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."clack" or (x: {}))
(import ./quicklisp-to-nix-output/clack.nix {
inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria";
"bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
"ironclad" = quicklisp-to-nix-packages."ironclad";
"lack" = quicklisp-to-nix-packages."lack";
"lack-component" = quicklisp-to-nix-packages."lack-component";
"lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace";
"lack-util" = quicklisp-to-nix-packages."lack-util";
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
"uiop" = quicklisp-to-nix-packages."uiop";
"usocket" = quicklisp-to-nix-packages."usocket";
}));
@ -4109,14 +4197,6 @@ let quicklisp-to-nix-packages = rec {
}));
"cl-custom-hash-table" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-custom-hash-table" or (x: {}))
(import ./quicklisp-to-nix-output/cl-custom-hash-table.nix {
inherit fetchurl;
}));
"caveman" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."caveman" or (x: {}))

View File

@ -160,10 +160,10 @@ busted = buildLuarocksPackage {
cassowary = buildLuarocksPackage {
pname = "cassowary";
version = "2.3.1-1";
version = "2.3.1-2";
knownRockspec = (fetchurl {
url = "https://luarocks.org/cassowary-2.3.1-1.rockspec";
sha256 = "1rgs0rmlmhghml0gi4dn0rg2iq7rqnn8w8dcy9r3qsbkpyylbajc";
url = "https://luarocks.org/cassowary-2.3.1-2.rockspec";
sha256 = "04y882f9ai1jhk0zwla2g0fvl56a75rwnxhsl9r3m0qa5i0ia1i5";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/sile-typesetter/cassowary.lua",
@ -171,7 +171,7 @@ cassowary = buildLuarocksPackage {
"date": "2021-07-19T14:37:34+03:00",
"path": "/nix/store/rzsbr6gqg8vhchl24ma3p1h4slhk0xp7-cassowary.lua",
"sha256": "1r668qcvd2a1rx17xp7ajp5wjhyvh2fwn0c60xmw0mnarjb5w1pq",
"fetchSubmodules": true,
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
}
@ -179,6 +179,10 @@ cassowary = buildLuarocksPackage {
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua penlight ];
checkInputs = [ busted ];
# Avoid circular dependency issue with busted / penlight, see:
# https://github.com/NixOS/nixpkgs/pull/136453/files#r700982255
doCheck = false;
meta = {
homepage = "https://github.com/sile-typesetter/cassowary.lua";
@ -1953,15 +1957,18 @@ nvim-client = buildLuarocksPackage {
penlight = buildLuarocksPackage {
pname = "penlight";
version = "dev-1";
version = "1.11.0-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/penlight-1.11.0-1.rockspec";
sha256 = "1sjhnywvamyi9fadhra5pw2an1rhy2hk2byfxmr3n5wi0xrqv004";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/lunarmodules/penlight.git",
"rev": "e3712f00fae09a166dd62540b677600165d5bcd7",
"date": "2021-08-18T21:37:47+02:00",
"path": "/nix/store/i70ndw8qhvcm828ifb3vyj08y22xp0ka-penlight",
"sha256": "19n9xqkb4hlak0k7hamk4ixwjvyxslsnyh1zjazdzrl8n736xhkl",
"fetchSubmodules": true,
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
}
@ -1969,12 +1976,13 @@ penlight = buildLuarocksPackage {
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua luafilesystem ];
checkInputs = [ busted busted ];
checkInputs = [ busted ];
doCheck = false;
meta = {
homepage = "https://lunarmodules.github.io/penlight";
description = "Lua utility libraries loosely based on the Python standard libraries";
maintainers = with lib.maintainers; [ alerque ];
license.fullName = "MIT/X11";
};
};

View File

@ -11,7 +11,7 @@ in {
};
fuse_3 = mkFuse {
version = "3.10.4";
sha256Hash = "1ml4bs4wx5dbz5xpnd5g8b9avmn7g7jvf16fbdlk0da8il0qd2rx";
version = "3.10.5";
sha256Hash = "1yxh85m8fnn3w21f6g6vza7k2giizmyhcbkms4rmkcd2dd2rzk3y";
};
}

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "xdotool";
version = "3.20210804.2";
version = "3.20210903.1";
src = fetchFromGitHub {
owner = "jordansissel";
repo = pname;
rev = "v${version}";
sha256 = "sha256-7N5f/BFtq/m5MsXe7ZCTUTc1yp+JDJNRF1P9qB2l554=";
sha256 = "sha256-fmz/CJm1GgNOYjOfC6uNwDa8jV+GczPw8m6Qb2jw3rE=";
};
nativeBuildInputs = [ pkg-config perl ];

View File

@ -16,13 +16,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "tts";
version = "0.2.1";
version = "0.2.2";
src = fetchFromGitHub {
owner = "coqui-ai";
repo = "TTS";
rev = "v${version}";
sha256 = "sha256-7YMNxZ15qQowEE0tE6x/LbtirNGp7h9OLyS1JSl9x2A=";
sha256 = "sha256-hhL6/hBs2umR8/VEumr2LzuCAOkroK8vBfDuNVY0ygw=";
};
postPatch = ''
@ -55,6 +55,7 @@ python3.pkgs.buildPythonApplication rec {
pypinyin
pysbd
pytorch
pyworld
scipy
soundfile
tensorboardx

View File

@ -18,21 +18,16 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-ah8IjShmivS6IWL3ku/4/j+WNr/LdUnh1YJnPdaFdcM=";
nativeBuildInputs = [
cmake pkg-config installShellFiles
# ghc is not supported on aarch64-darwin yet.
] ++ lib.optional (stdenv.hostPlatform.system != "aarch64-darwin") pandoc;
nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ];
buildInputs = [ zlib ]
++ lib.optionals stdenv.isDarwin [ libiconv Security ];
outputs = [ "out" ] ++ lib.optional (stdenv.hostPlatform.system != "aarch64-darwin") "man";
outputs = [ "out" "man" ];
postInstall = lib.optionalString (stdenv.hostPlatform.system != "aarch64-darwin") ''
postInstall = ''
pandoc --standalone -f markdown -t man man/exa.1.md > man/exa.1
pandoc --standalone -f markdown -t man man/exa_colors.5.md > man/exa_colors.5
installManPage man/exa.1 man/exa_colors.5
'' + ''
installShellCompletion \
--name exa completions/completions.bash \
--name exa.fish completions/completions.fish \

View File

@ -42,10 +42,9 @@ buildGoModule rec {
install -Dm444 -t $out/lib/systemd/system systemd/step-ca.service
'';
# Tests fail on darwin with
# panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted [recovered]
# probably some sandboxing issue
doCheck = stdenv.isLinux;
# Tests start http servers which need to bind to local addresses:
# panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted
__darwinAllowLocalNetworking = true;
meta = with lib; {
description = "A private certificate authority (X.509 & SSH) & ACME server for secure automated certificate management, so you can use TLS everywhere & SSO for SSH";

View File

@ -3,9 +3,8 @@
, fetchurl
, makeWrapper
, pkg-config
, autoconf
, automake
, poppler_utils
, gitMinimal
, harfbuzz
, icu
, fontconfig
@ -39,11 +38,11 @@ in
stdenv.mkDerivation rec {
pname = "sile";
version = "0.10.15";
version = "0.11.1";
src = fetchurl {
url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "0p1w3s6j34qi93aycqmqggfm277n90z90nlmm1j3qizxxwq5gda9";
sha256 = "06bx94zx6skhizk2bbrid82sldwgxfycvjh6zx1zy1xz8gajgrm3";
};
configureFlags = [
@ -52,8 +51,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [
autoconf
automake
gitMinimal
pkg-config
makeWrapper
];
@ -70,7 +68,9 @@ stdenv.mkDerivation rec {
poppler_utils
];
preConfigure = lib.optionalString stdenv.isDarwin ''
preConfigure = ''
patchShebangs build-aux/*.sh
'' + lib.optionalString stdenv.isDarwin ''
sed -i -e 's|@import AppKit;|#import <AppKit/AppKit.h>|' src/macfonts.m
'';
@ -108,7 +108,8 @@ stdenv.mkDerivation rec {
technologies and borrowing some ideas from graphical systems
such as InDesign.
'';
homepage = "https://sile-typesetter.org/";
homepage = "https://sile-typesetter.org";
changelog = "https://github.com/sile-typesetter/sile/raw/v${version}/CHANGELOG.md";
platforms = platforms.unix;
broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/issues/23018
maintainers = with maintainers; [ doronbehar alerque ];