forked from mirrors/nixpkgs
Merge branch 'master' into staging
This commit is contained in:
Luca Bruno
commit
b83aceaecb
19
doc/meta.xml
19
doc/meta.xml
|
|
@ -121,10 +121,11 @@ interpretation:</para>
|
|||
<varlistentry>
|
||||
<term><varname>license</varname></term>
|
||||
<listitem><para>The license for the package. One from attribute set defined in
|
||||
<link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/lib/licenses.nix">
|
||||
<link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix">
|
||||
<filename>nixpkgs/lib/licenses.nix</filename></link>.
|
||||
Example:
|
||||
<literal>stdenv.lib.licenses.gpl3</literal>.</para></listitem>
|
||||
See details in <xref linkend='sec-meta-license'/>,
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
|
|
@ -133,7 +134,7 @@ interpretation:</para>
|
|||
maintainers of this Nix expression. If
|
||||
you would like to be a maintainer of a package, you may want to add
|
||||
yourself to <link
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/lib/maintainers.nix"><filename>nixpkgs/lib/maintainers.nix</filename></link>
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/maintainers.nix"><filename>nixpkgs/lib/maintainers.nix</filename></link>
|
||||
and write something like <literal>[ stdenv.lib.maintainers.alice
|
||||
stdenv.lib.maintainers.bob ]</literal>.</para></listitem>
|
||||
</varlistentry>
|
||||
|
|
@ -159,8 +160,8 @@ interpretation:</para>
|
|||
meta.platforms = stdenv.lib.platforms.linux;
|
||||
</programlisting>
|
||||
|
||||
Attribute Set <varname>stdenv.lib.platforms</varname> in
|
||||
<link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/lib/platforms.nix">
|
||||
Attribute Set <varname>stdenv.lib.platforms</varname> in
|
||||
<link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/platforms.nix">
|
||||
<filename>nixpkgs/lib/platforms.nix</filename></link> defines various common
|
||||
lists of platforms types.
|
||||
</para></listitem>
|
||||
|
|
@ -202,9 +203,15 @@ meta.hydraPlatforms = [];
|
|||
|
||||
<section xml:id="sec-meta-license"><title>Licenses</title>
|
||||
|
||||
<para>The <varname>meta.license</varname> attribute could be one of the
|
||||
following:
|
||||
<para>The <varname>meta.license</varname> attribute should preferrably contain
|
||||
a value from <varname>stdenv.lib.licenses</varname> defined in
|
||||
<link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix">
|
||||
<filename>nixpkgs/lib/licenses.nix</filename></link>,
|
||||
or in-place license description of the same format if the license is
|
||||
unlikely to be useful in another expression.
|
||||
|
||||
A few generic options are available, although it's typically better
|
||||
to indicate the specific license:
|
||||
<variablelist>
|
||||
|
||||
<varlistentry>
|
||||
|
|
|
|||
327
lib/licenses.nix
327
lib/licenses.nix
|
|
@ -1,25 +1,24 @@
|
|||
{
|
||||
/* License identifiers loosely based on: http://fedoraproject.org/wiki/Licensing
|
||||
let
|
||||
spdx = lic: lic // {
|
||||
url = "http://spdx.org/licenses/${lic.shortName}";
|
||||
};
|
||||
in
|
||||
|
||||
rec {
|
||||
/* License identifiers from spdx.org where possible.
|
||||
* If you cannot find your license here, then look for a similar license or
|
||||
* add it to this list. The URL mentioned above is a good source for inspiration.
|
||||
*/
|
||||
|
||||
artistic2 = {
|
||||
shortName = "Artistic 2.0";
|
||||
fullName = "Artistic 2.0";
|
||||
url = "http://opensource.org/licenses/artistic-license-2.0.php";
|
||||
};
|
||||
|
||||
agpl3 = {
|
||||
shortName = "AGPLv3";
|
||||
fullName = "GNU Affero General Public License version 3 only";
|
||||
url = https://www.gnu.org/licenses/agpl.html;
|
||||
agpl3 = spdx {
|
||||
shortName = "AGPL-3.0";
|
||||
fullName = "GNU Affero General Public License v3.0";
|
||||
};
|
||||
|
||||
agpl3Plus = {
|
||||
shortName = "AGPLv3+";
|
||||
fullName = "GNU Affero General Public License version 3 or later";
|
||||
url = https://www.gnu.org/licenses/agpl.html;
|
||||
shortName = "AGPL-3.0+";
|
||||
fullName = "GNU Affero General Public License v3.0 or later";
|
||||
inherit (agpl3) url;
|
||||
};
|
||||
|
||||
amd = {
|
||||
|
|
@ -28,126 +27,149 @@
|
|||
url = http://developer.amd.com/amd-license-agreement/;
|
||||
};#
|
||||
|
||||
apsl20 = {
|
||||
shortName = "APSL 2.0";
|
||||
apsl20 = spdx {
|
||||
shortName = "APSL-2.0";
|
||||
fullName = "Apple Public Source License 2.0";
|
||||
url = http://opensource.org/licenses/APSL-2.0;
|
||||
};
|
||||
|
||||
asl20 = {
|
||||
shortName = "ASL2.0";
|
||||
fullName = "Apache Software License 2.0";
|
||||
url = http://www.apache.org/licenses/LICENSE-2.0;
|
||||
artistic2 = spdx {
|
||||
shortName = "Artistic-2.0";
|
||||
fullName = "Artistic License 2.0";
|
||||
};
|
||||
|
||||
boost = {
|
||||
shortName = "boost";
|
||||
fullName = "Boost Software License";
|
||||
url = http://www.boost.org/LICENSE_1_0.txt;
|
||||
asl20 = spdx {
|
||||
shortName = "Apache-2.0";
|
||||
fullName = "Apache License 2.0";
|
||||
};
|
||||
|
||||
bsd2 = {
|
||||
shortName = "BSD-2";
|
||||
fullName = "BSD license (2 clause)";
|
||||
url = http://opensource.org/licenses/BSD-2-Clause;
|
||||
boost = spdx {
|
||||
shortName = "BSL-1.0";
|
||||
fullName = "Boost Software License 1.0";
|
||||
};
|
||||
|
||||
bsd3 = {
|
||||
shortName = "BSD-3";
|
||||
fullName = "BSD license (3 clause)";
|
||||
url = http://opensource.org/licenses/BSD-3-Clause;
|
||||
bsd2 = spdx {
|
||||
shortName = "BSD-2-Clause";
|
||||
fullName = ''BSD 2-clause "Simplified" License'';
|
||||
};
|
||||
|
||||
bsdOriginal = {
|
||||
shortName = "BSD-original";
|
||||
fullName = "Original BSD license with advertising clause";
|
||||
url = https://fedoraproject.org/wiki/Licensing/BSD;
|
||||
bsd3 = spdx {
|
||||
shortName = "BSD-3-Clause";
|
||||
fullName = ''BSD 3-clause "New" or "Revised" License'';
|
||||
};
|
||||
|
||||
cc-by-30 = {
|
||||
shortName = "CC BY 3.0";
|
||||
bsdOriginal = spdx {
|
||||
shortName = "BSD-4-Clause";
|
||||
fullName = ''BSD 4-clause "Original" or "Old" License'';
|
||||
};
|
||||
|
||||
cc-by-30 = spdx {
|
||||
shortName = "CC-BY-3.0";
|
||||
fullName = "Creative Commons Attribution 3.0";
|
||||
url = http://creativecommons.org/licenses/by/3.0;
|
||||
};
|
||||
|
||||
cddl = {
|
||||
shortName = "CDDL";
|
||||
fullName = "Common Development Distribution License ";
|
||||
url = http://www.opensolaris.org/os/licensing/cddllicense.txt;
|
||||
cddl = spdx {
|
||||
shortName = "CDDL-1.0";
|
||||
fullName = "Common Development and Distribution License 1.0";
|
||||
};
|
||||
|
||||
cpl10 = {
|
||||
shortName = "CPL 1.0";
|
||||
fullName = "Common Public License version 1.0";
|
||||
url = http://www.eclipse.org/legal/cpl-v10.html;
|
||||
cecill-c = spdx {
|
||||
shortName = "CECILL-C";
|
||||
fullName = "CeCILL-C Free Software License Agreement";
|
||||
};
|
||||
|
||||
epl10 = {
|
||||
shortName = "EPL 1.0";
|
||||
fullName = "Eclipse Public License version 1.0";
|
||||
url = http://www.eclipse.org/legal/epl-v10.html;
|
||||
cpl10 = spdx {
|
||||
shortName = "CPL-1.0";
|
||||
fullName = "Common Public License 1.0";
|
||||
};
|
||||
|
||||
epl10 = spdx {
|
||||
shortName = "EPL-1.0";
|
||||
fullName = "Eclipse Public License 1.0";
|
||||
};
|
||||
|
||||
free = "free";
|
||||
|
||||
gpl2 = {
|
||||
shortName = "GPLv2";
|
||||
fullName = "GNU General Public License version 2";
|
||||
url = http://www.gnu.org/licenses/old-licenses/gpl-2.0.html;
|
||||
gpl2 = spdx {
|
||||
shortName = "GPL-2.0";
|
||||
fullName = "GNU General Public License v2.0 only";
|
||||
};
|
||||
|
||||
gpl2Oss = {
|
||||
shortName = "GPLv2+OSS";
|
||||
shortName = "GPL-2.0-with-OSS";
|
||||
fullName = "GNU General Public License version 2 only (with OSI approved licenses linking exception)";
|
||||
url = http://www.mysql.com/about/legal/licensing/foss-exception;
|
||||
};
|
||||
|
||||
gpl2Plus = {
|
||||
shortName = "GPLv2+";
|
||||
fullName = "GNU General Public License version 2 or later";
|
||||
url = http://www.gnu.org/licenses/old-licenses/gpl-2.0.html;
|
||||
gpl2Plus = spdx {
|
||||
shortName = "GPL-2.0+";
|
||||
fullName = "GNU General Public License v2.0 or later";
|
||||
};
|
||||
|
||||
gpl3 = {
|
||||
shortName = "GPLv3";
|
||||
fullName = "GNU General Public License version 3 only";
|
||||
url = http://www.fsf.org/licensing/licenses/gpl.html;
|
||||
gpl3 = spdx {
|
||||
shortName = "GPL-3.0";
|
||||
fullName = "GNU General Public License v3.0 only";
|
||||
};
|
||||
|
||||
gpl3Plus = {
|
||||
shortName = "GPLv3+";
|
||||
fullName = "GNU General Public License version 3 or later";
|
||||
url = http://www.fsf.org/licensing/licenses/gpl.html;
|
||||
gpl3Plus = spdx {
|
||||
shortName = "GPL-3.0+";
|
||||
fullName = "GNU General Public License v3.0 or later";
|
||||
};
|
||||
|
||||
gpl3ClasspathPlus = {
|
||||
shortName = "GPLv3+classpath+";
|
||||
fullName = "GNU General Public License version 3 or later (with Classpath exception)";
|
||||
shortName = "GPL-3.0+-with-classpath-exception";
|
||||
fullName = "GNU General Public License v3.0 or later (with Classpath exception)";
|
||||
url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception;
|
||||
};
|
||||
|
||||
isc = {
|
||||
inria = {
|
||||
shortName = "INRIA-NCLA";
|
||||
fullName = "INRIA Non-Commercial License Agreement";
|
||||
url = "http://compcert.inria.fr/doc/LICENSE";
|
||||
};
|
||||
|
||||
ipa = spdx {
|
||||
shortName = "IPA";
|
||||
fullName = "IPA Font License";
|
||||
};
|
||||
|
||||
ipl10 = spdx {
|
||||
shortName = "IPL-1.0";
|
||||
fullName = "IBM Public License v1.0";
|
||||
};
|
||||
|
||||
isc = spdx {
|
||||
shortName = "ISC";
|
||||
fullName = "Internet Systems Consortium License";
|
||||
url = http://www.opensource.org/licenses/ISC;
|
||||
fullName = "ISC License";
|
||||
};
|
||||
|
||||
ipa = {
|
||||
shortName = "IPA 1.0";
|
||||
fullName = "IPA Font License v1.0";
|
||||
url = http://ipafont.ipa.go.jp/ipafont/;
|
||||
lgpl2 = spdx {
|
||||
shortName = "LGPL-2.0";
|
||||
fullName = "GNU Library General Public License v2 only";
|
||||
};
|
||||
|
||||
ipl10 = {
|
||||
shortName = "IPL 1.0";
|
||||
fullName = "IBM Public License Version 1.0";
|
||||
url = http://www.ibm.com/developerworks/opensource/library/os-i18n2/os-ipl.html;
|
||||
lgpl2Plus = spdx {
|
||||
shortName = "LGPL-2.0+";
|
||||
fullName = "GNU Library General Public License v2 or later";
|
||||
};
|
||||
|
||||
ijg = {
|
||||
shortName = "IJG";
|
||||
fullName = "Independent JPEG Group License";
|
||||
url = https://fedoraproject.org/wiki/Licensing/IJG;
|
||||
lgpl21 = spdx {
|
||||
shortName = "LGPL-2.1";
|
||||
fullName = "GNU Library General Public License v2.1 only";
|
||||
};
|
||||
|
||||
lgpl21Plus = spdx {
|
||||
shortName = "LGPL-2.1+";
|
||||
fullName = "GNU Library General Public License v2.1 or later";
|
||||
};
|
||||
|
||||
lgpl3 = spdx {
|
||||
shortName = "LGPL-3.0";
|
||||
fullName = "GNU Lesser General Public License v3.0 only";
|
||||
};
|
||||
|
||||
lgpl3Plus = spdx {
|
||||
shortName = "LGPL-3.0+";
|
||||
fullName = "GNU Lesser General Public License v3.0 or later";
|
||||
};
|
||||
|
||||
libtiff = {
|
||||
|
|
@ -156,76 +178,47 @@
|
|||
url = https://fedoraproject.org/wiki/Licensing/libtiff;
|
||||
};
|
||||
|
||||
lgpl2 = {
|
||||
shortName = "LGPLv2";
|
||||
fullName = "GNU Library General Public License version 2";
|
||||
url = http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html;
|
||||
};
|
||||
|
||||
lgpl2Plus = {
|
||||
shortName = "LGPLv2+";
|
||||
fullName = "GNU Library General Public License version 2 or later";
|
||||
url = http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html;
|
||||
};
|
||||
|
||||
lgpl21 = {
|
||||
shortName = "LGPLv2.1";
|
||||
fullName = "GNU Lesser General Public License version 2.1";
|
||||
url = http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html;
|
||||
};
|
||||
|
||||
lgpl21Plus = {
|
||||
shortName = "LGPLv2.1+";
|
||||
fullName = "GNU Lesser General Public License version 2.1 or later";
|
||||
url = http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html;
|
||||
};
|
||||
|
||||
llgpl21 = {
|
||||
shortName = "LLGPLv2.1";
|
||||
shortName = "LLGPL-2.1";
|
||||
fullName = "Lisp LGPL; GNU Lesser General Public License version 2.1 with Franz Inc. preamble for clarification of LGPL terms in context of Lisp";
|
||||
url = http://opensource.franz.com/preamble.html;
|
||||
};
|
||||
|
||||
lgpl3 = {
|
||||
shortName = "LGPLv3";
|
||||
fullName = "GNU Lesser General Public License version 3 only";
|
||||
url = http://www.fsf.org/licensing/licenses/lgpl.html;
|
||||
};
|
||||
|
||||
lgpl3Plus = {
|
||||
shortName = "LGPLv3+";
|
||||
fullName = "GNU Lesser General Public License version 3 or later";
|
||||
url = http://www.fsf.org/licensing/licenses/lgpl.html;
|
||||
};
|
||||
|
||||
mit = {
|
||||
mit = spdx {
|
||||
shortName = "MIT";
|
||||
fullName = "MIT/X11 license";
|
||||
url = http://www.opensource.org/licenses/mit-license.php;
|
||||
fullName = "MIT License";
|
||||
};
|
||||
|
||||
mpl11 = {
|
||||
shortName = "MPL1.1";
|
||||
fullName = "Mozilla Public License version 1.1";
|
||||
url = http://www.mozilla.org/MPL/MPL-1.1.html;
|
||||
mpl11 = spdx {
|
||||
shortName = "MPL-1.1";
|
||||
fullName = "Mozilla Public License 1.1";
|
||||
};
|
||||
|
||||
mpl20 = {
|
||||
shortName = "MPL2.0";
|
||||
fullName = "Mozilla Public License version 2.0";
|
||||
url = https://www.mozilla.org/MPL/2.0;
|
||||
mpl20 = spdx {
|
||||
shortName = "MPL-2.0";
|
||||
fullName = "Mozilla Public License 2.0";
|
||||
};
|
||||
|
||||
ofl = {
|
||||
shortName = "OFL";
|
||||
fullName = "SIL Open Font License";
|
||||
url = "http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL_web";
|
||||
msrla = {
|
||||
shortName = "MSR-LA";
|
||||
fullName = "Microsoft Research License Agreement";
|
||||
url = "http://research.microsoft.com/en-us/projects/pex/msr-la.txt";
|
||||
};
|
||||
|
||||
openssl = {
|
||||
shortName = "openssl";
|
||||
fullName = "OpenSSL license";
|
||||
url = http://www.openssl.org/source/license.html;
|
||||
ofl = spdx {
|
||||
shortName = "OFL-1.1";
|
||||
fullName = "SIL Open Font License 1.1";
|
||||
};
|
||||
|
||||
openssl = spdx {
|
||||
shortName = "OpenSSL";
|
||||
fullName = "OpenSSL License";
|
||||
};
|
||||
|
||||
psfl = spdx {
|
||||
shortName = "Python-2.0";
|
||||
fullName = "Python Software Foundation License version 2";
|
||||
#url = http://docs.python.org/license.html;
|
||||
};
|
||||
|
||||
publicDomain = {
|
||||
|
|
@ -233,10 +226,9 @@
|
|||
fullname = "Public Domain";
|
||||
};
|
||||
|
||||
psfl = {
|
||||
shortName = "PSFL";
|
||||
fullName = "Python Software Foundation License";
|
||||
url = http://docs.python.org/license.html;
|
||||
sleepycat = spdx {
|
||||
shortName = "Sleepycat";
|
||||
fullName = "Sleepycat License";
|
||||
};
|
||||
|
||||
tcltk = {
|
||||
|
|
@ -257,45 +249,20 @@
|
|||
url = https://fedoraproject.org/wiki/Licensing:Wadalab?rd=Licensing/Wadalab;
|
||||
};
|
||||
|
||||
zlib = {
|
||||
shortName = "zlib";
|
||||
fullName = "zlib license";
|
||||
url = http://www.gzip.org/zlib/zlib_license.html;
|
||||
zlib = spdx {
|
||||
shortName = "Zlib";
|
||||
fullName = "zlib License";
|
||||
};
|
||||
|
||||
zpt20 = {
|
||||
shortName = "ZPT2.0";
|
||||
zpt20 = spdx { # FIXME: why zpt* instead of zpl*
|
||||
shortName = "ZPL-2.0";
|
||||
fullName = "Zope Public License 2.0";
|
||||
url = "http://old.zope.org/Resources/License/ZPL-2.0";
|
||||
};
|
||||
|
||||
zpt21 = {
|
||||
shortName = "ZPT2.1";
|
||||
zpt21 = spdx {
|
||||
shortName = "ZPL-2.1";
|
||||
fullName = "Zope Public License 2.1";
|
||||
url = "http://old.zope.org/Resources/License/ZPL-2.1";
|
||||
};
|
||||
|
||||
sleepycat = {
|
||||
shortName = "Sleepycat";
|
||||
fullName = "Sleepycat Public License";
|
||||
url = "https://en.wikipedia.org/wiki/Sleepycat_License";
|
||||
};
|
||||
|
||||
cecill-c = {
|
||||
shortName = "CeCILL-C";
|
||||
fullName = "CEA CNRS INRIA Logiciel Libre";
|
||||
url = "http://www.cecill.info/licences.en.html";
|
||||
};
|
||||
|
||||
msrla = {
|
||||
shortName = "MSR-LA";
|
||||
fullName = "Microsoft Research License Agreement";
|
||||
url = "http://research.microsoft.com/en-us/projects/pex/msr-la.txt";
|
||||
};
|
||||
|
||||
inria = {
|
||||
shortName = "INRIA-NCLA";
|
||||
fullName = "INRIA Non-Commercial License Agreement";
|
||||
url = "http://compcert.inria.fr/doc/LICENSE";
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@
|
|||
goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
|
||||
guibert = "David Guibert <david.guibert@gmail.com>";
|
||||
hinton = "Tom Hinton <t@larkery.com>";
|
||||
hrdinka = "Christoph Hrdinka <c.nix@hrdinka.at>";
|
||||
ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>";
|
||||
iElectric = "Domen Kozar <domen@dev.si>";
|
||||
iyzsong = "Song Wenwu <iyzsong@gmail.com>";
|
||||
|
|
@ -63,6 +64,7 @@
|
|||
madjar = "Georges Dubus <georges.dubus@compiletoi.net>";
|
||||
marcweber = "Marc Weber <marco-oweber@gmx.de>";
|
||||
matejc = "Matej Cotman <cotman.matej@gmail.com>";
|
||||
meisternu = "Matt Miemiec <meister@krutt.org>";
|
||||
modulistic = "Pablo Costa <modulistic@gmail.com>";
|
||||
mornfall = "Petr Ročkai <me@mornfall.net>";
|
||||
msackman = "Matthew Sackman <matthew@wellquite.org>";
|
||||
|
|
|
|||
|
|
@ -80,12 +80,12 @@ in {
|
|||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pulseaudio;
|
||||
example = literalExample "pulseaudio.override { jackaudioSupport = true; }";
|
||||
default = pulseaudioFull;
|
||||
example = literalExample "pulseaudioFull";
|
||||
description = ''
|
||||
The PulseAudio derivation to use. This can be used to enable
|
||||
features (such as JACK support) that are not enabled in the
|
||||
default PulseAudio in Nixpkgs.
|
||||
The PulseAudio derivation to use. This can be used to disable
|
||||
features (such as JACK support, Bluetooth) that are enabled in the
|
||||
pulseaudioFull package in Nixpkgs.
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -139,6 +139,8 @@
|
|||
polipo = 129;
|
||||
mopidy = 130;
|
||||
unifi = 131;
|
||||
gdm = 132;
|
||||
dhcpd = 133;
|
||||
|
||||
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
|
||||
|
||||
|
|
@ -252,6 +254,8 @@
|
|||
polipo = 129;
|
||||
mopidy = 130;
|
||||
docker = 131;
|
||||
gdm = 132;
|
||||
tss = 133;
|
||||
|
||||
# When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399!
|
||||
|
||||
|
|
|
|||
|
|
@ -50,6 +50,7 @@
|
|||
./programs/bash/bash.nix
|
||||
./programs/bash/command-not-found.nix
|
||||
./programs/blcr.nix
|
||||
./programs/dconf.nix
|
||||
./programs/environment.nix
|
||||
./programs/info.nix
|
||||
./programs/screen.nix
|
||||
|
|
@ -125,6 +126,7 @@
|
|||
./services/hardware/pcscd.nix
|
||||
./services/hardware/pommed.nix
|
||||
./services/hardware/sane.nix
|
||||
./services/hardware/tcsd.nix
|
||||
./services/hardware/thinkfan.nix
|
||||
./services/hardware/udev.nix
|
||||
./services/hardware/udisks2.nix
|
||||
|
|
@ -279,6 +281,7 @@
|
|||
./services/x11/desktop-managers/default.nix
|
||||
./services/x11/display-managers/auto.nix
|
||||
./services/x11/display-managers/default.nix
|
||||
./services/x11/display-managers/gdm.nix
|
||||
./services/x11/display-managers/kdm.nix
|
||||
./services/x11/display-managers/lightdm.nix
|
||||
./services/x11/display-managers/slim.nix
|
||||
|
|
@ -290,6 +293,7 @@
|
|||
#./services/x11/window-managers/compiz.nix
|
||||
./services/x11/window-managers/default.nix
|
||||
./services/x11/window-managers/icewm.nix
|
||||
./services/x11/window-managers/bspwm.nix
|
||||
./services/x11/window-managers/metacity.nix
|
||||
./services/x11/window-managers/none.nix
|
||||
./services/x11/window-managers/twm.nix
|
||||
|
|
|
|||
34
nixos/modules/programs/dconf.nix
Normal file
34
nixos/modules/programs/dconf.nix
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
{ config, lib, ... }:
|
||||
|
||||
let
|
||||
inherit (lib) mkOption mkIf types mapAttrsToList;
|
||||
cfg = config.programs.dconf;
|
||||
|
||||
mkDconfProfile = name: path:
|
||||
{ source = path; target = "dconf/profile/${name}"; };
|
||||
|
||||
in
|
||||
{
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
programs.dconf = {
|
||||
|
||||
profiles = mkOption {
|
||||
type = types.attrsOf types.path;
|
||||
default = {};
|
||||
description = "Set of dconf profile files.";
|
||||
internal = true;
|
||||
};
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf (cfg.profiles != {}) {
|
||||
environment.etc =
|
||||
(mapAttrsToList mkDconfProfile cfg.profiles);
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -30,7 +30,8 @@ with lib;
|
|||
|
||||
description = "Hardware RNG Entropy Gatherer Daemon";
|
||||
|
||||
serviceConfig.ExecStart = "${pkgs.rng_tools}/sbin/rngd -f";
|
||||
serviceConfig.ExecStart = "${pkgs.rng_tools}/sbin/rngd -f -v" +
|
||||
(if config.services.tcsd.enable then " --no-tpm=1" else "");
|
||||
|
||||
restartTriggers = [ pkgs.rng_tools ];
|
||||
};
|
||||
|
|
|
|||
139
nixos/modules/services/hardware/tcsd.nix
Normal file
139
nixos/modules/services/hardware/tcsd.nix
Normal file
|
|
@ -0,0 +1,139 @@
|
|||
# tcsd daemon.
|
||||
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
with pkgs.lib;
|
||||
let
|
||||
|
||||
cfg = config.services.tcsd;
|
||||
|
||||
tcsdConf = pkgs.writeText "tcsd.conf" ''
|
||||
port = 30003
|
||||
num_threads = 10
|
||||
system_ps_file = ${cfg.stateDir}/system.data
|
||||
# This is the log of each individual measurement done by the system.
|
||||
# By re-calculating the PCR registers based on this information, even
|
||||
# finer details about the measured environment can be inferred than
|
||||
# what is available directly from the PCR registers.
|
||||
firmware_log_file = /sys/kernel/security/tpm0/binary_bios_measurements
|
||||
kernel_log_file = /sys/kernel/security/ima/binary_runtime_measurements
|
||||
#firmware_pcrs = 0,1,2,3,4,5,6,7
|
||||
#kernel_pcrs = 10,11
|
||||
platform_cred = ${cfg.platformCred}
|
||||
conformance_cred = ${cfg.conformanceCred}
|
||||
endorsement_cred = ${cfg.endorsementCred}
|
||||
#remote_ops = create_key,random
|
||||
#host_platform_class = server_12
|
||||
#all_platform_classes = pc_11,pc_12,mobile_12
|
||||
'';
|
||||
|
||||
in
|
||||
{
|
||||
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
|
||||
services.tcsd = {
|
||||
|
||||
enable = mkOption {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
description = ''
|
||||
Whether to enable tcsd, a Trusted Computing management service
|
||||
that provides TCG Software Stack (TSS). The tcsd daemon is
|
||||
the only portal to the Trusted Platform Module (TPM), a hardware
|
||||
chip on the motherboard.
|
||||
'';
|
||||
};
|
||||
|
||||
user = mkOption {
|
||||
default = "tss";
|
||||
type = types.string;
|
||||
description = "User account under which tcsd runs.";
|
||||
};
|
||||
|
||||
group = mkOption {
|
||||
default = "tss";
|
||||
type = types.string;
|
||||
description = "Group account under which tcsd runs.";
|
||||
};
|
||||
|
||||
stateDir = mkOption {
|
||||
default = "/var/lib/tpm";
|
||||
type = types.path;
|
||||
description = ''
|
||||
The location of the system persistent storage file.
|
||||
The system persistent storage file holds keys and data across
|
||||
restarts of the TCSD and system reboots.
|
||||
'';
|
||||
};
|
||||
|
||||
platformCred = mkOption {
|
||||
default = "${cfg.stateDir}/platform.cert";
|
||||
type = types.path;
|
||||
description = ''
|
||||
Path to the platform credential for your TPM. Your TPM
|
||||
manufacturer may have provided you with a set of credentials
|
||||
(certificates) that should be used when creating identities
|
||||
using your TPM. When a user of your TPM makes an identity,
|
||||
this credential will be encrypted as part of that process.
|
||||
See the 1.1b TPM Main specification section 9.3 for information
|
||||
on this process. '';
|
||||
};
|
||||
|
||||
conformanceCred = mkOption {
|
||||
default = "${cfg.stateDir}/conformance.cert";
|
||||
type = types.path;
|
||||
description = ''
|
||||
Path to the conformance credential for your TPM.
|
||||
See also the platformCred option'';
|
||||
};
|
||||
|
||||
endorsementCred = mkOption {
|
||||
default = "${cfg.stateDir}/endorsement.cert";
|
||||
type = types.path;
|
||||
description = ''
|
||||
Path to the endorsement credential for your TPM.
|
||||
See also the platformCred option'';
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
environment.systemPackages = [ pkgs.trousers ];
|
||||
|
||||
# system.activationScripts.tcsd =
|
||||
# ''
|
||||
# chown ${cfg.user}:${cfg.group} ${tcsdConf}
|
||||
# '';
|
||||
|
||||
systemd.services.tcsd = {
|
||||
description = "TCSD";
|
||||
after = [ "systemd-udev-settle.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
path = [ pkgs.trousers ];
|
||||
preStart =
|
||||
''
|
||||
mkdir -m 0700 -p ${cfg.stateDir}
|
||||
chown -R ${cfg.user}:${cfg.group} ${cfg.stateDir}
|
||||
'';
|
||||
serviceConfig.ExecStart = "${pkgs.trousers}/sbin/tcsd -f -c ${tcsdConf}";
|
||||
};
|
||||
|
||||
users.extraUsers = optionalAttrs (cfg.user == "tss") (singleton
|
||||
{ name = "tss";
|
||||
group = "tss";
|
||||
uid = config.ids.uids.nginx;
|
||||
});
|
||||
|
||||
users.extraGroups = optionalAttrs (cfg.group == "tss") (singleton
|
||||
{ name = "tss";
|
||||
gid = config.ids.gids.nginx;
|
||||
});
|
||||
};
|
||||
}
|
||||
|
|
@ -13,7 +13,7 @@ let
|
|||
default-lease-time 600;
|
||||
max-lease-time 7200;
|
||||
authoritative;
|
||||
ddns-update-style ad-hoc;
|
||||
ddns-update-style interim;
|
||||
log-facility local1; # see dhcpd.nix
|
||||
|
||||
${cfg.extraConfig}
|
||||
|
|
@ -108,22 +108,41 @@ in
|
|||
|
||||
config = mkIf config.services.dhcpd.enable {
|
||||
|
||||
jobs.dhcpd =
|
||||
users = {
|
||||
extraUsers.dhcpd = {
|
||||
uid = config.ids.uids.dhcpd;
|
||||
description = "DHCP daemon user";
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services.dhcpd =
|
||||
{ description = "DHCP server";
|
||||
|
||||
startOn = "started network-interfaces";
|
||||
stopOn = "stopping network-interfaces";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
script =
|
||||
after = [ "network.target" ];
|
||||
|
||||
path = [ pkgs.dhcp ];
|
||||
|
||||
preStart =
|
||||
''
|
||||
mkdir -m 755 -p ${stateDir}
|
||||
|
||||
touch ${stateDir}/dhcpd.leases
|
||||
|
||||
exec ${pkgs.dhcp}/sbin/dhcpd -f -cf ${configFile} \
|
||||
-lf ${stateDir}/dhcpd.leases \
|
||||
${toString cfg.interfaces}
|
||||
mkdir -m 755 -p /run/dhcpd
|
||||
chown dhcpd /run/dhcpd
|
||||
'';
|
||||
|
||||
serviceConfig =
|
||||
{ ExecStart = "@${pkgs.dhcp}/sbin/dhcpd dhcpd"
|
||||
+ " -pf /run/dhcpd/dhcpd.pid -cf ${configFile}"
|
||||
+ " -lf ${stateDir}/dhcpd.leases -user dhcpd -group nogroup"
|
||||
+ " ${toString cfg.interfaces}";
|
||||
Restart = "always";
|
||||
Type = "forking";
|
||||
PIDFile = "/run/dhcpd/dhcpd.pid";
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -9,9 +9,9 @@ let
|
|||
cfg = config.services.lighttpd;
|
||||
|
||||
needModRedirect = cfg.gitweb.enable;
|
||||
needModAlias = cfg.cgit.enable or cfg.gitweb.enable;
|
||||
needModSetenv = cfg.cgit.enable or cfg.gitweb.enable;
|
||||
needModCgi = cfg.cgit.enable or cfg.gitweb.enable;
|
||||
needModAlias = cfg.cgit.enable || cfg.gitweb.enable;
|
||||
needModSetenv = cfg.cgit.enable || cfg.gitweb.enable;
|
||||
needModCgi = cfg.cgit.enable || cfg.gitweb.enable;
|
||||
needModStatus = cfg.mod_status;
|
||||
needModUserdir = cfg.mod_userdir;
|
||||
|
||||
|
|
|
|||
|
|
@ -35,6 +35,14 @@ in {
|
|||
description = "Enable Gnome 3 desktop manager.";
|
||||
};
|
||||
|
||||
services.xserver.desktopManager.gnome3.sessionPath = mkOption {
|
||||
default = [];
|
||||
example = "[ pkgs.gnome3.gpaste ]";
|
||||
description = "Additional list of packages to be added to the session search path.
|
||||
Useful for gnome shell extensions or gsettings-conditionated autostart.";
|
||||
apply = list: list ++ [ gnome3.gnome_shell ];
|
||||
};
|
||||
|
||||
environment.gnome3.packageSet = mkOption {
|
||||
default = pkgs.gnome3;
|
||||
example = literalExample "pkgs.gnome3_12";
|
||||
|
|
@ -86,10 +94,19 @@ in {
|
|||
|
||||
export XDG_MENU_PREFIX=gnome
|
||||
|
||||
# Don't let epiphany depend upon gnome-shell
|
||||
# Don't let gnome-session depend upon vino (for .desktop autostart condition)
|
||||
${concatMapStrings (p: ''
|
||||
if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then
|
||||
export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name}
|
||||
fi
|
||||
|
||||
if [ -d "${p}/lib/girepository-1.0" ]; then
|
||||
export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib
|
||||
fi
|
||||
'') cfg.sessionPath}
|
||||
|
||||
# Override default mimeapps
|
||||
export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${gnome3.gnome_shell}/share/gsettings-schemas/${gnome3.gnome_shell.name}:${gnome3.vino}/share/gsettings-schemas/${gnome3.vino.name}:${mimeAppsList}/share
|
||||
export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${mimeAppsList}/share
|
||||
|
||||
# Let gnome-control-center find gnome-shell search providers
|
||||
export GNOME_SEARCH_PROVIDERS_DIR=${config.system.path}/share/gnome-shell/search-providers/
|
||||
|
|
@ -123,7 +140,7 @@ in {
|
|||
gnome3.gnome_settings_daemon
|
||||
gnome3.gnome_shell
|
||||
gnome3.gnome_themes_standard
|
||||
] ++ (removePackagesByName [
|
||||
] ++ cfg.sessionPath ++ (removePackagesByName [
|
||||
gnome3.baobab
|
||||
gnome3.empathy
|
||||
gnome3.eog
|
||||
|
|
|
|||
151
nixos/modules/services/x11/display-managers/gdm.nix
Normal file
151
nixos/modules/services/x11/display-managers/gdm.nix
Normal file
|
|
@ -0,0 +1,151 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
|
||||
cfg = config.services.xserver.displayManager;
|
||||
gdm = pkgs.gnome3_12.gdm; # gdm 3.10 not supported
|
||||
gnome3 = config.environment.gnome3.packageSet;
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
|
||||
services.xserver.displayManager.gdm = {
|
||||
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
example = true;
|
||||
description = ''
|
||||
Whether to enable GDM as the display manager.
|
||||
<emphasis>GDM is very experimental and may render system unusable.</emphasis>
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf cfg.gdm.enable {
|
||||
|
||||
services.xserver.displayManager.slim.enable = false;
|
||||
|
||||
users.extraUsers.gdm =
|
||||
{ name = "gdm";
|
||||
uid = config.ids.uids.gdm;
|
||||
group = "gdm";
|
||||
home = "/run/gdm";
|
||||
description = "GDM user";
|
||||
};
|
||||
|
||||
users.extraGroups.gdm.gid = config.ids.gids.gdm;
|
||||
|
||||
services.xserver.displayManager.job =
|
||||
{
|
||||
environment = {
|
||||
GDM_X_SERVER = "${cfg.xserverBin} ${cfg.xserverArgs}";
|
||||
GDM_SESSIONS_DIR = "${cfg.session.desktops}";
|
||||
XDG_CONFIG_DIRS = "${gnome3.gnome_settings_daemon}/etc/xdg";
|
||||
};
|
||||
execCmd = "exec ${gdm}/sbin/gdm";
|
||||
};
|
||||
|
||||
# Because sd_login_monitor_new requires /run/systemd/machines
|
||||
systemd.services.display-manager.wants = [ "systemd-machined.service" ];
|
||||
systemd.services.display-manager.after = [ "systemd-machined.service" ];
|
||||
|
||||
systemd.services.display-manager.path = [ gnome3.gnome_shell gnome3.caribou ];
|
||||
|
||||
services.dbus.packages = [ gdm ];
|
||||
|
||||
programs.dconf.profiles.gdm = "${gdm}/share/dconf/profile/gdm";
|
||||
|
||||
# GDM LFS PAM modules, adapted somehow to NixOS
|
||||
security.pam.services = {
|
||||
gdm-launch-environment.text = ''
|
||||
auth required pam_succeed_if.so audit quiet_success user = gdm
|
||||
auth optional pam_permit.so
|
||||
|
||||
account required pam_succeed_if.so audit quiet_success user = gdm
|
||||
account sufficient pam_unix.so
|
||||
|
||||
password required pam_deny.so
|
||||
|
||||
session required pam_succeed_if.so audit quiet_success user = gdm
|
||||
session required pam_env.so envfile=${config.system.build.pamEnvironment}
|
||||
session optional ${pkgs.systemd}/lib/security/pam_systemd.so
|
||||
session optional pam_keyinit.so force revoke
|
||||
session optional pam_permit.so
|
||||
'';
|
||||
|
||||
gdm.text = ''
|
||||
auth requisite pam_nologin.so
|
||||
auth required pam_env.so
|
||||
|
||||
auth required pam_succeed_if.so uid >= 1000 quiet
|
||||
auth optional ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
|
||||
auth sufficient pam_unix.so nullok likeauth
|
||||
auth required pam_deny.so
|
||||
|
||||
account sufficient pam_unix.so
|
||||
|
||||
password requisite pam_unix.so nullok sha512
|
||||
|
||||
session required pam_env.so envfile=${config.system.build.pamEnvironment}
|
||||
session required pam_unix.so
|
||||
session required pam_loginuid.so
|
||||
session optional ${pkgs.systemd}/lib/security/pam_systemd.so
|
||||
session optional ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start
|
||||
'';
|
||||
|
||||
gdm-password.text = ''
|
||||
auth requisite pam_nologin.so
|
||||
auth required pam_env.so envfile=${config.system.build.pamEnvironment}
|
||||
|
||||
auth required pam_succeed_if.so uid >= 1000 quiet
|
||||
auth optional ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
|
||||
auth sufficient pam_unix.so nullok likeauth
|
||||
auth required pam_deny.so
|
||||
|
||||
account sufficient pam_unix.so
|
||||
|
||||
password requisite pam_unix.so nullok sha512
|
||||
|
||||
session required pam_env.so envfile=${config.system.build.pamEnvironment}
|
||||
session required pam_unix.so
|
||||
session required pam_loginuid.so
|
||||
session optional ${pkgs.systemd}/lib/security/pam_systemd.so
|
||||
session optional ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start
|
||||
'';
|
||||
|
||||
gdm-autologin.text = ''
|
||||
auth requisite pam_nologin.so
|
||||
|
||||
auth required pam_succeed_if.so uid >= 1000 quiet
|
||||
auth required pam_permit.so
|
||||
|
||||
account sufficient pam_unix.so
|
||||
|
||||
password requisite pam_unix.so nullok sha512
|
||||
|
||||
session optional pam_keyinit.so revoke
|
||||
session required pam_env.so envfile=${config.system.build.pamEnvironment}
|
||||
session required pam_unix.so
|
||||
session required pam_loginuid.so
|
||||
session optional ${pkgs.systemd}/lib/security/pam_systemd.so
|
||||
'';
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
29
nixos/modules/services/x11/window-managers/bspwm.nix
Normal file
29
nixos/modules/services/x11/window-managers/bspwm.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.xserver.windowManager.bspwm;
|
||||
in
|
||||
|
||||
{
|
||||
options = {
|
||||
services.xserver.windowManager.bspwm.enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
example = true;
|
||||
description = "Enable the bspwm window manager.";
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.xserver.windowManager.session = singleton {
|
||||
name = "bspwm";
|
||||
start = "
|
||||
${pkgs.sxhkd}/bin/sxhkd &
|
||||
${pkgs.bspwm}/bin/bspwm
|
||||
";
|
||||
};
|
||||
environment.systemPackages = [ pkgs.bspwm ];
|
||||
};
|
||||
}
|
||||
|
|
@ -17,6 +17,7 @@ in
|
|||
./xmonad.nix
|
||||
./i3.nix
|
||||
./herbstluftwm.nix
|
||||
./bspwm.nix
|
||||
];
|
||||
|
||||
options = {
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
let withSpotify = config.clementine.spotify or false;
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "clementine-1.2.1";
|
||||
name = "clementine-1.2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://clementine-player.googlecode.com/files/clementine-1.2.1.tar.gz;
|
||||
sha256 = "0kk5cjmb8nirx0im3c0z91af2k72zxi6lwzm6rb57qihya5nwmfv";
|
||||
url = https://github.com/clementine-player/Clementine/archive/1.2.3.tar.gz;
|
||||
sha256 = "1gx1109i4pylz6x7gvp4rdzc6dvh0w6in6hfbygw01d08l26bxbx";
|
||||
};
|
||||
|
||||
patches = [ ./clementine-1.2.1-include-paths.patch ];
|
||||
|
|
@ -40,6 +40,8 @@ stdenv.mkDerivation {
|
|||
usbmuxd
|
||||
] ++ stdenv.lib.optional withSpotify libspotify;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://www.clementine-player.org";
|
||||
description = "A multiplatform music player";
|
||||
|
|
@ -47,6 +49,6 @@ stdenv.mkDerivation {
|
|||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.ttuegel ];
|
||||
# libspotify is unfree
|
||||
hydraPlatforms = optional (!withSpotify) platforms.linux;
|
||||
hydraPlatforms = optionals (!withSpotify) platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
pythonPackages.buildPythonPackage rec {
|
||||
name = "mopidy-moped-${version}";
|
||||
|
||||
version = "0.3.1";
|
||||
version = "0.3.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/martijnboland/moped/archive/v${version}.tar.gz";
|
||||
sha256 = "0sjp8vr4yfyjx233gamhg0p67zjnlpc9yq3szbw897igsh23j2yr";
|
||||
sha256 = "19f3asqx7wmla53nhrxzdwj6qlkjv2rcwh34jxp27bz7nkhn0ihv";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ mopidy ];
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
pythonPackages.buildPythonPackage rec {
|
||||
name = "mopidy-${version}";
|
||||
|
||||
version = "0.19.0";
|
||||
version = "0.19.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mopidy/mopidy/archive/v${version}.tar.gz";
|
||||
sha256 = "10cnc1bipr0brk7478201cgm71lp5bci3qiaadyxv9hhcn0nmn9b";
|
||||
sha256 = "0rjq69vqak1d6fhvih259wmwp50xgr6x0x5nd0hl6hlkbbysc8dp";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ let
|
|||
desktopName = "PyCharm";
|
||||
genericName = "Powerful Python and Django IDE";
|
||||
categories = "Application;Development;";
|
||||
icon = "pycharm";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper patchelf p7zip ];
|
||||
|
|
@ -39,8 +40,9 @@ let
|
|||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -vp "$out/bin" "$out/$name"
|
||||
mkdir -vp "$out/bin" "$out/$name" "$out/share/pixmaps"
|
||||
cp -va . "$out/$name"
|
||||
ln -s "$out/$name/bin/pycharm.png" "$out/share/pixmaps/"
|
||||
|
||||
jdk="${jdk}/lib/openjdk"
|
||||
makeWrapper "$out/$name/bin/pycharm.sh" "$out/bin/pycharm" \
|
||||
|
|
@ -52,12 +54,12 @@ let
|
|||
cp -a "${desktopItem}"/* "$out"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://www.jetbrains.com/pycharm/";
|
||||
inherit description;
|
||||
inherit license;
|
||||
maintainers = [ stdenv.lib.maintainers.jgeerds ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ maintainers.jgeerds ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,25 +1,37 @@
|
|||
{stdenv, fetchurl, panotools, cmake, wxGTK, libtiff, libpng, openexr, boost
|
||||
, pkgconfig, exiv2, gettext, ilmbase, enblendenfuse, autopanosiftc, mesa
|
||||
, freeglut, glew, libXmu, libXi, tclap }:
|
||||
{ stdenv, cmake, fetchurl, gnumake, pkgconfig
|
||||
, boost, gettext, tclap, wxGTK
|
||||
, freeglut, glew, libXi, libXmu, mesa
|
||||
, autopanosiftc, enblendenfuse, exiv2, ilmbase, lensfun, libpng, libtiff
|
||||
, openexr, panotools, perlPackages
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "hugin-2011.4.0";
|
||||
name = "hugin-2013.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/hugin/${name}.tar.bz2";
|
||||
sha256 = "1bnxljgqxzfdz14l7y29wzi52x1a38mghsjavnr28fr4vfmqwjrf";
|
||||
sha256 = "1mgbvg09xvf0zcm9jfv5lb65nd292l86ffa23yp4pzm6izaiwkj8";
|
||||
};
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
|
||||
|
||||
#NIX_LDFLAGS = "-lrt";
|
||||
buildInputs = [ boost gettext tclap wxGTK
|
||||
freeglut glew libXi libXmu mesa
|
||||
exiv2 ilmbase lensfun libtiff libpng openexr panotools
|
||||
];
|
||||
|
||||
buildInputs = [ panotools wxGTK libtiff libpng openexr boost tclap
|
||||
exiv2 gettext ilmbase mesa freeglut glew libXmu libXi ];
|
||||
# disable installation of the python scripting interface
|
||||
cmakeFlags = [ "-DBUILD_HSI:BOOl=OFF" ];
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
|
||||
propagatedUserEnvPackages = [ enblendenfuse autopanosiftc ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# commandline tools needed by the hugin batch processor
|
||||
# you may have to tell hugin (in the preferences) where these binaries reside
|
||||
propagatedUserEnvPackages = [ autopanosiftc enblendenfuse gnumake
|
||||
perlPackages.ImageExifTool
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p "$out/nix-support"
|
||||
|
|
@ -32,6 +44,5 @@ stdenv.mkDerivation rec {
|
|||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = http://www.kipi-plugins.org;
|
||||
inherit (kdelibs.meta) platforms;
|
||||
maintainers = with stdenv.lib.maintainers; [ viric urkud ];
|
||||
broken = true; # it should be build from digikam sources, perhaps together
|
||||
};
|
||||
}
|
||||
|
|
|
|||
26
pkgs/applications/graphics/luminance-hdr/default.nix
Normal file
26
pkgs/applications/graphics/luminance-hdr/default.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ stdenv, cmake, fetchurl, pkgconfig, qt5, boost, exiv2, fftwFloat, gsl
|
||||
, ilmbase, lcms2, libraw, libtiff, openexr
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "luminance-hdr-2.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/qtpfsgui/${name}.tar.bz2";
|
||||
sha256 = "00fldbcizrx8jcnjgq74n3zmbm27dxzl96fxa7q49689mfnlw08l";
|
||||
};
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
|
||||
|
||||
buildInputs = [ qt5 boost exiv2 fftwFloat gsl ilmbase lcms2 libraw libtiff openexr ];
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://qtpfsgui.sourceforge.net/;
|
||||
description = "A complete open source solution for HDR photography";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.hrdinka ];
|
||||
};
|
||||
}
|
||||
|
|
@ -29,13 +29,6 @@ stdenv.mkDerivation rec {
|
|||
substituteInPlace */doc/manpage/blender.1.py --replace /usr/bin/python ${python}/bin/python3
|
||||
'';
|
||||
|
||||
patches = [(fetchpatch { # fix parallel builds
|
||||
url = "https://developer.blender.org/D619?download=true";
|
||||
sha256 = "18h4fqsbpwxzqz7qby18lrrbzqnyd5xnann3xcac5wddwv5wjb0f";
|
||||
name = "D619.diff";
|
||||
})];
|
||||
patchFlags = "-p0";
|
||||
|
||||
cmakeFlags =
|
||||
[ "-DOPENEXR_INC=${openexr}/include/OpenEXR"
|
||||
"-DWITH_OPENCOLLADA=OFF"
|
||||
|
|
|
|||
|
|
@ -1,18 +1,15 @@
|
|||
{ stdenv, fetchgit, coreutils , unzip, which, pkgconfig , dbus
|
||||
{ stdenv, fetchurl, coreutils , unzip, which, pkgconfig , dbus
|
||||
, freetype, xdg_utils , libXext, glib, pango , cairo, libX11, libnotify
|
||||
, libxdg_basedir , libXScrnSaver, xproto, libXinerama , perl, gdk_pixbuf
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
rev = "6a3a855b48a3db64821d1cf8a91c5ee2815a2b2d";
|
||||
name = "dunst-0-${stdenv.lib.strings.substring 0 7 rev}";
|
||||
name = "dunst-1.1.0";
|
||||
version = "1.1.0";
|
||||
|
||||
# 1.0.0 release doesn't include 100% CPU fix
|
||||
# https://github.com/knopwob/dunst/issues/98
|
||||
src = fetchgit {
|
||||
inherit rev;
|
||||
url = "https://github.com/knopwob/dunst.git";
|
||||
sha256 = "0m7yki16d72xm9n2m2fjszd8phqpn5b95q894cz75pmd0sv1j6bj";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/knopwob/dunst/archive/v${version}.tar.gz";
|
||||
sha256 = "0x95f57s0a96c4lifxdpf73v706iggwmdw8742mabbjnxq55l1qs";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
@ -26,7 +23,7 @@ stdenv.mkDerivation rec {
|
|||
libXScrnSaver xproto libXinerama perl];
|
||||
|
||||
buildPhase = ''
|
||||
export VERSION=${rev};
|
||||
export VERSION=${version};
|
||||
export PREFIX=$out;
|
||||
make dunst;
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ fetchurl, stdenv, texLive, python, makeWrapper, pkgconfig
|
||||
, libX11, qt4, enchant #, mythes, boost
|
||||
{ fetchurl, stdenv, pkgconfig, python, file, bc
|
||||
, qt4, hunspell, makeWrapper #, mythes, boost
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.0.7";
|
||||
version = "2.1.1";
|
||||
name = "lyx-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${name}.tar.xz";
|
||||
sha256 = "0qp8xqmlafib4hispjgl1friln0w3s05mi20sjfzaxnl6jkvv5q5";
|
||||
url = "ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/${name}.tar.xz";
|
||||
sha256 = "1fir1dzzy7c92jf3a3psnd10c6widslk0852xk4svpl6phcg4nya";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
|
@ -18,18 +18,29 @@ stdenv.mkDerivation rec {
|
|||
#"--without-included-mythes" # such a small library isn't worth a separate package
|
||||
];
|
||||
|
||||
# LaTeX is used from $PATH, as people often want to have it with extra pkgs
|
||||
buildInputs = [
|
||||
texLive qt4 python makeWrapper pkgconfig
|
||||
enchant # mythes boost
|
||||
pkgconfig qt4 python file/*for libmagic*/ bc
|
||||
hunspell makeWrapper # enchant
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
# python is run during runtime to do various tasks
|
||||
postFixup = ''
|
||||
sed '1s:/usr/bin/python:${python}/bin/python:'
|
||||
|
||||
wrapProgram "$out/bin/lyx" \
|
||||
--prefix PATH : '${python}/bin'
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "WYSIWYM frontend for LaTeX, DocBook";
|
||||
homepage = "http://www.lyx.org";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = [ stdenv.lib.maintainers.vcunat ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.vcunat ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
homepage = http://www.x.org/;
|
||||
description = "Allows testing the fonts available in an X server";
|
||||
licesnse = "free";
|
||||
license = "free";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
homepage = http://www.x.org/;
|
||||
description = "Lists the fonts available in the X server";
|
||||
licesnse = "free";
|
||||
license = "free";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -23,6 +23,6 @@ cabal.mkDerivation (self: {
|
|||
homepage = "http://xmobar.org";
|
||||
description = "A Minimalistic Text Based Status Bar";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
platforms = self.stdenv.lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -23,11 +23,11 @@ stdenv.mkDerivation {
|
|||
--prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://portix.bitbucket.org/dwb/;
|
||||
description = "A lightweight web browser based on the webkit web browser engine and the gtk toolkit";
|
||||
platforms = stdenv.lib.platforms.mesaPlatforms;
|
||||
maintainers = [ stdenv.lib.maintainers.pSub ];
|
||||
license = "GPL";
|
||||
platforms = platforms.mesaPlatforms;
|
||||
maintainers = with maintainers;[ pSub ];
|
||||
license = licenses.gpl3;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "vimb-${version}";
|
||||
version = "2.4";
|
||||
version = "2.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/fanglingsu/vimb/archive/${version}.tar.gz";
|
||||
sha256 = "167ilbsd4y4zl493k6g4j5v85y784qz8z7qflzd1ccsjjznv7fm8";
|
||||
sha256 = "1g6zm5fk3k52jk3vbbzj7rm0kanykd4zgxrqhlvj3qzj2nsn4a21";
|
||||
};
|
||||
|
||||
# Nixos default ca bundle
|
||||
|
|
|
|||
|
|
@ -25,9 +25,9 @@ let
|
|||
else if stdenv.system == "i686-linux" then "ld-linux.so.2"
|
||||
else throw "Dropbox client for: ${stdenv.system} not supported!";
|
||||
|
||||
version = "2.6.2";
|
||||
sha256 = if stdenv.system == "x86_64-linux" then "0j511nglqg2xngyl78ww7xk09v8yzhghk5cnj6slr9sldy83n7g9"
|
||||
else if stdenv.system == "i686-linux" then "0n0y0wf313yjas4b89ag613jb80skby1qmfkyy1aazgjancf7v5i"
|
||||
version = "2.10.27";
|
||||
sha256 = if stdenv.system == "x86_64-linux" then "0l5fkmcr5jc0sm9xm4gshhdn3a7c9ff8qf60vjbiz3gn3n7asjvv"
|
||||
else if stdenv.system == "i686-linux" then "0gn1lx97z4wr1clyjd3y8r6bvwni47rc84zl20s3lsalmm25srh7"
|
||||
else throw "Dropbox client for: ${stdenv.system} not supported!";
|
||||
|
||||
# relative location where the dropbox libraries are stored
|
||||
|
|
@ -56,10 +56,9 @@ in stdenv.mkDerivation {
|
|||
name = "dropbox-${version}-bin";
|
||||
src = fetchurl {
|
||||
name = "dropbox-${version}.tar.gz";
|
||||
# using version-specific URL so if the version is no longer available,
|
||||
# build will fail without having to finish downloading first
|
||||
# url = "http://www.dropbox.com/download?plat=lnx.${arch}";
|
||||
url = "http://dl-web.dropbox.com/u/17/dropbox-lnx.${arch}-${version}.tar.gz";
|
||||
|
||||
# I found the URLs here: https://forums.dropbox.com/topic.php?id=118678
|
||||
url = "https://d1ilhw0800yew8.cloudfront.net/client/dropbox-lnx.${arch}-${version}.tar.gz";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
|
|
@ -71,13 +70,13 @@ in stdenv.mkDerivation {
|
|||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/${appdir}"
|
||||
cp -r ".dropbox-dist/"* "$out/${appdir}/"
|
||||
cp -r ".dropbox-dist/dropbox-lnx.${arch}-${version}"/* "$out/${appdir}/"
|
||||
mkdir -p "$out/bin"
|
||||
ln -s "$out/${appdir}/dropbox" "$out/bin/dropbox"
|
||||
|
||||
patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} \
|
||||
"$out/${appdir}/dropbox"
|
||||
|
||||
|
||||
RPATH=${ldpath}:${gcc.gcc}/lib:$out/${appdir}
|
||||
echo "updating rpaths to: $RPATH"
|
||||
find "$out/${appdir}" -type f -a -perm +0100 \
|
||||
|
|
@ -87,8 +86,6 @@ in stdenv.mkDerivation {
|
|||
cp "${desktopItem}/share/applications/"* $out/share/applications
|
||||
'';
|
||||
|
||||
buildInputs = [ patchelf ];
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.dropbox.com";
|
||||
description = "Online stored folders (daemon version)";
|
||||
|
|
|
|||
|
|
@ -15,6 +15,10 @@ stdenv.mkDerivation {
|
|||
|
||||
configureFlags = "CPPFLAGS=-DQT_NO_DEBUG";
|
||||
|
||||
preConfigure = ''
|
||||
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${phonon}/lib64/pkgconfig:${phonon}/lib32/pkgconfig"
|
||||
'';
|
||||
|
||||
cmakeFlags = "-DENABLE_AUTODOWNLOAD=OFF -DBUILD_DESCRIPTION='NixOS' -DCMAKE_BUILD_TYPE=Release";
|
||||
|
||||
prePatch = ''
|
||||
|
|
|
|||
|
|
@ -1,8 +1,10 @@
|
|||
args : with args;
|
||||
args : with args;
|
||||
let version = "1.5.0";
|
||||
in
|
||||
rec {
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/pidgin-latex/pidgin-latex-1.2.1.tar.bz2;
|
||||
sha256 = "19h76fwsx5y30l5wda2930k10r385aipngfljz5bdi7b9y52lii7";
|
||||
url = "mirror://sourceforge/pidgin-latex/pidgin-latex_${version}.tar.bz2";
|
||||
sha256 = "9c850aee90d7e59de834f83e09fa6e3e51b123f06e265ead70957608ada95441";
|
||||
};
|
||||
|
||||
buildInputs = [texLive pkgconfig gtk imagemagick glib pidgin which];
|
||||
|
|
@ -33,8 +35,8 @@ rec {
|
|||
|
||||
/* doConfigure should be specified separately */
|
||||
phaseNames = [ "preBuild" "doMakeInstall" "postInstall"];
|
||||
|
||||
name = "pidgin-latex-1.2.1";
|
||||
|
||||
name = "pidgin-latex-${version}";
|
||||
meta = {
|
||||
description = "LaTeX rendering plugin for Pidgin IM";
|
||||
priority = "10";
|
||||
|
|
|
|||
35
pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
Normal file
35
pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
{ stdenv, fetchurl, cmake, pkgconfig, qt4, boost, bzip2, libX11, pcre, libidn, lua5, miniupnpc, aspell, gettext }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "eiskaltdcpp-2.2.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://eiskaltdc.googlecode.com/files/${name}.tar.xz";
|
||||
sha256 = "3d9170645450f9cb0a605278b8646fec2110b9637910d86fd27cf245cbe24eaf";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake pkgconfig qt4 boost bzip2 libX11 pcre libidn lua5 miniupnpc aspell gettext ];
|
||||
|
||||
cmakeFlags = ''
|
||||
-DUSE_ASPELL=ON
|
||||
-DUSE_QT_QML=ON
|
||||
-DFREE_SPACE_BAR_C=ON
|
||||
-DUSE_MINIUPNP=ON
|
||||
-DDBUS_NOTIFY=ON
|
||||
-DUSE_JS=ON
|
||||
-DPERL_REGEX=ON
|
||||
-DUSE_CLI_XMLRPC=ON
|
||||
-DWITH_SOUNDS=ON
|
||||
-DLUA_SCRIPT=ON
|
||||
-DWITH_LUASCRIPTS=ON
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A cross-platform program that uses the Direct Connect and ADC protocols";
|
||||
homepage = https://code.google.com/p/eiskaltdc/;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
23
pkgs/applications/science/misc/fityk/default.nix
Normal file
23
pkgs/applications/science/misc/fityk/default.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ stdenv, fetchurl, wxGTK30, boost, lua, zlib, bzip2, xylib, readline, gnuplot }:
|
||||
|
||||
let
|
||||
name = "fityk";
|
||||
version = "1.2.9";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "${name}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/wojdyr/fityk/releases/download/v${version}/${name}-${version}.tar.bz2";
|
||||
sha256 = "1gl938nd2jyya8b3gzbagm1jab2mkc9zvr6zsg5d0vkfdqlk0pv1";
|
||||
};
|
||||
|
||||
buildInputs = [wxGTK30 boost lua zlib bzip2 xylib readline gnuplot ];
|
||||
|
||||
meta = {
|
||||
description = "Fityk -- curve fitting and peak fitting software";
|
||||
license = "GPL2";
|
||||
homepage = http://fityk.nieto.pl/;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,20 +1,19 @@
|
|||
{ fetchurl, stdenv, cmake, perl, ruby }:
|
||||
{ fetchurl, stdenv, cmake, perl, ruby, boost, lua5_1, graphviz, libsigcxx
|
||||
, libunwind, elfutils
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "simgrid-3.5";
|
||||
version = "3.11.1";
|
||||
name = "simgrid-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gforge.inria.fr/frs/download.php/28017/${name}.tar.gz";
|
||||
sha256 = "1vd4pvrcyii1nfwyca3kpbwshbc965lfpn083zd8rigg6ydchq8y";
|
||||
url = "https://gforge.inria.fr/frs/download.php/33686/${name}.tar.gz";
|
||||
sha256 = "0mkrzxpf42lmn96khfl1791vram67r2nqsgmppd2yil889nyz5kp";
|
||||
};
|
||||
|
||||
/* FIXME: Ruby currently disabled because of this:
|
||||
|
||||
Linking C shared library ../src/.libs/libsimgrid.so
|
||||
ld: cannot find -lruby-1.8.7-p72
|
||||
|
||||
*/
|
||||
buildInputs = [ cmake perl /* ruby */ ];
|
||||
buildInputs = [ cmake perl ruby boost lua5_1 graphviz libsigcxx libunwind
|
||||
elfutils
|
||||
];
|
||||
|
||||
preConfigure =
|
||||
# Make it so that libsimgrid.so will be found when running programs from
|
||||
|
|
@ -22,8 +21,17 @@ stdenv.mkDerivation rec {
|
|||
'' export LD_LIBRARY_PATH="$PWD/src/.libs"
|
||||
export cmakeFlags="-Dprefix=$out"
|
||||
|
||||
# Enable tracing.
|
||||
export cmakeFlags="$cmakeFlags -Denable_tracing=on"
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE
|
||||
-isystem $(echo "${libsigcxx}/lib/"sigc++*/include)
|
||||
-isystem $(echo "${libsigcxx}/include"/sigc++* )
|
||||
"
|
||||
export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH:$(echo "${libsigcxx}/lib/"sigc++*)"
|
||||
|
||||
# Enable more functionality.
|
||||
export cmakeFlags="$cmakeFlags -Denable_tracing=on -Denable_jedule=on
|
||||
-Denable_latency_bound_tracking=on -Denable_lua=on
|
||||
-Denable_ns3=on -Denable_gtnets=on
|
||||
"
|
||||
'';
|
||||
|
||||
makeFlags = "VERBOSE=1";
|
||||
|
|
@ -45,6 +53,7 @@ stdenv.mkDerivation rec {
|
|||
patchPhase =
|
||||
'' for i in "src/smpi/"*
|
||||
do
|
||||
test -f "$i" &&
|
||||
sed -i "$i" -e's|/bin/bash|/bin/sh|g'
|
||||
done
|
||||
|
||||
|
|
|
|||
|
|
@ -21,5 +21,7 @@ cabal.mkDerivation (self: {
|
|||
description = "backs up everything github knows about a repository, to the repository";
|
||||
license = "GPL";
|
||||
platforms = self.ghc.meta.platforms;
|
||||
hydraPlatforms = self.stdenv.lib.platforms.none;
|
||||
broken = true;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -22,11 +22,11 @@ assert portaudioSupport -> (portaudio != null);
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "aegisub-${version}";
|
||||
version = "3.1.3";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.aegisub.org/pub/releases/${name}.tar.xz";
|
||||
sha256 = "0n2y5cggayr8246p2cvrz0ajlhhvmzcgsp7nljnm21jypk15pspg";
|
||||
sha256 = "0nciw5p1aq94qwz5j4vbc06fywdjhazgh4qs6qr9iqj3n94gvrfr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ intltool ];
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
|||
# Add a ‘qemu-kvm’ wrapper for compatibility/convenience.
|
||||
p="$out/bin/qemu-system-${if stdenv.system == "x86_64-linux" then "x86_64" else "i386"}"
|
||||
if [ -e "$p" ]; then
|
||||
makeWrapper "$p" $out/bin/qemu-kvm --add-flags "-enable-kvm"
|
||||
makeWrapper "$p" $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"
|
||||
fi
|
||||
'';
|
||||
|
||||
|
|
|
|||
23
pkgs/applications/window-managers/bar/default.nix
Normal file
23
pkgs/applications/window-managers/bar/default.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ stdenv, fetchurl, git, perl, libxcb, libXinerama, xcbutil, xcbutilwm, xcbutilkeysyms }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "bar-1.0";
|
||||
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/LemonBoy/bar/archive/v1.0.tar.gz";
|
||||
sha256 = "1n2vak2acs37sslxl250cnz9c3irif5z4s54wi9qjyxbfzr2h2nc";
|
||||
};
|
||||
|
||||
buildInputs = [ libxcb git perl libXinerama xcbutil xcbutilkeysyms xcbutilwm ];
|
||||
|
||||
prePatch = ''sed -i "s@/usr@$out@" Makefile'';
|
||||
|
||||
meta = {
|
||||
description = "A lightweight xcb based bar";
|
||||
homepage = "https://github.com/LemonBoy/bar";
|
||||
maintainers = stdenv.lib.maintainers.meisternu;
|
||||
license = "Custom";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
29
pkgs/applications/window-managers/bspwm/default.nix
Normal file
29
pkgs/applications/window-managers/bspwm/default.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ stdenv, fetchurl, libxcb, libXinerama, sxhkd, xcbutil, xcbutilkeysyms, xcbutilwm }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "bspwm-0.8.9";
|
||||
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/baskerville/bspwm/archive/0.8.9.tar.gz";
|
||||
sha256 = "750c76132914661d8d5edf7809e9b601977215d31e747dd780c60fd562913d55";
|
||||
};
|
||||
|
||||
buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ];
|
||||
|
||||
buildPhase = ''
|
||||
make PREFIX=$out
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
make PREFIX=$out install
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A tiling window manager based on binary space partitioning";
|
||||
homepage = "http://github.com/baskerville/bspwm";
|
||||
maintainers = stdenv.lib.maintainers.meisternu;
|
||||
license = "BSD";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
27
pkgs/applications/window-managers/sxhkd/default.nix
Normal file
27
pkgs/applications/window-managers/sxhkd/default.nix
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{ stdenv, fetchurl, asciidoc, libxcb, xcbutil, xcbutilkeysyms, xcbutilwm }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sxhkd-0.5.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/baskerville/sxhkd/archive/0.5.4.tar.gz";
|
||||
sha256 = "de95f97155319ded41ece9403ac9e9f18bfdd914a09f553ab09b331bbfe5d332";
|
||||
};
|
||||
|
||||
buildInputs = [ asciidoc libxcb xcbutil xcbutilkeysyms xcbutilwm ];
|
||||
|
||||
buildPhase = ''
|
||||
make PREFIX=$out
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
make PREFIX=$out install
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Simple X hotkey daemon";
|
||||
homepage = "http://github.com/baskerville/sxhkd";
|
||||
license = "BSD";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -275,6 +275,7 @@ rec {
|
|||
postgresql = [
|
||||
ftp://ftp.postgresql.org/pub/
|
||||
ftp://ftp-archives.postgresql.org/pub/
|
||||
http://ftp.postgresql.org/pub/
|
||||
];
|
||||
|
||||
metalab = [
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@
|
|||
, ant ? pkgs.ant
|
||||
, jre ? pkgs.openjdk
|
||||
, hydraAntLogger ? pkgs.hydraAntLogger
|
||||
, zip ? pkgs.zip
|
||||
, unzip ? pkgs.unzip
|
||||
, ... } @ args:
|
||||
|
||||
let
|
||||
|
|
@ -45,7 +47,10 @@ stdenv.mkDerivation (
|
|||
'' else stdenv.lib.concatMapStrings (j: ''
|
||||
cp -v ${j} $out/share/java
|
||||
'') jars }
|
||||
|
||||
. ${./functions.sh}
|
||||
for j in $out/share/java/*.jar ; do
|
||||
canonicalizeJar $j
|
||||
echo file jar $j >> $out/nix-support/hydra-build-products
|
||||
done
|
||||
'';
|
||||
|
|
@ -95,7 +100,7 @@ stdenv.mkDerivation (
|
|||
{
|
||||
name = name + (if src ? version then "-" + src.version else "");
|
||||
|
||||
buildInputs = [ant jre] ++ stdenv.lib.optional (args ? buildInputs) args.buildInputs ;
|
||||
buildInputs = [ant jre zip unzip] ++ stdenv.lib.optional (args ? buildInputs) args.buildInputs ;
|
||||
|
||||
postHook = ''
|
||||
mkdir -p $out/nix-support
|
||||
|
|
|
|||
|
|
@ -8,6 +8,29 @@ findTarballs() {
|
|||
echo "$1"
|
||||
}
|
||||
|
||||
canonicalizeJarManifest() {
|
||||
local input=$1
|
||||
# http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#Notes_on_Manifest_and_Signature_Files
|
||||
(head -n 1 $input && tail -n +2 $input | sort | grep -v '^\s*$') > $input-tmp
|
||||
mv $input-tmp $input
|
||||
}
|
||||
|
||||
# Post-process a jar file to contain canonical timestamps and metadata ordering
|
||||
canonicalizeJar() {
|
||||
local input=$1
|
||||
local outer=$(pwd)
|
||||
unzip -qq $input -d $input-tmp
|
||||
canonicalizeJarManifest $input-tmp/META-INF/MANIFEST.MF
|
||||
# Set all timestamps to Jan 1 1980, which is the earliest date the zip format supports...
|
||||
find $input-tmp -exec touch -t 198001010000.00 {} +
|
||||
rm $input
|
||||
pushd $input-tmp
|
||||
zip -q -r -o -X $outer/tmp-out.jar . 2> /dev/null
|
||||
popd
|
||||
rm -rf $input-tmp
|
||||
mv $outer/tmp-out.jar $input
|
||||
}
|
||||
|
||||
propagateImageName() {
|
||||
mkdir -p $out/nix-support
|
||||
cat "$diskImage"/nix-support/full-name > $out/nix-support/full-name
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dconf-${version}";
|
||||
version = "0.18.0";
|
||||
version = "0.20.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/dconf/0.18/${name}.tar.xz";
|
||||
sha256 = "0mf921pnkhs8xn1dr2wxfq277vjsbkpl9cccv0gaz4460z31p6qh";
|
||||
url = "mirror://gnome/sources/dconf/0.20/${name}.tar.xz";
|
||||
sha256 = "22c046a247d05ea65ad181e3aef4009c898a5531f76c0181f8ec0dfef83447d9";
|
||||
};
|
||||
|
||||
buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2
|
||||
|
|
@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://wiki.gnome.org/action/show/Projects/dconf;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, intltool, accountsservice, libX11
|
||||
, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection, dconf }:
|
||||
{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus
|
||||
, intltool, accountsservice, libX11, gnome3, systemd, gnome_session
|
||||
, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gdm-3.12.2";
|
||||
|
|
@ -9,10 +10,33 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "cc91fff5afd2a7c3e712c960a0b60744774167dcfc16f486372e1eb3c0aa1cc4";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig glib itstool libxml2 intltool accountsservice dconf
|
||||
gobjectIntrospection libX11 gtk libcanberra_gtk3 pam libtool ];
|
||||
# Only needed to make it build
|
||||
preConfigure = ''
|
||||
substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X"
|
||||
'';
|
||||
|
||||
configureFlags = [ "--localstatedir=/var" "--with-systemd=yes"
|
||||
"--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
|
||||
|
||||
buildInputs = [ pkgconfig glib itstool libxml2 intltool
|
||||
accountsservice gnome3.dconf systemd
|
||||
gobjectIntrospection libX11 gtk
|
||||
libcanberra_gtk3 pam libtool ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preBuild = ''
|
||||
substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session'
|
||||
substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.tools}/bin/dbus-launch'
|
||||
'';
|
||||
|
||||
# Disable Access Control because our X does not support FamilyServerInterpreted yet
|
||||
patches = [ ./xserver_path.patch ./sessions_dir.patch ./disable_x_access_control.patch ./propagate_xdgconfigdirs.patch ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://wiki.gnome.org/Projects/GDM;
|
||||
description = "A program that manages graphical display servers and handles graphical user logins";
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.lethalman ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,18 @@
|
|||
diff --git a/daemon/gdm-slave.c b/daemon/gdm-slave.c
|
||||
index 1afe48e..e3d1ec2 100644
|
||||
--- a/daemon/gdm-slave.c
|
||||
+++ b/daemon/gdm-slave.c
|
||||
@@ -291,9 +291,10 @@ gdm_slave_connect_to_x11_display (GdmSlave *slave)
|
||||
|
||||
gdm_error_trap_push ();
|
||||
|
||||
- for (i = 0; i < G_N_ELEMENTS (host_entries); i++) {
|
||||
+ /*for (i = 0; i < G_N_ELEMENTS (host_entries); i++) {
|
||||
XAddHost (slave->priv->server_display, &host_entries[i]);
|
||||
- }
|
||||
+ }*/
|
||||
+ XDisableAccessControl(slave->priv->server_display);
|
||||
|
||||
XSync (slave->priv->server_display, False);
|
||||
if (gdm_error_trap_pop ()) {
|
||||
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
--- a/daemon/gdm-launch-environment.c 2014-08-03 12:05:39.380178964 +0200
|
||||
+++ b/daemon/gdm-launch-environment.c 2014-08-03 12:08:26.570182517 +0200
|
||||
@@ -224,6 +224,7 @@
|
||||
NULL
|
||||
};
|
||||
char *system_data_dirs;
|
||||
+ char *system_config_dirs;
|
||||
int i;
|
||||
|
||||
load_lang_config_file (LANG_CONFIG_FILE,
|
||||
@@ -251,6 +252,15 @@
|
||||
system_data_dirs));
|
||||
g_free (system_data_dirs);
|
||||
|
||||
+ system_config_dirs = g_strjoinv (":", (char **) g_get_system_config_dirs ());
|
||||
+
|
||||
+ g_hash_table_insert (hash,
|
||||
+ g_strdup ("XDG_CONFIG_DIRS"),
|
||||
+ g_strdup_printf ("%s",
|
||||
+ system_config_dirs));
|
||||
+ g_free (system_config_dirs);
|
||||
+
|
||||
+
|
||||
g_hash_table_insert (hash, g_strdup ("XAUTHORITY"), g_strdup (launch_environment->priv->x11_authority_file));
|
||||
|
||||
g_hash_table_insert (hash, g_strdup ("LOGNAME"), g_strdup (launch_environment->priv->user_name));
|
||||
17
pkgs/desktops/gnome-3/3.12/core/gdm/sessions_dir.patch
Normal file
17
pkgs/desktops/gnome-3/3.12/core/gdm/sessions_dir.patch
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
|
||||
index f759d2d..d154716 100644
|
||||
--- a/daemon/gdm-session.c
|
||||
+++ b/daemon/gdm-session.c
|
||||
@@ -373,9 +373,12 @@ get_system_session_dirs (void)
|
||||
#ifdef ENABLE_WAYLAND_SUPPORT
|
||||
DATADIR "/wayland-sessions/",
|
||||
#endif
|
||||
+ NULL,
|
||||
NULL
|
||||
};
|
||||
|
||||
+ search_dirs[4] = getenv("GDM_SESSIONS_DIR") != NULL ? getenv("GDM_SESSIONS_DIR") : NULL;
|
||||
+
|
||||
return search_dirs;
|
||||
}
|
||||
|
||||
15
pkgs/desktops/gnome-3/3.12/core/gdm/xserver_path.patch
Normal file
15
pkgs/desktops/gnome-3/3.12/core/gdm/xserver_path.patch
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
--- a/daemon/gdm-server.c 2014-07-30 23:00:17.786841724 +0200
|
||||
+++ b/daemon/gdm-server.c 2014-07-30 23:02:10.491239180 +0200
|
||||
@@ -322,7 +322,11 @@
|
||||
fallback:
|
||||
#endif
|
||||
|
||||
- server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
|
||||
+ if (g_getenv("GDM_X_SERVER") != NULL) {
|
||||
+ server->priv->command = g_strdup (g_getenv("GDM_X_SERVER"));
|
||||
+ } else {
|
||||
+ server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
|
||||
+ }
|
||||
}
|
||||
|
||||
static gboolean
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
{ fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret
|
||||
, python, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns, at_spi2_core
|
||||
, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip
|
||||
, hicolor_icon_theme
|
||||
, pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper
|
||||
, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }:
|
||||
|
||||
|
|
@ -20,6 +21,7 @@ stdenv.mkDerivation rec {
|
|||
clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns
|
||||
libXtst p11_kit networkmanagerapplet gjs mutter pulseaudio caribou evolution_data_server
|
||||
libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm gnome_control_center
|
||||
hicolor_icon_theme gnome_icon_theme gnome_icon_theme_symbolic
|
||||
at_spi2_core upower ibus gnome_session gnome_desktop telepathy_logger gnome3.gnome_settings_daemon ];
|
||||
|
||||
installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper
|
||||
, hicolor_icon_theme, gnome3
|
||||
, libnotify, file, telepathy_glib, dbus_glib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -14,11 +15,12 @@ stdenv.mkDerivation rec {
|
|||
doCheck = true;
|
||||
|
||||
buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify
|
||||
hicolor_icon_theme gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic
|
||||
dbus_glib telepathy_glib file makeWrapper ];
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram "$out/libexec/vino-server" \
|
||||
--prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
|
||||
--prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -237,5 +237,7 @@ rec {
|
|||
|
||||
gnome-tweak-tool = callPackage ./misc/gnome-tweak-tool { };
|
||||
|
||||
gpaste = callPackage ./misc/gpaste { };
|
||||
|
||||
gtkhtml = callPackage ./misc/gtkhtml { };
|
||||
}
|
||||
|
|
|
|||
44
pkgs/desktops/gnome-3/3.12/misc/gpaste/default.nix
Normal file
44
pkgs/desktops/gnome-3/3.12/misc/gpaste/default.nix
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
{ stdenv, fetchurl, intltool, autoreconfHook, pkgconfig, vala, glib
|
||||
, pango, gtk3, gnome3, dbus, clutter, appdata-tools, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.12.2";
|
||||
name = "gpaste-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz";
|
||||
sha256 = "665c1d228c02148a8a1a5675d352cd4397a02c0c9992af2e9f0258dcc6b812ec";
|
||||
};
|
||||
|
||||
buildInputs = [ intltool autoreconfHook pkgconfig vala glib
|
||||
gtk3 gnome3.gnome_control_center dbus.libs
|
||||
clutter pango appdata-tools makeWrapper ];
|
||||
|
||||
preConfigure = "intltoolize -f";
|
||||
|
||||
configureFlags = [ "--with-controlcenterdir=$(out)/gnome-control-center/keybindings"
|
||||
"--with-dbusservicesdir=$(out)/share/dbus-1/services" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preFixup =
|
||||
let
|
||||
libPath = stdenv.lib.makeLibraryPath
|
||||
[ glib gtk3 clutter pango ];
|
||||
in
|
||||
''
|
||||
for i in $out/libexec/gpaste/*; do
|
||||
wrapProgram $i \
|
||||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
|
||||
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
|
||||
--prefix LD_LIBRARY_PATH : "${libPath}"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/Keruspe/GPaste;
|
||||
description = "Clipboard management system with GNOME3 integration";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -111,5 +111,7 @@ stdenv.mkDerivation rec {
|
|||
license = stdenv.lib.licenses.unfree;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,24 @@
|
|||
{ stdenv, fetchurl, ncurses, x11 }:
|
||||
let
|
||||
safeX11 = stdenv: !(stdenv.isArm || stdenv.isMips);
|
||||
in
|
||||
|
||||
{ stdenv, fetchurl, ncurses, buildEnv, libX11, xproto, useX11 ? safeX11 stdenv }:
|
||||
|
||||
if useX11 && !(safeX11 stdenv)
|
||||
then throw "x11 not available in ocaml with arm or mips arch"
|
||||
else # let the indentation flow
|
||||
|
||||
let
|
||||
useX11 = !stdenv.isArm && !stdenv.isMips;
|
||||
useNativeCompilers = !stdenv.isMips;
|
||||
inherit (stdenv.lib) optionals optionalString;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
x11env = buildEnv { name = "x11env"; paths = [libX11 xproto]; };
|
||||
x11lib = x11env + "/lib";
|
||||
x11inc = x11env + "/include";
|
||||
|
||||
name = "ocaml-4.01.0";
|
||||
|
||||
src = fetchurl {
|
||||
|
|
@ -16,9 +27,11 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
prefixKey = "-prefix ";
|
||||
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ];
|
||||
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11lib
|
||||
"-x11include" x11inc ];
|
||||
|
||||
buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";
|
||||
buildInputs = [ncurses] ++ optionals useX11 [ x11 ];
|
||||
buildInputs = [ncurses] ++ optionals useX11 [ libX11 xproto ];
|
||||
installTargets = "install" + optionalString useNativeCompilers " installopt";
|
||||
preConfigure = ''
|
||||
CAT=$(type -tp cat)
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
{ stdenv, fetchurl, which, ocaml, perl, jdk
|
||||
, findlib, ocaml_ssl, openssl, cryptokit, camlzip, ulex
|
||||
, ocamlgraph, coreutils, zlib, ncurses, makeWrapper
|
||||
, gcc, binutils, gnumake } :
|
||||
, gcc, binutils, gnumake, nodejs, git } :
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opa";
|
||||
version = "962";
|
||||
version = "4308";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/MLstate/opalang/tarball/v${version}";
|
||||
name = "opa-${version}.tar.gz";
|
||||
sha256 = "0g4kq2kxbld0iqlzb076b7g43d8fh4sfxam615z15mbk1jcvpf9l";
|
||||
sha256 = "1farii9474i14ack6bpqm1jihs6i8pvwky3a7q8v8pbnl4i6lb5g";
|
||||
};
|
||||
|
||||
# Paths so the opa compiler code generation will use the same programs as were
|
||||
|
|
@ -23,18 +23,27 @@ stdenv.mkDerivation rec {
|
|||
find . -type f -exec sed -i 's@/usr/bin/perl@${perl}/bin/perl@' {} \;
|
||||
'';
|
||||
|
||||
patches = [ ./locate.patch ./libdir.patch ];
|
||||
patches = [];
|
||||
|
||||
preConfigure = ''
|
||||
configureFlags="$configureFlags -prefix $out"
|
||||
(
|
||||
cat ./compiler/buildinfos/buildInfos.ml.pre
|
||||
./compiler/buildinfos/generate_buildinfos.sh . --release --version ./compiler/buildinfos/version_major.txt
|
||||
echo let opa_git_version = ${version}
|
||||
echo 'let opa_git_sha = "xxxx"'
|
||||
cat ./compiler/buildinfos/buildInfos.ml.post
|
||||
)> ./compiler/buildinfos/buildInfos.ml
|
||||
'';
|
||||
|
||||
dontAddPrefix = true;
|
||||
|
||||
configureFlags = "-ocamlfind ${findlib}/bin/ocamlfind -openssl ${openssl}/lib";
|
||||
configureFlags = "-ocamlfind ${findlib}/bin/ocamlfind ";
|
||||
|
||||
buildInputs = [ which ocaml perl jdk findlib ocaml_ssl openssl cryptokit camlzip ulex
|
||||
ocamlgraph coreutils zlib ncurses makeWrapper gcc binutils gnumake ];
|
||||
ocamlgraph coreutils zlib ncurses makeWrapper gcc binutils gnumake
|
||||
nodejs git
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
# Have compiler use same tools for code generation as used to build it.
|
||||
|
|
@ -58,5 +67,14 @@ stdenv.mkDerivation rec {
|
|||
license = stdenv.lib.licenses.gpl3;
|
||||
maintainers = [ stdenv.lib.maintainers.kkallio ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
# File "compiler/libqmlcompil/dbGen/schema_io.ml", line 199, characters 3-53:
|
||||
# Error: Signature mismatch:
|
||||
# ...
|
||||
# The field `remove_edge_e' is required but not provided
|
||||
# The field `remove_edge' is required but not provided
|
||||
# The field `remove_vertex' is required but not provided
|
||||
# Command exited with code 2.
|
||||
# make: *** [node] Error 10
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ let
|
|||
|
||||
fsrc = fetchurl {
|
||||
url = "http://www.informatik.uni-kiel.de/~pakcs/download/${fname}-src.tar.gz";
|
||||
sha256 = "0m9s6693svr57in8rhkvq9h2j0hiphki6jn0syzrzzs4ahb7i1gb";
|
||||
sha256 = "0f4rhaqss9vfinpdjchxq75g343hz322cv0admjnl4g5g568wk3x";
|
||||
};
|
||||
|
||||
in
|
||||
|
|
@ -118,5 +118,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
maintainers = [ stdenv.lib.maintainers.kkallio ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@ with stdenv.lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "erlang-" + version;
|
||||
version = "17.0";
|
||||
version = "17.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.erlang.org/download/otp_src_${version}.tar.gz";
|
||||
sha256 = "1nyaka6238vh4kdgaynmg8hm5y5zj7hhyl1c971d2pjylsm2nzr9";
|
||||
sha256 = "0mn3p5rwvjfsxjnn1vrm0lxdq40wq9bmd9nibl6hqbfcnnrga1mq";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
|
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
|||
postInstall = let
|
||||
manpages = fetchurl {
|
||||
url = "http://www.erlang.org/download/otp_doc_man_${version}.tar.gz";
|
||||
sha256 = "16dkz3w1q4ahy37c8a8r2h8zjcr7cxz7pd9z38chbxf6frc2pxxc";
|
||||
sha256 = "1aza6hxhh7ag2frsa0hg6il6ancjrbazvgz7jc2p7qrmy5vh48sa";
|
||||
};
|
||||
in ''
|
||||
ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ let
|
|||
|
||||
buildInputs =
|
||||
optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
|
||||
[ bzip2 ]
|
||||
[ bzip2 openssl ]
|
||||
++ optional zlibSupport zlib;
|
||||
|
||||
|
||||
|
|
@ -178,10 +178,7 @@ let
|
|||
deps = [ sqlite ];
|
||||
};
|
||||
|
||||
ssl = buildInternalPythonModule {
|
||||
moduleName = "ssl";
|
||||
deps = [ openssl ];
|
||||
};
|
||||
ssl = null;
|
||||
|
||||
tkinter = buildInternalPythonModule {
|
||||
moduleName = "tkinter";
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
assert faacSupport -> faac != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gst-plugins-bad-1.2.4";
|
||||
name = "gst-plugins-bad-1.4.0";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Gstreamer Bad Plugins";
|
||||
|
|
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz";
|
||||
sha256 = "1jifzrgr4y3566d2lq30fibcd4rb8z8vpqnr2gihbmymr4z16k4q";
|
||||
sha256 = "1y821785rvr6s79cmdll66hg6h740qa2n036xid20nvjyxabfb7z";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig python ];
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gst-plugins-base-1.2.4";
|
||||
name = "gst-plugins-base-1.4.0";
|
||||
|
||||
meta = {
|
||||
description = "Base plugins and helper libraries";
|
||||
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz";
|
||||
sha256 = "0l35zh2cdv515zv6n4yif49y6jfxzlf73q6g7k2vr52s7zf76qjd";
|
||||
sha256 = "07jcs08hjyban0amls5s0g6i4a1hwiir1llwpqzlwkmnhfwx9bjx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -29,4 +29,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
propagatedBuildInputs = [ gstreamer ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gstreamer-1.2.4";
|
||||
name = "gstreamer-1.4.0";
|
||||
|
||||
meta = {
|
||||
description = "Open source multimedia framework";
|
||||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/src/gstreamer/${name}.tar.xz";
|
||||
sha256 = "0aa93cqzrhm1z7rkzk343p251ifvih0d0l8xsng2ra3hg1xacz0y";
|
||||
sha256 = "15f68pn2b47x543ih7hj59czgzl4af14j15bgjq8ky145gf9zhr3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gstreamer-editing-services-1.2.0";
|
||||
name = "gstreamer-editing-services-1.2.1";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Library for creation of audio/video non-linear editors";
|
||||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz";
|
||||
sha256 = "1n7nw8rqvwna9af55lggah44gdvfgld1igvgaya8glc37wpq89b0";
|
||||
sha256 = "1c20zg272wgzqw4f93f1prkv9a9gdqxmf3kal29l0r2wmwhqnxpy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig python gobjectIntrospection ];
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnonlin-1.2.0";
|
||||
name = "gnonlin-1.2.1";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Gstreamer Non-Linear Multimedia Editing Plugins";
|
||||
|
|
@ -13,14 +13,14 @@ stdenv.mkDerivation rec {
|
|||
support for writing non-linear audio and video editing
|
||||
applications. It introduces the concept of a timeline.
|
||||
'';
|
||||
license = licenses.lgpl2Plus;
|
||||
license = licenses.lgpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ iyzsong ];
|
||||
};
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/src/gnonlin/${name}.tar.xz";
|
||||
sha256 = "15hyb0kg8sm92kj37cir4l3sa21b8zy4la1ccfhb358b4mf24vl7";
|
||||
sha256 = "14zb3bz3xn40a2kns719amrr77cp6wyxddml621kyxc424ihcw3q";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gst-plugins-good-1.2.4";
|
||||
name = "gst-plugins-good-1.4.0";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Gstreamer Good Plugins";
|
||||
|
|
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz";
|
||||
sha256 = "1lr0yk352jrcgxadi9mvjgkli7xiwwnc15by71w5wbiw75l07jf9";
|
||||
sha256 = "11965w4zr0jvrsnw33rbcc8d20dlh368rz0x16d2iypzhxwjx9j8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig python ];
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
assert withSystemLibav -> libav != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gst-libav-1.2.4";
|
||||
name = "gst-libav-1.4.0";
|
||||
|
||||
meta = {
|
||||
homepage = "http://gstreamer.freedesktop.org";
|
||||
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/src/gst-libav/${name}.tar.xz";
|
||||
sha256 = "0dzhs73vzl0kvrj0y6w8vg1bnh9mmcly5qnr94rbjbgwcc6lhs9a";
|
||||
sha256 = "1073p7xdpr3pwyx37fnldfni908apnq3k9fbqmxf5wk3g1jplb68";
|
||||
};
|
||||
|
||||
configureFlags = stdenv.lib.optionalString withSystemLibav
|
||||
|
|
|
|||
|
|
@ -3,14 +3,14 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gst-python-1.2.0";
|
||||
name = "gst-python-1.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"${meta.homepage}/src/gst-python/${name}.tar.bz2"
|
||||
"mirror://gentoo/distfiles/${name}.tar.bz2"
|
||||
];
|
||||
sha256 = "09c6yls8ipbmwimdjr7xi3hvf2xa1xn1pv07855r7wfyzas1xbl1";
|
||||
sha256 = "1m7gh017f70i5pg6k9sx54ihwaizvi2dlli687gi44n5zylya8w8";
|
||||
};
|
||||
|
||||
patches = [ ./different-path-with-pygobject.patch ];
|
||||
|
|
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
propagatedBuildInputs = [ gstreamer python ];
|
||||
|
||||
|
||||
meta = {
|
||||
homepage = http://gstreamer.freedesktop.org;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gst-plugins-ugly-1.2.4";
|
||||
name = "gst-plugins-ugly-1.4.0";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Gstreamer Ugly Plugins";
|
||||
|
|
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz";
|
||||
sha256 = "1a4fk0mv21az5wz2wz0xmd0w13y2nhhbdispsj2q6yym8xmggxjf";
|
||||
sha256 = "0kblc5f4n0mh2sw8dhf7c9dg3wzm7a0p7pqpcff7n6ixy5hbn52k";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig python ];
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "Chart-cairo";
|
||||
version = "1.2.3";
|
||||
sha256 = "1lbl1qvgm4yxslahlms6kzfrhh8s2fcdiwmvk1bs319k1fylia1b";
|
||||
version = "1.2.4";
|
||||
sha256 = "1ggqh3v14mwv9q1pmz3hbx7g1dvibfwl1vzvag92q7432q4pqm2z";
|
||||
buildDepends = [
|
||||
cairo Chart colour dataDefaultClass lens mtl operational time
|
||||
];
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "Chart-diagrams";
|
||||
version = "1.2.3";
|
||||
sha256 = "08ps30vn9ljiyhgakwdbixn4csy504bsw3h5z9w1dxhn27wij772";
|
||||
version = "1.2.4";
|
||||
sha256 = "099frqvfjqqc7h3zr52saqyg37di0klr0y649afzxd7lj3d67mvw";
|
||||
buildDepends = [
|
||||
blazeSvg Chart colour dataDefaultClass diagramsCore diagramsLib
|
||||
diagramsPostscript diagramsSvg lens mtl operational SVGFonts text
|
||||
|
|
@ -20,5 +20,6 @@ cabal.mkDerivation (self: {
|
|||
description = "Diagrams backend for Charts";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
hydraPlatforms = self.stdenv.lib.platforms.none;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -4,15 +4,13 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "Chart-gtk";
|
||||
version = "1.2.3";
|
||||
sha256 = "0vl9nh48pa7sdrqh5a6smmfallf4mwzrvspc2v94cpnrcnickiyq";
|
||||
version = "1.2.4";
|
||||
sha256 = "16dfmkls341cmk13j1z3rw2wxdvxr5rqsv1ff4qjhjak9j7hkqjq";
|
||||
buildDepends = [ cairo Chart ChartCairo colour gtk mtl time ];
|
||||
meta = {
|
||||
homepage = "https://github.com/timbod7/haskell-chart/wiki";
|
||||
description = "Utility functions for using the chart library with GTK";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
hydraPlatforms = self.stdenv.lib.platforms.none;
|
||||
broken = true;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "Chart";
|
||||
version = "1.2.3";
|
||||
sha256 = "067bahxig5xyd6zasi74k86qb7bxvbs3shjn9fbslhyckxg50q1j";
|
||||
version = "1.2.4";
|
||||
sha256 = "0zizrkxsligvxs5x5r2j0pynf6ncjl4mgyzbh1zfqgnz29frylh7";
|
||||
buildDepends = [
|
||||
colour dataDefaultClass lens mtl operational time
|
||||
];
|
||||
|
|
|
|||
16
pkgs/development/libraries/haskell/HaskellNet/default.nix
Normal file
16
pkgs/development/libraries/haskell/HaskellNet/default.nix
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, base64String, Crypto, mimeMail, mtl, network, text }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "HaskellNet";
|
||||
version = "0.3.1";
|
||||
sha256 = "168w6y5rizszq1428amxbkhww65sy3b7czxpjyrzzq3dhjn517nr";
|
||||
buildDepends = [ base64String Crypto mimeMail mtl network text ];
|
||||
meta = {
|
||||
homepage = "https://github.com/jtdaugherty/HaskellNet";
|
||||
description = "Client support for POP3, SMTP, and IMAP";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "IntervalMap";
|
||||
version = "0.3.0.2";
|
||||
sha256 = "14pbq5n2cn9gxjkmqpnbn7dx9963wp3sdbb180wm9l5xqi338s0l";
|
||||
version = "0.3.0.3";
|
||||
sha256 = "11lxsjq9nw9mmj5ga0x03d8rgcx2s85kzi17d9cm7m28mq4dqdag";
|
||||
buildDepends = [ deepseq ];
|
||||
testDepends = [ Cabal deepseq QuickCheck ];
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "JuicyPixels";
|
||||
version = "3.1.5.2";
|
||||
sha256 = "0afw7kwyaqw2lwgrdc1mamz45vmqy471fgsyvn9rhla8znr3a9nq";
|
||||
version = "3.1.6.1";
|
||||
sha256 = "1v560y0l1zpznbpw8zgb2j6zlcwi8i207xgzggzzd3p0v2m8955c";
|
||||
buildDepends = [
|
||||
binary deepseq mtl primitive transformers vector zlib
|
||||
];
|
||||
|
|
|
|||
|
|
@ -4,14 +4,12 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "bitarray";
|
||||
version = "0.0.1";
|
||||
sha256 = "01ijysisw70zaw70hx851axw48agfamdqj21rzzhdqd2ww6bwchb";
|
||||
version = "0.0.1.1";
|
||||
sha256 = "00nqd62cbh42qqqvcl6iv1i9kbv0f0mkiygv4j70wfh5cl86yzxj";
|
||||
meta = {
|
||||
homepage = "http://code.haskell.org/~bkomuves/";
|
||||
description = "Mutable and immutable bit arrays";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
hydraPlatforms = self.stdenv.lib.platforms.none;
|
||||
broken = true;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
26
pkgs/development/libraries/haskell/bound/default.nix
Normal file
26
pkgs/development/libraries/haskell/bound/default.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, bifunctors, binary, bytes, cereal, comonad, doctest
|
||||
, filepath, hashable, hashableExtras, preludeExtras, profunctors
|
||||
, transformers, vector
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "bound";
|
||||
version = "1.0.3";
|
||||
sha256 = "0nfcxq87i9lzdkrg7g65cprn4rg9rhn9nyk2jpjh4c1rc7gdn0aq";
|
||||
buildDepends = [
|
||||
bifunctors binary bytes cereal comonad hashable hashableExtras
|
||||
preludeExtras profunctors transformers
|
||||
];
|
||||
testDepends = [
|
||||
doctest filepath preludeExtras transformers vector
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://github.com/ekmett/bound/";
|
||||
description = "Making de Bruijn Succ Less";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
|
||||
};
|
||||
})
|
||||
|
|
@ -6,8 +6,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "bson";
|
||||
version = "0.3";
|
||||
sha256 = "0787z6970lf93mgrsyqcilnkx5bynny88ag15z2f07l1rhva6ac4";
|
||||
version = "0.3.1";
|
||||
sha256 = "1kihsjws8sqb44gvilh1zxrqn2bml8gxq2bbanxqb7nr4ymwfkiv";
|
||||
buildDepends = [
|
||||
binary cryptohash dataBinaryIeee754 mtl network text time
|
||||
];
|
||||
|
|
@ -17,7 +17,7 @@ cabal.mkDerivation (self: {
|
|||
];
|
||||
doCheck = false;
|
||||
meta = {
|
||||
homepage = "http://github.com/selectel/bson-haskell";
|
||||
homepage = "http://github.com/mongodb-haskell/bson";
|
||||
description = "BSON documents are JSON-like objects with a standard binary encoding";
|
||||
license = "unknown";
|
||||
platforms = self.ghc.meta.platforms;
|
||||
|
|
|
|||
|
|
@ -12,5 +12,7 @@ cabal.mkDerivation (self: {
|
|||
description = "Template Haskell expressions for reading fields from a project's cabal file";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
hydraPlatforms = self.stdenv.lib.platforms.none;
|
||||
broken = true;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -12,5 +12,7 @@ cabal.mkDerivation (self: {
|
|||
description = "Categories";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
hydraPlatforms = self.stdenv.lib.platforms.none;
|
||||
broken = true;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -17,5 +17,7 @@ cabal.mkDerivation (self: {
|
|||
description = "Declarative command-line option parsing and documentation library";
|
||||
license = self.stdenv.lib.licenses.mit;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
hydraPlatforms = self.stdenv.lib.platforms.none;
|
||||
broken = true;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -11,5 +11,7 @@ cabal.mkDerivation (self: {
|
|||
description = "An FFI interface to the DevIL library";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
hydraPlatforms = self.stdenv.lib.platforms.none;
|
||||
broken = true;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -18,5 +18,7 @@ cabal.mkDerivation (self: {
|
|||
description = "Extra concurrency primitives";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
hydraPlatforms = self.stdenv.lib.platforms.none;
|
||||
broken = true;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
|
|||
description = "Utilities for Data.Lens";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
hydraPlatforms = self.stdenv.lib.platforms.none;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -12,5 +12,7 @@ cabal.mkDerivation (self: {
|
|||
description = "Used to be Haskell 98 Lenses";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
hydraPlatforms = self.stdenv.lib.platforms.none;
|
||||
broken = true;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -18,5 +18,7 @@ cabal.mkDerivation (self: {
|
|||
description = "Postscript backend for diagrams drawing EDSL";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
hydraPlatforms = self.stdenv.lib.platforms.none;
|
||||
broken = true;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -17,5 +17,7 @@ cabal.mkDerivation (self: {
|
|||
description = "Generate Haskell code from a type";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
hydraPlatforms = self.stdenv.lib.platforms.none;
|
||||
broken = self.stdenv.lib.versionOlder "7.7" self.ghc.version;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "dns";
|
||||
version = "1.4.2";
|
||||
sha256 = "1xfvc5amiqafb2z37jf47k5h8i2f4ygvck68nppi5fkwii5w74hr";
|
||||
version = "1.4.3";
|
||||
sha256 = "15v24f338w71dn3cxrzwyg04hk3vxvrvswbv3nnf2ggjgg46yq3i";
|
||||
buildDepends = [
|
||||
attoparsec binary blazeBuilder conduit conduitExtra iproute mtl
|
||||
network random resourcet
|
||||
|
|
|
|||
|
|
@ -12,5 +12,7 @@ cabal.mkDerivation (self: {
|
|||
description = "High-level file download based on URLs";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
hydraPlatforms = self.stdenv.lib.platforms.none;
|
||||
broken = true;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -12,5 +12,7 @@ cabal.mkDerivation (self: {
|
|||
description = "Difference strings";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
hydraPlatforms = self.stdenv.lib.platforms.none;
|
||||
broken = true;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -13,5 +13,7 @@ cabal.mkDerivation (self: {
|
|||
description = "IntMap and IntSet with Enum keys/elements";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
hydraPlatforms = self.stdenv.lib.platforms.none;
|
||||
broken = true;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
15
pkgs/development/libraries/haskell/formatting/default.nix
Normal file
15
pkgs/development/libraries/haskell/formatting/default.nix
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, scientific, text, textFormat, time }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "formatting";
|
||||
version = "5.2";
|
||||
sha256 = "0lmbzm98idy7bzpvaqnk9j6181vakk553smqkf959gn5jdj95z3k";
|
||||
buildDepends = [ scientific text textFormat time ];
|
||||
meta = {
|
||||
description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -17,5 +17,7 @@ cabal.mkDerivation (self: {
|
|||
description = "Bindings to the date parsing from Git";
|
||||
license = self.stdenv.lib.licenses.gpl2;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
hydraPlatforms = self.stdenv.lib.platforms.none;
|
||||
broken = true;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -16,5 +16,7 @@ cabal.mkDerivation (self: {
|
|||
description = "Binding to the GTK+ OpenGL Extension";
|
||||
license = self.stdenv.lib.licenses.lgpl21;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
hydraPlatforms = self.stdenv.lib.platforms.none;
|
||||
broken = true;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -0,0 +1,22 @@
|
|||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, bifunctors, doctest, filepath, genericDeriving, hashable
|
||||
, transformers
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hashable-extras";
|
||||
version = "0.2.0.1";
|
||||
sha256 = "09y2m0wpim7sl7n9qnkr0miwfsbvb1q8lm6shpcq0jxzxknbag7s";
|
||||
buildDepends = [
|
||||
bifunctors genericDeriving hashable transformers
|
||||
];
|
||||
testDepends = [ doctest filepath ];
|
||||
meta = {
|
||||
homepage = "http://github.com/analytics/hashable-extras/";
|
||||
description = "Higher-rank Hashable";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
|
||||
};
|
||||
})
|
||||
|
|
@ -12,5 +12,7 @@ cabal.mkDerivation (self: {
|
|||
description = "Class interface for working with Haskeline";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
hydraPlatforms = self.stdenv.lib.platforms.none;
|
||||
broken = true;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
17
pkgs/development/libraries/haskell/haste-perch/default.nix
Normal file
17
pkgs/development/libraries/haskell/haste-perch/default.nix
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, hasteCompiler, transformers }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "haste-perch";
|
||||
version = "0.1.0.3";
|
||||
sha256 = "1ad7kv47kq0sav49qnqdk76blk44sgjvk1zgn5k2bqvfnr26641j";
|
||||
buildDepends = [ hasteCompiler transformers ];
|
||||
meta = {
|
||||
homepage = "https://github.com/agocorona/haste-perch";
|
||||
description = "Create, navigate and modify the DOM tree with composable syntax, with the haste compiler";
|
||||
license = self.stdenv.lib.licenses.gpl3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = with self.stdenv.lib.maintainers; [ tomberek ];
|
||||
};
|
||||
})
|
||||
|
|
@ -7,7 +7,6 @@ cabal.mkDerivation (self: {
|
|||
version = "0.1.5";
|
||||
sha256 = "0hp9jjj59smfcs51d9zjhyvgdbn46l0rl0jr98wbzg3qya0vwj5k";
|
||||
buildDepends = [ cereal mtl text ];
|
||||
buildTools = [ ];
|
||||
meta = {
|
||||
homepage = "http://github.com/luite/hfsevents";
|
||||
description = "File/folder watching for OS X";
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue