Merge branch 'master' into staging-next

Hydra: ?compare=1477053
This commit is contained in:
Vladimír Čunát 2018-09-04 13:06:45 +02:00
commit 1428d00aa4
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
191 changed files with 1731 additions and 6189 deletions

View file

@ -1 +1 @@
18.09
19.03

View file

@ -325,7 +325,7 @@
};
};
}
</screen>
</screen>
<para>
To install it into our environment, you can just run <literal>nix-env -iA
@ -347,7 +347,7 @@
};
};
}
</screen>
</screen>
<para>
<literal>pathsToLink</literal> tells Nixpkgs to only link the paths listed
@ -383,7 +383,7 @@
};
};
}
</screen>
</screen>
<para>
This provides us with some useful documentation for using our packages.
@ -395,15 +395,15 @@
{
packageOverrides = pkgs: with pkgs; rec {
myProfile = writeText "my-profile" ''
export PATH=$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/sbin:/bin:/usr/sbin:/usr/bin
export MANPATH=$HOME/.nix-profile/share/man:/nix/var/nix/profiles/default/share/man:/usr/share/man
export PATH=$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/sbin:/bin:/usr/sbin:/usr/bin
export MANPATH=$HOME/.nix-profile/share/man:/nix/var/nix/profiles/default/share/man:/usr/share/man
'';
myPackages = pkgs.buildEnv {
name = "my-packages";
paths = [
(runCommand "profile" {} ''
mkdir -p $out/etc/profile.d
cp ${myProfile} $out/etc/profile.d/my-profile.sh
mkdir -p $out/etc/profile.d
cp ${myProfile} $out/etc/profile.d/my-profile.sh
'')
aspell
bc
@ -421,7 +421,7 @@ cp ${myProfile} $out/etc/profile.d/my-profile.sh
};
};
}
</screen>
</screen>
<para>
For this to work fully, you must also have this script sourced when you are
@ -438,7 +438,7 @@ if [ -d $HOME/.nix-profile/etc/profile.d ]; then
fi
done
fi
</screen>
</screen>
<para>
Now just run <literal>source $HOME/.profile</literal> and you can starting
@ -459,16 +459,16 @@ fi
{
packageOverrides = pkgs: with pkgs; rec {
myProfile = writeText "my-profile" ''
export PATH=$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/sbin:/bin:/usr/sbin:/usr/bin
export MANPATH=$HOME/.nix-profile/share/man:/nix/var/nix/profiles/default/share/man:/usr/share/man
export INFOPATH=$HOME/.nix-profile/share/info:/nix/var/nix/profiles/default/share/info:/usr/share/info
export PATH=$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/sbin:/bin:/usr/sbin:/usr/bin
export MANPATH=$HOME/.nix-profile/share/man:/nix/var/nix/profiles/default/share/man:/usr/share/man
export INFOPATH=$HOME/.nix-profile/share/info:/nix/var/nix/profiles/default/share/info:/usr/share/info
'';
myPackages = pkgs.buildEnv {
name = "my-packages";
paths = [
(runCommand "profile" {} ''
mkdir -p $out/etc/profile.d
cp ${myProfile} $out/etc/profile.d/my-profile.sh
mkdir -p $out/etc/profile.d
cp ${myProfile} $out/etc/profile.d/my-profile.sh
'')
aspell
bc
@ -485,17 +485,17 @@ cp ${myProfile} $out/etc/profile.d/my-profile.sh
pathsToLink = [ "/share/man" "/share/doc" "/share/info" "/bin" "/etc" ];
extraOutputsToInstall = [ "man" "doc" "info" ];
postBuild = ''
if [ -x $out/bin/install-info -a -w $out/share/info ]; then
shopt -s nullglob
for i in $out/share/info/*.info $out/share/info/*.info.gz; do
$out/bin/install-info $i $out/share/info/dir
done
fi
if [ -x $out/bin/install-info -a -w $out/share/info ]; then
shopt -s nullglob
for i in $out/share/info/*.info $out/share/info/*.info.gz; do
$out/bin/install-info $i $out/share/info/dir
done
fi
'';
};
};
}
</screen>
</screen>
<para>
<literal>postBuild</literal> tells Nixpkgs to run a command after building

View file

@ -1,7 +1,7 @@
<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
xml:id="chap-functions">
xml:id="chap-functions">
<title>Functions reference</title>
<para>
The nixpkgs repository has several utility functions to manipulate Nix
@ -31,12 +31,16 @@
<para>
Example usages:
<programlisting>pkgs.foo.override { arg1 = val1; arg2 = val2; ... }</programlisting>
<programlisting>import pkgs.path { overlays = [ (self: super: {
foo = super.foo.override { barSupport = true ; };
})]};</programlisting>
<programlisting>mypkg = pkgs.callPackage ./mypkg.nix {
mydep = pkgs.mydep.override { ... };
}</programlisting>
<programlisting>
import pkgs.path { overlays = [ (self: super: {
foo = super.foo.override { barSupport = true ; };
})]};
</programlisting>
<programlisting>
mypkg = pkgs.callPackage ./mypkg.nix {
mydep = pkgs.mydep.override { ... };
}
</programlisting>
</para>
<para>
@ -61,9 +65,11 @@
<para>
Example usage:
<programlisting>helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec {
separateDebugInfo = true;
});</programlisting>
<programlisting>
helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec {
separateDebugInfo = true;
});
</programlisting>
</para>
<para>
@ -134,14 +140,16 @@
<para>
Example usage:
<programlisting>mySed = pkgs.gnused.overrideDerivation (oldAttrs: {
name = "sed-4.2.2-pre";
src = fetchurl {
url = ftp://alpha.gnu.org/gnu/sed/sed-4.2.2-pre.tar.bz2;
sha256 = "11nq06d131y4wmf3drm0yk502d2xc6n5qy82cg88rb9nqd2lj41k";
};
patches = [];
});</programlisting>
<programlisting>
mySed = pkgs.gnused.overrideDerivation (oldAttrs: {
name = "sed-4.2.2-pre";
src = fetchurl {
url = ftp://alpha.gnu.org/gnu/sed/sed-4.2.2-pre.tar.bz2;
sha256 = "11nq06d131y4wmf3drm0yk502d2xc6n5qy82cg88rb9nqd2lj41k";
};
patches = [];
});
</programlisting>
</para>
<para>
@ -181,8 +189,10 @@
<para>
Example usage:
<programlisting>f = { a, b }: { result = a+b; }
c = lib.makeOverridable f { a = 1; b = 2; }</programlisting>
<programlisting>
f = { a, b }: { result = a+b; };
c = lib.makeOverridable f { a = 1; b = 2; };
</programlisting>
</para>
<para>
@ -482,29 +492,29 @@ merge:"diff3"
<example xml:id='ex-dockerTools-buildImage'>
<title>Docker build</title>
<programlisting>
buildImage {
name = "redis"; <co xml:id='ex-dockerTools-buildImage-1' />
tag = "latest"; <co xml:id='ex-dockerTools-buildImage-2' />
buildImage {
name = "redis"; <co xml:id='ex-dockerTools-buildImage-1' />
tag = "latest"; <co xml:id='ex-dockerTools-buildImage-2' />
fromImage = someBaseImage; <co xml:id='ex-dockerTools-buildImage-3' />
fromImageName = null; <co xml:id='ex-dockerTools-buildImage-4' />
fromImageTag = "latest"; <co xml:id='ex-dockerTools-buildImage-5' />
fromImage = someBaseImage; <co xml:id='ex-dockerTools-buildImage-3' />
fromImageName = null; <co xml:id='ex-dockerTools-buildImage-4' />
fromImageTag = "latest"; <co xml:id='ex-dockerTools-buildImage-5' />
contents = pkgs.redis; <co xml:id='ex-dockerTools-buildImage-6' />
runAsRoot = '' <co xml:id='ex-dockerTools-buildImage-runAsRoot' />
#!${stdenv.shell}
mkdir -p /data
'';
contents = pkgs.redis; <co xml:id='ex-dockerTools-buildImage-6' />
runAsRoot = '' <co xml:id='ex-dockerTools-buildImage-runAsRoot' />
#!${stdenv.shell}
mkdir -p /data
'';
config = { <co xml:id='ex-dockerTools-buildImage-8' />
Cmd = [ "/bin/redis-server" ];
WorkingDir = "/data";
Volumes = {
"/data" = {};
};
config = { <co xml:id='ex-dockerTools-buildImage-8' />
Cmd = [ "/bin/redis-server" ];
WorkingDir = "/data";
Volumes = {
"/data" = {};
};
}
</programlisting>
};
}
</programlisting>
</example>
<para>
@ -647,15 +657,15 @@ merge:"diff3"
<example xml:id='ex-dockerTools-pullImage'>
<title>Docker pull</title>
<programlisting>
pullImage {
imageName = "nixos/nix"; <co xml:id='ex-dockerTools-pullImage-1' />
imageDigest = "sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b"; <co xml:id='ex-dockerTools-pullImage-2' />
finalImageTag = "1.11"; <co xml:id='ex-dockerTools-pullImage-3' />
sha256 = "0mqjy3zq2v6rrhizgb9nvhczl87lcfphq9601wcprdika2jz7qh8"; <co xml:id='ex-dockerTools-pullImage-4' />
os = "linux"; <co xml:id='ex-dockerTools-pullImage-5' />
arch = "x86_64"; <co xml:id='ex-dockerTools-pullImage-6' />
}
</programlisting>
pullImage {
imageName = "nixos/nix"; <co xml:id='ex-dockerTools-pullImage-1' />
imageDigest = "sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b"; <co xml:id='ex-dockerTools-pullImage-2' />
finalImageTag = "1.11"; <co xml:id='ex-dockerTools-pullImage-3' />
sha256 = "0mqjy3zq2v6rrhizgb9nvhczl87lcfphq9601wcprdika2jz7qh8"; <co xml:id='ex-dockerTools-pullImage-4' />
os = "linux"; <co xml:id='ex-dockerTools-pullImage-5' />
arch = "x86_64"; <co xml:id='ex-dockerTools-pullImage-6' />
}
</programlisting>
</example>
<calloutlist>
@ -677,9 +687,9 @@ merge:"diff3"
exactly which image you want. By default it will match the OS and
architecture of the host the command is run on.
<programlisting>
$ nix-shell --packages skopeo jq --command "skopeo --override-os linux --override-arch x86_64 inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest'"
sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b
</programlisting>
$ nix-shell --packages skopeo jq --command "skopeo --override-os linux --override-arch x86_64 inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest'"
sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b
</programlisting>
This argument is required.
</para>
</callout>
@ -737,13 +747,13 @@ merge:"diff3"
<example xml:id='ex-dockerTools-exportImage'>
<title>Docker export</title>
<programlisting>
exportImage {
fromImage = someLayeredImage;
fromImageName = null;
fromImageTag = null;
exportImage {
fromImage = someLayeredImage;
fromImageName = null;
fromImageTag = null;
name = someLayeredImage.name;
}
name = someLayeredImage.name;
}
</programlisting>
</example>
@ -774,19 +784,19 @@ merge:"diff3"
<example xml:id='ex-dockerTools-shadowSetup'>
<title>Shadow base files</title>
<programlisting>
buildImage {
name = "shadow-basic";
buildImage {
name = "shadow-basic";
runAsRoot = ''
#!${stdenv.shell}
${shadowSetup}
groupadd -r redis
useradd -r -g redis redis
mkdir /data
chown redis:redis /data
'';
}
</programlisting>
runAsRoot = ''
#!${stdenv.shell}
${shadowSetup}
groupadd -r redis
useradd -r -g redis redis
mkdir /data
chown redis:redis /data
'';
}
</programlisting>
</example>
<para>

View file

@ -546,6 +546,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "Public Domain";
};
purdueBsd = {
fullName = " Purdue BSD-Style License"; # also know as lsof license
url = https://enterprise.dejacode.com/licenses/public/purdue-bsd;
};
qpl = spdx {
spdxId = "QPL-1.0";
fullName = "Q Public License 1.0";

View file

@ -36,18 +36,18 @@ rec {
/* bitwise and */
bitAnd = builtins.bitAnd
or import ./zip-int-bits.nix
(a: b: if a==1 && b==1 then 1 else 0);
or (import ./zip-int-bits.nix
(a: b: if a==1 && b==1 then 1 else 0));
/* bitwise or */
bitOr = builtins.bitOr
or import ./zip-int-bits.nix
(a: b: if a==1 || b==1 then 1 else 0);
or (import ./zip-int-bits.nix
(a: b: if a==1 || b==1 then 1 else 0));
/* bitwise xor */
bitXor = builtins.bitXor
or import ./zip-int-bits.nix
(a: b: if a!=b then 1 else 0);
or (import ./zip-int-bits.nix
(a: b: if a!=b then 1 else 0));
/* bitwise not */
bitNot = builtins.sub (-1);

View file

@ -1645,6 +1645,11 @@
github = "heel";
name = "Sergii Paryzhskyi";
};
helkafen = {
email = "arnaudpourseb@gmail.com";
github = "Helkafen";
name = "Sébastian Méric de Bellefon";
};
henrytill = {
email = "henrytill@gmail.com";
github = "henrytill";
@ -1872,6 +1877,11 @@
github = "jgillich";
name = "Jakob Gillich";
};
jglukasik = {
email = "joseph@jgl.me";
github = "jglukasik";
name = "Joseph Lukasik";
};
jhhuh = {
email = "jhhuh.note@gmail.com";
github = "jhhuh";

View file

@ -60,7 +60,7 @@
# systemctl start display-manager.service
</screen>
</para>
<simplesect>
<simplesect xml:id="sec-x11-graphics-cards-nvidia">
<title>NVIDIA Graphics Cards</title>
<para>
NVIDIA provides a proprietary driver for its graphics cards that has better
@ -86,7 +86,7 @@
</programlisting>
</para>
</simplesect>
<simplesect>
<simplesect xml:id="sec-x11--graphics-cards-amd">
<title>AMD Graphics Cards</title>
<para>
AMD provides a proprietary driver for its graphics cards that has better 3D
@ -106,7 +106,7 @@
</programlisting>
</para>
</simplesect>
<simplesect>
<simplesect xml:id="sec-x11-touchpads">
<title>Touchpads</title>
<para>
Support for Synaptics touchpads (found in many laptops such as the Dell
@ -123,7 +123,7 @@
since NixOS 17.09.
</para>
</simplesect>
<simplesect>
<simplesect xml:id="sec-x11-gtk-and-qt-themes">
<title>GTK/Qt themes</title>
<para>
GTK themes can be installed either to user profile or system-wide (via

View file

@ -31,7 +31,7 @@
(system wide), put them into your
<xref linkend="opt-environment.systemPackages"/>.
</para>
<simplesect>
<simplesect xml:id="sec-xfce-thunar-volumes">
<title>Thunar Volume Support</title>
<para>
To enable <emphasis>Thunar</emphasis> volume support, put
@ -41,7 +41,7 @@
into your <emphasis>configuration.nix</emphasis>.
</para>
</simplesect>
<simplesect>
<simplesect xml:id="sec-xfce-polkit">
<title>Polkit Authentication Agent</title>
<para>
There is no authentication agent automatically installed alongside Xfce. To
@ -50,7 +50,7 @@
and login did the trick.
</para>
</simplesect>
<simplesect>
<simplesect xml:id="sec-xfce-troubleshooting">
<title>Troubleshooting</title>
<para>
Even after enabling udisks2, volume management might not work. Thunar and/or

View file

@ -90,7 +90,9 @@ let
fi
${buildPackages.libxslt.bin}/bin/xsltproc \
--stringparam revision '${revision}' \
-o $out ${./options-to-docbook.xsl} $optionsXML
-o intermediate.xml ${./options-to-docbook.xsl} $optionsXML
${buildPackages.libxslt.bin}/bin/xsltproc \
-o "$out" ${./postprocess-option-descriptions.xsl} intermediate.xml
'';
sources = lib.sourceFilesBySuffices ./. [".xml"];

View file

@ -17,7 +17,7 @@ config = {
definitions in a <emphasis>property</emphasis> to achieve certain effects:
</para>
<simplesect>
<simplesect xml:id="sec-option-definitions-delaying-conditionals">
<title>Delaying Conditionals</title>
<para>
If a set of option definitions is conditional on the value of another
@ -59,7 +59,7 @@ config = {
</para>
</simplesect>
<simplesect>
<simplesect xml:id="sec-option-definitions-setting-priorities">
<title>Setting Priorities</title>
<para>
A module can override the definitions of an option in other modules by
@ -76,7 +76,7 @@ services.openssh.enable = mkOverride 10 false;
</para>
</simplesect>
<simplesect>
<simplesect xml:id="sec-option-definitions-merging">
<title>Merging Configurations</title>
<para>
In conjunction with <literal>mkIf</literal>, it is sometimes useful for a

View file

@ -4,6 +4,7 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:str="http://exslt.org/strings"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:nixos="tag:nixos.org"
xmlns="http://docbook.org/ns/docbook"
extension-element-prefixes="str"
>
@ -30,10 +31,12 @@
<listitem>
<para>
<xsl:value-of disable-output-escaping="yes"
select="attr[@name = 'description']/string/@value" />
</para>
<nixos:option-description>
<para>
<xsl:value-of disable-output-escaping="yes"
select="attr[@name = 'description']/string/@value" />
</para>
</nixos:option-description>
<xsl:if test="attr[@name = 'type']">
<para>

View file

@ -0,0 +1,115 @@
<?xml version="1.0"?>
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:str="http://exslt.org/strings"
xmlns:exsl="http://exslt.org/common"
xmlns:db="http://docbook.org/ns/docbook"
xmlns:nixos="tag:nixos.org"
extension-element-prefixes="str exsl">
<xsl:output method='xml' encoding="UTF-8" />
<xsl:template match="@*|node()">
<xsl:copy>
<xsl:apply-templates select="@*|node()" />
</xsl:copy>
</xsl:template>
<xsl:template name="break-up-description">
<xsl:param name="input" />
<xsl:param name="buffer" />
<!-- Every time we have two newlines following each other, we want to
break it into </para><para>. -->
<xsl:variable name="parbreak" select="'&#xa;&#xa;'" />
<!-- Similar to "(head:tail) = input" in Haskell. -->
<xsl:variable name="head" select="$input[1]" />
<xsl:variable name="tail" select="$input[position() &gt; 1]" />
<xsl:choose>
<xsl:when test="$head/self::text() and contains($head, $parbreak)">
<!-- If the haystack provided to str:split() directly starts or
ends with $parbreak, it doesn't generate a <token/> for that,
so we are doing this here. -->
<xsl:variable name="splitted-raw">
<xsl:if test="starts-with($head, $parbreak)"><token /></xsl:if>
<xsl:for-each select="str:split($head, $parbreak)">
<token><xsl:value-of select="node()" /></token>
</xsl:for-each>
<!-- Something like ends-with($head, $parbreak), but there is
no ends-with() in XSLT, so we need to use substring(). -->
<xsl:if test="
substring($head, string-length($head) -
string-length($parbreak) + 1) = $parbreak
"><token /></xsl:if>
</xsl:variable>
<xsl:variable name="splitted"
select="exsl:node-set($splitted-raw)/token" />
<!-- The buffer we had so far didn't contain any text nodes that
contain a $parbreak, so we can put the buffer along with the
first token of $splitted into a para element. -->
<para xmlns="http://docbook.org/ns/docbook">
<xsl:apply-templates select="exsl:node-set($buffer)" />
<xsl:apply-templates select="$splitted[1]/node()" />
</para>
<!-- We have already emitted the first splitted result, so the
last result is going to be set as the new $buffer later
because its contents may not be directly followed up by a
$parbreak. -->
<xsl:for-each select="$splitted[position() &gt; 1
and position() &lt; last()]">
<para xmlns="http://docbook.org/ns/docbook">
<xsl:apply-templates select="node()" />
</para>
</xsl:for-each>
<xsl:call-template name="break-up-description">
<xsl:with-param name="input" select="$tail" />
<xsl:with-param name="buffer" select="$splitted[last()]/node()" />
</xsl:call-template>
</xsl:when>
<!-- Either non-text node or one without $parbreak, which we just
want to buffer and continue recursing. -->
<xsl:when test="$input">
<xsl:call-template name="break-up-description">
<xsl:with-param name="input" select="$tail" />
<!-- This essentially appends $head to $buffer. -->
<xsl:with-param name="buffer">
<xsl:if test="$buffer">
<xsl:for-each select="exsl:node-set($buffer)">
<xsl:apply-templates select="." />
</xsl:for-each>
</xsl:if>
<xsl:apply-templates select="$head" />
</xsl:with-param>
</xsl:call-template>
</xsl:when>
<!-- No more $input, just put the remaining $buffer in a para. -->
<xsl:otherwise>
<para xmlns="http://docbook.org/ns/docbook">
<xsl:apply-templates select="exsl:node-set($buffer)" />
</para>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template match="nixos:option-description">
<xsl:choose>
<!--
Only process nodes that are comprised of a single <para/> element,
because if that's not the case the description already contains
</para><para> in between and we need no further processing.
-->
<xsl:when test="count(db:para) > 1">
<xsl:apply-templates select="node()" />
</xsl:when>
<xsl:otherwise>
<xsl:call-template name="break-up-description">
<xsl:with-param name="input"
select="exsl:node-set(db:para/node())" />
</xsl:call-template>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
</xsl:stylesheet>

View file

@ -8,6 +8,7 @@
This section lists the release notes for each stable version of NixOS and
current unstable revision.
</para>
<xi:include href="rl-1903.xml" />
<xi:include href="rl-1809.xml" />
<xi:include href="rl-1803.xml" />
<xi:include href="rl-1709.xml" />

View file

@ -528,6 +528,14 @@ inherit (pkgs.nixos {
to <literal>true</literal>.
</para>
</listitem>
<listitem>
<para>
NixOS option descriptions are now automatically broken up into individual
paragraphs if the text contains two consecutive newlines, so it's no
longer necessary to use <code>&lt;/para&gt;&lt;para&gt;</code> to start
a new paragraph.
</para>
</listitem>
</itemizedlist>
</section>
</section>

View file

@ -0,0 +1,58 @@
<section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-release-19.03">
<title>Release 19.03 (“Koi”, 2019/03/??)</title>
<section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-release-19.03-highlights">
<title>Highlights</title>
<para>
In addition to numerous new and upgraded packages, this release has the
following highlights:
</para>
<itemizedlist>
<listitem>
<para />
</listitem>
</itemizedlist>
</section>
<section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-release-19.03-new-services">
<title>New Services</title>
<para>
The following new services were added since the last release:
</para>
<itemizedlist>
<listitem>
<para />
</listitem>
</itemizedlist>
</section>
<section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-release-19.03-notable-changes">
<title>Other Notable Changes</title>
<itemizedlist>
<listitem>
<para />
</listitem>
</itemizedlist>
</section>
</section>

View file

@ -34,6 +34,7 @@ in
environment.variables = mkOption {
default = {};
example = { EDITOR = "nvim"; VISUAL = "nvim"; };
description = ''
A set of environment variables used in the global environment.
These variables will be set on shell initialisation (e.g. in /etc/profile).

View file

@ -69,7 +69,7 @@ ibus.engines = with pkgs.ibus-engines; [ table table-others ];
as shown above, and also (after running <literal>nixos-rebuild</literal>) the
input method must be added from IBus' preference dialog.</para>
<simplesect>
<simplesect xml:id="module-services-input-methods-troubleshooting">
<title>Troubleshooting</title>
<para>If IBus works in some applications but not others, a likely cause of
this is that IBus is depending on a different version of

View file

@ -1,6 +1,6 @@
{
x86_64-linux = "/nix/store/0d60i73mcv8z1m8d2m74yfn84980gfsa-nix-2.0.4";
i686-linux = "/nix/store/6ssafj2s5a2g9x28yld7b70vwd6vw6lb-nix-2.0.4";
aarch64-linux = "/nix/store/3wwch7bp7n7xsl8apgy2a4b16yzyij1z-nix-2.0.4";
x86_64-darwin = "/nix/store/771l8i0mz4c8kry8cz3sz8rr3alalckg-nix-2.0.4";
x86_64-linux = "/nix/store/r9i30v8nasafg2851wflg71ln49fw03y-nix-2.1";
i686-linux = "/nix/store/dsg3pr7wwrk51f7la9wgby173j18llqh-nix-2.1";
aarch64-linux = "/nix/store/m3qgnch4xin21pmd1azas8kkcp9rhkr6-nix-2.1";
x86_64-darwin = "/nix/store/n7fvy0k555gwkkdszdkhi3h0aahca8h3-nix-2.1";
}

View file

@ -84,7 +84,7 @@ in
versionSuffix = mkIf (pathIsDirectory gitRepo) (mkDefault (".git." + gitCommitId));
# Note: the first letter is bumped on every release. It's an animal.
codeName = "Jellyfish";
codeName = "Koi";
};
# Generate /etc/os-release. See

View file

@ -274,7 +274,7 @@ $ ./result/bin/emacs -q
<para>
The list of available packages in the various ELPA
repositories can be seen with the following commands:
<example>
<example xml:id="module-services-emacs-querying-packages">
<title>Querying Emacs packages</title>
<programlisting><![CDATA[
nix-env -f "<nixpkgs>" -qaP -A emacsPackagesNg.elpaPackages
@ -291,7 +291,7 @@ nix-env -f "<nixpkgs>" -qaP -A emacsPackagesNg.orgPackages
(see <xref linkend="sec-declarative-package-mgmt" />). Simply
modify your file <filename>configuration.nix</filename> to
make it contain:
<example>
<example xml:id="module-services-emacs-configuration-nix">
<title>Custom Emacs in <filename>configuration.nix</filename></title>
<programlisting><![CDATA[
{
@ -319,7 +319,7 @@ https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides
Emacs only for yourself, you can do so by adding it to your
<filename>~/.config/nixpkgs/config.nix</filename>
(see <link xlink:href="http://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides">Nixpkgs manual</link>):
<example>
<example xml:id="module-services-emacs-config-nix">
<title>Custom Emacs in <filename>~/.config/nixpkgs/config.nix</filename></title>
<programlisting><![CDATA[
{
@ -522,7 +522,7 @@ emacsclient --create-frame --tty # opens a new frame on the current terminal
The Emacs init file should be changed to load the extension
packages at startup:
<example>
<example xml:id="module-services-emacs-package-initialisation">
<title>Package initialization in <filename>.emacs</filename></title>
<programlisting><![CDATA[
(require 'package)

View file

@ -44,7 +44,13 @@ let
helpScript = pkgs.writeScriptBin "nixos-help"
''
#! ${pkgs.runtimeShell} -e
browser="$BROWSER"
# Finds first executable browser in a colon-separated list.
# (see how xdg-open defines BROWSER)
browser="$(
IFS=: ; for b in $BROWSER; do
[ -n "$(type -P "$b" || true)" ] && echo "$b" && break
done
)"
if [ -z "$browser" ]; then
browser="$(type -P xdg-open || true)"
if [ -z "$browser" ]; then

View file

@ -190,7 +190,8 @@ let
nameValuePair "wireguard-${name}"
{
description = "WireGuard Tunnel - ${name}";
after = [ "network.target" ];
requires = [ "network-online.target" ];
after = [ "network.target" "network-online.target" ];
wantedBy = [ "multi-user.target" ];
environment.DEVICE = name;
path = with pkgs; [ kmod iproute wireguard-tools ];
@ -236,7 +237,7 @@ let
${values.postSetup}
'';
preStop = ''
postStop = ''
ip link del dev ${name}
${values.postShutdown}
'';

View file

@ -8,7 +8,12 @@ let
addAttributeName = mapAttrs (a: v: v // {
text = ''
#### Activation script snippet ${a}:
_localstatus=0
${v.text}
if (( _localstatus > 0 )); then
printf "Activation script snippet '%s' failed (%s)\n" "${a}" "$_localstatus"
fi
'';
});
@ -71,7 +76,7 @@ in
done
_status=0
trap "_status=1" ERR
trap "_status=1 _localstatus=\$?" ERR
# Ensure a consistent umask.
umask 0022

View file

@ -248,7 +248,7 @@ if ($grubVersion == 1) {
";
if ($splashImage) {
copy $splashImage, "$bootPath/background.xpm.gz" or die "cannot copy $splashImage to $bootPath\n";
$conf .= "splashimage " . $grubBoot->path . "/background.xpm.gz\n";
$conf .= "splashimage " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/background.xpm.gz\n";
}
}
@ -289,7 +289,7 @@ else {
copy $font, "$bootPath/converted-font.pf2" or die "cannot copy $font to $bootPath\n";
$conf .= "
insmod font
if loadfont " . $grubBoot->path . "/converted-font.pf2; then
if loadfont " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/converted-font.pf2; then
insmod gfxterm
if [ \"\${grub_platform}\" = \"efi\" ]; then
set gfxmode=$gfxmodeEfi
@ -317,7 +317,7 @@ else {
copy $splashImage, "$bootPath/background$suffix" or die "cannot copy $splashImage to $bootPath\n";
$conf .= "
insmod " . substr($suffix, 1) . "
if background_image --mode '$splashMode' " . $grubBoot->path . "/background$suffix; then
if background_image --mode '$splashMode' " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/background$suffix; then
set color_normal=white/black
set color_highlight=black/white
else
@ -352,7 +352,7 @@ sub copyToKernelsDir {
rename $tmp, $dst or die "cannot rename $tmp to $dst\n";
}
$copied{$dst} = 1;
return $grubBoot->path . "/kernels/$name";
return ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/kernels/$name";
}
sub addEntry {

View file

@ -327,7 +327,6 @@ in rec {
tests.keymap = callSubTests tests/keymap.nix {};
tests.initrdNetwork = callTest tests/initrd-network.nix {};
tests.kafka = callSubTests tests/kafka.nix {};
tests.kernel-copperhead = callTest tests/kernel-copperhead.nix {};
tests.kernel-latest = callTest tests/kernel-latest.nix {};
tests.kernel-lts = callTest tests/kernel-lts.nix {};
tests.kubernetes.dns = callSubTestsOnMatchingSystems ["x86_64-linux"] tests/kubernetes/dns.nix {};

View file

@ -1,19 +0,0 @@
import ./make-test.nix ({ pkgs, ...} : {
name = "kernel-copperhead";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ nequissimus ];
};
machine = { pkgs, ... }:
{
boot.kernelPackages = pkgs.linuxPackages_copperhead_lts;
};
testScript =
''
$machine->succeed("uname -a");
$machine->succeed("uname -s | grep 'Linux'");
$machine->succeed("uname -a | grep '${pkgs.linuxPackages_copperhead_lts.kernel.modDirVersion}'");
$machine->succeed("uname -a | grep 'hardened'");
'';
})

View file

@ -11,6 +11,7 @@ let
let
vlanIfs = range 1 (length config.virtualisation.vlans);
in {
environment.systemPackages = [ pkgs.iptables ]; # to debug firewall rules
virtualisation.vlans = [ 1 2 3 ];
boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = true;
networking = {
@ -320,9 +321,14 @@ let
name = "MACVLAN";
nodes.router = router;
nodes.client = { pkgs, ... }: with pkgs.lib; {
environment.systemPackages = [ pkgs.iptables ]; # to debug firewall rules
virtualisation.vlans = [ 1 ];
networking = {
useNetworkd = networkd;
firewall.logReversePathDrops = true; # to debug firewall rules
# reverse path filtering rules for the macvlan interface seem
# to be incorrect, causing the test to fail. Disable temporarily.
firewall.checkReversePath = false;
firewall.allowPing = true;
useDHCP = true;
macvlans.macvlan.interface = "eth1";
@ -341,9 +347,16 @@ let
$client->waitUntilSucceeds("ip addr show dev eth1 | grep -q '192.168.1'");
$client->waitUntilSucceeds("ip addr show dev macvlan | grep -q '192.168.1'");
# Print diagnosting information
# Print lots of diagnostic information
$router->log('**********************************************');
$router->succeed("ip addr >&2");
$router->succeed("ip route >&2");
$router->execute("iptables-save >&2");
$client->log('==============================================');
$client->succeed("ip addr >&2");
$client->succeed("ip route >&2");
$client->execute("iptables-save >&2");
$client->log('##############################################');
# Test macvlan creates routable ips
$client->waitUntilSucceeds("ping -c 1 192.168.1.1");

View file

@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
gobjectIntrospection
meson
ninja
python36Packages.python
pkgconfig
wrapGAppsHook
wrapPython

View file

@ -4,6 +4,7 @@
, ninja
, pkgconfig
, itstool
, python3
, libxml2
, desktop-file-utils
, wrapGAppsHook
@ -58,6 +59,7 @@ in stdenv.mkDerivation rec {
pkgconfig
libxml2
itstool
python3
desktop-file-utils
wrapGAppsHook
];

View file

@ -1,14 +1,14 @@
{ stdenv, fetchurl, cmake, qt5, zlib, taglib, pkgconfig, pcre, gst_all_1 }:
let
version = "1.0.0-git5-20180115";
version = "1.1.1-git1-20180828";
in
stdenv.mkDerivation {
name = "sayonara-player-${version}";
src = fetchurl {
url = "https://sayonara-player.com/sw/sayonara-player-${version}.tar.gz";
sha256 = "1fl7zplnrrvbv1xm4g348bpd46jj39jvbm808hyjjq92i64wqg37";
sha256 = "0rvy47qvavrp03zjdrw025dmq9fq5aaii3q1qq8b94byarl0c5kn";
};
nativeBuildInputs = [ cmake pkgconfig ];
@ -39,7 +39,7 @@ stdenv.mkDerivation {
{ description = "Sayonara music player";
homepage = https://sayonara-player.com/;
license = licenses.gpl3;
platforms = qt5.qtbase.meta.platforms;
platforms = platforms.linux;
maintainers = [ maintainers.deepfire ];
};
}

View file

@ -31,9 +31,10 @@
, stdenv
, unzip
, which
, writeTextFile
, runCommand
, xkeyboard_config
, zlib
, makeDesktopItem
}:
let
@ -113,6 +114,17 @@ let
'';
};
desktopItem = makeDesktopItem {
name = drvName;
exec = pname;
icon = drvName;
desktopName = "Android Studio (${channel} channel)";
comment = "The official Android IDE";
categories = "Development;IDE;";
startupNotify = "true";
extraEntries="StartupWMClass=jetbrains-studio";
};
# Android Studio downloads prebuilt binaries as part of the SDK. These tools
# (e.g. `mksdcard`) have `/lib/ld-linux.so.2` set as the interpreter. An FHS
# environment is used as a work around for that.
@ -120,18 +132,15 @@ let
name = "${drvName}-fhs-env";
multiPkgs = pkgs: [ pkgs.ncurses5 ];
};
in
writeTextFile {
name = "${drvName}-wrapper";
# TODO: Rename preview -> beta (and add -stable suffix?):
destination = "/bin/${pname}";
executable = true;
text = ''
in runCommand
"${drvName}-wrapper"
{
startScript = ''
#!${bash}/bin/bash
${fhsEnv}/bin/${drvName}-fhs-env ${androidStudio}/bin/studio.sh
'';
} // {
preferLocalBuild = true;
allowSubstitutes = false;
meta = with stdenv.lib; {
description = "The Official IDE for Android (${channel} channel)";
longDescription = ''
@ -146,3 +155,12 @@ in
maintainers = with maintainers; [ primeos ];
};
}
''
mkdir -p $out/{bin,share/pixmaps}
# TODO: Rename preview -> beta (and add -stable suffix?):
echo -n "$startScript" > $out/bin/${pname}
chmod +x $out/bin/${pname}
ln -s ${androidStudio}/bin/studio.png $out/share/pixmaps/${drvName}.png
ln -s ${desktopItem}/share/applications $out/share/applications
''

View file

@ -146,6 +146,12 @@ self:
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});
magit-todos = super.magit-todos.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});
# missing OCaml
merlin = markBroken super.merlin;

View file

@ -151,6 +151,12 @@ self:
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});
magit-todos = super.magit-todos.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});
# missing OCaml
merlin = markBroken super.merlin;

View file

@ -52,6 +52,7 @@ in stdenv.mkDerivation {
meson
ninja
pkgconfig
python3
python3.pkgs.wrapPython
wrapGAppsHook
];

View file

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, gnome3, libtool, intltool, pkgconfig, gtk3, hicolor-icon-theme, wrapGAppsHook } :
{ stdenv, fetchFromGitHub, fetchpatch, gnome3, meson, ninja, gettext, pkgconfig, libxml2, gtk3, hicolor-icon-theme, wrapGAppsHook }:
let
version = "2.2";
version = "2.3";
in stdenv.mkDerivation {
name = "gcolor3-${version}";
@ -9,23 +9,35 @@ in stdenv.mkDerivation {
owner = "hjdskes";
repo = "gcolor3";
rev = "v${version}";
sha256 = "1rbahsi33pfggpj5cigy6wy5333g3rpm8v2q0b35c6m7pwhmf2gr";
sha256 = "186j72kwsqdcakvdik9jl18gz3csdj53j3ylwagr9gfwmy0nmyjb";
};
nativeBuildInputs = [ gnome3.gnome-common libtool intltool pkgconfig hicolor-icon-theme wrapGAppsHook ];
patches = [
# Fix darwin build
(fetchpatch {
url = https://github.com/Hjdskes/gcolor3/commit/9130ffeff091fbafff6a0c8f06b09f54657d5dfd.patch;
sha256 = "1kn5hx536wivafb4awg7lsa8h32njy0lynmn7ci9y78dlp54057r";
})
(fetchpatch {
url = https://github.com/Hjdskes/gcolor3/commit/8d89081a8e13749f5a9051821114bc5fe814eaf3.patch;
sha256 = "1ldyr84dl2g6anqkp2mpxsrcr41fcqwi6ck14rfhai7rgrm8yar3";
})
];
buildInputs = [ gtk3 ];
nativeBuildInputs = [ meson ninja gettext pkgconfig libxml2 wrapGAppsHook ];
configureScript = "./autogen.sh";
buildInputs = [ gtk3 hicolor-icon-theme ];
# clang-4.0: error: argument unused during compilation: '-pthread'
NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-error=unused-command-line-argument";
postPatch = ''
chmod +x meson_install.sh # patchShebangs requires executable file
patchShebangs meson_install.sh
'';
meta = {
meta = with stdenv.lib; {
description = "A simple color chooser written in GTK3";
homepage = https://hjdskes.github.io/projects/gcolor3/;
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ jtojnar ];
platforms = stdenv.lib.platforms.unix;
license = licenses.gpl2;
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.unix;
};
}

View file

@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "imgcat-${version}";
version = "2.3.0";
buildTools = [ autoconf automake libtool ncurses ];
buildInputs = [ autoconf automake libtool ncurses ];
preConfigure = ''
${autoconf}/bin/autoconf

View file

@ -1,25 +1,32 @@
{ stdenv, fetchgit, SDL2, SDL2_ttf, freeimage, fontconfig }:
{ stdenv, fetchFromGitHub, SDL2, SDL2_ttf
, freeimage, fontconfig, pkgconfig
, asciidoc, docbook_xsl, libxslt, cmocka
}:
stdenv.mkDerivation rec {
name = "imv-${version}";
version = "2.1.3";
version = "3.0.0";
src = fetchgit {
url = "https://github.com/eXeC64/imv.git";
rev = "e59d0e9e120f1dbde9ab068748a190e93978e5b7";
sha256 = "0j48dk1bcbh5541522qkn487637wcx104zckrnxa5g3nirfqa7r7";
src = fetchFromGitHub {
owner = "eXeC64";
repo = "imv";
rev = "v${version}";
sha256 = "0j5aykdkm1g518ism5y5flhwxvjvl92ksq989fhl2wpnv0la82jp";
};
buildInputs = [ SDL2 SDL2_ttf freeimage fontconfig ];
buildInputs = [
SDL2 SDL2_ttf freeimage fontconfig pkgconfig
asciidoc docbook_xsl libxslt cmocka
];
configurePhase = "substituteInPlace Makefile --replace /usr $out";
installFlags = [ "PREFIX=$(out)" "CONFIGPREFIX=$(out)/etc" ];
meta = with stdenv.lib; {
description = "A command line image viewer for tiling window managers";
homepage = https://github.com/eXeC64/imv;
license = licenses.gpl2;
maintainers = with maintainers; [ rnhmjoj ];
platforms = platforms.unix;
platforms = [ "x86_64-linux" ];
};
}

View file

@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, gettext, glib, libxml2, pkgconfig, swig, automake, gobjectIntrospection, cmake, ninja, libtiff, libjpeg, fftw, exiv2, lensfun, gtkmm2, libraw, lcms2, libexif, vips, expat, pcre, pugixml }:
stdenv.mkDerivation {
name = "photoflow-unstable-2018-03-06";
name = "photoflow-unstable-2018-08-28";
src = fetchFromGitHub {
owner = "aferrero2707";
repo = "PhotoFlow";
rev = "f9bbea183fa02412d1d17075955d2284eeaf8174";
sha256 = "1fsk7kdmlkd64wcswbxrl87aqwmzqak6p3s38ggxzx2h51fa7lmf";
rev = "df03f2538ddd232e693c307db4ab63eb5bdfea38";
sha256 = "08ybhv08h24y4li8wb4m89xgrz1szlwpksf6vjharp8cznn4y4x9";
};
nativeBuildInputs = [
@ -50,6 +50,7 @@ stdenv.mkDerivation {
homepage = https://aferrero2707.github.io/PhotoFlow/;
license = licenses.gpl3Plus;
maintainers = [ maintainers.MtP ];
platforms = platforms.all;
platforms = platforms.linux;
broken = stdenv.isAarch64;
};
}

View file

@ -1,38 +1,68 @@
{ stdenv, fetchurl, pkgconfig, bzip2, curl, expat, fribidi
, libunibreak, qt4, sqlite, zlib }:
{ stdenv, fetchFromGitHub, pkgconfig
, bzip2, curl, expat, fribidi, libunibreak, sqlite, zlib
, uiTarget ? if !stdenv.isDarwin then "desktop" else "macosx"
, uiType ? if !stdenv.isDarwin then "qt4" else "cocoa"
, qt4, gtk2
, AppKit, Cocoa
}:
with stdenv.lib;
assert elem uiTarget [ "desktop" "macosx" ];
assert elem uiType [ "qt4" "gtk" "cocoa" ];
assert uiTarget == "macosx" -> uiType == "cocoa";
# Note: "qt" uiType option mentioned in ${src}/README.build is qt3,
# which is way to old and no longer in nixpkgs.
stdenv.mkDerivation {
name = "fbreader-0.99.4";
name = "fbreader-${uiType}-0.99.6";
src = fetchurl {
url = https://fbreader.org/files/desktop/fbreader-sources-0.99.4.tgz;
sha256 = "1sdq3vvwkq4bkyrvh0p884d66gaddz8hlab3m798ji9ixbak2z1x";
src = fetchFromGitHub {
owner = "geometer";
repo = "FBReader";
rev = "9e608db14372ae580beae4976eec7241fa069e75";
sha256 = "0lzafk02mv0cf2l2a61q5y4743zi913byik4bw1ix0gr1drnsa7y";
};
patches = [ ./typecheck.patch ];
postPatch = ''
cat << EOF > makefiles/target.mk
TARGET_ARCH = ${uiTarget}
TARGET_STATUS = release
UI_TYPE = ${uiType}
EOF
substituteInPlace makefiles/arch/desktop.mk \
--replace ccache "" \
--replace moc-qt4 moc
# libunibreak supersedes liblinebreak
substituteInPlace zlibrary/text/Makefile \
--replace -llinebreak -lunibreak
'';
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
bzip2 curl expat fribidi libunibreak
qt4 sqlite zlib
];
bzip2 curl expat fribidi libunibreak sqlite zlib
]
++ optional (uiType == "qt4") qt4
++ optional (uiType == "gtk") gtk2
++ optionals (uiType == "cocoa") [ AppKit Cocoa ];
makeFlags = "INSTALLDIR=$(out)";
NIX_CFLAGS_COMPILE = [ "-Wno-error=narrowing" ]; # since gcc-6
patchPhase = ''
# don't try to use ccache
substituteInPlace makefiles/arch/desktop.mk \
--replace "CCACHE = " "# CCACHE = "
substituteInPlace fbreader/desktop/Makefile \
--replace "/usr/share" "$out/share"
'';
meta = with stdenv.lib; {
description = "An e-book reader for Linux";
homepage = http://www.fbreader.org/;
license = licenses.gpl3;
platforms = platforms.linux; # possibly also on unix general
broken = stdenv.isDarwin # untested, might work
|| uiType == "gtk"; # builds, but the result is unusable, hangs a lot
platforms = platforms.unix;
maintainers = [ maintainers.coroa ];
};
};
}

View file

@ -0,0 +1,11 @@
diff --git a/fbreader/src/database/booksdb/BooksDB.cpp b/fbreader/src/database/booksdb/BooksDB.cpp
index e33a22e76..1b6092800 100644
--- a/fbreader/src/database/booksdb/BooksDB.cpp
+++ b/fbreader/src/database/booksdb/BooksDB.cpp
@@ -146,5 +146,5 @@ shared_ptr<Book> BooksDB::loadBook(const std::string &fileName) {
myFindFileId->setFileName(fileName);
if (!myFindFileId->run()) {
- return false;
+ return 0;
}
((DBIntValue&)*myLoadBook->parameter("@file_id").value()) = myFindFileId->fileId();

View file

@ -2,29 +2,34 @@
stdenv.mkDerivation rec {
name = "gpxsee-${version}";
version = "4.19";
version = "5.17";
src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
rev = version;
sha256 = "1xjf2aawf633c1ydhpcsjhdlfkjkfsjbcgjd737xpfv1wjz99l4l";
sha256 = "0fr835glvwnpq6sy181z0gskvwfrmvh7115r3d92xy71v8b1l5ib";
};
nativeBuildInputs = [ qmake qttools ];
nativeBuildInputs = [ qmake ];
buildInputs = [ qttools ];
preConfigure = ''
substituteInPlace src/config.h --replace /usr/share/gpxsee $out/share/gpxsee
lrelease lang/*.ts
'';
preFixup = ''
installPhase = ''
install -Dm755 GPXSee $out/bin/GPXSee
mkdir -p $out/share/gpxsee
cp pkg/maps.txt $out/share/gpxsee
cp -r pkg/csv $out/share/gpxsee/
cp -r pkg/maps $out/share/gpxsee/
mkdir -p $out/share/gpxsee/translations
cp -r lang/*.qm $out/share/gpxsee/translations
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = http://www.gpxsee.org/;
description = "GPX viewer and analyzer";

View file

@ -26,6 +26,8 @@ buildPythonApplication rec {
nativeBuildInputs = [ pkgconfig which sphinx ];
outputs = [ "out" "terminfo" ];
postPatch = ''
substituteInPlace kitty/utils.py \
--replace "find_library('startup-notification-1')" "'${libstartup_notification}/lib/libstartup-notification-1.so'"
@ -47,11 +49,19 @@ buildPythonApplication rec {
runHook postInstall
'';
postInstall = ''
mkdir -p $terminfo/share
mv $out/share/terminfo $terminfo/share/terminfo
mkdir -p $out/nix-support
echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
'';
meta = with stdenv.lib; {
homepage = https://github.com/kovidgoyal/kitty;
description = "A modern, hackable, featureful, OpenGL based terminal emulator";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ tex ];
maintainers = with maintainers; [ tex rvolosatovs ];
};
}

View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub
, meson, ninja, pkgconfig, vala, gobjectIntrospection, gettext, wrapGAppsHook, desktop-file-utils
, meson, ninja, pkgconfig, vala, gobjectIntrospection, gettext, wrapGAppsHook, python3, desktop-file-utils
, gtk3, glib, granite, libgee, libgda, gtksourceview, libxml2, libsecret }:
@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
sha256 = "04x3fg665201g3zy66sicfna4vac4n1pmrahbra90gvfzaia1cai";
};
nativeBuildInputs = [ meson ninja pkgconfig vala gobjectIntrospection gettext wrapGAppsHook desktop-file-utils ];
nativeBuildInputs = [ meson ninja pkgconfig vala gobjectIntrospection gettext wrapGAppsHook python3 desktop-file-utils ];
buildInputs = [ gtk3 glib granite libgee sqlGda gtksourceview libxml2 libsecret ];

View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub
, meson, ninja, pkgconfig
, meson, ninja, pkgconfig, python3
, gnome3, vala, gobjectIntrospection, wrapGAppsHook
, gtk3, granite
, json-glib, glib, glib-networking
@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
sha256 = "022h1rh1jk3m1f9al0s1rylmnqnkydyc81idfc8jf1g0frnvn5i6";
};
nativeBuildInputs = [ meson ninja pkgconfig vala gobjectIntrospection wrapGAppsHook ];
nativeBuildInputs = [ meson ninja pkgconfig python3 vala gobjectIntrospection wrapGAppsHook ];
buildInputs = [
gtk3 granite json-glib glib glib-networking
gnome3.libgee gnome3.libsoup gnome3.gsettings-desktop-schemas

View file

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, glib, gtk3, json-glib, sqlite, libsoup, gettext, vala_0_40
, meson, ninja, pkgconfig, gnome3, gst_all_1, wrapGAppsHook, gobjectIntrospection
, glib-networking }:
, glib-networking, python3 }:
stdenv.mkDerivation rec {
version = "1.7.4";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
meson ninja vala_0_40 pkgconfig wrapGAppsHook
meson ninja vala_0_40 pkgconfig wrapGAppsHook python3
gobjectIntrospection # for setup hook
];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala_0_40, gettext
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala_0_40, gettext, python3
, appstream-glib, desktop-file-utils, glibcLocales, wrapGAppsHook
, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite
}:
@ -18,7 +18,7 @@ in stdenv.mkDerivation {
nativeBuildInputs = [
meson ninja pkgconfig vala_0_40 gettext appstream-glib desktop-file-utils
glibcLocales wrapGAppsHook
python3 glibcLocales wrapGAppsHook
];
buildInputs = [

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, boost }:
{ stdenv, fetchFromGitHub, cmake, boost166 }:
stdenv.mkDerivation rec {
name = "SkypeExport-${version}";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake ];
buildInputs = [ boost ];
buildInputs = [ boost166 ];
preConfigure = "cd src/SkypeExport/_gccbuild/linux";
installPhase = "install -Dt $out/bin SkypeExport";

View file

@ -1,30 +1,32 @@
{ stdenv, fetchgit, pkgconfig, pidgin, json-glib, glib, http-parser } :
{ stdenv, fetchgit, pkgconfig, pidgin, json-glib, glib, http-parser, sqlite, olm, libgcrypt } :
let
version = "2016-07-11";
version = "2018-08-03";
in
stdenv.mkDerivation rec {
name = "purple-matrix-unstable-${version}";
src = fetchgit {
url = "https://github.com/matrix-org/purple-matrix";
rev = "f9d36198a57de1cd1740a3ae11c2ad59b03b724a";
sha256 = "1mmyvc70gslniphmcpk8sfl6ylik6dnprqghx4n47gsj1sb1cy00";
rev = "5a7166a3f54f85793c6b60662f8d12196aeaaeb0";
sha256 = "0ph0s24b37d1c50p8zbzgf4q2xns43a8v6vk85iz633wdd72zsa0";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ pidgin json-glib glib http-parser ];
buildInputs = [ pidgin json-glib glib http-parser sqlite olm libgcrypt ];
installPhase = ''
install -Dm755 -t $out/lib/pidgin/ libmatrix.so
for size in 16 22 48; do
install -TDm644 matrix-"$size"px.png $out/pixmaps/pidgin/protocols/$size/matrix.png
done
'';
hardeningDisable = [ "fortify" ]; # upstream compiles with -O0
meta = {
makeFlags = [
"DESTDIR=$(out)"
"PLUGIN_DIR_PURPLE=/lib/pidgin/"
"DATA_ROOT_DIR_PURPLE=/share"
];
meta = with stdenv.lib; {
homepage = https://github.com/matrix-org/purple-matrix;
description = "Matrix support for Pidgin / libpurple";
license = stdenv.lib.licenses.gpl2;
license = licenses.gpl2;
maintainers = with maintainers; [ symphorien ];
};
}

View file

@ -1,24 +1,24 @@
{ stdenv, fetchFromGitHub, cmake
, qt5, libidn, qca2-qt5, libXScrnSaver, hunspell
, libgcrypt, libotr, html-tidy, libgpgerror
, libgcrypt, libotr, html-tidy, libgpgerror, libsignal-protocol-c
}:
stdenv.mkDerivation rec {
name = "psi-plus-${version}";
version = "1.2.235";
version = "1.3.410";
src = fetchFromGitHub {
owner = "psi-plus";
repo = "psi-plus-snapshots";
rev = "${version}";
sha256 = "0rc65gs6m3jxg407r99kikdylvrar5mq7x5m66ma604yk5igwg47";
sha256 = "02m984z2dfmlx522q9x1z0aalvi2mi48s5ghhs80hr5afnfyc5w6";
};
resources = fetchFromGitHub {
owner = "psi-plus";
repo = "resources";
rev = "8f5038380e1be884b04b5a1ad3cc3385e793f668";
sha256 = "1b8a2aixg966fzjwp9hz51rc31imyvpx014mp2fsm47k8na4470d";
rev = "c0bfb8a025eeec82cd0a23a559e0aa3da15c3ec3";
sha256 = "1q7v01w085vk7ml6gwis7j409w6f5cplpm7c0ajs4i93c4j53xdf";
};
postUnpack = ''
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
buildInputs = [
qt5.qtbase qt5.qtmultimedia qt5.qtx11extras qt5.qttools qt5.qtwebkit
libidn qca2-qt5 libXScrnSaver hunspell
libgcrypt libotr html-tidy libgpgerror
libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c
];
enableParallelBuilding = true;
@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "XMPP (Jabber) client";
maintainers = with maintainers; [ orivej ];
license = licenses.gpl2;
platforms = platforms.linux;
};
}

View file

@ -22,9 +22,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = {
meta = with stdenv.lib; {
description = "Psi, an XMPP (Jabber) client";
maintainers = [ stdenv.lib.maintainers.raskin ];
maintainers = [ maintainers.raskin ];
license = licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -0,0 +1,41 @@
{ stdenv, buildGoPackage, fetchFromGitHub, fetchgx, gx-go }:
buildGoPackage rec {
name = "ipfs-cluster-${version}";
version = "0.5.0";
rev = "v${version}";
goPackagePath = "github.com/ipfs/ipfs-cluster";
extraSrcPaths = [
(fetchgx {
inherit name src;
sha256 = "0jwz3kd07i5fs0sxds80j8d338skhgxgxra377qxsk0cr2hhj2vm";
})
];
src = fetchFromGitHub {
owner = "ipfs";
repo = "ipfs-cluster";
inherit rev;
sha256 = "132whjyplcifq8747hcdrgbc0amhp618dg049jq5nyslcxfgdypm";
};
nativeBuildInputs = [ gx-go ];
preBuild = ''
# fetchgx stores packages by their ipfs hash
# this will rewrite github.com/ imports to gx/ipfs/
cd go/src/${goPackagePath}
gx-go rewrite
'';
meta = with stdenv.lib; {
description = "Allocate, replicate, and track Pins across a cluster of IPFS daemons";
homepage = https://cluster.ipfs.io/;
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ jglukasik ];
};
}

View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub
, meson, ninja, pkgconfig, sphinx
, meson, ninja, pkgconfig, python3, sphinx
, acl, curl, fuse, libselinux, udev, xz, zstd
, fuseSupport ? true
, selinuxSupport ? true
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optionals (fuseSupport) [ fuse ]
++ stdenv.lib.optionals (selinuxSupport) [ libselinux ]
++ stdenv.lib.optionals (udevSupport) [ udev ];
nativeBuildInputs = [ meson ninja pkgconfig sphinx ];
nativeBuildInputs = [ meson ninja pkgconfig python3 sphinx ];
checkInputs = [ glibcLocales rsync ];
postPatch = ''

View file

@ -2,7 +2,7 @@
buildGoPackage rec {
name = "rclone-${version}";
version = "1.42";
version = "1.43";
goPackagePath = "github.com/ncw/rclone";
@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "ncw";
repo = "rclone";
rev = "v${version}";
sha256 = "0r85d45q0jdfwcrblq1rd698cw3h6mc9h4dmlhzl982zpkncijqj";
sha256 = "1khg5jsrjmnblv8zg0zqs1n0hmjv05pjj94m9d7jbp9d936lxsxx";
};
outputs = [ "bin" "out" "man" ];

View file

@ -5,6 +5,7 @@
, pkgconfig
, granite
, vala_0_40
, python3
, gnome3
, libxml2
, gettext
@ -37,6 +38,7 @@ in stdenv.mkDerivation rec {
ninja
pkgconfig
vala_0_40
python3
wrapGAppsHook
];

View file

@ -0,0 +1,41 @@
{
stdenv
, python
}:
python.buildPythonPackage rec {
pname = "snakemake";
version = "5.2.2";
propagatedBuildInputs = with python; [
appdirs
ConfigArgParse
datrie
docutils
jsonschema
pyyaml
ratelimiter
requests
wrapt
];
src = python.fetchPypi {
inherit pname version;
sha256 = "adffe7e24b4a613a9e8bf0a2a320b3cea236d86afb9132bb0bbbc08b8e35a3a3";
};
doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json
meta = with stdenv.lib; {
homepage = http://snakemake.bitbucket.io;
license = licenses.mit;
description = "Python-based execution environment for make-like workflows";
longDescription = ''
Snakemake is a workflow management system that aims to reduce the complexity of
creating workflows by providing a fast and comfortable execution environment,
together with a clean and readable specification language in Python style. Snakemake
workflows are essentially Python scripts extended by declarative code to define
rules. Rules describe how to create output files from input files.
'';
};
}

View file

@ -7,13 +7,13 @@ with stdenv.lib;
buildGoPackage rec {
name = "gitea-${version}";
version = "1.5.0";
version = "1.5.1";
src = fetchFromGitHub {
owner = "go-gitea";
repo = "gitea";
rev = "v${version}";
sha256 = "0gp777x8yjbqvz9i79qv3bn3hrlp1bn7ib57r7w5a7jmr9rd0nca";
sha256 = "06h6v9py35mm0xk9l8xrq02vvr5vzl15gfbw9qqvpn8kiamkn53r";
};
patches = [ ./static-root-path.patch ];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, meson, ninja
{ stdenv, fetchFromGitHub, meson, ninja, python3
, gettext, pkgconfig, desktop-file-utils, wrapGAppsHook
, appstream-glib, epoxy, glib, gtk3, mpv
}:
@ -15,13 +15,14 @@ stdenv.mkDerivation rec {
sha256 = "1cjhw3kz163iwj2japhnv354i1lr112xyyfkxw82cwy2554cfim4";
};
nativeBuildInputs = [ meson ninja appstream-glib gettext pkgconfig desktop-file-utils wrapGAppsHook ];
nativeBuildInputs = [ meson ninja python3 appstream-glib gettext pkgconfig desktop-file-utils wrapGAppsHook ];
buildInputs = [ epoxy glib gtk3 mpv ];
enableParallelBuilding = true;
postPatch = ''
patchShebangs .
patchShebangs meson_post_install.py
patchShebangs src/generate_authors.py
sed -i '/gtk-update-icon-cache/s/^/#/' meson_post_install.py
'';

View file

@ -189,7 +189,7 @@ in stdenv.mkDerivation rec {
wrapProgram $out/bin/$p \
--prefix PATH ":" "${lib.makeBinPath [ python2 glxinfo xdpyinfo ]}" \
--prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath
[ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass ]}"
([ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass ] ++ lib.optional nfsSupport libnfs)}"
done
substituteInPlace $out/share/xsessions/kodi.desktop \

View file

@ -12,13 +12,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "mkvtoolnix-${version}";
version = "25.0.0";
version = "26.0.0";
src = fetchFromGitLab {
owner = "mbunkus";
repo = "mkvtoolnix";
rev = "release-${version}";
sha256 = "04m57719q7q0h0gcj1b2bh8xbdcl5bijic4hw71xf9xd19a95k78";
sha256 = "0dq0lbr6kzj455mv4z6a851n7ff3xlmsxklijiyp4drn1jf0q1pb";
};
nativeBuildInputs = [

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, wrapGAppsHook
{ stdenv, fetchurl, pkgconfig, intltool, itstool, python3, wrapGAppsHook
, python3Packages, gst, gtk3
, gobjectIntrospection, librsvg, gnome3, libnotify
, meson, ninja
@ -43,7 +43,7 @@ in python3Packages.buildPythonApplication rec {
patchShebangs ./getenvvar.py
'';
nativeBuildInputs = [ meson ninja pkgconfig intltool itstool wrapGAppsHook ];
nativeBuildInputs = [ meson ninja pkgconfig intltool itstool python3 wrapGAppsHook ];
buildInputs = [
gobjectIntrospection gtk3 librsvg gnome3.gnome-desktop gnome3.gsound

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, meson, ninja, gtk3, elementary-icon-theme }:
{ stdenv, fetchFromGitHub, meson, ninja, python3, gtk3, elementary-icon-theme }:
stdenv.mkDerivation rec {
name = "${package-name}-${version}";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "0xh6ppr73p76z60ym49b4d0liwdc96w41cc5p07d48hxjsa6qd6n";
};
nativeBuildInputs = [ meson ninja gtk3 elementary-icon-theme ];
nativeBuildInputs = [ meson ninja python3 gtk3 elementary-icon-theme ];
postPatch = ''
patchShebangs meson/post_install.py

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, meson, ninja, gtk3, faba-icon-theme }:
{ stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, faba-icon-theme }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "015l02im4mha5z91dbchxf6xkp66d346bg3xskwg0rh3lglhjsrd";
};
nativeBuildInputs = [ meson ninja gtk3 faba-icon-theme ];
nativeBuildInputs = [ meson ninja gtk3 python3 faba-icon-theme ];
postPatch = ''
patchShebangs meson/post_install.py

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, meson, ninja, gtk3 }:
{ stdenv, fetchFromGitHub, meson, ninja, gtk3, python3 }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "0x45zkjnmbz904df63ph06npbm3phpgck4xwyymx8r8jgrfplk6v";
};
nativeBuildInputs = [ meson ninja gtk3 ];
nativeBuildInputs = [ meson ninja gtk3 python3 ];
postPatch = ''
patchShebangs meson/post_install.py

View file

@ -0,0 +1,40 @@
{ stdenv, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget,
qt5integration }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "deepin-menu";
version = "3.3.10";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "1666821c2irs2hjgr3kvivij6c2fgjva8323kplrz75w2lz518xb";
};
nativeBuildInputs = [
pkgconfig
qmake
];
buildInputs = [
dtkcore
dtkwidget
qt5integration
];
postPatch = ''
sed -i deepin-menu.pro -e "s,/usr,$out,"
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Deepin menu service";
homepage = https://github.com/linuxdeepin/deepin-menu;
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};
}

View file

@ -1,4 +1,6 @@
{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, ninja, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, json-glib, gobjectIntrospection }:
{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake,
ninja, vte, libgee, wnck, zssh, gettext, librsvg, libsecret,
json-glib, gobjectIntrospection, deepin-menu }:
stdenv.mkDerivation rec {
name = "deepin-terminal-${version}";
@ -30,7 +32,7 @@ stdenv.mkDerivation rec {
gobjectIntrospection
];
buildInputs = [ gtk3 vte libgee wnck librsvg libsecret json-glib ];
buildInputs = [ gtk3 vte libgee wnck librsvg libsecret json-glib deepin-menu ];
meta = with stdenv.lib; {
description = "The default terminal emulation for Deepin";
@ -41,7 +43,7 @@ stdenv.mkDerivation rec {
'';
homepage = https://github.com/linuxdeepin/deepin-terminal;
license = licenses.gpl3;
maintainers = with maintainers; [ ];
platforms = platforms.linux;
maintainers = [ maintainers.romildo ];
};
}

View file

@ -7,11 +7,15 @@ let
deepin-gettext-tools = callPackage ./deepin-gettext-tools { };
deepin-gtk-theme = callPackage ./deepin-gtk-theme { };
deepin-icon-theme = callPackage ./deepin-icon-theme { };
deepin-menu = callPackage ./deepin-menu { };
deepin-terminal = callPackage ./deepin-terminal {
inherit (pkgs.gnome3) libgee vte;
wnck = pkgs.libwnck3;
};
dtkcore = callPackage ./dtkcore { };
dtkwidget = callPackage ./dtkwidget { };
qt5dxcb-plugin = callPackage ./qt5dxcb-plugin { };
qt5integration = callPackage ./qt5integration { };
};

View file

@ -23,11 +23,16 @@ stdenv.mkDerivation rec {
];
postPatch = ''
sed -i src/src.pro src/dtk_module.prf \
-e "s,\$\''${QT_HOST_DATA}/mkspecs,$out/mkspecs,"
# Only define QT_HOST_DATA if it is empty
sed '/QT_HOST_DATA=/a }' -i src/dtk_module.prf
sed '/QT_HOST_DATA=/i isEmpty(QT_HOST_DATA) {' -i src/dtk_module.prf
sed -i tools/script/dtk-translate.py \
-e "s,#!env,#!/usr/bin/env,"
# Fix shebang
sed -i tools/script/dtk-translate.py -e "s,#!env,#!/usr/bin/env,"
'';
preConfigure = ''
qmakeFlags="$qmakeFlags QT_HOST_DATA=$out"
'';
postFixup = ''
@ -35,6 +40,8 @@ stdenv.mkDerivation rec {
wrapPythonProgramsIn "$out/lib/dtk2" "$out $pythonPath"
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Deepin tool kit core modules";
homepage = https://github.com/linuxdeepin/dtkcore;

View file

@ -0,0 +1,51 @@
{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, qtmultimedia,
qtsvg, qtx11extras, librsvg, libstartup_notification, gsettings-qt,
dde-qt-dbus-factory, dtkcore
}:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "dtkwidget";
version = "2.0.9.3";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "1ngspvjvws1d2nkyqjh9y45ilahkd1fqwxnlmazgik4355mb76bv";
};
nativeBuildInputs = [
pkgconfig
qmake
qttools
];
buildInputs = [
qtmultimedia
qtsvg
qtx11extras
librsvg
libstartup_notification
gsettings-qt
dde-qt-dbus-factory
dtkcore
];
preConfigure = ''
qmakeFlags="$qmakeFlags \
INCLUDE_INSTALL_DIR=$out/include \
LIB_INSTALL_DIR=$out/lib \
QT_HOST_DATA=$out"
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Deepin graphical user interface library";
homepage = https://github.com/linuxdeepin/dtkwidget;
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};
}

View file

@ -0,0 +1,40 @@
{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, libSM, mtdev, cairo }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "qt5dxcb-plugin";
version = "1.1.11";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "157p2cqs9fvd4n4fmxj6mh4cxlc35bkl4rnf832wk2gvjnxdfrfy";
};
nativeBuildInputs = [
pkgconfig
qmake
];
buildInputs = [
qtx11extras
libSM
mtdev
cairo
];
preConfigure = ''
qmakeFlags="$qmakeFlags INSTALL_PATH=$out/$qtPluginPrefix/platforms"
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Qt platform theme integration plugin for DDE";
homepage = https://github.com/linuxdeepin/qt5dxcb-plugin;
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};
}

View file

@ -0,0 +1,52 @@
{ stdenv, fetchFromGitHub, pkgconfig, qmake, mtdev, gsettings-qt
, lxqt, qtx11extras, qtmultimedia, qtsvg, fontconfig, freetype
, qt5dxcb-plugin, qtstyleplugins, dtkcore, dtkwidget
}:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "qt5integration";
version = "0.3.5";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "0qf9ndsg8pz2n68y68a30d1hxr3ri8k4j00dxlbcf5cn5mbnny1b";
};
nativeBuildInputs = [
pkgconfig
qmake
];
buildInputs = [
dtkcore
dtkwidget
qt5dxcb-plugin
mtdev
lxqt.libqtxdg
qtstyleplugins
qtx11extras
qtmultimedia
qtsvg
];
postPatch = ''
sed -i dstyleplugin/dstyleplugin.pro \
platformthemeplugin/qt5deepintheme-plugin.pro \
iconengineplugins/svgiconengine/svgiconengine.pro \
imageformatplugins/svg/svg.pro \
-e "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix,"
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Qt platform theme integration plugins for DDE";
homepage = https://github.com/linuxdeepin/qt5integration;
license = with licenses; [ gpl3 lgpl2Plus bsd2 ];
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};
}

View file

@ -1,5 +1,5 @@
{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig
, wrapGAppsHook, itstool, desktop-file-utils
, wrapGAppsHook, itstool, desktop-file-utils, python3
, glib, gtk3, evolution-data-server
, libuuid, webkitgtk, zeitgeist
, gnome3, libxml2 }:
@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
'';
nativeBuildInputs = [
meson ninja pkgconfig gettext itstool libxml2 desktop-file-utils wrapGAppsHook
meson ninja pkgconfig gettext itstool libxml2 desktop-file-utils python3 wrapGAppsHook
];
buildInputs = [

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, glib, gtk, meson, ninja, pkgconfig, gnome3, gettext, itstool, libxml2, libarchive
, file, json-glib, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales }:
, file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales }:
stdenv.mkDerivation rec {
name = "file-roller-${version}";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
LANG = "en_US.UTF-8"; # postinstall.py
nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook glibcLocales desktop-file-utils ];
nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 python3 wrapGAppsHook glibcLocales desktop-file-utils ];
buildInputs = [ glib gtk json-glib libarchive file gnome3.defaultIconTheme libnotify nautilus ];

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, meson, ninja, wrapGAppsHook, pkgconfig, gettext, itstool, libvirt-glib
, glib, gobjectIntrospection, libxml2, gtk3, gtk-vnc, libvirt, spice-gtk
, glib, gobjectIntrospection, libxml2, gtk3, gtk-vnc, libvirt, spice-gtk, python3
, spice-protocol, libsoup, libosinfo, systemd, tracker, tracker-miners, vala
, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop-file-utils
, mtools, cdrkit, libcdio, libusb, libarchive, acl, libgudev, qemu, libsecret
@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
doCheck = true;
nativeBuildInputs = [
meson ninja vala pkgconfig gettext itstool wrapGAppsHook gobjectIntrospection desktop-file-utils
meson ninja vala pkgconfig gettext itstool wrapGAppsHook gobjectIntrospection desktop-file-utils python3
];
# Required for USB redirection PolicyKit rules file

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook, libdazzle, libgweather, geoclue2, geocode-glib
{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook, libdazzle, libgweather, geoclue2, geocode-glib, python3
, gettext, libxml2, gnome3, gtk, evolution-data-server, libsoup
, glib, gnome-online-accounts, gsettings-desktop-schemas }:
@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
};
};
nativeBuildInputs = [ meson ninja pkgconfig gettext libxml2 wrapGAppsHook ];
nativeBuildInputs = [ meson ninja pkgconfig gettext libxml2 wrapGAppsHook python3 ];
buildInputs = [
gtk evolution-data-server libsoup glib gnome-online-accounts libdazzle libgweather geoclue2 geocode-glib
gsettings-desktop-schemas gnome3.defaultIconTheme

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, glib, gtk3, pango, wrapGAppsHook
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, glib, gtk3, pango, wrapGAppsHook, python3
, gobjectIntrospection, gjs, libunistring }:
stdenv.mkDerivation rec {
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
};
};
nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook gobjectIntrospection ];
nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 gobjectIntrospection ];
buildInputs = [ glib gtk3 gjs pango gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme libunistring ];
mesonFlags = [

View file

@ -4,7 +4,7 @@
, gnome-desktop, libzapojit, libgepub
, gnome3, gdk_pixbuf, libsoup, docbook_xsl, docbook_xml_dtd_42
, gobjectIntrospection, inkscape, poppler_utils
, desktop-file-utils, wrapGAppsHook }:
, desktop-file-utils, wrapGAppsHook, python3 }:
stdenv.mkDerivation rec {
name = "gnome-documents-${version}";
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
mesonFlags = [ "-Dgetting-started=true" ];
nativeBuildInputs = [
meson ninja pkgconfig gettext itstool libxslt desktop-file-utils docbook_xsl docbook_xml_dtd_42 wrapGAppsHook
meson ninja pkgconfig gettext itstool libxslt desktop-file-utils docbook_xsl docbook_xml_dtd_42 wrapGAppsHook python3
inkscape poppler_utils # building getting started
];
buildInputs = [

View file

@ -7,6 +7,7 @@
, meson
, ninja
, upower
, python3
, desktop-file-utils
, wrapGAppsHook
, gnome3 }:
@ -37,6 +38,7 @@ in stdenv.mkDerivation rec {
gettext
# needed by meson_post_install.sh
python3
glib.dev
desktop-file-utils
];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook
{ stdenv, fetchurl, meson, ninja, pkgconfig, python3, wrapGAppsHook
, gettext, gnome3, glib, gtk, libpeas
, gnome-online-accounts, gsettings-desktop-schemas
, evolution-data-server, libxml2, libsoup, libical, rest, json-glib }:
@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [
meson ninja pkgconfig gettext wrapGAppsHook
meson ninja pkgconfig gettext python3 wrapGAppsHook
];
buildInputs = [
glib gtk libpeas gnome-online-accounts

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, meson, ninja, vala, libxslt, pkgconfig, glib, dbus-glib, gtk3, gnome3
{ stdenv, fetchurl, meson, ninja, vala, libxslt, pkgconfig, glib, dbus-glib, gtk3, gnome3, python3
, libxml2, gettext, docbook_xsl, wrapGAppsHook, gobjectIntrospection }:
let
@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
sha256 = "0nhcpwqrkmpxbhaf0cafvy6dlp6s7vhm5vknl4lgs3l24zc56ns5";
};
nativeBuildInputs = [ meson ninja vala libxslt pkgconfig wrapGAppsHook gettext docbook_xsl libxml2 gobjectIntrospection ];
nativeBuildInputs = [ meson ninja vala libxslt pkgconfig wrapGAppsHook gettext docbook_xsl libxml2 gobjectIntrospection python3 ];
buildInputs = [ glib dbus-glib gtk3 gnome3.defaultIconTheme gnome3.dconf ];

View file

@ -1,6 +1,6 @@
{ fetchurl, stdenv, meson, ninja, gettext, itstool, pkgconfig, libxml2, libjpeg, libpeas, gnome3
, gtk3, glib, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop, lcms2, gdk_pixbuf, exempi
, shared-mime-info, wrapGAppsHook, librsvg, libexif, gobjectIntrospection }:
, shared-mime-info, wrapGAppsHook, librsvg, libexif, gobjectIntrospection, python3 }:
let
pname = "eog";
@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
sha256 = "1lj8v9m8jdxc3d4nzmgrxcccddg3hh8lkbmz4g71yxa0ykxxvbip";
};
nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobjectIntrospection ];
nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobjectIntrospection python3 ];
buildInputs = [
libjpeg gtk3 gdk_pixbuf glib libpeas librsvg lcms2 gnome-desktop libexif exempi

View file

@ -1,7 +1,7 @@
{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk, glib, icu
, wrapGAppsHook, gnome3, libxml2, libxslt, itstool
, webkitgtk, libsoup, glib-networking, libsecret, gnome-desktop, libnotify, p11-kit
, sqlite, gcr, isocodes, desktop-file-utils
, sqlite, gcr, isocodes, desktop-file-utils, python3
, gdk_pixbuf, gst_all_1, json-glib }:
stdenv.mkDerivation rec {
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
mesonFlags = [ "-Dunit_tests=false" ];
nativeBuildInputs = [
meson ninja libxslt pkgconfig itstool gettext wrapGAppsHook desktop-file-utils
meson ninja libxslt pkgconfig itstool gettext wrapGAppsHook desktop-file-utils python3
];
buildInputs = [

View file

@ -1,5 +1,5 @@
{ stdenv, meson, ninja, vala, gettext, itstool, fetchurl, pkgconfig, libxml2
, gtk3, glib, gtksourceview3, wrapGAppsHook, gobjectIntrospection
, gtk3, glib, gtksourceview3, wrapGAppsHook, gobjectIntrospection, python3
, gnome3, mpfr, gmp, libsoup, libmpc }:
stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
meson ninja pkgconfig vala gettext itstool wrapGAppsHook
meson ninja pkgconfig vala gettext itstool wrapGAppsHook python3
gobjectIntrospection # for finding vapi files
];

View file

@ -1,5 +1,5 @@
{ stdenv, gettext, fetchurl, evolution-data-server
, pkgconfig, libxslt, docbook_xsl, docbook_xml_dtd_42, gtk3, glib, cheese
, pkgconfig, libxslt, docbook_xsl, docbook_xml_dtd_42, python3, gtk3, glib, cheese
, libchamplain, clutter-gtk, geocode-glib, gnome-desktop, gnome-online-accounts
, wrapGAppsHook, folks, libxml2, gnome3, telepathy-glib
, vala, meson, ninja }:
@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ evolution-data-server ];
nativeBuildInputs = [
meson ninja pkgconfig vala gettext libxslt docbook_xsl docbook_xml_dtd_42 wrapGAppsHook
meson ninja pkgconfig vala gettext libxslt docbook_xsl docbook_xml_dtd_42 python3 wrapGAppsHook
];
buildInputs = [

View file

@ -5,7 +5,7 @@
, cracklib, libkrb5, networkmanagerapplet, networkmanager, glibc
, libwacom, samba, shared-mime-info, tzdata, libtool, libgnomekbd
, docbook_xsl, modemmanager, clutter, clutter-gtk, cheese
, fontconfig, sound-theme-freedesktop, grilo }:
, fontconfig, sound-theme-freedesktop, grilo, python3 }:
let
pname = "gnome-control-center";
@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [
meson ninja pkgconfig gettext wrapGAppsHook libtool libxslt docbook_xsl
shared-mime-info
shared-mime-info python3
];
buildInputs = with gnome3; [

View file

@ -1,5 +1,5 @@
{ stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread
, meson, ninja, gtk, glib, wrapGAppsHook, libnotify
, meson, ninja, gtk, glib, wrapGAppsHook, python3, libnotify
, itstool, gnome3, libxml2
, libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }:
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
meson ninja pkgconfig gettext itstool libxslt docbook_xsl
wrapGAppsHook libxml2
wrapGAppsHook python3 libxml2
];
buildInputs = [
gtk glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3

View file

@ -1,5 +1,5 @@
{ stdenv, gettext, libxml2, fetchurl, pkgconfig, libcanberra-gtk3
, gtk3, glib, meson, ninja, wrapGAppsHook, appstream-glib, desktop-file-utils
, gtk3, glib, meson, ninja, python3, wrapGAppsHook, appstream-glib, desktop-file-utils
, gnome3 }:
let
@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
patchShebangs build-aux/postinstall.py
'';
nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 desktop-file-utils wrapGAppsHook ];
nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 desktop-file-utils python3 wrapGAppsHook ];
buildInputs = [
gtk3 glib libcanberra-gtk3 gnome3.defaultIconTheme
gnome3.gsettings-desktop-schemas

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, libxml2, glib, gtk, gettext, libsoup
, gtk-doc, docbook_xsl, gobjectIntrospection, tzdata, geocode-glib, vala, gnome3 }:
, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gobjectIntrospection, python3, tzdata, geocode-glib, vala, gnome3 }:
let
pname = "libgweather";
@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
sha256 = "0xfy5ghwvnz2g9074dy6512m4z2pv66pmja14vhi9imgacbfh708";
};
nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl gobjectIntrospection ];
nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobjectIntrospection python3 ];
buildInputs = [ glib gtk libsoup libxml2 geocode-glib ];
postPatch = ''

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, desktop-file-utils, wrapGAppsHook
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, desktop-file-utils, python3, wrapGAppsHook
, gtk, gnome3, gnome-autoar, dbus-glib, shared-mime-info, libnotify, libexif
, exempi, librsvg, tracker, tracker-miners, gnome-desktop, gexiv2, libselinux, gdk_pixbuf }:
@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
sha256 = "19dhpa2ylrg8d5274lahy7xqr2p9z3jnq1h4qmsh95czkpy7is4w";
};
nativeBuildInputs = [ meson ninja pkgconfig libxml2 gettext wrapGAppsHook desktop-file-utils ];
nativeBuildInputs = [ meson ninja pkgconfig libxml2 gettext python3 wrapGAppsHook desktop-file-utils ];
buildInputs = [
dbus-glib shared-mime-info libexif gtk exempi libnotify libselinux

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, wrapGAppsHook
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, python3, wrapGAppsHook
, cairo, gdk_pixbuf, colord, glib, gtk, gusb, packagekit, libwebp
, libxml2, sane-backends, vala, gnome3, gobjectIntrospection }:
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [ cairo gdk_pixbuf colord glib gnome3.defaultIconTheme gusb
gtk libwebp packagekit sane-backends vala ];
nativeBuildInputs = [
meson ninja gettext itstool pkgconfig wrapGAppsHook libxml2
meson ninja gettext itstool pkgconfig python3 wrapGAppsHook libxml2
# For setup hook
gobjectIntrospection
];

View file

@ -5,7 +5,7 @@
let
pname = "tracker";
version = "2.1.2";
version = "2.1.3";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "1sf923f3ya3gj5s90da8qkqqvjj3fdll7xrjgscpb6yhgv0kzqsi";
sha256 = "00gimpn2ydv3yka25cmw3i0n402d2nhx7992byvq4yvhr77rni22";
};
nativeBuildInputs = [

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, gtk3, wrapGAppsHook
, glib, amtk, appstream-glib, gobjectIntrospection
, glib, amtk, appstream-glib, gobjectIntrospection, python3
, webkitgtk, gettext, itstool, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1rzilsn0v8dj86djankllc5f10d58f6rwg4w1fffh5zly10nlli5";
};
nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook appstream-glib gobjectIntrospection ];
nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook appstream-glib gobjectIntrospection python3 ];
buildInputs = [
glib gtk3 webkitgtk amtk
gnome3.defaultIconTheme gsettings-desktop-schemas

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, glib, meson, gettext, ninja }:
{ stdenv, fetchFromGitHub, glib, meson, gettext, ninja, python3 }:
stdenv.mkDerivation rec {
name = "gnome-shell-extensions-mediaplayer-${version}";
@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
meson
ninja
python3
];
buildInputs = [
glib

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook
{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook, python3
, gettext, gnome3, glib, gtk3, libgnome-games-support, gdk_pixbuf }:
let
@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
sha256 = "1k8bvwywpvw5f13pw40brk6c3rz2mdz9cd4zhcawg7qdm77dvcvb";
};
nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook ];
nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 ];
buildInputs = [ glib gtk3 gdk_pixbuf libgnome-games-support gnome3.defaultIconTheme ];
postPatch = ''

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, meson, ninja, vala, pkgconfig, wrapGAppsHook, gobjectIntrospection
, gettext, itstool, libxml2, gnome3, glib, gtk3, librsvg }:
, gettext, itstool, libxml2, python3, gnome3, glib, gtk3, librsvg }:
stdenv.mkDerivation rec {
name = "gnome-chess-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1q8gc0mq8k2b7pjy363g0yjd80czqknw6ssqzbvgqx5b8nkfvmv1";
};
nativeBuildInputs = [ meson ninja vala pkgconfig gettext itstool libxml2 wrapGAppsHook gobjectIntrospection ];
nativeBuildInputs = [ meson ninja vala pkgconfig gettext itstool libxml2 python3 wrapGAppsHook gobjectIntrospection ];
buildInputs = [ glib gtk3 librsvg gnome3.defaultIconTheme ];
postPatch = ''

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, meson, ninja, vala, gobjectIntrospection, pkgconfig, gnome3, gtk3, wrapGAppsHook
, librsvg, gettext, itstool, libxml2, libgnome-games-support, libgee }:
, librsvg, gettext, itstool, python3, libxml2, libgnome-games-support, libgee }:
stdenv.mkDerivation rec {
name = "gnome-mines-${version}";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
# gobjectIntrospection for finding vapi files
nativeBuildInputs = [ meson ninja vala gobjectIntrospection pkgconfig gettext itstool libxml2 wrapGAppsHook ];
nativeBuildInputs = [ meson ninja vala gobjectIntrospection pkgconfig gettext itstool python3 libxml2 wrapGAppsHook ];
buildInputs = [ gtk3 librsvg gnome3.defaultIconTheme libgnome-games-support libgee ];
postPatch = ''

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, vala, glib, gtk3, gnome3, desktop-file-utils
, clutter, clutter-gtk, gettext, itstool, libxml2, wrapGAppsHook }:
, clutter, clutter-gtk, gettext, itstool, libxml2, wrapGAppsHook, python3 }:
let
pname = "swell-foop";
@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
};
};
nativeBuildInputs = [ meson ninja vala pkgconfig wrapGAppsHook itstool gettext libxml2 desktop-file-utils ];
nativeBuildInputs = [ meson ninja vala pkgconfig wrapGAppsHook python3 itstool gettext libxml2 desktop-file-utils ];
buildInputs = [ glib gtk3 gnome3.defaultIconTheme clutter clutter-gtk ];
postPatch = ''

View file

@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [
meson ninja pkgconfig gettext itstool libxml2 wrapGAppsHook
meson ninja pkgconfig gettext itstool libxml2 wrapGAppsHook python3Packages.python
];
buildInputs = [
gtk3 glib gnome3.gsettings-desktop-schemas

View file

@ -1,5 +1,10 @@
{ mkXfceDerivation, automakeAddFlags, dbus-glib, gtk2, libxfce4ui, libxfce4util, xfce4-panel, xfconf }:
{ mkXfceDerivation, automakeAddFlags, dbus-glib, gtk2, libxfce4ui, libxfce4util, xfce4-panel, xfconf, gst-plugins-base, libunique }:
let
gst_plugins_minimal = gst-plugins-base.override {
minimalDeps = true;
};
in
mkXfceDerivation rec {
category = "apps";
pname = "xfce4-mixer";
@ -16,7 +21,9 @@ mkXfceDerivation rec {
buildInputs = [
dbus-glib
gst_plugins_minimal
gtk2
libunique
libxfce4ui
libxfce4util
xfce4-panel

View file

@ -12,12 +12,13 @@ let
rpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc libunwind libuuid icu openssl zlib curl ];
in
stdenv.mkDerivation rec {
version = "2.1.302";
version = "2.1.401";
name = "dotnet-sdk-${version}";
src = fetchurl {
url = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/dotnet-sdk-${version}-linux-x64.tar.gz";
sha256 = "1a8z9q69cd9a33j7fr7907abm5z4qiivw5k379cgsjmmvxwyvjia";
# use sha512 from the download page
sha512 = "639f9f68f225246d9cce798d72d011f65c7eda0d775914d1394df050bddf93e2886555f5eed85a75d6c72e9063a54d8aa053c64c326c683b94e9e0a0570e5654";
};
unpackPhase = "tar xvzf $src";

View file

@ -36,9 +36,9 @@
}:
let
v_major = "4.1";
version = "${v_major}-RELEASE";
version_friendly = "${v_major}";
v_base = "4.1.3";
version = "${v_base}-RELEASE";
version_friendly = "${v_base}";
tag = "refs/tags/swift-${version}";
fetch = { repo, sha256, fetchSubmodules ? false }:
@ -58,7 +58,7 @@ let
};
llvm = fetch {
repo = "swift-llvm";
sha256 = "03558f5zbchqvdabi3x9ahyz4xkmj7w69gazivz372832lgr9zfh";
sha256 = "0q5cv4iydm8c1kcax32573y3q2cbpihwgj5aa8ws1fnpy4jvq934";
};
compilerrt = fetch {
repo = "swift-compiler-rt";
@ -70,7 +70,7 @@ let
};
lldb = fetch {
repo = "swift-lldb";
sha256 = "09x3d3bc6rn9g6jpi3fb120c4r2carsmqla4bq4scjrs0867jz9m";
sha256 = "1d0pa7xm289bjb6r52hkkmlngkqkwbwgixnmm30bin2q18mkxk7s";
};
llbuild = fetch {
repo = "swift-llbuild";
@ -86,7 +86,7 @@ let
};
foundation = fetch {
repo = "swift-corelibs-foundation";
sha256 = "06pbhb7wg4q5qgprhiyzbqy6hssga7xxjclhlh81gd6rvfd6bxvw";
sha256 = "1bhrag63rmz41bg2g6ap01qrdpq37hislgf5hg6myy2v69q7mahx";
};
libdispatch = fetch {
repo = "swift-corelibs-libdispatch";
@ -95,7 +95,7 @@ let
};
swift = fetch {
repo = "swift";
sha256 = "1flvr12bg8m4k44yq0xy9qrllv5rpxgxisjgbpakk5p3myfsx7ky";
sha256 = "1ydx11pkvaasgjbr29lnha0lpnak758gd5l0aqzmp3q6mcyvfm7a";
};
};
@ -287,6 +287,7 @@ stdenv.mkDerivation rec {
# Swift doesn't support 32bit Linux, unknown on other platforms.
platforms = platforms.linux;
badPlatforms = platforms.i686;
broken = stdenv.isAarch64; # 2018-09-04, never built on Hydra
};
}

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