commit
52e4445b26
GPG Key ID:
90734A9E619C8A6C
@ -1,650 +0,0 @@ |
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<article xmlns="http://docbook.org/ns/docbook" |
||||
xmlns:xlink="http://www.w3.org/1999/xlink"> |
||||
<title>Nixpkgs Release Notes</title> |
||||
<section xml:id="release-notes-0.14"> |
||||
<title>Release 0.14 (June 4, 2012)</title> |
||||
|
||||
<para> |
||||
In preparation for the switch from Subversion to Git, this release is mainly the prevent the Nixpkgs version number from going backwards. (This would happen because prerelease version numbers produced for the Git repository are lower than those for the Subversion repository.) |
||||
</para> |
||||
|
||||
<para> |
||||
Since the last release, there have been thousands of changes and new packages by numerous contributors. For details, see the commit logs. |
||||
</para> |
||||
</section> |
||||
<section xml:id="release-notes-0.13"> |
||||
<title>Release 0.13 (February 5, 2010)</title> |
||||
|
||||
<para> |
||||
As always, there are many changes. Some of the most important updates are: |
||||
<itemizedlist> |
||||
<listitem> |
||||
<para> |
||||
Glibc 2.9. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
GCC 4.3.3. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
Linux 2.6.32. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
X.org 7.5. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
KDE 4.3.4. |
||||
</para> |
||||
</listitem> |
||||
</itemizedlist> |
||||
</para> |
||||
</section> |
||||
<section xml:id="release-notes-0.12"> |
||||
<title>Release 0.12 (April 24, 2009)</title> |
||||
|
||||
<para> |
||||
There are way too many additions to Nixpkgs since the last release to list here: for example, the number of packages on Linux has increased from 1002 to 2159. However, some specific improvements are worth listing: |
||||
<itemizedlist> |
||||
<listitem> |
||||
<para> |
||||
Nixpkgs now has a manual. In particular, it describes the standard build environment in detail. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
Major new packages: |
||||
<itemizedlist> |
||||
<listitem> |
||||
<para> |
||||
KDE 4. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
TeXLive. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
VirtualBox. |
||||
</para> |
||||
</listitem> |
||||
</itemizedlist> |
||||
… and many others. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
Important updates: |
||||
<itemizedlist> |
||||
<listitem> |
||||
<para> |
||||
Glibc 2.7. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
GCC 4.2.4. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
Linux 2.6.25 — 2.6.28. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
Firefox 3. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
X.org 7.3. |
||||
</para> |
||||
</listitem> |
||||
</itemizedlist> |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
Support for building derivations in a virtual machine, including RPM and Debian builds in automatically generated VM images. See <filename>pkgs/build-support/vm/default.nix</filename> for details. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
Improved support for building Haskell packages. |
||||
</para> |
||||
</listitem> |
||||
</itemizedlist> |
||||
</para> |
||||
|
||||
<para> |
||||
The following people contributed to this release: Andres Löh, Arie Middelkoop, Armijn Hemel, Eelco Dolstra, Lluís Batlle, Ludovic Courtès, Marc Weber, Mart Kolthof, Martin Bravenboer, Michael Raskin, Nicolas Pierron, Peter Simons, Pjotr Prins, Rob Vermaas, Sander van der Burg, Tobias Hammerschmidt, Valentin David, Wouter den Breejen and Yury G. Kudryashov. In addition, several people contributed patches on the <literal>nix-dev</literal> mailing list. |
||||
</para> |
||||
</section> |
||||
<section xml:id="release-notes-0.11"> |
||||
<title>Release 0.11 (September 11, 2007)</title> |
||||
|
||||
<para> |
||||
This release has the following improvements: |
||||
<itemizedlist> |
||||
<listitem> |
||||
<para> |
||||
The standard build environment (<literal>stdenv</literal>) is now pure on the <literal>x86_64-linux</literal> and <literal>powerpc-linux</literal> platforms, just as on <literal>i686-linux</literal>. (Purity means that building and using the standard environment has no dependencies outside of the Nix store. For instance, it doesn’t require an external C compiler such as <filename>/usr/bin/gcc</filename>.) Also, the statically linked binaries used in the bootstrap process are now automatically reproducible, making it easy to update the bootstrap tools and to add support for other Linux platforms. See <filename>pkgs/stdenv/linux/make-bootstrap-tools.nix</filename> for details. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
Hook variables in the generic builder are now executed using the <function>eval</function> shell command. This has a major advantage: you can write hooks directly in Nix expressions. For instance, rather than writing a builder like this: |
||||
<programlisting> |
||||
source $stdenv/setup |
||||
|
||||
postInstall=postInstall |
||||
postInstall() { |
||||
ln -sf gzip $out/bin/gunzip |
||||
ln -sf gzip $out/bin/zcat |
||||
} |
||||
|
||||
genericBuild</programlisting> |
||||
(the <literal>gzip</literal> builder), you can just add this attribute to the derivation: |
||||
<programlisting> |
||||
postInstall = "ln -sf gzip $out/bin/gunzip; ln -sf gzip $out/bin/zcat";</programlisting> |
||||
and so a separate build script becomes unnecessary. This should allow us to get rid of most builders in Nixpkgs. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
It is now possible to have the generic builder pass arguments to <command>configure</command> and <command>make</command> that contain whitespace. Previously, for example, you could say in a builder, |
||||
<programlisting> |
||||
configureFlags="CFLAGS=-O0"</programlisting> |
||||
but not |
||||
<programlisting> |
||||
configureFlags="CFLAGS=-O0 -g"</programlisting> |
||||
since the <literal>-g</literal> would be interpreted as a separate argument to <command>configure</command>. Now you can say |
||||
<programlisting> |
||||
configureFlagsArray=("CFLAGS=-O0 -g")</programlisting> |
||||
or similarly |
||||
<programlisting> |
||||
configureFlagsArray=("CFLAGS=-O0 -g" "LDFLAGS=-L/foo -L/bar")</programlisting> |
||||
which does the right thing. Idem for <literal>makeFlags</literal>, <literal>installFlags</literal>, <literal>checkFlags</literal> and <literal>distFlags</literal>. |
||||
</para> |
||||
<para> |
||||
Unfortunately you can't pass arrays to Bash through the environment, so you can't put the array above in a Nix expression, e.g., |
||||
<programlisting> |
||||
configureFlagsArray = ["CFLAGS=-O0 -g"];</programlisting> |
||||
since it would just be flattened to a since string. However, you <emphasis>can</emphasis> use the inline hooks described above: |
||||
<programlisting> |
||||
preConfigure = "configureFlagsArray=(\"CFLAGS=-O0 -g\")";</programlisting> |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
The function <function>fetchurl</function> now has support for two different kinds of mirroring of files. First, it has support for <emphasis>content-addressable mirrors</emphasis>. For example, given the <function>fetchurl</function> call |
||||
<programlisting> |
||||
fetchurl { |
||||
url = "http://releases.mozilla.org/<replaceable>...</replaceable>/firefox-2.0.0.6-source.tar.bz2"; |
||||
sha1 = "eb72f55e4a8bf08e8c6ef227c0ade3d068ba1082"; |
||||
}</programlisting> |
||||
<function>fetchurl</function> will first try to download this file from <link |
||||
xlink:href="http://tarballs.nixos.org/sha1/eb72f55e4a8bf08e8c6ef227c0ade3d068ba1082"/>. If that file doesn’t exist, it will try the original URL. In general, the “content-addressed” location is <replaceable>mirror</replaceable><literal>/</literal><replaceable>hash-type</replaceable><literal>/</literal><replaceable>hash</replaceable>. There is currently only one content-addressable mirror (<link |
||||
xlink:href="http://tarballs.nixos.org"/>), but more can be specified in the <varname>hashedMirrors</varname> attribute in <filename>pkgs/build-support/fetchurl/mirrors.nix</filename>, or by setting the <envar>NIX_HASHED_MIRRORS</envar> environment variable to a whitespace-separated list of URLs. |
||||
</para> |
||||
<para> |
||||
Second, <function>fetchurl</function> has support for widely-mirrored distribution sites such as SourceForge or the Linux kernel archives. Given a URL of the form <literal>mirror://<replaceable>site</replaceable>/<replaceable>path</replaceable></literal>, it will try to download <replaceable>path</replaceable> from a configurable list of mirrors for <replaceable>site</replaceable>. (This idea was borrowed from Gentoo Linux.) Example: |
||||
<programlisting> |
||||
fetchurl { |
||||
url = mirror://gnu/gcc/gcc-4.2.0/gcc-core-4.2.0.tar.bz2; |
||||
sha256 = "0ykhzxhr8857dr97z0j9wyybfz1kjr71xk457cfapfw5fjas4ny1"; |
||||
}</programlisting> |
||||
Currently <replaceable>site</replaceable> can be <literal>sourceforge</literal>, <literal>gnu</literal> and <literal>kernel</literal>. The list of mirrors is defined in <filename>pkgs/build-support/fetchurl/mirrors.nix</filename>. You can override the list of mirrors for a particular site by setting the environment variable <envar>NIX_MIRRORS_<replaceable>site</replaceable></envar>, e.g. |
||||
<programlisting> |
||||
export NIX_MIRRORS_sourceforge=http://osdn.dl.sourceforge.net/sourceforge/</programlisting> |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
Important updates: |
||||
<itemizedlist> |
||||
<listitem> |
||||
<para> |
||||
Glibc 2.5. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
GCC 4.1.2. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
Gnome 2.16.3. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
X11R7.2. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
Linux 2.6.21.7 and 2.6.22.6. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
Emacs 22.1. |
||||
</para> |
||||
</listitem> |
||||
</itemizedlist> |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
Major new packages: |
||||
<itemizedlist> |
||||
<listitem> |
||||
<para> |
||||
KDE 3.5.6 Base. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
Wine 0.9.43. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
OpenOffice 2.2.1. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
Many Linux system packages to support NixOS. |
||||
</para> |
||||
</listitem> |
||||
</itemizedlist> |
||||
</para> |
||||
</listitem> |
||||
</itemizedlist> |
||||
</para> |
||||
|
||||
<para> |
||||
The following people contributed to this release: Andres Löh, Arie Middelkoop, Armijn Hemel, Eelco Dolstra, Marc Weber, Mart Kolthof, Martin Bravenboer, Michael Raskin, Wouter den Breejen and Yury G. Kudryashov. |
||||
</para> |
||||
</section> |
||||
<section xml:id="release-notes-0.10"> |
||||
<title>Release 0.10 (October 12, 2006)</title> |
||||
|
||||
<note> |
||||
<para> |
||||
This release of Nixpkgs requires <link |
||||
xlink:href='https://nixos.org/releases/nix/nix-0.10/'>Nix 0.10</link> or higher. |
||||
</para> |
||||
</note> |
||||
|
||||
<para> |
||||
This release has the following improvements: |
||||
</para> |
||||
|
||||
<itemizedlist> |
||||
<listitem> |
||||
<para> |
||||
<filename>pkgs/system/all-packages-generic.nix</filename> is gone, we now just have <filename>pkgs/top-level/all-packages.nix</filename> that contains all available packages. This should cause much less confusion with users. <filename>all-packages.nix</filename> is a function that by default returns packages for the current platform, but you can override this by specifying a different <varname>system</varname> argument. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
Certain packages in Nixpkgs are now user-configurable through a configuration file, i.e., without having to edit the Nix expressions in Nixpkgs. For instance, the Firefox provided in the Nixpkgs channel is built without the RealPlayer plugin (for legal reasons). Previously, you could easily enable RealPlayer support by editing the call to the Firefox function in <filename>all-packages.nix</filename>, but such changes are not respected when Firefox is subsequently updated through the Nixpkgs channel. |
||||
</para> |
||||
<para> |
||||
The Nixpkgs configuration file (found in <filename>~/.nixpkgs/config.nix</filename> or through the <envar>NIXPKGS_CONFIG</envar> environment variable) is an attribute set that contains configuration options that <filename>all-packages.nix</filename> reads and uses for certain packages. For instance, the following configuration file: |
||||
<programlisting> |
||||
{ |
||||
firefox = { |
||||
enableRealPlayer = true; |
||||
}; |
||||
}</programlisting> |
||||
persistently enables RealPlayer support in the Firefox build. |
||||
</para> |
||||
<para> |
||||
(Actually, <literal>firefox.enableRealPlayer</literal> is the <emphasis>only</emphasis> configuration option currently available, but more are sure to be added.) |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
Support for new platforms: |
||||
<itemizedlist> |
||||
<listitem> |
||||
<para> |
||||
<literal>i686-cygwin</literal>, i.e., Windows (using <link xlink:href="http://www.cygwin.com/">Cygwin</link>). The standard environment on <literal>i686-cygwin</literal> by default builds binaries for the Cygwin environment (i.e., it uses Cygwin tools and produces executables that use the Cygwin library). However, there is also a standard environment that produces binaries that use <link |
||||
xlink:href="http://www.mingw.org/">MinGW</link>. You can use it by calling <filename>all-package.nix</filename> with the <varname>stdenvType</varname> argument set to <literal>"i686-mingw"</literal>. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
<literal>i686-darwin</literal>, i.e., Mac OS X on Intel CPUs. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
<literal>powerpc-linux</literal>. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
<literal>x86_64-linux</literal>, i.e., Linux on 64-bit AMD/Intel CPUs. Unlike <literal>i686-linux</literal>, this platform doesn’t have a pure <literal>stdenv</literal> yet. |
||||
</para> |
||||
</listitem> |
||||
</itemizedlist> |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
The default compiler is now GCC 4.1.1. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
X11 updated to X.org’s X11R7.1. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
Notable new packages: |
||||
<itemizedlist> |
||||
<listitem> |
||||
<para> |
||||
Opera. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
Microsoft Visual C++ 2005 Express Edition and the Windows SDK. |
||||
</para> |
||||
</listitem> |
||||
</itemizedlist> |
||||
In total there are now around 809 packages in Nixpkgs. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
It is now <emphasis>much</emphasis> easier to override the default C compiler and other tools in <literal>stdenv</literal> for specific packages. <filename>all-packages.nix</filename> provides two utility functions for this purpose: <function>overrideGCC</function> and <function>overrideInStdenv</function>. Both take a <literal>stdenv</literal> and return an augmented <literal>stdenv</literal>; the formed changes the C compiler, and the latter adds additional packages to the front of <literal>stdenv</literal>’s initial <envar>PATH</envar>, allowing tools to be overridden. |
||||
</para> |
||||
<para> |
||||
For instance, the package <varname>strategoxt</varname> doesn’t build with the GNU Make in <literal>stdenv</literal> (version 3.81), so we call it with an augmented <literal>stdenv</literal> that uses GNU Make 3.80: |
||||
<programlisting> |
||||
strategoxt = (import ../development/compilers/strategoxt) { |
||||
inherit fetchurl pkgconfig sdf aterm; |
||||
stdenv = overrideInStdenv stdenv [gnumake380]; |
||||
}; |
||||
|
||||
gnumake380 = <replaceable>...</replaceable>;</programlisting> |
||||
Likewise, there are many packages that don’t compile with the default GCC (4.1.1), but that’s easily fixed: |
||||
<programlisting> |
||||
exult = import ../games/exult { |
||||
inherit fetchurl SDL SDL_mixer zlib libpng unzip; |
||||
stdenv = overrideGCC stdenv gcc34; |
||||
};</programlisting> |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
It has also become much easier to experiment with changes to the <literal>stdenv</literal> setup script (which notably contains the generic builder). Since edits to <filename>pkgs/stdenv/generic/setup.sh</filename> trigger a rebuild of <emphasis>everything</emphasis>, this was formerly quite painful. But now <literal>stdenv</literal> contains a function to “regenerate” <literal>stdenv</literal> with a different setup script, allowing the use of a different setup script for specific packages: |
||||
<programlisting> |
||||
pkg = import <replaceable>...</replaceable> { |
||||
stdenv = stdenv.regenerate ./my-setup.sh; |
||||
<replaceable>...</replaceable> |
||||
}</programlisting> |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
Packages can now have a human-readable <emphasis>description</emphasis> field. Package descriptions are shown by <literal>nix-env -qa --description</literal>. In addition, they’re shown on the Nixpkgs release page. A description can be added to a package as follows: |
||||
<programlisting> |
||||
stdenv.mkDerivation { |
||||
name = "exult-1.2"; |
||||
<replaceable>...</replaceable> |
||||
meta = { |
||||
description = "A reimplementation of the Ultima VII game engine"; |
||||
}; |
||||
}</programlisting> |
||||
The <varname>meta</varname> attribute is not passed to the builder, so changes to the description do not trigger a rebuild. Additional <varname>meta</varname> attributes may be defined in the future (such as the URL of the package’s homepage, the license, etc.). |
||||
</para> |
||||
</listitem> |
||||
</itemizedlist> |
||||
|
||||
<para> |
||||
The following people contributed to this release: Andres Löh, Armijn Hemel, Christof Douma, Eelco Dolstra, Eelco Visser, Mart Kolthof, Martin Bravenboer, Merijn de Jonge, Rob Vermaas and Roy van den Broek. |
||||
</para> |
||||
</section> |
||||
<section xml:id="release-notes-0.9"> |
||||
<title>Release 0.9 (January 31, 2006)</title> |
||||
|
||||
<para> |
||||
There have been zillions of changes since the last release of Nixpkgs. Many packages have been added or updated. The following are some of the more notable changes: |
||||
</para> |
||||
|
||||
<itemizedlist> |
||||
<listitem> |
||||
<para> |
||||
Distribution files have been moved to <link |
||||
xlink:href="https://nixos.org/" />. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
The C library on Linux, Glibc, has been updated to version 2.3.6. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
The default compiler is now GCC 3.4.5. GCC 4.0.2 is also available. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
The old, unofficial Xlibs has been replaced by the official modularised X11 distribution from X.org, i.e., X11R7.0. X11R7.0 consists of 287 (!) packages, all of which are in Nixpkgs though not all have been tested. It is now possible to build a working X server (previously we only had X client libraries). We use a fully Nixified X server on NixOS. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
The Sun JDK 5 has been purified, i.e., it doesn’t require any non-Nix components such as <filename>/lib/ld-linux.so.2</filename>. This means that Java applications such as Eclipse and Azureus can run on NixOS. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
Hardware-accelerated OpenGL support, used by games like Quake 3 (which is now built from source). |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
Improved support for FreeBSD on x86. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
Improved Haskell support; e.g., the GHC build is now pure. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
Some support for cross-compilation: cross-compiling builds of GCC and Binutils, and cross-compiled builds of the C library uClibc. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
Notable new packages: |
||||
<itemizedlist> |
||||
<listitem> |
||||
<para> |
||||
teTeX, including support for building LaTeX documents using Nix (with automatic dependency determination). |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
Ruby. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
System-level packages to support NixOS, e.g. Grub, GNU <literal>parted</literal> and so on. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
<literal>ecj</literal>, the Eclipse Compiler for Java, so we finally have a freely distributable compiler that supports Java 5.0. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
<literal>php</literal>. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
The GIMP. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
Inkscape. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
GAIM. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
<literal>kdelibs</literal>. This allows us to add KDE-based packages (such as <literal>kcachegrind</literal>). |
||||
</para> |
||||
</listitem> |
||||
</itemizedlist> |
||||
</para> |
||||
</listitem> |
||||
</itemizedlist> |
||||
|
||||
<para> |
||||
The following people contributed to this release: Andres Löh, Armijn Hemel, Bogdan Dumitriu, Christof Douma, Eelco Dolstra, Eelco Visser, Mart Kolthof, Martin Bravenboer, Rob Vermaas and Roy van den Broek. |
||||
</para> |
||||
</section> |
||||
<section xml:id="release-notes-0.8"> |
||||
<title>Release 0.8 (April 11, 2005)</title> |
||||
|
||||
<para> |
||||
This release is mostly to remain synchronised with the changed hashing scheme in Nix 0.8. |
||||
</para> |
||||
|
||||
<para> |
||||
Notable updates: |
||||
<itemizedlist> |
||||
<listitem> |
||||
<para> |
||||
Adobe Reader 7.0 |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
Various security updates (zlib 1.2.2, etc.) |
||||
</para> |
||||
</listitem> |
||||
</itemizedlist> |
||||
</para> |
||||
</section> |
||||
<section xml:id="release-notes-0.7"> |
||||
<title>Release 0.7 (March 14, 2005)</title> |
||||
|
||||
<itemizedlist> |
||||
<listitem> |
||||
<para> |
||||
The bootstrap process for the standard build environment on Linux (stdenv-linux) has been improved. It is no longer dependent in its initial bootstrap stages on the system Glibc, GCC, and other tools. Rather, Nixpkgs contains a statically linked bash and curl, and uses that to download other statically linked tools. These are then used to build a Glibc and dynamically linked versions of all other tools. |
||||
</para> |
||||
<para> |
||||
This change also makes the bootstrap process faster. For instance, GCC is built only once instead of three times. |
||||
</para> |
||||
<para> |
||||
(Contributed by Armijn Hemel.) |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
Tarballs used by Nixpkgs are now obtained from the same server that hosts Nixpkgs (<link |
||||
xlink:href="http://catamaran.labs.cs.uu.nl/" />). This reduces the risk of packages being unbuildable due to moved or deleted files on various servers. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
There now is a generic mechanism for building Perl modules. See the various Perl modules defined in pkgs/system/all-packages-generic.nix. |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
Notable new packages: |
||||
<itemizedlist> |
||||
<listitem> |
||||
<para> |
||||
Qt 3 |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
MySQL |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
MythTV |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
Mono |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
MonoDevelop (alpha) |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
Xine |
||||
</para> |
||||
</listitem> |
||||
</itemizedlist> |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
Notable updates: |
||||
<itemizedlist> |
||||
<listitem> |
||||
<para> |
||||
GCC 3.4.3 |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
Glibc 2.3.4 |
||||
</para> |
||||
</listitem> |
||||
<listitem> |
||||
<para> |
||||
GTK 2.6 |
||||
</para> |
||||
</listitem> |
||||
</itemizedlist> |
||||
</para> |
||||
</listitem> |
||||
</itemizedlist> |
||||
</section> |
||||
</article> |
||||
@ -0,0 +1,31 @@ |
||||
{ lib, ... }: |
||||
let |
||||
inherit (lib) types; |
||||
in { |
||||
options = { |
||||
name = lib.mkOption { |
||||
type = types.str; |
||||
}; |
||||
email = lib.mkOption { |
||||
type = types.str; |
||||
}; |
||||
matrix = lib.mkOption { |
||||
type = types.nullOr types.str; |
||||
default = null; |
||||
}; |
||||
github = lib.mkOption { |
||||
type = types.nullOr types.str; |
||||
default = null; |
||||
}; |
||||
githubId = lib.mkOption { |
||||
type = types.nullOr types.ints.unsigned; |
||||
default = null; |
||||
}; |
||||
keys = lib.mkOption { |
||||
type = types.listOf (types.submodule { |
||||
options.fingerprint = lib.mkOption { type = types.str; }; |
||||
}); |
||||
default = []; |
||||
}; |
||||
}; |
||||
} |
||||
@ -0,0 +1,20 @@ |
||||
{ config, lib, ... }: |
||||
let |
||||
inherit (lib) types mkOption setDefaultModuleLocation evalModules; |
||||
inherit (types) deferredModule lazyAttrsOf submodule str raw enum; |
||||
in |
||||
{ |
||||
options = { |
||||
deferred = mkOption { |
||||
type = deferredModule; |
||||
}; |
||||
result = mkOption { |
||||
default = (evalModules { modules = [ config.deferred ]; }).config.result; |
||||
}; |
||||
}; |
||||
config = { |
||||
deferred = { ... }: |
||||
# this should be an attrset, so this fails |
||||
true; |
||||
}; |
||||
} |
||||
@ -0,0 +1,58 @@ |
||||
{ lib, ... }: |
||||
let |
||||
inherit (lib) types mkOption setDefaultModuleLocation; |
||||
inherit (types) deferredModule lazyAttrsOf submodule str raw enum; |
||||
in |
||||
{ |
||||
imports = [ |
||||
# generic module, declaring submodules: |
||||
# - nodes.<name> |
||||
# - default |
||||
# where all nodes include the default |
||||
({ config, ... }: { |
||||
_file = "generic.nix"; |
||||
options.nodes = mkOption { |
||||
type = lazyAttrsOf (submodule { imports = [ config.default ]; }); |
||||
default = {}; |
||||
}; |
||||
options.default = mkOption { |
||||
type = deferredModule; |
||||
default = { }; |
||||
description = '' |
||||
Module that is included in all nodes. |
||||
''; |
||||
}; |
||||
}) |
||||
|
||||
{ |
||||
_file = "default-1.nix"; |
||||
default = { config, ... }: { |
||||
options.settingsDict = lib.mkOption { type = lazyAttrsOf str; default = {}; }; |
||||
options.bottom = lib.mkOption { type = enum []; }; |
||||
}; |
||||
} |
||||
|
||||
{ |
||||
_file = "default-a-is-b.nix"; |
||||
default = ./define-settingsDict-a-is-b.nix; |
||||
} |
||||
|
||||
{ |
||||
_file = "nodes-foo.nix"; |
||||
nodes.foo.settingsDict.b = "beta"; |
||||
} |
||||
|
||||
{ |
||||
_file = "the-file-that-contains-the-bad-config.nix"; |
||||
default.bottom = "bogus"; |
||||
} |
||||
|
||||
{ |
||||
_file = "nodes-foo-c-is-a.nix"; |
||||
nodes.foo = { config, ... }: { |
||||
settingsDict.c = config.settingsDict.a; |
||||
}; |
||||
} |
||||
|
||||
]; |
||||
} |
||||
@ -0,0 +1,3 @@ |
||||
{ config, ... }: { |
||||
settingsDict.a = config.settingsDict.b; |
||||
} |
||||
@ -0,0 +1,50 @@ |
||||
# to run these tests: |
||||
# nix-build nixpkgs/lib/tests/teams.nix |
||||
# If it builds, all tests passed |
||||
{ pkgs ? import ../.. {}, lib ? pkgs.lib }: |
||||
|
||||
let |
||||
inherit (lib) types; |
||||
|
||||
teamModule = { config, ... }: { |
||||
options = { |
||||
shortName = lib.mkOption { |
||||
type = types.str; |
||||
}; |
||||
scope = lib.mkOption { |
||||
type = types.str; |
||||
}; |
||||
enableFeatureFreezePing = lib.mkOption { |
||||
type = types.bool; |
||||
default = false; |
||||
}; |
||||
members = lib.mkOption { |
||||
type = types.listOf (types.submodule |
||||
(import ./maintainer-module.nix { inherit lib; }) |
||||
); |
||||
default = []; |
||||
}; |
||||
githubTeams = lib.mkOption { |
||||
type = types.listOf types.str; |
||||
default = []; |
||||
}; |
||||
}; |
||||
}; |
||||
|
||||
checkTeam = team: uncheckedAttrs: |
||||
let |
||||
prefix = [ "lib" "maintainer-team" team ]; |
||||
checkedAttrs = (lib.modules.evalModules { |
||||
inherit prefix; |
||||
modules = [ |
||||
teamModule |
||||
{ |
||||
_file = toString ../../maintainers/team-list.nix; |
||||
config = uncheckedAttrs; |
||||
} |
||||
]; |
||||
}).config; |
||||
in checkedAttrs; |
||||
|
||||
checkedTeams = lib.mapAttrs checkTeam lib.teams; |
||||
in pkgs.writeTextDir "maintainer-teams.json" (builtins.toJSON checkedTeams) |
||||
File diff suppressed because it is too large
Load Diff
|
Can't render this file because it has a wrong number of fields in line 72.
|
@ -1,8 +1,63 @@ |
||||
{ evalMinimalConfig, pkgs, lib, stdenv }: |
||||
let |
||||
eval = mod: evalMinimalConfig { |
||||
imports = [ ../nixpkgs.nix mod ]; |
||||
}; |
||||
withHost = eval { |
||||
nixpkgs.hostPlatform = "aarch64-linux"; |
||||
}; |
||||
withHostAndBuild = eval { |
||||
nixpkgs.hostPlatform = "aarch64-linux"; |
||||
nixpkgs.buildPlatform = "aarch64-darwin"; |
||||
}; |
||||
ambiguous = { |
||||
_file = "ambiguous.nix"; |
||||
nixpkgs.hostPlatform = "aarch64-linux"; |
||||
nixpkgs.buildPlatform = "aarch64-darwin"; |
||||
nixpkgs.system = "x86_64-linux"; |
||||
nixpkgs.localSystem.system = "x86_64-darwin"; |
||||
nixpkgs.crossSystem.system = "i686-linux"; |
||||
imports = [ |
||||
{ _file = "repeat.nix"; |
||||
nixpkgs.hostPlatform = "aarch64-linux"; |
||||
} |
||||
]; |
||||
}; |
||||
getErrors = module: |
||||
let |
||||
uncheckedEval = lib.evalModules { modules = [ ../nixpkgs.nix module ]; }; |
||||
in map (ass: ass.message) (lib.filter (ass: !ass.assertion) uncheckedEval.config.assertions); |
||||
in |
||||
lib.recurseIntoAttrs { |
||||
invokeNixpkgsSimple = |
||||
(evalMinimalConfig ({ config, modulesPath, ... }: { |
||||
imports = [ (modulesPath + "/misc/nixpkgs.nix") ]; |
||||
(eval { |
||||
nixpkgs.system = stdenv.hostPlatform.system; |
||||
}))._module.args.pkgs.hello; |
||||
})._module.args.pkgs.hello; |
||||
assertions = |
||||
assert withHost._module.args.pkgs.stdenv.hostPlatform.system == "aarch64-linux"; |
||||
assert withHost._module.args.pkgs.stdenv.buildPlatform.system == "aarch64-linux"; |
||||
assert withHostAndBuild._module.args.pkgs.stdenv.hostPlatform.system == "aarch64-linux"; |
||||
assert withHostAndBuild._module.args.pkgs.stdenv.buildPlatform.system == "aarch64-darwin"; |
||||
assert builtins.trace (lib.head (getErrors ambiguous)) |
||||
getErrors ambiguous == |
||||
['' |
||||
Your system configures nixpkgs with the platform parameters: |
||||
nixpkgs.hostPlatform, with values defined in: |
||||
- repeat.nix |
||||
- ambiguous.nix |
||||
nixpkgs.buildPlatform, with values defined in: |
||||
- ambiguous.nix |
||||
|
||||
However, it also defines the legacy options: |
||||
nixpkgs.system, with values defined in: |
||||
- ambiguous.nix |
||||
nixpkgs.localSystem, with values defined in: |
||||
- ambiguous.nix |
||||
nixpkgs.crossSystem, with values defined in: |
||||
- ambiguous.nix |
||||
|
||||
For a future proof system configuration, we recommend to remove |
||||
the legacy definitions. |
||||
'']; |
||||
pkgs.emptyFile; |
||||
} |
||||
|
||||
@ -1,21 +0,0 @@ |
||||
{ config, lib, pkgs, ... }: |
||||
|
||||
{ |
||||
|
||||
options.programs.clickshare-csc1.enable = |
||||
lib.options.mkEnableOption '' |
||||
Barco ClickShare CSC-1 driver/client. |
||||
This allows users in the <literal>clickshare</literal> |
||||
group to access and use a ClickShare USB dongle |
||||
that is connected to the machine |
||||
''; |
||||
|
||||
config = lib.modules.mkIf config.programs.clickshare-csc1.enable { |
||||
environment.systemPackages = [ pkgs.clickshare-csc1 ]; |
||||
services.udev.packages = [ pkgs.clickshare-csc1 ]; |
||||
users.groups.clickshare = {}; |
||||
}; |
||||
|
||||
meta.maintainers = [ lib.maintainers.yarny ]; |
||||
|
||||
} |
||||
@ -0,0 +1,44 @@ |
||||
{ config, lib, pkgs, ... }: |
||||
|
||||
with lib; |
||||
|
||||
let cfg = config.programs.thunar; |
||||
|
||||
in { |
||||
meta = { |
||||
maintainers = teams.xfce.members; |
||||
}; |
||||
|
||||
options = { |
||||
programs.thunar = { |
||||
enable = mkEnableOption "Thunar, the Xfce file manager"; |
||||
|
||||
plugins = mkOption { |
||||
default = []; |
||||
type = types.listOf types.package; |
||||
description = "List of thunar plugins to install."; |
||||
example = literalExpression "with pkgs.xfce; [ thunar-archive-plugin thunar-volman ]"; |
||||
}; |
||||
|
||||
}; |
||||
}; |
||||
|
||||
config = mkIf cfg.enable ( |
||||
let package = pkgs.xfce.thunar.override { thunarPlugins = cfg.plugins; }; |
||||
|
||||
in { |
||||
environment.systemPackages = [ |
||||
package |
||||
]; |
||||
|
||||
services.dbus.packages = [ |
||||
package |
||||
pkgs.xfce.xfconf |
||||
]; |
||||
|
||||
systemd.packages = [ |
||||
package |
||||
]; |
||||
} |
||||
); |
||||
} |
||||
@ -0,0 +1,148 @@ |
||||
{ config, pkgs, lib, ... }: |
||||
|
||||
with lib; |
||||
|
||||
let |
||||
cfg = config.services.dgraph; |
||||
settingsFormat = pkgs.formats.json {}; |
||||
configFile = settingsFormat.generate "config.json" cfg.settings; |
||||
dgraphWithNode = pkgs.runCommand "dgraph" { |
||||
nativeBuildInputs = [ pkgs.makeWrapper ]; |
||||
} |
||||
'' |
||||
mkdir -p $out/bin |
||||
makeWrapper ${cfg.package}/bin/dgraph $out/bin/dgraph \ |
||||
--set PATH '${lib.makeBinPath [ pkgs.nodejs ]}:$PATH' \ |
||||
''; |
||||
securityOptions = { |
||||
NoNewPrivileges = true; |
||||
|
||||
AmbientCapabilities = ""; |
||||
CapabilityBoundingSet = ""; |
||||
|
||||
DeviceAllow = ""; |
||||
|
||||
LockPersonality = true; |
||||
|
||||
PrivateTmp = true; |
||||
PrivateDevices = true; |
||||
PrivateUsers = true; |
||||
|
||||
ProtectClock = true; |
||||
ProtectControlGroups = true; |
||||
ProtectHostname = true; |
||||
ProtectKernelLogs = true; |
||||
ProtectKernelModules = true; |
||||
ProtectKernelTunables = true; |
||||
|
||||
RemoveIPC = true; |
||||
|
||||
RestrictNamespaces = true; |
||||
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ]; |
||||
RestrictRealtime = true; |
||||
RestrictSUIDSGID = true; |
||||
|
||||
SystemCallArchitectures = "native"; |
||||
SystemCallErrorNumber = "EPERM"; |
||||
SystemCallFilter = [ |
||||
"@system-service" |
||||
"~@cpu-emulation" "~@debug" "~@keyring" "~@memlock" "~@obsolete" "~@privileged" "~@setuid" |
||||
]; |
||||
}; |
||||
in |
||||
{ |
||||
options = { |
||||
services.dgraph = { |
||||
enable = mkEnableOption "Dgraph native GraphQL database with a graph backend"; |
||||
|
||||
package = lib.mkPackageOption pkgs "dgraph" { }; |
||||
|
||||
settings = mkOption { |
||||
type = settingsFormat.type; |
||||
default = {}; |
||||
description = '' |
||||
Contents of the dgraph config. For more details see https://dgraph.io/docs/deploy/config |
||||
''; |
||||
}; |
||||
|
||||
alpha = { |
||||
host = mkOption { |
||||
type = types.str; |
||||
default = "localhost"; |
||||
description = '' |
||||
The host which dgraph alpha will be run on. |
||||
''; |
||||
}; |
||||
port = mkOption { |
||||
type = types.port; |
||||
default = 7080; |
||||
description = '' |
||||
The port which to run dgraph alpha on. |
||||
''; |
||||
}; |
||||
|
||||
}; |
||||
|
||||
zero = { |
||||
host = mkOption { |
||||
type = types.str; |
||||
default = "localhost"; |
||||
description = '' |
||||
The host which dgraph zero will be run on. |
||||
''; |
||||
}; |
||||
port = mkOption { |
||||
type = types.port; |
||||
default = 5080; |
||||
description = '' |
||||
The port which to run dgraph zero on. |
||||
''; |
||||
}; |
||||
}; |
||||
|
||||
}; |
||||
}; |
||||
|
||||
config = mkIf cfg.enable { |
||||
services.dgraph.settings = { |
||||
badger.compression = mkDefault "zstd:3"; |
||||
}; |
||||
|
||||
systemd.services.dgraph-zero = { |
||||
description = "Dgraph native GraphQL database with a graph backend. Zero controls node clustering"; |
||||
after = [ "network.target" ]; |
||||
wantedBy = [ "multi-user.target" ]; |
||||
|
||||
serviceConfig = { |
||||
StateDirectory = "dgraph-zero"; |
||||
WorkingDirectory = "/var/lib/dgraph-zero"; |
||||
DynamicUser = true; |
||||
ExecStart = "${cfg.package}/bin/dgraph zero --my ${cfg.zero.host}:${toString cfg.zero.port}"; |
||||
Restart = "on-failure"; |
||||
} // securityOptions; |
||||
}; |
||||
|
||||
systemd.services.dgraph-alpha = { |
||||
description = "Dgraph native GraphQL database with a graph backend. Alpha serves data"; |
||||
after = [ "network.target" "dgraph-zero.service" ]; |
||||
requires = [ "dgraph-zero.service" ]; |
||||
wantedBy = [ "multi-user.target" ]; |
||||
|
||||
serviceConfig = { |
||||
StateDirectory = "dgraph-alpha"; |
||||
WorkingDirectory = "/var/lib/dgraph-alpha"; |
||||
DynamicUser = true; |
||||
ExecStart = "${dgraphWithNode}/bin/dgraph alpha --config ${configFile} --my ${cfg.alpha.host}:${toString cfg.alpha.port} --zero ${cfg.zero.host}:${toString cfg.zero.port}"; |
||||
ExecStop = '' |
||||
${pkgs.curl}/bin/curl --data "mutation { shutdown { response { message code } } }" \ |
||||
--header 'Content-Type: application/graphql' \ |
||||
-X POST \ |
||||
http://localhost:8080/admin |
||||
''; |
||||
Restart = "on-failure"; |
||||
} // securityOptions; |
||||
}; |
||||
}; |
||||
|
||||
meta.maintainers = with lib.maintainers; [ happysalada ]; |
||||
} |
||||
@ -1,162 +0,0 @@ |
||||
{ config, lib, pkgs, ... }: |
||||
|
||||
with lib; |
||||
|
||||
let |
||||
|
||||
cfg = config.services.riak; |
||||
|
||||
in |
||||
|
||||
{ |
||||
|
||||
###### interface |
||||
|
||||
options = { |
||||
|
||||
services.riak = { |
||||
|
||||
enable = mkEnableOption "riak"; |
||||
|
||||
package = mkOption { |
||||
type = types.package; |
||||
default = pkgs.riak; |
||||
defaultText = literalExpression "pkgs.riak"; |
||||
description = '' |
||||
Riak package to use. |
||||
''; |
||||
}; |
||||
|
||||
nodeName = mkOption { |
||||
type = types.str; |
||||
default = "riak@127.0.0.1"; |
||||
description = '' |
||||
Name of the Erlang node. |
||||
''; |
||||
}; |
||||
|
||||
distributedCookie = mkOption { |
||||
type = types.str; |
||||
default = "riak"; |
||||
description = '' |
||||
Cookie for distributed node communication. All nodes in the |
||||
same cluster should use the same cookie or they will not be able to |
||||
communicate. |
||||
''; |
||||
}; |
||||
|
||||
dataDir = mkOption { |
||||
type = types.path; |
||||
default = "/var/db/riak"; |
||||
description = '' |
||||
Data directory for Riak. |
||||
''; |
||||
}; |
||||
|
||||
logDir = mkOption { |
||||
type = types.path; |
||||
default = "/var/log/riak"; |
||||
description = '' |
||||
Log directory for Riak. |
||||
''; |
||||
}; |
||||
|
||||
extraConfig = mkOption { |
||||
type = types.lines; |
||||
default = ""; |
||||
description = '' |
||||
Additional text to be appended to <filename>riak.conf</filename>. |
||||
''; |
||||
}; |
||||
|
||||
extraAdvancedConfig = mkOption { |
||||
type = types.lines; |
||||
default = ""; |
||||
description = '' |
||||
Additional text to be appended to <filename>advanced.config</filename>. |
||||
''; |
||||
}; |
||||
|
||||
}; |
||||
|
||||
}; |
||||
|
||||
###### implementation |
||||
|
||||
config = mkIf cfg.enable { |
||||
|
||||
environment.systemPackages = [ cfg.package ]; |
||||
environment.etc."riak/riak.conf".text = '' |
||||
nodename = ${cfg.nodeName} |
||||
distributed_cookie = ${cfg.distributedCookie} |
||||
|
||||
platform_log_dir = ${cfg.logDir} |
||||
platform_etc_dir = /etc/riak |
||||
platform_data_dir = ${cfg.dataDir} |
||||
|
||||
${cfg.extraConfig} |
||||
''; |
||||
|
||||
environment.etc."riak/advanced.config".text = '' |
||||
${cfg.extraAdvancedConfig} |
||||
''; |
||||
|
||||
users.users.riak = { |
||||
name = "riak"; |
||||
uid = config.ids.uids.riak; |
||||
group = "riak"; |
||||
description = "Riak server user"; |
||||
}; |
||||
|
||||
users.groups.riak.gid = config.ids.gids.riak; |
||||
|
||||
systemd.services.riak = { |
||||
description = "Riak Server"; |
||||
|
||||
wantedBy = [ "multi-user.target" ]; |
||||
after = [ "network.target" ]; |
||||
|
||||
path = [ |
||||
pkgs.util-linux # for `logger` |
||||
pkgs.bash |
||||
]; |
||||
|
||||
environment.HOME = "${cfg.dataDir}"; |
||||
environment.RIAK_DATA_DIR = "${cfg.dataDir}"; |
||||
environment.RIAK_LOG_DIR = "${cfg.logDir}"; |
||||
environment.RIAK_ETC_DIR = "/etc/riak"; |
||||
|
||||
preStart = '' |
||||
if ! test -e ${cfg.logDir}; then |
||||
mkdir -m 0755 -p ${cfg.logDir} |
||||
chown -R riak ${cfg.logDir} |
||||
fi |
||||
|
||||
if ! test -e ${cfg.dataDir}; then |
||||
mkdir -m 0700 -p ${cfg.dataDir} |
||||
chown -R riak ${cfg.dataDir} |
||||
fi |
||||
''; |
||||
|
||||
serviceConfig = { |
||||
ExecStart = "${cfg.package}/bin/riak console"; |
||||
ExecStop = "${cfg.package}/bin/riak stop"; |
||||
StandardInput = "tty"; |
||||
User = "riak"; |
||||
Group = "riak"; |
||||
PermissionsStartOnly = true; |
||||
# Give Riak a decent amount of time to clean up. |
||||
TimeoutStopSec = 120; |
||||
LimitNOFILE = 65536; |
||||
}; |
||||
|
||||
unitConfig.RequiresMountsFor = [ |
||||
"${cfg.dataDir}" |
||||
"${cfg.logDir}" |
||||
"/etc/riak" |
||||
]; |
||||
}; |
||||
|
||||
}; |
||||
|
||||
} |
||||
@ -0,0 +1,58 @@ |
||||
{ config, lib, pkgs, ... }: |
||||
|
||||
let |
||||
cfg = config.services.hardware.argonone; |
||||
in |
||||
{ |
||||
options.services.hardware.argonone = { |
||||
enable = lib.mkEnableOption "the driver for Argon One Raspberry Pi case fan and power button"; |
||||
package = lib.mkOption { |
||||
type = lib.types.package; |
||||
default = pkgs.argononed; |
||||
defaultText = "pkgs.argononed"; |
||||
description = '' |
||||
The package implementing the Argon One driver |
||||
''; |
||||
}; |
||||
}; |
||||
|
||||
config = lib.mkIf cfg.enable { |
||||
hardware.i2c.enable = true; |
||||
hardware.deviceTree.overlays = [ |
||||
{ |
||||
name = "argononed"; |
||||
dtboFile = "${cfg.package}/boot/overlays/argonone.dtbo"; |
||||
} |
||||
{ |
||||
name = "i2c1-okay-overlay"; |
||||
dtsText = '' |
||||
/dts-v1/; |
||||
/plugin/; |
||||
/ { |
||||
compatible = "brcm,bcm2711"; |
||||
fragment@0 { |
||||
target = <&i2c1>; |
||||
__overlay__ { |
||||
status = "okay"; |
||||
}; |
||||
}; |
||||
}; |
||||
''; |
||||
} |
||||
]; |
||||
environment.systemPackages = [ cfg.package ]; |
||||
systemd.services.argononed = { |
||||
description = "Argon One Raspberry Pi case Daemon Service"; |
||||
wantedBy = [ "multi-user.target" ]; |
||||
serviceConfig = { |
||||
Type = "forking"; |
||||
ExecStart = "${cfg.package}/bin/argononed"; |
||||
PIDFile = "/run/argononed.pid"; |
||||
Restart = "on-failure"; |
||||
}; |
||||
}; |
||||
}; |
||||
|
||||
meta.maintainers = with lib.maintainers; [ misterio77 ]; |
||||
|
||||
} |
||||
@ -0,0 +1,162 @@ |
||||
{ config, pkgs, lib, ... }: |
||||
let |
||||
cfg = config.services.schleuder; |
||||
settingsFormat = pkgs.formats.yaml { }; |
||||
postfixMap = entries: lib.concatStringsSep "\n" (lib.mapAttrsToList (name: value: "${name} ${value}") entries); |
||||
writePostfixMap = name: entries: pkgs.writeText name (postfixMap entries); |
||||
configScript = pkgs.writeScript "schleuder-cfg" '' |
||||
#!${pkgs.runtimeShell} |
||||
set -exuo pipefail |
||||
umask 0077 |
||||
${pkgs.yq}/bin/yq \ |
||||
--slurpfile overrides <(${pkgs.yq}/bin/yq . <${lib.escapeShellArg cfg.extraSettingsFile}) \ |
||||
< ${settingsFormat.generate "schleuder.yml" cfg.settings} \ |
||||
'. * $overrides[0]' \ |
||||
> /etc/schleuder/schleuder.yml |
||||
chown schleuder: /etc/schleuder/schleuder.yml |
||||
''; |
||||
in |
||||
{ |
||||
options.services.schleuder = { |
||||
enable = lib.mkEnableOption "Schleuder secure remailer"; |
||||
enablePostfix = lib.mkEnableOption "automatic postfix integration" // { default = true; }; |
||||
lists = lib.mkOption { |
||||
description = '' |
||||
List of list addresses that should be handled by Schleuder. |
||||
|
||||
Note that this is only handled by the postfix integration, and |
||||
the setup of the lists, their members and their keys has to be |
||||
performed separately via schleuder's API, using a tool such as |
||||
schleuder-cli. |
||||
''; |
||||
type = lib.types.listOf lib.types.str; |
||||
default = [ ]; |
||||
example = [ "widget-team@example.com" "security@example.com" ]; |
||||
}; |
||||
/* maybe one day.... |
||||
domains = lib.mkOption { |
||||
description = "Domains for which all mail should be handled by Schleuder."; |
||||
type = lib.types.listOf lib.types.str; |
||||
default = []; |
||||
example = ["securelists.example.com"]; |
||||
}; |
||||
*/ |
||||
settings = lib.mkOption { |
||||
description = '' |
||||
Settings for schleuder.yml. |
||||
|
||||
Check the <link xlink:href="https://0xacab.org/schleuder/schleuder/blob/master/etc/schleuder.yml">example configuration</link> for possible values. |
||||
''; |
||||
type = lib.types.submodule { |
||||
freeformType = settingsFormat.type; |
||||
options.keyserver = lib.mkOption { |
||||
type = lib.types.str; |
||||
description = '' |
||||
Key server from which to fetch and update keys. |
||||
|
||||
Note that NixOS uses a different default from upstream, since the upstream default sks-keyservers.net is deprecated. |
||||
''; |
||||
default = "keys.openpgp.org"; |
||||
}; |
||||
}; |
||||
default = { }; |
||||
}; |
||||
extraSettingsFile = lib.mkOption { |
||||
description = "YAML file to merge into the schleuder config at runtime. This can be used for secrets such as API keys."; |
||||
type = lib.types.nullOr lib.types.path; |
||||
default = null; |
||||
}; |
||||
listDefaults = lib.mkOption { |
||||
description = '' |
||||
Default settings for lists (list-defaults.yml). |
||||
|
||||
Check the <link xlink:href="https://0xacab.org/schleuder/schleuder/-/blob/master/etc/list-defaults.yml">example configuration</link> for possible values. |
||||
''; |
||||
type = settingsFormat.type; |
||||
default = { }; |
||||
}; |
||||
}; |
||||
config = lib.mkIf cfg.enable { |
||||
assertions = [ |
||||
{ |
||||
assertion = !(cfg.settings.api ? valid_api_keys); |
||||
message = '' |
||||
services.schleuder.settings.api.valid_api_keys is set. Defining API keys via NixOS config results in them being copied to the world-readable Nix store. Please use the extraSettingsFile option to store API keys in a non-public location. |
||||
''; |
||||
} |
||||
{ |
||||
assertion = !(lib.any (db: db ? password) (lib.attrValues cfg.settings.database or {})); |
||||
message = '' |
||||
A password is defined for at least one database in services.schleuder.settings.database. Defining passwords via NixOS config results in them being copied to the world-readable Nix store. Please use the extraSettingsFile option to store database passwords in a non-public location. |
||||
''; |
||||
} |
||||
]; |
||||
users.users.schleuder.isSystemUser = true; |
||||
users.users.schleuder.group = "schleuder"; |
||||
users.groups.schleuder = {}; |
||||
environment.systemPackages = [ |
||||
pkgs.schleuder-cli |
||||
]; |
||||
services.postfix = lib.mkIf cfg.enablePostfix { |
||||
extraMasterConf = '' |
||||
schleuder unix - n n - - pipe |
||||
flags=DRhu user=schleuder argv=/${pkgs.schleuder}/bin/schleuder work ''${recipient} |
||||
''; |
||||
transport = lib.mkIf (cfg.lists != [ ]) (postfixMap (lib.genAttrs cfg.lists (_: "schleuder:"))); |
||||
extraConfig = '' |
||||
schleuder_destination_recipient_limit = 1 |
||||
''; |
||||
# review: does this make sense? |
||||
localRecipients = lib.mkIf (cfg.lists != [ ]) cfg.lists; |
||||
}; |
||||
systemd.services = let commonServiceConfig = { |
||||
# We would have liked to use DynamicUser, but since the default |
||||
# database is SQLite and lives in StateDirectory, and that same |
||||
# database needs to be readable from the postfix service, this |
||||
# isn't trivial to do. |
||||
User = "schleuder"; |
||||
StateDirectory = "schleuder"; |
||||
StateDirectoryMode = "0700"; |
||||
}; in |
||||
{ |
||||
schleuder-init = { |
||||
serviceConfig = commonServiceConfig // { |
||||
ExecStartPre = lib.mkIf (cfg.extraSettingsFile != null) [ |
||||
"+${configScript}" |
||||
]; |
||||
ExecStart = [ "${pkgs.schleuder}/bin/schleuder install" ]; |
||||
Type = "oneshot"; |
||||
}; |
||||
}; |
||||
schleuder-api-daemon = { |
||||
after = [ "local-fs.target" "network.target" "schleuder-init.service" ]; |
||||
wantedBy = [ "multi-user.target" ]; |
||||
requires = [ "schleuder-init.service" ]; |
||||
serviceConfig = commonServiceConfig // { |
||||
ExecStart = [ "${pkgs.schleuder}/bin/schleuder-api-daemon" ]; |
||||
}; |
||||
}; |
||||
schleuder-weekly-key-maintenance = { |
||||
after = [ "local-fs.target" "network.target" ]; |
||||
startAt = "weekly"; |
||||
serviceConfig = commonServiceConfig // { |
||||
ExecStart = [ |
||||
"${pkgs.schleuder}/bin/schleuder refresh_keys" |
||||
"${pkgs.schleuder}/bin/schleuder check_keys" |
||||
]; |
||||
}; |
||||
}; |
||||
}; |
||||
|
||||
environment.etc."schleuder/schleuder.yml" = lib.mkIf (cfg.extraSettingsFile == null) { |
||||
source = settingsFormat.generate "schleuder.yml" cfg.settings; |
||||
}; |
||||
environment.etc."schleuder/list-defaults.yml".source = settingsFormat.generate "list-defaults.yml" cfg.listDefaults; |
||||
|
||||
services.schleuder = { |
||||
#lists_dir = "/var/lib/schleuder.lists"; |
||||
settings.filters_dir = lib.mkDefault "/var/lib/schleuder/filters"; |
||||
settings.keyword_handlers_dir = lib.mkDefault "/var/lib/schleuder/keyword_handlers"; |
||||
}; |
||||
}; |
||||
} |
||||
@ -0,0 +1,143 @@ |
||||
{ lib, pkgs, config, generators, ... }: |
||||
with lib; |
||||
let |
||||
cfg = config.services.grafana-agent; |
||||
settingsFormat = pkgs.formats.yaml { }; |
||||
configFile = settingsFormat.generate "grafana-agent.yaml" cfg.settings; |
||||
in |
||||
{ |
||||
meta = { |
||||
maintainers = with maintainers; [ flokli zimbatm ]; |
||||
}; |
||||
|
||||
options.services.grafana-agent = { |
||||
enable = mkEnableOption "grafana-agent"; |
||||
|
||||
package = mkOption { |
||||
type = types.package; |
||||
default = pkgs.grafana-agent; |
||||
defaultText = "pkgs.grafana-agent"; |
||||
description = "The grafana-agent package to use."; |
||||
}; |
||||
|
||||
credentials = mkOption { |
||||
description = '' |
||||
Credentials to load at service startup. Keys that are UPPER_SNAKE will be loaded as env vars. Values are absolute paths to the credentials. |
||||
''; |
||||
type = types.attrsOf types.str; |
||||
default = { }; |
||||
|
||||
example = { |
||||
logs_remote_write_password = "/run/keys/grafana_agent_logs_remote_write_password"; |
||||
LOGS_REMOTE_WRITE_URL = "/run/keys/grafana_agent_logs_remote_write_url"; |
||||
LOGS_REMOTE_WRITE_USERNAME = "/run/keys/grafana_agent_logs_remote_write_username"; |
||||
metrics_remote_write_password = "/run/keys/grafana_agent_metrics_remote_write_password"; |
||||
METRICS_REMOTE_WRITE_URL = "/run/keys/grafana_agent_metrics_remote_write_url"; |
||||
METRICS_REMOTE_WRITE_USERNAME = "/run/keys/grafana_agent_metrics_remote_write_username"; |
||||
}; |
||||
}; |
||||
|
||||
settings = mkOption { |
||||
description = '' |
||||
Configuration for <package>grafana-agent</package>. |
||||
|
||||
See https://grafana.com/docs/agent/latest/configuration/ |
||||
''; |
||||
|
||||
type = types.submodule { |
||||
freeformType = settingsFormat.type; |
||||
}; |
||||
|
||||
default = { |
||||
metrics = { |
||||
wal_directory = "\${STATE_DIRECTORY}"; |
||||
global.scrape_interval = "5s"; |
||||
}; |
||||
integrations = { |
||||
agent.enabled = true; |
||||
agent.scrape_integration = true; |
||||
node_exporter.enabled = true; |
||||
replace_instance_label = true; |
||||
}; |
||||
}; |
||||
|
||||
example = { |
||||
metrics.global.remote_write = [{ |
||||
url = "\${METRICS_REMOTE_WRITE_URL}"; |
||||
basic_auth.username = "\${METRICS_REMOTE_WRITE_USERNAME}"; |
||||
basic_auth.password_file = "\${CREDENTIALS_DIRECTORY}/metrics_remote_write_password"; |
||||
}]; |
||||
logs.configs = [{ |
||||
name = "default"; |
||||
scrape_configs = [ |
||||
{ |
||||
job_name = "journal"; |
||||
journal = { |
||||
max_age = "12h"; |
||||
labels.job = "systemd-journal"; |
||||
}; |
||||
relabel_configs = [ |
||||
{ |
||||
source_labels = [ "__journal__systemd_unit" ]; |
||||
target_label = "systemd_unit"; |
||||
} |
||||
{ |
||||
source_labels = [ "__journal__hostname" ]; |
||||
target_label = "nodename"; |
||||
} |
||||
{ |
||||
source_labels = [ "__journal_syslog_identifier" ]; |
||||
target_label = "syslog_identifier"; |
||||
} |
||||
]; |
||||
} |
||||
]; |
||||
positions.filename = "\${STATE_DIRECTORY}/loki_positions.yaml"; |
||||
clients = [{ |
||||
url = "\${LOGS_REMOTE_WRITE_URL}"; |
||||
basic_auth.username = "\${LOGS_REMOTE_WRITE_USERNAME}"; |
||||
basic_auth.password_file = "\${CREDENTIALS_DIRECTORY}/logs_remote_write_password"; |
||||
}]; |
||||
}]; |
||||
}; |
||||
}; |
||||
}; |
||||
|
||||
config = mkIf cfg.enable { |
||||
systemd.services.grafana-agent = { |
||||
wantedBy = [ "multi-user.target" ]; |
||||
script = '' |
||||
set -euo pipefail |
||||
shopt -u nullglob |
||||
|
||||
# Load all credentials into env if they are in UPPER_SNAKE form. |
||||
if [[ -n "''${CREDENTIALS_DIRECTORY:-}" ]]; then |
||||
for file in "$CREDENTIALS_DIRECTORY"/*; do |
||||
key=$(basename "$file") |
||||
if [[ $key =~ ^[A-Z0-9_]+$ ]]; then |
||||
echo "Environ $key" |
||||
export "$key=$(< "$file")" |
||||
fi |
||||
done |
||||
fi |
||||
|
||||
# We can't use Environment=HOSTNAME=%H, as it doesn't include the domain part. |
||||
export HOSTNAME=$(< /proc/sys/kernel/hostname) |
||||
|
||||
exec ${cfg.package}/bin/agent -config.expand-env -config.file ${configFile} |
||||
''; |
||||
serviceConfig = { |
||||
Restart = "always"; |
||||
DynamicUser = true; |
||||
RestartSec = 2; |
||||
SupplementaryGroups = [ |
||||
# allow to read the systemd journal for loki log forwarding |
||||
"systemd-journal" |
||||
]; |
||||
StateDirectory = "grafana-agent"; |
||||
LoadCredential = lib.mapAttrsToList (key: value: "${key}:${value}") cfg.credentials; |
||||
Type = "simple"; |
||||
}; |
||||
}; |
||||
}; |
||||
} |
||||
@ -0,0 +1,84 @@ |
||||
{ config |
||||
, lib |
||||
, pkgs |
||||
, ... |
||||
}: |
||||
|
||||
with lib; |
||||
|
||||
let |
||||
cfg = config.services.routedns; |
||||
settingsFormat = pkgs.formats.toml { }; |
||||
in |
||||
{ |
||||
options.services.routedns = { |
||||
enable = mkEnableOption "RouteDNS - DNS stub resolver, proxy and router"; |
||||
|
||||
settings = mkOption { |
||||
type = settingsFormat.type; |
||||
example = literalExpression '' |
||||
{ |
||||
resolvers.cloudflare-dot = { |
||||
address = "1.1.1.1:853"; |
||||
protocol = "dot"; |
||||
}; |
||||
groups.cloudflare-cached = { |
||||
type = "cache"; |
||||
resolvers = ["cloudflare-dot"]; |
||||
}; |
||||
listeners.local-udp = { |
||||
address = "127.0.0.1:53"; |
||||
protocol = "udp"; |
||||
resolver = "cloudflare-cached"; |
||||
}; |
||||
listeners.local-tcp = { |
||||
address = "127.0.0.1:53"; |
||||
protocol = "tcp"; |
||||
resolver = "cloudflare-cached"; |
||||
}; |
||||
} |
||||
''; |
||||
description = '' |
||||
Configuration for RouteDNS, see <link xlink:href="https://github.com/folbricht/routedns/blob/master/doc/configuration.md"/> |
||||
for more information. |
||||
''; |
||||
}; |
||||
|
||||
configFile = mkOption { |
||||
default = settingsFormat.generate "routedns.toml" cfg.settings; |
||||
defaultText = "A RouteDNS configuration file automatically generated by values from services.routedns.*"; |
||||
type = types.path; |
||||
example = literalExpression ''"''${pkgs.routedns}/cmd/routedns/example-config/use-case-1.toml"''; |
||||
description = "Path to RouteDNS TOML configuration file."; |
||||
}; |
||||
|
||||
package = mkOption { |
||||
default = pkgs.routedns; |
||||
defaultText = literalExpression "pkgs.routedns"; |
||||
type = types.package; |
||||
description = "RouteDNS package to use."; |
||||
}; |
||||
}; |
||||
|
||||
config = mkIf cfg.enable { |
||||
systemd.services.routedns = { |
||||
description = "RouteDNS - DNS stub resolver, proxy and router"; |
||||
after = [ "network.target" ]; # in case a bootstrap resolver is used, this might fail a few times until the respective server is actually reachable |
||||
wantedBy = [ "multi-user.target" ]; |
||||
wants = [ "network.target" ]; |
||||
startLimitIntervalSec = 30; |
||||
startLimitBurst = 5; |
||||
serviceConfig = { |
||||
Restart = "on-failure"; |
||||
RestartSec = "5s"; |
||||
LimitNPROC = 512; |
||||
LimitNOFILE = 1048576; |
||||
DynamicUser = true; |
||||
AmbientCapabilities = "CAP_NET_BIND_SERVICE"; |
||||
NoNewPrivileges = true; |
||||
ExecStart = "${getBin cfg.package}/bin/routedns -l 4 ${cfg.configFile}"; |
||||
}; |
||||
}; |
||||
}; |
||||
meta.maintainers = with maintainers; [ jsimonetti ]; |
||||
} |
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue