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

Merge master into staging

Browse Source
This commit is contained in:
Frederik Rietdijk 2018-09-02 12:10:33 +02:00
commit b910b697f6
122 changed files with 614 additions and 399 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/cross-compilation.xml
View File

@ -30,7 +30,7 @@
<section xml:id="sec-cross-packaging">
<title>Packaging in a cross-friendly manner</title>
<section>
<section xml:id="sec-cross-platform-parameters">
<title>Platform parameters</title>
<para>
@ -219,7 +219,7 @@
</variablelist>
</section>
<section>
<section xml:id="sec-cross-specifying-dependencies">
<title>Specifying Dependencies</title>
<para>
@ -304,7 +304,7 @@
</note>
</section>
<section>
<section xml:id="sec-cross-cookbook">
<title>Cross packaging cookbook</title>
<para>
@ -317,7 +317,7 @@
</para>
<qandaset>
<qandaentry>
<qandaentry xml:id="cross-qa-build-c-program-in-build-environment">
<question>
<para>
What if my package's build system needs to build a C program to be run
@ -331,7 +331,7 @@
</para>
</answer>
</qandaentry>
<qandaentry>
<qandaentry xml:id="cross-qa-fails-to-find-ar">
<question>
<para>
My package fails to find <command>ar</command>.
@ -347,7 +347,7 @@
</para>
</answer>
</qandaentry>
<qandaentry>
<qandaentry xml:id="cross-testsuite-runs-host-code">
<question>
<para>
My package's testsuite needs to run host platform code.

4
doc/languages-frameworks/texlive.xml
View File

@ -8,7 +8,7 @@
under attribute <varname>texlive</varname>.
</para>
<section>
<section xml:id="sec-language-texlive-users-guide">
<title>User's guide</title>
<itemizedlist>
@ -68,7 +68,7 @@ nix-repl> texlive.collection-&lt;TAB>
</itemizedlist>
</section>
<section>
<section xml:id="sec-language-texlive-known-problems">
<title>Known problems</title>
<itemizedlist>

10
doc/multiple-output.xml
View File

@ -6,7 +6,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="chap-multiple-output">
<title>Multiple-output packages</title>
<section>
<section xml:id="sec-multiple-outputs-introduction">
<title>Introduction</title>
<para>
@ -38,7 +38,7 @@
</para>
</note>
</section>
<section>
<section xml:id="sec-multiple-outputs-installing">
<title>Installing a split package</title>
<para>
@ -84,7 +84,7 @@
</listitem>
</itemizedlist>
</section>
<section>
<section xml:id="sec-multiple-outputs-using-split-packages">
<title>Using a split package</title>
<para>
@ -102,7 +102,7 @@
also added. (See <xref linkend="multiple-output-file-type-groups" />.)
</para>
</section>
<section>
<section xml:id="sec-multiple-outputs-">
<title>Writing a split derivation</title>
<para>
@ -283,7 +283,7 @@
</variablelist>
</section>
<section>
<section xml:id="sec-multiple-outputs-caveats">
<title>Common caveats</title>
<itemizedlist>

4
doc/package-notes.xml
View File

@ -181,7 +181,7 @@ $ cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) \
</section>
<!--============================================================-->
<!--
<section>
<section xml:id="sec-package-notes-gnome">
<title>Gnome</title>
<para>* Expression is auto-generated</para>
<para>* How to update</para>
@ -189,7 +189,7 @@ $ cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) \
-->
<!--============================================================-->
<!--
<section>
<section xml:id="sec-package-notes-gcc">
<title>GCC</title>
<para>…</para>
</section>

16
doc/release-notes.xml
View File

@ -2,7 +2,7 @@
<article xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Nixpkgs Release Notes</title>
<section>
<section xml:id="release-notes-0.14">
<title>Release 0.14 (June 4, 2012)</title>
<para>
@ -17,7 +17,7 @@
packages by numerous contributors. For details, see the commit logs.
</para>
</section>
<section>
<section xml:id="release-notes-0.13">
<title>Release 0.13 (February 5, 2010)</title>
<para>
@ -51,7 +51,7 @@
</itemizedlist>
</para>
</section>
<section>
<section xml:id="release-notes-0.12">
<title>Release 0.12 (April 24, 2009)</title>
<para>
@ -145,7 +145,7 @@
<literal>nix-dev</literal> mailing list.
</para>
</section>
<section>
<section xml:id="release-notes-0.11">
<title>Release 0.11 (September 11, 2007)</title>
<para>
@ -344,7 +344,7 @@ export NIX_MIRRORS_sourceforge=http://osdn.dl.sourceforge.net/sourceforge/</prog
Bravenboer, Michael Raskin, Wouter den Breejen and Yury G. Kudryashov.
</para>
</section>
<section>
<section xml:id="release-notes-0.10">
<title>Release 0.10 (October 12, 2006)</title>
<note>
@ -547,7 +547,7 @@ stdenv.mkDerivation {
Bravenboer, Merijn de Jonge, Rob Vermaas and Roy van den Broek.
</para>
</section>
<section>
<section xml:id="release-notes-0.9">
<title>Release 0.9 (January 31, 2006)</title>
<para>
@ -676,7 +676,7 @@ stdenv.mkDerivation {
Martin Bravenboer, Rob Vermaas and Roy van den Broek.
</para>
</section>
<section>
<section xml:id="release-notes-0.8">
<title>Release 0.8 (April 11, 2005)</title>
<para>
@ -700,7 +700,7 @@ stdenv.mkDerivation {
</itemizedlist>
</para>
</section>
<section>
<section xml:id="release-notes-0.7">
<title>Release 0.7 (March 14, 2005)</title>
<itemizedlist>

20
doc/reviewing-contributions.xml
View File

@ -56,7 +56,7 @@
meant as examples. Their usage is optional and the reviewer is free to adapt
them to their liking.
</para>
<section>
<section xml:id="reviewing-contributions-package-updates">
<title>Package updates</title>
<para>
@ -208,7 +208,7 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
</listitem>
</itemizedlist>
<example>
<example xml:id="reviewing-contributions-sample-package-update">
<title>Sample template for a package update review</title>
<screen>
##### Reviewed points
@ -226,7 +226,7 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
</screen>
</example>
</section>
<section>
<section xml:id="reviewing-contributions-new-packages">
<title>New packages</title>
<para>
@ -320,7 +320,7 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
</listitem>
</itemizedlist>
<example>
<example xml:id="reviewing-contributions-sample-new-package">
<title>Sample template for a new package review</title>
<screen>
##### Reviewed points
@ -346,7 +346,7 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
</screen>
</example>
</section>
<section>
<section xml:id="reviewing-contributions-module-updates">
<title>Module updates</title>
<para>
@ -443,7 +443,7 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
</listitem>
</itemizedlist>
<example>
<example xml:id="reviewing-contributions-sample-module-update">
<title>Sample template for a module update review</title>
<screen>
##### Reviewed points
@ -464,7 +464,7 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
</screen>
</example>
</section>
<section>
<section xml:id="reviewing-contributions-new-modules">
<title>New modules</title>
<para>
@ -542,7 +542,7 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
</listitem>
</itemizedlist>
<example>
<example xml:id="reviewing-contributions-sample-new-module">
<title>Sample template for a new module review</title>
<screen>
##### Reviewed points
@ -564,7 +564,7 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
</screen>
</example>
</section>
<section>
<section xml:id="reviewing-contributions-other-submissions">
<title>Other submissions</title>
<para>
@ -585,7 +585,7 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
pull requests fitting this category.
</para>
</section>
<section>
<section xml:id="reviewing-contributions--merging-pull-requests">
<title>Merging pull-requests</title>
<para>

14
doc/stdenv.xml
View File

@ -212,7 +212,7 @@ genericBuild
platforms relative to the new derivation's, and whether they are propagated.
The platform distinctions are motivated by cross compilation; see
<xref linkend="chap-cross"/> for exactly what each platform means.
<footnote>
<footnote xml:id="footnote-stdenv-ignored-build-platform">
<para>
The build platform is ignored because it is a mere implementation detail
of the package satisfying the dependency: As a general programming
@ -233,7 +233,7 @@ genericBuild
out only for dependencies whose host platform matches the new derivation's
build platform–i.e. which run on the platform where the new derivation
will be built.
<footnote>
<footnote xml:id="footnote-stdenv-native-dependencies-in-path">
<para>
Currently, that means for native builds all dependencies are put on the
<envar>PATH</envar>. But in the future that may not be the case for sake
@ -280,7 +280,7 @@ genericBuild
<link xlink:href="https://en.wikipedia.org/wiki/Natural_deduction">Natural
Deduction</link> using the inference rules. This probably seems a bit
obtuse, but so is the bash code that actually implements it!
<footnote>
<footnote xml:id="footnote-stdenv-find-inputs-location">
<para>
The <function>findInputs</function> function, currently residing in
<filename>pkgs/stdenv/generic/setup.sh</filename>, implements the
@ -1112,7 +1112,7 @@ passthru = {
By default, the configure phase applies some special hackery to all
files called <filename>ltmain.sh</filename> before running the configure
script in order to improve the purity of Libtool-based packages
<footnote>
<footnote xml:id="footnote-stdenv-sys-lib-search-path">
<para>
It clears the
<varname>sys_lib_<replaceable>*</replaceable>search_path</varname>
@ -1151,7 +1151,7 @@ passthru = {
or a subset to control exactly which platform flags are passed.
Compilers and other tools should use this to also pass the target
platform, for example.
<footnote>
<footnote xml:id="footnote-stdenv-build-time-guessing-impurity">
<para>
Eventually these will be passed when in native builds too, to improve
determinism: build-time guessing, as is done today, is a risk of
@ -1732,7 +1732,7 @@ set debug-file-directory ~/.nix-profile/lib/debug
Controls whether the installCheck phase is executed. By default it is
skipped, but if <varname>doInstallCheck</varname> is set to true, the
installCheck phase is usually executed. Thus you should set
<programlisting>doInstallCheck = true;</programlisting>
<programlisting>doInstallCheck = true;</programlisting>
in the derivation to enable install checks. The exception is cross
compilation. Cross compiled builds never run tests, no matter how
<varname>doInstallCheck</varname> is set, as the newly-built program
@ -2213,7 +2213,7 @@ addEnvHooks "$hostOffset" myBashFunction
<command>clang</command> is to be used. Secondly, this helps packages
not get confused when cross-compiling, in which case multiple Bintools
Wrappers may simultaneously be in use.
<footnote>
<footnote xml:id="footnote-stdenv-per-platform-wrapper">
<para>
Each wrapper targets a single platform, so if binaries for multiple
platforms are needed, the underlying binaries must be wrapped multiple

30
doc/submitting-changes.xml
View File

@ -2,7 +2,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="chap-submitting-changes">
<title>Submitting changes</title>
<section>
<section xml:id="submitting-changes-making-patches">
<title>Making patches</title>
<itemizedlist>
@ -205,7 +205,7 @@ Additional information.
</listitem>
</itemizedlist>
</section>
<section>
<section xml:id="submitting-changes-submitting-changes">
<title>Submitting changes</title>
<itemizedlist>
@ -253,7 +253,7 @@ Additional information.
</listitem>
</itemizedlist>
</section>
<section>
<section xml:id="submitting-changes-pull-request-template">
<title>Pull Request Template</title>
<para>
@ -269,7 +269,7 @@ Additional information.
below:
</para>
<section>
<section xml:id="submitting-changes-tested-with-sandbox">
<title>Tested using sandboxing</title>
<para>
@ -322,7 +322,7 @@ Additional information.
</para>
</section>
<section>
<section xml:id="submitting-changes-platform-diversity">
<title>Built on platform(s)</title>
<para>
@ -334,7 +334,7 @@ Additional information.
</para>
</section>
<section>
<section xml:id="submitting-changes-nixos-tests">
<title>Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)</title>
<para>
@ -350,7 +350,7 @@ Additional information.
</para>
</section>
<section>
<section xml:id="submitting-changes-tested-compilation">
<title>Tested compilation of all pkgs that depend on this change using <command>nox-review</command></title>
<para>
@ -373,7 +373,7 @@ Additional information.
</para>
</section>
<section>
<section xml:id="submitting-changes-tested-execution">
<title>Tested execution of all binary files (usually in <filename>./result/bin/</filename>)</title>
<para>
@ -387,8 +387,8 @@ Additional information.
</para>
</section>
<section>
<title>Meets nixpkgs contribution standards</title>
<section xml:id="submitting-changes-contribution-standards">
<title>Meets Nixpkgs contribution standards</title>
<para>
The last checkbox is fits
@ -402,7 +402,7 @@ Additional information.
</para>
</section>
</section>
<section>
<section xml:id="submitting-changes-hotfixing-pull-requests">
<title>Hotfixing pull requests</title>
<itemizedlist>
@ -430,7 +430,7 @@ Additional information.
</listitem>
</itemizedlist>
</section>
<section>
<section xml:id="submitting-changes-commit-policy">
<title>Commit policy</title>
<itemizedlist>
@ -456,7 +456,7 @@ Additional information.
</listitem>
</itemizedlist>
<section>
<section xml:id="submitting-changes-master-branch">
<title>Master branch</title>
<itemizedlist>
@ -468,7 +468,7 @@ Additional information.
</itemizedlist>
</section>
<section>
<section xml:id="submitting-changes-staging-branch">
<title>Staging branch</title>
<itemizedlist>
@ -493,7 +493,7 @@ Additional information.
</itemizedlist>
</section>
<section>
<section xml:id="submitting-changes-stable-release-branches">
<title>Stable release branches</title>
<itemizedlist>

5
maintainers/maintainer-list.nix
View File

@ -1570,6 +1570,11 @@
github = "grburst";
name = "Julius Elias";
};
greydot = {
email = "lanablack@amok.cc";
github = "greydot";
name = "Lana Black";
};
gridaphobe = {
email = "eric@seidel.io";
github = "gridaphobe";

2
nixos/doc/manual/Makefile
View File

@ -11,7 +11,7 @@ manual-combined.xml: generated *.xml
.PHONY: format
format:
find . -iname '*.xml' -type f -print0 | xargs -0 -I{} -n1 \
find ../../ -iname '*.xml' -type f -print0 | xargs -0 -I{} -n1 \
xmlformat --config-file "../xmlformat.conf" -i {}
.PHONY: fix-misc-xml

11
nixos/doc/manual/configuration/linux-kernel.xml
View File

@ -66,14 +66,15 @@ nixpkgs.config.packageOverrides = pkgs:
sets the kernel’s TCP keepalive time to 120 seconds. To see the available
parameters, run <command>sysctl -a</command>.
</para>
<section>
<section xml:id="sec-linux-config-customizing">
<title>Customize your kernel</title>
<para>
The first step before compiling the kernel is to generate an appropriate
<literal>.config</literal> configuration. Either you pass your own config via
the <literal>configfile</literal> setting of <literal>linuxManualConfig</literal>:
<screen><![CDATA[
<literal>.config</literal> configuration. Either you pass your own config
via the <literal>configfile</literal> setting of
<literal>linuxManualConfig</literal>:
<screen><![CDATA[
custom-kernel = super.linuxManualConfig {
inherit (super) stdenv hostPlatform;
inherit (linux_4_9) src;
@ -117,7 +118,7 @@ You can edit the config with this snippet (by default <command>make menuconfig</
]]></screen>
</para>
</section>
<section>
<section xml:id="sec-linux-config-developing-modules">
<title>Developing kernel modules</title>
<para>

2
nixos/doc/manual/configuration/modularity.xml
View File

@ -74,7 +74,7 @@ The unique option `services.httpd.adminAddr' is defined multiple times, in `/etc
argument is for: it contains the complete, merged system configuration. That
is, <varname>config</varname> is the result of combining the configurations
returned by every module
<footnote>
<footnote xml:id="footnote-nix-is-lazy">
<para>
If you’re wondering how it’s possible that the (indirect)
<emphasis>result</emphasis> of a function is passed as an

4
nixos/doc/manual/development/assertions.xml
View File

@ -20,7 +20,7 @@
NixOS module system.
</para>
<section>
<section xml:id="sec-assertions-warnings">
<title>Warnings</title>
<para>
@ -44,7 +44,7 @@
</programlisting>
</section>
<section>
<section xml:id="sec-assertions-assertions">
<title>Assertions</title>
<para>

12
nixos/doc/manual/development/option-types.xml
View File

@ -11,7 +11,7 @@
value definitions.
</para>
<section>
<section xml:id="sec-option-types-basic">
<title>Basic Types</title>
<para>
@ -196,7 +196,7 @@
</variablelist>
</section>
<section>
<section xml:id="sec-option-types-value">
<title>Value Types</title>
<para>
@ -257,7 +257,7 @@
</variablelist>
</section>
<section>
<section xml:id="sec-option-types-composed">
<title>Composed Types</title>
<para>
@ -483,7 +483,7 @@ config.mod.two = { foo = 2; bar = "two"; };</screen>
</example>
</section>
<section>
<section xml:id="sec-option-types-extending">
<title>Extending types</title>
<para>
@ -543,14 +543,14 @@ nixThings = mkOption {
</variablelist>
</section>
<section>
<section xml:id="sec-option-types-custom">
<title>Custom Types</title>
<para>
Custom types can be created with the <literal>mkOptionType</literal>
function. As type creation includes some more complex topics such as
submodule handling, it is recommended to get familiar with
<filename
<filename
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/types.nix">types.nix</filename>
code before creating a new type.
</para>

8
nixos/doc/manual/development/writing-documentation.xml
View File

@ -10,7 +10,7 @@
sources and presenting it in an accessible style would be a worthy
contribution to the project.
</para>
<section>
<section xml:id="sec-writing-docs-building-the-manual">
<title>Building the Manual</title>
<para>
@ -42,7 +42,7 @@
<filename>./result/share/doc/nixos/index.html</filename>.
</para>
</section>
<section>
<section xml:id="sec-writing-docs-editing-docbook-xml">
<title>Editing DocBook XML</title>
<para>
@ -76,7 +76,7 @@
Issue</link> and someone will handle the conversion to XML for you.
</para>
</section>
<section>
<section xml:id="sec-writing-docs-creating-a-topic">
<title>Creating a Topic</title>
<para>
@ -128,7 +128,7 @@
</itemizedlist>
</para>
</section>
<section>
<section xml:id="sec-writing-docs-adding-a-topic">
<title>Adding a Topic to the Book</title>
<para>

2
nixos/doc/manual/installation/upgrading.xml
View File

@ -109,7 +109,7 @@ nixos https://nixos.org/channels/nixos-unstable
so in that case you will not be able to go back to your original channel.
</para>
</warning>
<section>
<section xml:id="sec-upgrading-automatic">
<title>Automatic Upgrades</title>
<para>

2
nixos/doc/manual/manual.xml
View File

@ -8,7 +8,7 @@
<subtitle>Version <xi:include href="./generated/version" parse="text" />
</subtitle>
</info>
<preface>
<preface xml:id="preface">
<title>Preface</title>
<para>
This manual describes how to install, use and extend NixOS, a Linux

2
nixos/doc/manual/options-to-docbook.xsl
View File

@ -15,7 +15,7 @@
<xsl:template match="/expr/list">
<appendix>
<appendix xml:id="appendix-configuration-options">
<title>Configuration Options</title>
<variablelist xml:id="configuration-variable-list">
<xsl:for-each select="attrs">

8
nixos/modules/i18n/input-method/default.xml
View File

@ -23,7 +23,7 @@
bridge.</para></listitem>
</itemizedlist>
<section><title>IBus</title>
<section xml:id="module-services-input-methods-ibus"><title>IBus</title>
<para>IBus is an Intelligent Input Bus. It provides full featured and user
friendly input method user interface.</para>
@ -82,7 +82,7 @@ ibus.engines = with pkgs.ibus-engines; [ table table-others ];
</simplesect>
</section>
<section><title>Fcitx</title>
<section xml:id="module-services-input-methods-fcitx"><title>Fcitx</title>
<para>Fcitx is an input method framework with extension support. It has three
built-in Input Method Engine, Pinyin, QuWei and Table-based input
@ -122,7 +122,7 @@ i18n.inputMethod = {
</itemizedlist>
</section>
<section><title>Nabi</title>
<section xml:id="module-services-input-methods-nabi"><title>Nabi</title>
<para>Nabi is an easy to use Korean X input method. It allows you to enter
phonetic Korean characters (hangul) and pictographic Korean characters
@ -136,7 +136,7 @@ i18n.inputMethod = {
</programlisting>
</section>
<section><title>Uim</title>
<section xml:id="module-services-input-methods-uim"><title>Uim</title>
<para>Uim (short for "universal input method") is a multilingual input method
framework. Applications can use it through so-called bridges.</para>

2
nixos/modules/installer/cd-dvd/iso-image.nix
View File

@ -233,7 +233,7 @@ let
"
# Make our own efi program, we can't rely on "grub-install" since it seems to
# probe for devices, even with --skip-fs-probe.
${pkgs.grub2_efi}/bin/grub-mkimage -o $out/EFI/boot/bootx64.efi -p /EFI/boot -O x86_64-efi \
${pkgs.grub2_efi}/bin/grub-mkimage -o $out/EFI/boot/${if targetArch == "x64" then "bootx64" else "bootx32"}.efi -p /EFI/boot -O ${if targetArch == "x64" then "x86_64" else "i386"}-efi \
$MODULES
cp ${pkgs.grub2_efi}/share/grub/unicode.pf2 $out/EFI/boot/

2
nixos/modules/installer/tools/nixos-generate-config.pl Executable file → Normal file
View File

@ -575,7 +575,7 @@ $bootLoaderConfig
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
# Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.default = "http://user:password\@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# Select internationalisation properties.

8
nixos/modules/programs/zsh/oh-my-zsh.xml
View File

@ -10,7 +10,7 @@
to manage your <link xlink:href="https://www.zsh.org/">ZSH</link> configuration
including completion scripts for several CLI tools or custom prompt themes.</para>
<section><title>Basic usage</title>
<section xml:id="module-programs-oh-my-zsh-usage"><title>Basic usage</title>
<para>The module uses the <literal>oh-my-zsh</literal> package with all available features. The
initial setup using Nix expressions is fairly similar to the configuration format
of <literal>oh-my-zsh</literal>.
@ -32,7 +32,7 @@ For a detailed explanation of these arguments please refer to the
configuration and writes it into your <literal>/etc/zshrc</literal>.
</para></section>
<section><title>Custom additions</title>
<section xml:id="module-programs-oh-my-zsh-additions"><title>Custom additions</title>
<para>Sometimes third-party or custom scripts such as a modified theme may be needed.
<literal>oh-my-zsh</literal> provides the
@ -48,7 +48,7 @@ environment variable for this which points to a directory with additional script
</programlisting>
</para></section>
<section><title>Custom environments</title>
<section xml:id="module-programs-oh-my-zsh-environments"><title>Custom environments</title>
<para>There are several extensions for <literal>oh-my-zsh</literal> packaged in <literal>nixpkgs</literal>.
One of them is <link xlink:href="https://github.com/spwhitt/nix-zsh-completions">nix-zsh-completions</link>
@ -77,7 +77,7 @@ as it requires an immutable store path while <literal>custom</literal> shall rem
will be thrown if both <literal>custom</literal> and <literal>customPkgs</literal> are set.</emphasis>
</para></section>
<section><title>Package your own customizations</title>
<section xml:id="module-programs-oh-my-zsh-packaging-customizations"><title>Package your own customizations</title>
<para>If third-party customizations (e.g. new themes) are supposed to be added to <literal>oh-my-zsh</literal>
there are several pitfalls to keep in mind:</para>

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

@ -11,7 +11,7 @@ retrieval and renewal using the ACME protocol. This is currently only
implemented by and for Let's Encrypt. The alternative ACME client
<literal>simp_le</literal> is used under the hood.</para>
<section><title>Prerequisites</title>
<section xml:id="module-security-acme-prerequisites"><title>Prerequisites</title>
<para>You need to have a running HTTP server for verification. The server must
have a webroot defined that can serve
@ -41,7 +41,7 @@ http {
</section>
<section><title>Configuring</title>
<section xml:id="module-security-acme-configuring"><title>Configuring</title>
<para>To enable ACME certificate retrieval &amp; renewal for a certificate for
<literal>foo.example.com</literal>, add the following in your
@ -66,7 +66,7 @@ options for the <link linkend="opt-security.acme.certs">security.acme</link> mod
</section>
<section><title>Using ACME certificates in Nginx</title>
<section xml:id="module-security-acme-nginx"><title>Using ACME certificates in Nginx</title>
<para>NixOS supports fetching ACME certificates for you by setting
<literal><link linkend="opt-services.nginx.virtualHosts._name_.enableACME">enableACME</link> = true;</literal> in a virtualHost config. We
first create self-signed placeholder certificates in place of the

18
nixos/modules/services/databases/foundationdb.xml
View File

@ -17,7 +17,7 @@
<para>FoundationDB (or "FDB") is an open source, distributed, transactional
key-value store.</para>
<section><title>Configuring and basic setup</title>
<section xml:id="module-services-foundationdb-configuring"><title>Configuring and basic setup</title>
<para>To enable FoundationDB, add the following to your
<filename>configuration.nix</filename>:
@ -133,7 +133,7 @@ corresponding <option>services.foundationdb.logDir</option> as well.</para>
</section>
<section><title>Scaling processes and backup agents</title>
<section xml:id="module-services-foundationdb-scaling"><title>Scaling processes and backup agents</title>
<para>Scaling the number of server processes is quite easy; simply specify
<option>services.foundationdb.serverProcesses</option> to be the number of
@ -151,7 +151,7 @@ available backup processes.</para>
</section>
<section><title>Clustering</title>
<section xml:id="module-services-foundationdb-clustering"><title>Clustering</title>
<para>FoundationDB on NixOS works similarly to other Linux systems, so this
section will be brief. Please refer to the full FoundationDB documentation for
@ -221,7 +221,7 @@ informing all client processes to do the same.</para>
</section>
<section><title>Client connectivity</title>
<section xml:id="module-services-foundationdb-connectivity"><title>Client connectivity</title>
<para>By default, all clients must use the current
<command>fdb.cluster</command> file to access a given FoundationDB cluster.
@ -232,7 +232,7 @@ to a new node in order to connect, if it is not part of the cluster.</para>
</section>
<section><title>Client authorization and TLS</title>
<section xml:id="module-services-foundationdb-authorization"><title>Client authorization and TLS</title>
<para>By default, any user who can connect to a FoundationDB process with the
correct cluster configuration can access anything. FoundationDB uses a
@ -270,7 +270,7 @@ on.</para>
</section>
<section><title>Backups and Disaster Recovery</title>
<section xml:id="module-services-foundationdb-disaster-recovery"><title>Backups and Disaster Recovery</title>
<para>The usual rules for doing FoundationDB backups apply on NixOS as written
in the FoundationDB manual. However, one important difference is the security
@ -316,7 +316,7 @@ $ sudo -u foundationdb fdbbackup status -t default
</section>
<section><title>Known limitations</title>
<section xml:id="module-services-foundationdb-limitations"><title>Known limitations</title>
<para>The FoundationDB setup for NixOS should currently be considered beta.
FoundationDB is not new software, but the NixOS compilation and integration has
@ -333,7 +333,7 @@ only undergone fairly basic testing of all the available functionality.</para>
</section>
<section><title>Options</title>
<section xml:id="module-services-foundationdb-options"><title>Options</title>
<para>NixOS's FoundationDB module allows you to configure all of the most
relevant configuration options for <command>fdbmonitor</command>, matching it
@ -343,7 +343,7 @@ also read the FoundationDB documentation as well.</para>
</section>
<section><title>Full documentation</title>
<section xml:id="module-services-foundationdb-full-docs"><title>Full documentation</title>
<para>FoundationDB is a complex piece of software, and requires careful
administration to properly use. Full documentation for administration can be

6
nixos/modules/services/databases/postgresql.xml
View File

@ -17,7 +17,7 @@
<para>PostgreSQL is an advanced, free relational database.<!-- MORE --></para>
<section><title>Configuring</title>
<section xml:id="module-services-postgres-configuring"><title>Configuring</title>
<para>To enable PostgreSQL, add the following to your
<filename>configuration.nix</filename>:
@ -60,14 +60,14 @@ alice=>
</section>
<section><title>Upgrading</title>
<section xml:id="module-services-postgres-upgrading"><title>Upgrading</title>
<para>FIXME: document dump/upgrade/load cycle.</para>
</section>
<section><title>Options</title>
<section xml:id="module-services-postgres-options"><title>Options</title>
<para>A complete list of options for the PostgreSQL module may be found <link linkend="opt-services.postgresql.enable">here</link>.</para>

24
nixos/modules/services/editors/emacs.xml
View File

@ -39,7 +39,7 @@
starting the Emacs daemon.
</para>
<section>
<section xml:id="module-services-emacs-installing">
<title>Installing <application>Emacs</application></title>
<para>
@ -49,7 +49,7 @@
can be enabled.
</para>
<section>
<section xml:id="module-services-emacs-releases">
<title>The Different Releases of Emacs</title>
<para>
@ -100,7 +100,7 @@
</para>
</section>
<section>
<section xml:id="module-services-emacs-adding-packages">
<title>Adding Packages to Emacs</title>
<para>
Emacs includes an entire ecosystem of functionality beyond
@ -339,7 +339,7 @@ https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides
</para>
</section>
<section>
<section xml:id="module-services-emacs-advanced">
<title>Advanced Emacs Configuration</title>
<para>
@ -380,7 +380,7 @@ in [...]
</section>
</section>
<section>
<section xml:id="module-services-emacs-running">
<title>Running Emacs as a Service</title>
<para>
<productname>NixOS</productname> provides an optional
@ -396,7 +396,7 @@ in [...]
<filename>modules/services/editors/emacs.nix</filename>
</para>
<section>
<section xml:id="module-services-emacs-enabling">
<title>Enabling the Service</title>
<para>
@ -438,7 +438,7 @@ $ systemctl --user start emacs.service # to start the Emacs daemon
</section>
<section>
<section xml:id="module-services-emacs-starting-client">
<title>Starting the client</title>
<para>
Ensure that the emacs server is enabled, either by customizing
@ -457,7 +457,7 @@ emacsclient --create-frame --tty # opens a new frame on the current terminal
</para>
</section>
<section>
<section xml:id="module-services-emacs-editor-variable">
<title>Configuring the <varname>EDITOR</varname> variable</title>
<!--<title><command>emacsclient</command> as the Default Editor</title>-->
@ -487,7 +487,7 @@ emacsclient --create-frame --tty # opens a new frame on the current terminal
</para>
</section>
<section>
<section xml:id="module-services-emacs-per-user">
<title>Per-User Enabling of the Service</title>
<para>
@ -515,7 +515,7 @@ emacsclient --create-frame --tty # opens a new frame on the current terminal
</section>
</section>
<section>
<section xml:id="module-services-emacs-configuring">
<title>Configuring Emacs</title>
<para>
@ -548,7 +548,7 @@ emacsclient --create-frame --tty # opens a new frame on the current terminal
server-switch-hook, server-done-hook?
-->
<section>
<section xml:id="module-services-emacs-major-mode">
<title>A Major Mode for Nix Expressions</title>
<para>
@ -558,7 +558,7 @@ emacsclient --create-frame --tty # opens a new frame on the current terminal
</para>
</section>
<section>
<section xml:id="module-services-emacs-man-pages">
<title>Accessing man pages</title>
<para>
You can use <function>woman</function> to get completion of all

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

@ -8,7 +8,7 @@
<para>Gitlab is a feature-rich git hosting service.</para>
<section><title>Prerequisites</title>
<section xml:id="module-services-gitlab-prerequisites"><title>Prerequisites</title>
<para>The gitlab service exposes only an Unix socket at
<literal>/run/gitlab/gitlab-workhorse.socket</literal>. You need to configure a
@ -35,7 +35,7 @@ webserver to proxy HTTP requests to the socket.</para>
</section>
<section><title>Configuring</title>
<section xml:id="module-services-gitlab-configuring"><title>Configuring</title>
<para>Gitlab depends on both PostgreSQL and Redis and will automatically enable
both services. In the case of PostgreSQL, a database and a role will be created.
@ -119,7 +119,7 @@ options for the <link linkend="opt-services.gitlab.enable">services.gitlab</link
</section>
<section><title>Maintenance</title>
<section xml:id="module-services-gitlab-maintenance"><title>Maintenance</title>
<para>You can run Gitlab's rake tasks with <literal>gitlab-rake</literal>
which will be available on the system when gitlab is enabled. You will

8
nixos/modules/services/misc/taskserver/doc.xml
View File

@ -16,7 +16,7 @@
<link xlink:href="https://taskwarrior.org/docs/#taskd"/>
</para>
<section>
<section xml:id="module-services-taskserver-configuration">
<title>Configuration</title>
<para>
@ -48,7 +48,7 @@
</para>
</section>
<section>
<section xml:id="module-services-taskserver-nixos-taskserver-tool">
<title>The nixos-taskserver tool</title>
<para>
@ -78,7 +78,7 @@
<option>--help</option> switch.
</para>
</section>
<section>
<section xml:id="module-services-taskserver-declarative-ca-management">
<title>Declarative/automatic CA management</title>
<para>
@ -131,7 +131,7 @@ $ ssh server nixos-taskserver user export my-company alice | sh
<command>task sync</command> after that stage.
</para>
</section>
<section>
<section xml:id="module-services-taskserver-manual-ca-management">
<title>Manual CA management</title>
<para>

4
nixos/modules/services/monitoring/prometheus/exporters.xml
View File

@ -8,7 +8,7 @@
<para>Prometheus exporters provide metrics for the <link xlink:href="https://prometheus.io">prometheus monitoring system</link>.</para>
<section><title>Configuration</title>
<section xml:id="module-services-prometheus-exporters-configuration"><title>Configuration</title>
<para>One of the most common exporters is the <link xlink:href="https://github.com/prometheus/node_exporter">node exporter</link>, it provides hardware and OS metrics from the host it's running on. The exporter could be configured as follows:
<programlisting>
services.promtheus.exporters.node = {
@ -33,7 +33,7 @@ For more information about configuration see <literal>man configuration.nix</lit
search through the <link xlink:href="https://nixos.org/nixos/options.html#prometheus.exporters">available options</link>.
</para>
</section>
<section><title>Adding a new exporter</title>
<section xml:id="module-services-prometheus-exporters-new-exporter"><title>Adding a new exporter</title>
<para>To add a new exporter, it has to be packaged first (see <literal>nixpkgs/pkgs/servers/monitoring/prometheus/</literal> for examples), then a module can be added. The postfix exporter is used in this example:</para>
<itemizedlist>
<listitem>

1
nixos/modules/services/networking/bird.nix
View File

@ -44,6 +44,7 @@ let
systemd.services.${variant} = {
description = "BIRD Internet Routing Daemon (${descr})";
wantedBy = [ "multi-user.target" ];
reloadIfChanged = true;
serviceConfig = {
Type = "forking";
Restart = "on-failure";

8
nixos/modules/services/networking/dnscrypt-proxy.xml
View File

@ -14,7 +14,7 @@
upstream is trustworthy).
</para>
<sect1><title>Basic configuration</title>
<sect1 xml:id="sec-dnscrypt-proxy-configuration"><title>Basic configuration</title>
<para>
To enable the client proxy, set
@ -31,7 +31,7 @@
</sect1>
<sect1><title>As a forwarder for another DNS client</title>
<sect1 xml:id="sec-dnscrypt-proxy-forwarder"><title>As a forwarder for another DNS client</title>
<para>
To run the DNSCrypt proxy client as a forwarder for another
@ -42,7 +42,7 @@
</programlisting>
</para>
<sect2><title>dnsmasq</title>
<sect2 xml:id="sec-dnscrypt-proxy-forwarder-dsnmasq"><title>dnsmasq</title>
<para>
<programlisting>
{
@ -53,7 +53,7 @@
</para>
</sect2>
<sect2><title>unbound</title>
<sect2 xml:id="sec-dnscrypt-proxy-forwarder-unbound"><title>unbound</title>
<para>
<programlisting>
{

29
nixos/modules/services/networking/networkmanager.nix
View File

@ -289,7 +289,7 @@ in {
source = mkOption {
type = types.path;
description = ''
A script.
Path to the hook script.
'';
};
@ -297,12 +297,28 @@ in {
type = types.enum (attrNames dispatcherTypesSubdirMap);
default = "basic";
description = ''
Dispatcher hook type. Only basic hooks are currently available.
Dispatcher hook type. Look up the hooks described at
<link xlink:href="https://developer.gnome.org/NetworkManager/stable/NetworkManager.html">https://developer.gnome.org/NetworkManager/stable/NetworkManager.html</link>
and choose the type depending on the output folder.
You should then filter the event type (e.g., "up"/"down") from within your script.
'';
};
};
});
default = [];
example = literalExample ''
[ {
source = pkgs.writeText "upHook" '''
if [ "$2" != "up" ]; then
logger "exit: event $2 != up"
fi
# coreutils and iproute are in PATH too
logger "Device $DEVICE_IFACE coming up"
''';
type = "basic";
} ]'';
description = ''
A list of scripts which will be executed in response to network events.
'';
@ -418,6 +434,7 @@ in {
++ lib.imap1 (i: s: {
inherit (s) source;
target = "NetworkManager/dispatcher.d/${dispatcherTypesSubdirMap.${s.type}}03userscript${lib.fixedWidthNumber 4 i}";
mode = "0544";
}) cfg.dispatcherScripts
++ optional (dynamicHostsEnabled)
{ target = "NetworkManager/dnsmasq.d/dyndns.conf";
@ -475,6 +492,14 @@ in {
};
};
systemd.services."NetworkManager-dispatcher" = {
wantedBy = [ "network.target" ];
restartTriggers = [ configFile ];
# useful binaries for user-specified hooks
path = [ pkgs.iproute pkgs.utillinux pkgs.coreutils ];
};
# Turn off NixOS' network management
networking = {
useDHCP = false;

8
nixos/modules/services/web-apps/matomo-doc.xml
View File

@ -15,7 +15,7 @@
</para>
<section>
<section xml:id="module-services-matomo-database-setup">
<title>Database Setup</title>
<para>
@ -51,7 +51,7 @@
</section>
<section>
<section xml:id="module-services-matomo-backups">
<title>Backup</title>
<para>
You only need to take backups of your MySQL database and the
@ -62,7 +62,7 @@
</section>
<section>
<section xml:id="module-services-matomo-issues">
<title>Issues</title>
<itemizedlist>
<listitem>
@ -83,7 +83,7 @@
</section>
<section>
<section xml:id="module-services-matomo-other-web-servers">
<title>Using other Web Servers than nginx</title>
<para>

2
nixos/modules/services/web-servers/nginx/vhost-options.nix
View File

@ -130,7 +130,7 @@ with lib;
};
sslTrustedCertificate = mkOption {
type = types.path;
type = types.nullOr types.path;
default = null;
example = "/var/root.cert";
description = "Path to root SSL certificate for stapling and client certificates.";

14
nixos/modules/services/x11/display-managers/auto.nix
View File

@ -49,6 +49,20 @@ in
};
};
# lightdm by default doesn't allow auto login for root, which is
# required by some nixos tests. Override it here.
security.pam.services.lightdm-autologin.text = lib.mkForce ''
auth requisite pam_nologin.so
auth required pam_succeed_if.so quiet
auth required pam_permit.so
account include lightdm
password include lightdm
session include lightdm
'';
};
}

21
nixos/modules/services/x11/display-managers/default.nix
View File

@ -27,6 +27,15 @@ let
Xft.hintstyle: hintslight
'';
mkCases = session:
concatStrings (
mapAttrsToList (name: starts: ''
(${name})
${concatMapStringsSep "\n " (n: n.start) starts}
;;
'') (lib.groupBy (n: n.name) session)
);
# file provided by services.xserver.displayManager.session.wrapper
xsessionWrapper = pkgs.writeScript "xsession-wrapper"
''
@ -139,21 +148,13 @@ let
# Start the window manager.
case "$windowManager" in
${concatMapStrings (s: ''
(${s.name})
${s.start}
;;
'') wm}
${mkCases wm}
(*) echo "$0: Window manager '$windowManager' not found.";;
esac
# Start the desktop manager.
case "$desktopManager" in
${concatMapStrings (s: ''
(${s.name})
${s.start}
;;
'') dm}
${mkCases dm}
(*) echo "$0: Desktop manager '$desktopManager' not found.";;
esac

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

@ -473,7 +473,12 @@ let
# Remove Dead Interfaces
ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}"
ip link add link "${v.interface}" name "${n}" type vlan id "${toString v.id}"
ip link set "${n}" up
# We try to bring up the logical VLAN interface. If the master
# interface the logical interface is dependent upon is not up yet we will
# fail to immediately bring up the logical interface. The resulting logical
# interface will brought up later when the master interface is up.
ip link set "${n}" up || true
'';
postStop = ''
ip link delete "${n}" || true

2
nixos/release.nix
View File

@ -249,7 +249,7 @@ in rec {
tests.beegfs = callTest tests/beegfs.nix {};
tests.bittorrent = callTest tests/bittorrent.nix {};
tests.bind = callTest tests/bind.nix {};
tests.blivet = callTest tests/blivet.nix {};
#tests.blivet = callTest tests/blivet.nix {}; # broken since 2017-07024
tests.boot = callSubTests tests/boot.nix {};
tests.boot-stage1 = callTest tests/boot-stage1.nix {};
tests.borgbackup = callTest tests/borgbackup.nix {};

2
nixos/tests/flatpak.nix
View File

@ -10,6 +10,8 @@ import ./make-test.nix ({ pkgs, ... }:
machine = { pkgs, ... }: {
imports = [ ./common/x11.nix ];
services.xserver.desktopManager.gnome3.enable = true; # TODO: figure out minimal environment where the tests work
# common/x11.nix enables the auto display manager (lightdm)
services.xserver.displayManager.gdm.enable = false;
environment.gnome3.excludePackages = pkgs.gnome3.optionalPackages;
services.flatpak.enable = true;
environment.systemPackages = with pkgs; [ gnupg gnome-desktop-testing ostree python2 ];

5
pkgs/applications/altcoins/ethabi.nix
View File

@ -17,10 +17,11 @@ buildRustPackage rec {
cargoBuildFlags = ["--features cli"];
meta = {
meta = with stdenv.lib; {
description = "Ethereum function call encoding (ABI) utility";
homepage = https://github.com/ethcore/ethabi/;
maintainers = [stdenv.lib.maintainers.dbrock];
maintainers = [ maintainers.dbrock ];
license = licenses.gpl3;
inherit version;
};
}

5
pkgs/applications/altcoins/ethrun.nix
View File

@ -15,10 +15,11 @@ buildRustPackage rec {
cargoSha256 = "14x8pbjgkz0g724lnvd9mi2alqd6fipjljw6xsraf9gqwijn1kn0";
meta = {
meta = with stdenv.lib; {
description = "Directly run Ethereum bytecode";
homepage = https://github.com/dapphub/ethrun/;
maintainers = [stdenv.lib.maintainers.dbrock];
maintainers = [ maintainers.dbrock ];
license = licenses.gpl3;
broken = true; # mark temporary as broken
inherit version;
};

2
pkgs/applications/audio/axoloti/dfu-util.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
phones. With dfu-util you are able to download firmware to your device or
upload firmware from it.
'';
homepage = http://dfu-util.gnumonks.org/;
homepage = http://dfu-util.sourceforge.net;
license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = [ ];

6
pkgs/applications/audio/axoloti/libusb1.nix
View File

@ -29,10 +29,10 @@ stdenv.mkDerivation rec {
sed 's,-ludev,-L${systemd.lib}/lib -ludev,' -i $out/lib/libusb-1.0.la
'';
meta = {
meta = with stdenv.lib; {
homepage = http://www.libusb.info;
description = "User-space USB library";
platforms = stdenv.lib.platforms.unix;
maintainers = [ ];
platforms = platforms.unix;
license = licenses.lgpl21;
};
}

1
pkgs/applications/audio/distrho/default.nix
View File

@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
TAL-Filter-2 TAL-NoiseMaker TAL-Reverb TAL-Reverb-2 TAL-Reverb-3
TAL-Vocoder-2 TheFunction ThePilgrim Vex Wolpertinger
'';
license = with licenses; [ gpl2 gpl3 gpl2Plus lgpl3 mit ];
maintainers = [ maintainers.goibhniu ];
platforms = [ "x86_64-linux" ];
};

3
pkgs/applications/audio/lastfmsubmitd/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, pythonPackages }:
{ lib, fetchurl, pythonPackages }:
pythonPackages.buildPythonApplication rec {
pname = "lastfmsubmitd";
@ -15,6 +15,7 @@ pythonPackages.buildPythonApplication rec {
meta = {
homepage = https://www.red-bean.com/decklin/lastfmsubmitd/;
license = lib.licenses.mit;
description = "An last.fm audio scrobbler and daemon";
};
}

8
pkgs/applications/audio/pianobar/default.nix
View File

@ -1,16 +1,16 @@
{ fetchurl, stdenv, pkgconfig, libao, json_c, libgcrypt, libav, curl }:
{ fetchurl, stdenv, pkgconfig, libao, json_c, libgcrypt, ffmpeg, curl }:
stdenv.mkDerivation rec {
name = "pianobar-2016.06.02";
name = "pianobar-2018.06.22";
src = fetchurl {
url = "http://6xq.net/projects/pianobar/${name}.tar.bz2";
sha256 = "0n9544bfsdp04xqcjm4nhfvp357dx0c3gpys0rjkq09nzv8b1vy6";
sha256 = "1hnlif62vsxgh8j9mcibxwj4gybpgqc11ba729kflpvvi9qmfqwl";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
libao json_c libgcrypt libav curl
libao json_c libgcrypt ffmpeg curl
];
makeFlags="PREFIX=$(out)";

4
pkgs/applications/audio/pulseeffects/default.nix
View File

@ -43,13 +43,13 @@ let
];
in stdenv.mkDerivation rec {
name = "pulseeffects-${version}";
version = "4.3.3";
version = "4.3.4";
src = fetchFromGitHub {
owner = "wwmm";
repo = "pulseeffects";
rev = "v${version}";
sha256 = "1krfxvwqimfcsv7f2l722ivzz0qdf5h0pmb702mg65qb160zn065";
sha256 = "0gyyqxfmmp6hbwc10i48sxrgdxansm3vsbwgc6rh89clxwcnfiml";
};
nativeBuildInputs = [

2
pkgs/applications/editors/flpsed/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "WYSIWYG PostScript annotator";
homepage = http://http://flpsed.org/flpsed.html;
homepage = http://flpsed.org/flpsed.html;
license = licenses.gpl3;
platforms = platforms.mesaPlatforms;
maintainers = with maintainers; [ fuuzetsu ];

2
pkgs/applications/graphics/grafx2/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Bitmap paint program inspired by the Amiga programs Deluxe Paint and Brilliance";
homepage = http://code.google.co/p/grafx2/;
homepage = http://pulkomandy.tk/projects/GrafX2;
license = stdenv.lib.licenses.gpl2;
platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = [ stdenv.lib.maintainers.zoomulator ];

9
pkgs/applications/graphics/k3d/default.nix
View File

@ -39,12 +39,11 @@ stdenv.mkDerivation rec {
#doCheck = false;
meta = {
meta = with stdenv.lib; {
description = "A 3D editor with support for procedural editing";
homepage = http://www.k-3d.org/;
platforms = with stdenv.lib.platforms;
linux;
maintainers = with stdenv.lib.maintainers;
[raskin];
platforms = platforms.linux;
maintainers = [ maintainers.raskin ];
license = licenses.gpl2;
};
}

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

@ -1,4 +1,4 @@
{ mkDerivation, lib, fetchurl, cmake, extra-cmake-modules
{ mkDerivation, lib, stdenv, fetchurl, cmake, extra-cmake-modules
, karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons
, kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem
, kio, kcrash
@ -23,10 +23,10 @@ mkDerivation rec {
karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons
ki18n kitemmodels kitemviews kwindowsystem kio kcrash
boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib
openjpeg opencolorio vc poppler_qt5 curl ilmbase
openjpeg opencolorio poppler_qt5 curl ilmbase
qtmultimedia qtx11extras
python3
];
] ++ lib.optional (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) vc;
NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ];

43
pkgs/applications/graphics/qcomicbook/default.nix Normal file
View File

@ -0,0 +1,43 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtx11extras, poppler_qt5 }:
stdenv.mkDerivation rec {
name = "qcomicbook-${version}";
version = "0.9.1";
src = fetchFromGitHub {
owner = "stolowski";
repo = "QComicBook";
rev = version;
sha256 = "1b769lp6gfwds4jb2g7ymhdm9c06zg57zpyz3zpdb40w07zfsjzv";
};
nativeBuildInputs = [
cmake pkgconfig
];
buildInputs = [
qtbase qttools qtx11extras poppler_qt5
];
postInstall = ''
substituteInPlace $out/share/applications/*.desktop \
--replace "Exec=qcomicbook" "Exec=$out/bin/qcomicbook"
'';
meta = with stdenv.lib; {
homepage = https://github.com/stolowski/QComicBook;
description = "Comic book reader in Qt5";
license = licenses.gpl2;
longDescription = ''
QComicBook is a viewer for PDF files and comic book archives containing
jpeg/png/xpm/gif/bmp images, which aims at convenience and simplicity.
Features include: automatic unpacking of archive files, full-screen mode, continuous
scrolling mode, double-pages viewing, manga mode, thumbnails view, page scaling,
mouse or keyboard navigation etc.
'';
platforms = platforms.linux;
maintainers = with maintainers; [ greydot ];
};
}

7
pkgs/applications/misc/golden-cheetah/default.nix
View File

@ -34,9 +34,10 @@ stdenv.mkDerivation rec {
# RCC: Error in 'Resources/application.qrc': Cannot find file 'translations/gc_fr.qm'
enableParallelBuilding = false;
meta = {
meta = with stdenv.lib; {
description = "Performance software for cyclists, runners and triathletes";
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.ocharles ];
platforms = platforms.linux;
maintainers = [ maintainers.ocharles ];
license = licenses.gpl3;
};
}

8
pkgs/applications/misc/goldendict/default.nix
View File

@ -19,11 +19,11 @@ stdenv.mkDerivation rec {
qmakeFlags = [ "CONFIG+=zim_support" ];
meta = {
meta = with stdenv.lib; {
homepage = http://goldendict.org/;
description = "A feature-rich dictionary lookup program";
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ gebner astsmtl ];
platforms = platforms.linux;
maintainers = with maintainers; [ gebner astsmtl ];
license = licenses.gpl3Plus;
};
}

10
pkgs/applications/misc/gphoto2/gphotofs.nix
View File

@ -13,11 +13,11 @@ stdenv.mkDerivation rec {
libgphoto2 fuse glib libtool
];
meta = {
meta = with stdenv.lib; {
description = "Fuse FS to mount a digital camera";
maintainers = [
stdenv.lib.maintainers.raskin
];
platforms = stdenv.lib.platforms.linux;
homepage = http://www.gphoto.org/;
maintainers = [ maintainers.raskin ];
platforms = platforms.linux;
license = with licenses; [ lgpl2 gpl2 ];
};
}

5
pkgs/applications/misc/gxneur/default.nix
View File

@ -14,8 +14,9 @@ stdenv.mkDerivation {
libglade GConf pcre libappindicator-gtk2
];
meta = {
meta = with stdenv.lib; {
description = "GUI for XNEUR keyboard layout switcher";
platforms = stdenv.lib.platforms.linux;
platforms = platforms.linux;
license = with licenses; [ gpl2 gpl3 ];
};
}

1
pkgs/applications/misc/krename/default.nix
View File

@ -20,6 +20,7 @@ in mkDerivation rec {
meta = with lib; {
homepage = http://www.krename.net;
description = "A powerful batch renamer for KDE";
license = licenses.gpl2;
inherit (kconfig.meta) platforms;
maintainers = with maintainers; [ peterhoeg ];
};

5
pkgs/applications/misc/mop/default.nix
View File

@ -22,9 +22,10 @@ buildGoPackage rec {
sha256 = "0zp51g9i8rw6acs4vnrxclbxa5z1v0a0m1xx27szszp0rphcczkx";
};
meta = {
meta = with stdenv.lib; {
description = "Simple stock tracker implemented in go";
homepage = https://github.com/mop-tracker/mop;
platforms = stdenv.lib.platforms.all;
license = licenses.mit;
platforms = platforms.all;
};
}

7
pkgs/applications/misc/nut/default.nix
View File

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
"$out/lib:${neon}/lib:${libusb.out}/lib:${avahi}/lib:${freeipmi}/lib"
'';
meta = {
meta = with stdenv.lib; {
description = "Network UPS Tools";
longDescription = ''
Network UPS Tools is a collection of programs which provide a common
@ -41,8 +41,9 @@ stdenv.mkDerivation rec {
'';
homepage = http://www.networkupstools.org/;
repositories.git = https://github.com/networkupstools/nut.git;
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [ pierron ];
platforms = platforms.linux;
maintainers = [ maintainers.pierron ];
license = with licenses; [ gpl1Plus gpl2Plus gpl3Plus ];
priority = 10;
};
}

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

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = [ ncurses gsl ] ++ (with ocamlPackages; [ ocaml camlp4 ]);
meta = {
homepage = http://pessimization.com/software/orpie/;
homepage = https://github.com/pelzlpj/orpie;
description = "A fullscreen RPN calculator for the console";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.all;

1
pkgs/applications/misc/pdf-quench/default.nix
View File

@ -31,6 +31,7 @@ pythonPackages.buildPythonApplication rec {
homepage = https://github.com/linuxerwang/pdf-quench;
description = "A visual tool for cropping pdf files";
platforms = platforms.linux;
license = licenses.gpl2;
maintainers = with maintainers; [ flokli ];
};
}

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

@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec {
doCheck = false; # no tests
meta = with stdenv.lib; {
homepage = https://gna.org/projects/pdfshuffler/;
homepage = https://sourceforge.net/p/pdfshuffler/wiki/Home;
description = "Merge or split pdf documents and rotate, crop and rearrange their pages";
platforms = platforms.linux;
maintainers = with maintainers; [ mic92 ];

1
pkgs/applications/misc/pinfo/default.nix
View File

@ -17,7 +17,6 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "A viewer for info files";
homepage = https://alioth.debian.org/projects/pinfo/;
license = licenses.gpl2Plus;
platforms = platforms.unix;
};

7
pkgs/applications/misc/posterazor/default.nix
View File

@ -28,10 +28,11 @@ stdenv.mkDerivation rec {
cp PosteRazor $out/bin
'';
meta = {
meta = with stdenv.lib; {
homepage = http://posterazor.sourceforge.net/;
description = "Cuts a raster image into pieces which can afterwards be printed out and assembled to a poster";
maintainers = [ stdenv.lib.maintainers.madjar ];
platforms = stdenv.lib.platforms.linux;
maintainers = [ maintainers.madjar ];
license = licenses.gpl3Plus;
platforms = platforms.linux;
};
}

4
pkgs/applications/misc/terminal-notifier/default.nix
View File

@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
meta = with lib; {
maintainers = with maintainers; [ cstrahan ];
platforms = platforms.darwin;
homepage = https://github.com/julienXX/terminal-notifier;
license = licenses.mit;
platforms = platforms.darwin;
};
}

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

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A command-line time tracker";
homepage = https://tasktools.org/projects/timewarrior.html;
homepage = https://taskwarrior.org/docs/timewarrior;
license = licenses.mit;
maintainers = with maintainers; [ mrVanDalo ];
platforms = platforms.linux ++ platforms.darwin;

5
pkgs/applications/misc/wordnet/default.nix
View File

@ -42,7 +42,10 @@ stdenv.mkDerivation rec {
'';
homepage = https://wordnet.princeton.edu/;
license = {
fullName = "WordNet 3.0 license";
url = https://wordnet.princeton.edu/license-and-commercial-use;
};
maintainers = [ ];
platforms = with stdenv.lib.platforms; linux ++ darwin;
};

7
pkgs/applications/misc/xautoclick/default.nix
View File

@ -23,7 +23,10 @@ stdenv.mkDerivation rec {
addToSearchPath PATH .bin
'';
meta = {
platforms = stdenv.lib.platforms.linux;
meta = with stdenv.lib; {
description = "Autoclicker application, which enables you to automatically click the left mousebutton";
homepage = http://xautoclick.sourceforge.net;
license = licenses.gpl2;
platforms = platforms.linux;
};
}

5
pkgs/applications/misc/xchm/default.nix
View File

@ -13,9 +13,10 @@ stdenv.mkDerivation {
echo $NIX_LDFLAGS
'';
meta = {
meta = with stdenv.lib; {
description = "A viewer for Microsoft HTML Help files";
homepage = http://xchm.sourceforge.net;
platforms = stdenv.lib.platforms.linux;
license = licenses.gpl2;
platforms = platforms.linux;
};
}

10
pkgs/applications/misc/xpdf/default.nix
View File

@ -41,11 +41,11 @@ stdenv.mkDerivation {
--set QT_PLUGIN_PATH ${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtsvg.bin}/${qtbase.qtPluginPrefix}
'';
meta = {
homepage = http://www.foolabs.com/xpdf/;
meta = with stdenv.lib; {
homepage = https://www.xpdfreader.com;
description = "Viewer for Portable Document Format (PDF) files";
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.peti ];
license = with licenses; [ gpl2 gpl3 ];
platforms = platforms.unix;
maintainers = [ maintainers.peti ];
};
}

2
pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ];
meta = with stdenv.lib; {
homepage = http://tox.dhs.org/;
homepage = https://github.com/jin-eld/tox-prpl;
description = "Tox plugin for Pidgin / libpurple";
license = licenses.gpl3;
platforms = platforms.linux;

2
pkgs/applications/networking/mailreaders/sup/default.nix
View File

@ -15,7 +15,7 @@ bundlerEnv {
meta = with lib; {
description = "A curses threads-with-tags style email client";
homepage = http://supmua.org;
homepage = http://sup-heliotrope.github.io;
license = licenses.gpl2;
maintainers = with maintainers; [ cstrahan lovek323 ];
platforms = platforms.unix;

2
pkgs/applications/office/keepnote/default.nix
View File

@ -16,7 +16,7 @@ python2Packages.buildPythonApplication {
meta = {
description = "Note taking application";
homepage = http://rasm.ods.org/keepnote;
homepage = http://keepnote.org;
license = stdenv.lib.licenses.gpl2Plus;
};
}

2
pkgs/applications/science/logic/jonprl/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
based on Brouwer-realizability & meaning explanations.
Inspired by Nuprl
'';
homepage = http://www.jonprl.org/;
homepage = https://github.com/jonsterling/JonPRL;
license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [ puffnfresh ];
platforms = stdenv.lib.platforms.linux;

10
pkgs/applications/science/math/jags/default.nix
View File

@ -9,11 +9,11 @@ stdenv.mkDerivation rec {
buildInputs = [gfortran openblas];
configureFlags = [ "--with-blas=-lopenblas" "--with-lapack=-lopenblas" ];
meta = {
meta = with stdenv.lib; {
description = "Just Another Gibbs Sampler";
license = "GPL2";
homepage = http://www-ice.iarc.fr/~martyn/software/jags/;
maintainers = [stdenv.lib.maintainers.andres];
platforms = stdenv.lib.platforms.unix;
license = licenses.gpl2;
homepage = http://mcmc-jags.sourceforge.net;
maintainers = [ maintainers.andres ];
platforms = platforms.unix;
};
}

2
pkgs/applications/science/math/symmetrica/default.nix
View File

@ -57,6 +57,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.publicDomain;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.unix;
homepage = http://www.symmetrica.de/;
homepage = http://www.algorithm.uni-bayreuth.de/en/research/SYMMETRICA/index.html;
};
}

2
pkgs/applications/science/programming/plm/default.nix
View File

@ -28,9 +28,9 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Free cross-platform programming exerciser";
homepage = http://webloria.loria.fr/~quinson/Teaching/PLM/;
license = licenses.gpl3;
maintainers = [ ];
platforms = stdenv.lib.platforms.all;
broken = true;
};
}

2
pkgs/applications/version-management/tkcvs/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation
'';
meta = {
homepage = http://www.twobarleycorns.net/tkcvs.html;
homepage = https://tkcvs.sourceforge.io;
description = "TCL/TK GUI for cvs and subversion";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.unix;

3
pkgs/applications/video/uvccapture/default.nix
View File

@ -10,7 +10,7 @@ in
stdenv.mkDerivation rec {
name = "uvccapture-0.5";
src = fetchurl {
url = "mirror://debian/pool/main/u/uvccapture/uvccapture_0.5.orig.tar.gz";
sha256 = "1b3akkcmr3brbf93akr8xi20w8zqf2g0qfq928500wy04qi6jqpi";
@ -43,7 +43,6 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Capture image from USB webcam at a specified interval";
homepage = http://linux-uvc.berlios.de/;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];

2
pkgs/applications/virtualization/containerd/default.nix
View File

@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
'';
meta = {
homepage = https://containerd.tools/;
homepage = https://containerd.io/;
description = "A daemon to control runC";
license = licenses.asl20;
maintainers = with maintainers; [ offline vdemeester ];

2
pkgs/applications/window-managers/larswm/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation {
'';
meta = {
homepage = http://larswm.fnurt.net/;
homepage = http://www.fnurt.net/larswm;
description = "9wm-like tiling window manager";
license = stdenv.lib.licenses.free;
platforms = stdenv.lib.platforms.linux;

2
pkgs/data/icons/numix-cursor-theme/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Numix cursor theme";
homepage = https://numixproject.org;
homepage = https://numixproject.github.io;
license = licenses.gpl3;
platforms = platforms.all;
maintainers = with maintainers; [ offline ];

46
pkgs/desktops/deepin/deepin-gettext-tools/default.nix Normal file
View File

@ -0,0 +1,46 @@
{ stdenv, fetchFromGitHub, gettext, python3Packages, perlPackages }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "deepin-gettext-tools";
version = "1.0.8";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "03cwa82dd14a31v44jd3z0kpiri6g21ar4f48s8ph78nvjy55880";
};
nativeBuildInputs = [
python3Packages.wrapPython
];
buildInputs = [
gettext
perlPackages.perl
perlPackages.XMLLibXML
perlPackages.ConfigTiny
python3Packages.python
];
makeFlags = [ "PREFIX=$(out)" ];
postPatch = ''
sed -e 's/sudo cp/cp/' -i src/generate_mo.py
'';
postFixup = ''
wrapPythonPrograms
wrapPythonProgramsIn "$out/lib/${pname}"
wrapProgram $out/bin/deepin-desktop-ts-convert --set PERL5LIB $PERL5LIB
'';
meta = with stdenv.lib; {
description = "Deepin Internationalization utilities";
homepage = https://github.com/linuxdeepin/deepin-gettext-tools;
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};
}

1
pkgs/desktops/deepin/default.nix
View File

@ -4,6 +4,7 @@ let
packages = self: with self; {
dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { };
deepin-gettext-tools = callPackage ./deepin-gettext-tools { };
deepin-gtk-theme = callPackage ./deepin-gtk-theme { };
deepin-icon-theme = callPackage ./deepin-icon-theme { };
deepin-terminal = callPackage ./deepin-terminal {

4
pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "gnome-font-viewer-${version}";
version = "3.28.0";
version = "3.30.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-font-viewer/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "16mp22f255b8zqnnlqh25n6v79b9bd0gmli9ywqyapa0cfai09x3";
sha256 = "1wwnx2zrlbd2d6np7m9s78alx6j6ranrnh1g2z6zrv9qcj8rpzz5";
};
passthru = {

4
pkgs/desktops/gnome-3/core/tracker-miners/default.nix
View File

@ -8,11 +8,11 @@ let
pname = "tracker-miners";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
version = "2.1.1";
version = "2.1.3";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "107638773mihxdi194wf3saacqrr4cp9xn3qjfmx60bwq5451ma0";
sha256 = "10j6iifq0ccnqckdx7fqlrfifbvs08jbczgxajldz26057kwp8fz";
};
nativeBuildInputs = [

12
pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch
View File

@ -1,6 +1,6 @@
--- a/meson.build
+++ b/meson.build
@@ -37,15 +37,15 @@
@@ -25,15 +25,15 @@
#
# This check acts as a guard to make sure we are being configured with the
# right prefix, among other things.
@ -17,12 +17,12 @@
+ tracker_uninstalled_domain_rule = join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'share', 'tracker', 'domain-ontologies', 'default.rule')
+ tracker_uninstalled_nepomuk_ontologies_dir = join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'share', 'tracker', 'ontologies', 'nepomuk')
+ tracker_uninstalled_stop_words_dir = join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'share', 'tracker', 'stop-words', 'default.rule')
endif
avcodec = dependency('libavcodec', version: '>= 0.8.4', required: false)
else
tracker_subproject = subproject('tracker',
default_options: [
--- a/src/libtracker-miners-common/tracker-domain-ontology.c
+++ b/src/libtracker-miners-common/tracker-domain-ontology.c
@@ -313,7 +313,7 @@
@@ -323,7 +323,7 @@
goto end;
}
} else {
@ -31,7 +31,7 @@
DEFAULT_RULE, NULL);
if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) {
@@ -378,7 +378,7 @@
@@ -388,7 +388,7 @@
if (!priv->ontology_location) {
gchar *ontology_path;

4
pkgs/desktops/gnome-3/misc/geary/default.nix
View File

@ -6,14 +6,14 @@
let
pname = "geary";
version = "0.12.3";
version = "0.12.4";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "18zzjzs075zja00xpnyvjrrdzm54icdhfw4ywhpr6rqfcpnzifw7";
sha256 = "01ykhkjfkprvh9kp4rzrl6xs2pqibiw44ckvqsn5cs3xy2rlq8mm";
};
nativeBuildInputs = [ vala_0_40 intltool pkgconfig wrapGAppsHook cmake ninja desktop-file-utils gnome-doc-utils gobjectIntrospection ];

20
pkgs/development/compilers/glslang/default.nix
View File

@ -1,20 +1,28 @@
{ stdenv, fetchFromGitHub, cmake, bison, spirv-tools, jq }:
{ stdenv, fetchFromGitHub, fetchpatch, cmake, bison, spirv-tools, jq }:
stdenv.mkDerivation rec {
name = "glslang-git-${version}";
version = "2018-06-21";
version = "2018-07-27";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "glslang";
rev = "ef1f899b5d64a9628023f1bb129198674cba2b97";
sha256 = "052w6rahmy1wlphv533wz8nyn82icky28lprvl8w3acfq3831zg6";
rev = "e99a26810f65314183163c07664a40e05647c15f";
sha256 = "1w11z518xfbnf34xgzg1mp3xicpw2qmpcvaixlzw79s9ifqg5lqs";
};
patches = [
# spirv-tools bump for vulkan sdk 1.1.82.1; remove on update
(fetchpatch {
url = "https://github.com/lenny-lunarg/glslang/commit/c7f4e818ac55f545289f87f8c37571b2eadcde86.patch";
sha256 = "197293alxjdpm3x1vd6pksdb1d9za42vlyn8yn2w786av0l7vf1k";
})
];
buildInputs = [ cmake bison jq ] ++ spirv-tools.buildInputs;
enableParallelBuilding = true;
patchPhase = ''
postPatch = ''
cp --no-preserve=mode -r "${spirv-tools.src}" External/spirv-tools
ln -s "${spirv-tools.headers}" External/spirv-tools/external/spirv-headers
'';
@ -23,7 +31,7 @@ stdenv.mkDerivation rec {
HEADERS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools/external/spirv-headers"))[0].commit')
TOOLS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools"))[0].commit')
if [ "$HEADERS_COMMIT" != "${spirv-tools.headers.rev}" ] || [ "$TOOLS_COMMIT" != "${spirv-tools.src.rev}" ]; then
echo "ERROR: spirv-tools commits do not match expected versions";
echo "ERROR: spirv-tools commits do not match expected versions: expected tools at $TOOLS_COMMIT, headers at $HEADERS_COMMIT";
exit 1;
fi
'';

4
pkgs/development/compilers/orc/default.nix
View File

@ -20,10 +20,10 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "The Oil Runtime Compiler";
homepage = http://code.entropywave.com/orc/;
homepage = https://gstreamer.freedesktop.org/projects/orc.html;
# The source code implementing the Marsenne Twister algorithm is licensed
# under the 3-clause BSD license. The rest is 2-clause BSD license.
license = licenses.bsd3;
license = with licenses; [ bsd3 bsd2 ];
platforms = platforms.unix;
maintainers = [ maintainers.fuuzetsu ];
};

2
pkgs/development/interpreters/qnial/default.nix
View File

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
meta = {
description = "An array language from Nial Systems";
homepage = http://www.nial.com;
homepage = https://github.com/vrthra/qnial;
license = stdenv.lib.licenses.artistic1;
maintainers = [ stdenv.lib.maintainers.vrthra ];
platforms = stdenv.lib.platforms.linux;

4
pkgs/development/libraries/LASzip/default.nix
View File

@ -8,12 +8,12 @@ stdenv.mkDerivation rec {
url = "https://github.com/LASzip/LASzip/archive/v${version}.tar.gz";
sha256 = "b8e8cc295f764b9d402bc587f3aac67c83ed8b39f1cb686b07c168579c61fbb2";
};
buildInputs = [cmake];
meta = {
description = "Turn quickly bulky LAS files into compact LAZ files without information loss";
homepage = https://www.laszip.org;
homepage = https://laszip.org;
license = stdenv.lib.licenses.lgpl2;
maintainers = [ stdenv.lib.maintainers.michelk ];
platforms = stdenv.lib.platforms.unix;

2
pkgs/development/libraries/audio/jamomacore/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A C++ platform for building dynamic and reflexive systems with an emphasis on audio and media";
homepage = https://jamoma.org;
homepage = http://www.jamoma.org;
license = stdenv.lib.licenses.bsd3;
maintainers = [ stdenv.lib.maintainers.magnetophon ];
platforms = stdenv.lib.platforms.linux;

2
pkgs/development/libraries/bwidget/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
buildInputs = [ tcl ];
meta = {
homepage = http://tcl.activestate.com/software/tcllib/;
homepage = https://sourceforge.net/projects/tcllib;
description = "High-level widget set for Tcl/Tk";
license = stdenv.lib.licenses.tcltk;
platforms = stdenv.lib.platforms.linux;

2
pkgs/development/libraries/clipper/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
The Clipper library performs line & polygon clipping - intersection, union, difference & exclusive-or,
and line & polygon offsetting. The library is based on Vatti's clipping algorithm.
'';
homepage = https://www.angusj.com/delphi/clipper.php;
homepage = https://sourceforge.net/projects/polyclipping;
license = licenses.boost;
maintainers = with maintainers; [ mpickering ];
platforms = with platforms; unix;

2
pkgs/development/libraries/gtkimageview/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = {
homepage = http://trac.bjourne.webfactional.com/;
homepage = "https://wiki.gnome.org/Projects/GTK%2B/GtkImageView";
description = "Image viewer widget for GTK+";

4
pkgs/development/libraries/libircclient/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
version = "1.9";
version = "1.10";
pname = "libircclient";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}/${version}/${name}.tar.gz";
sha256 = "0r60i76jh4drjh2jgp5sx71chagqllmkaq49zv67nrhqwvp9ghw1";
sha256 = "0b9wa0h3xc31wpqlvgxgnvqp5wgx3kwsf5s9432m5cj8ycx6zcmv";
};
outputs = [ "out" "dev" ];

54
pkgs/development/libraries/qt-3/default.nix
View File

@ -34,27 +34,39 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" ];
configureFlags = "
-v
-system-zlib -system-libpng -system-libjpeg
-qt-gif
-I${xextproto}/include
${if openglSupport then "-dlopen-opengl
-L${libGLU_combined}/lib -I${libGLU_combined}/include
-L${libXmu.out}/lib -I${libXmu.dev}/include" else ""}
${if threadSupport then "-thread" else "-no-thread"}
${if xrenderSupport then "-xrender -L${libXrender.out}/lib -I${libXrender.dev}/include" else "-no-xrender"}
${if xrandrSupport then "-xrandr
-L${libXrandr.out}/lib -I${libXrandr.dev}/include
-I${randrproto}/include" else "-no-xrandr"}
${if xineramaSupport then "-xinerama -L${libXinerama.out}/lib -I${libXinerama.dev}/include" else "-no-xinerama"}
${if cursorSupport then "-L${libXcursor.out}/lib -I${libXcursor.dev}/include" else ""}
${if mysqlSupport then "-qt-sql-mysql -L${mysql.connector-c}/lib/mysql -I${mysql.connector-c}/include/mysql" else ""}
${if xftSupport then "-xft
-L${libXft.out}/lib -I${libXft.dev}/include
-L${libXft.freetype.out}/lib -I${libXft.freetype.dev}/include
-L${libXft.fontconfig.lib}/lib -I${libXft.fontconfig.dev}/include" else "-no-xft"}
";
configureFlags = let
mk = cond: name: "-${stdenv.lib.optionalString (!cond) "no-"}${name}";
in [
"-v"
"-system-zlib" "-system-libpng" "-system-libjpeg"
"-qt-gif"
"-I${xextproto}/include"
(mk threadSupport "thread")
(mk xrenderSupport "xrender")
(mk xrandrSupport "xrandr")
(mk xineramaSupport "xinerama")
(mk xrandrSupport "xrandr")
(mk xftSupport "xft")
] ++ stdenv.lib.optionals openglSupport [
"-dlopen-opengl"
"-L${libGLU_combined}/lib" "-I${libGLU_combined}/include"
"-L${libXmu.out}/lib" "-I${libXmu.dev}/include"
] ++ stdenv.lib.optionals xrenderSupport [
"-L${libXrender.out}/lib" "-I${libXrender.dev}/include"
] ++ stdenv.lib.optionals xrandrSupport [
"-L${libXrandr.out}/lib" "-I${libXrandr.dev}/include"
"-I${randrproto}/include"
] ++ stdenv.lib.optionals xineramaSupport [
"-L${libXinerama.out}/lib" "-I${libXinerama.dev}/include"
] ++ stdenv.lib.optionals cursorSupport [
"-L${libXcursor.out}/lib -I${libXcursor.dev}/include"
] ++ stdenv.lib.optionals mysqlSupport [
"-qt-sql-mysql" "-L${mysql.connector-c}/lib/mysql" "-I${mysql.connector-c}/include/mysql"
] ++ stdenv.lib.optionals xftSupport [
"-L${libXft.out}/lib" "-I${libXft.dev}/include"
"-L${libXft.freetype.out}/lib" "-I${libXft.freetype.dev}/include"
"-L${libXft.fontconfig.lib}/lib" "-I${libXft.fontconfig.dev}/include"
];
patches = [
# Don't strip everything so we can get useful backtraces.

4
pkgs/development/libraries/vulkan-headers/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
name = "vulkan-headers-${version}";
version = "1.1.77.0";
version = "1.1.82.0";
buildInputs = [ cmake ];
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
owner = "KhronosGroup";
repo = "Vulkan-Headers";
rev = "sdk-${version}";
sha256 = "1k01y5cj154mw7853w5xh135b2jp6k83kzwknw0dbs5adj4dx0kf";
sha256 = "1pp0kmgd89g8rz6qqfqmdmv209s0d6hbsshrzrlwrdm6dc25f20p";
};
meta = with stdenv.lib; {

4
pkgs/development/libraries/vulkan-loader/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig,
xlibsWrapper, libxcb, libXrandr, libXext, wayland, libGL_driver }:
let version = "1.1.77.0"; in
let version = "1.1.82.0"; in
assert version == vulkan-headers.version;
stdenv.mkDerivation rec {
name = "vulkan-loader-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "KhronosGroup";
repo = "Vulkan-Loader";
rev = "sdk-${version}";
sha256 = "1nzzkqh0i3j1d3h7kgmaxzi748l338m2p31lxkwxm4y81xp56a94";
sha256 = "16i4s1adfh822ahj3ywp279lv6szwd2sn2q5pmvpg2kk6mbh410d";
};
nativeBuildInputs = [ pkgconfig ];

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