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

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk 2020-04-21 19:59:56 +02:00
commit 23be4a8b4d
141 changed files with 481 additions and 484 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
doc/languages-frameworks/python.section.md
View File

@ -1290,32 +1290,9 @@ self: super: {
### How to use Intel's MKL with numpy and scipy?
A `site.cfg` is created that configures BLAS based on the `blas` parameter of
the `numpy` derivation. By passing in `mkl`, `numpy` and packages depending on
`numpy` will be built with `mkl`.
The following is an overlay that configures `numpy` to use `mkl`:
```nix
self: super: {
python37 = super.python37.override {
packageOverrides = python-self: python-super: {
numpy = python-super.numpy.override {
blas = super.pkgs.mkl;
};
};
};
}
```
`mkl` requires an `openmp` implementation when running with multiple processors.
By default, `mkl` will use Intel's `iomp` implementation if no other is
specified, but this is a runtime-only dependency and binary compatible with the
LLVM implementation. To use that one instead, Intel recommends users set it with
`LD_PRELOAD`.
Note that `mkl` is only available on `x86_64-{linux,darwin}` platforms;
moreover, Hydra is not building and distributing pre-compiled binaries using it.
MKL can be configured using an overlay. See the section “[Using
overlays to configure
alternatives](#sec-overlays-alternatives-blas-lapack)”.
### What inputs do `setup_requires`, `install_requires` and `tests_require` map to?

114
doc/using/overlays.xml
View File

@ -137,4 +137,118 @@ self: super:
Overlays are similar to other methods for customizing Nixpkgs, in particular the <literal>packageOverrides</literal> attribute described in <xref linkend="sec-modify-via-packageOverrides"/>. Indeed, <literal>packageOverrides</literal> acts as an overlay with only the <varname>super</varname> argument. It is therefore appropriate for basic use, but overlays are more powerful and easier to distribute.
</para>
</section>
<section xml:id="sec-overlays-alternatives">
<title>Using overlays to configure alternatives</title>
<para>
Certain software has different implementations of the same
interface. Other distributions have functionality to switch
between these. For example, Debian provides <link
xlink:href="https://wiki.debian.org/DebianAlternatives">DebianAlternatives</link>.
Nixpkgs has what we call <literal>alternatives</literal>, which
are configured through overlays.
</para>
<section xml:id="sec-overlays-alternatives-blas-lapack">
<title>BLAS/LAPACK</title>
<para>
In Nixpkgs, we have multiple implementations of the BLAS/LAPACK
numerical linear algebra interfaces. They are:
</para>
<itemizedlist>
<listitem>
<para>
<link xlink:href="https://www.openblas.net/">OpenBLAS</link>
</para>
<para>
The Nixpkgs attribute is <literal>openblas</literal> for
ILP64 and <literal>openblasCompat</literal> for LP64. This
is the default.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="http://www.netlib.org/lapack/">LAPACK
reference</link> (also provides BLAS)
</para>
<para>
The Nixpkgs attribute is <literal>lapack-reference</literal>.
</para>
</listitem>
<listitem>
<para>
<link
xlink:href="https://software.intel.com/en-us/mkl">Intel
MKL</link> (only works on x86 architecture, unfree)
</para>
<para>
The Nixpkgs attribute is <literal>mkl</literal>.
</para>
</listitem>
</itemizedlist>
<para>
Introduced in <link
xlink:href="https://github.com/NixOS/nixpkgs/pull/83888">PR
#83888</link>, we are able to override the ‘blas’ and ‘lapack’
packages to use different implementations, through the
‘blasProvider’ and ‘lapackProvider’ argument. This can be used
to select a different provider. For example, an overlay can be
created that looks like:
</para>
<programlisting>
self: super:
{
blas = super.blas.override {
blasProvider = self.mkl;
}
lapack = super.lapack.override {
lapackProvider = self.mkl;
}
}
</programlisting>
<para>
This overlay uses Intel’s MKL library for both BLAS and LAPACK
interfaces. Note that the same can be accomplished at runtime
using <literal>LD_PRELOAD</literal> of libblas.so.3 and
liblapack.so.3.
</para>
<para>
Intel MKL requires an <literal>openmp</literal> implementation
when running with multiple processors. By default,
<literal>mkl</literal> will use Intel’s <literal>iomp</literal>
implementation if no other is specified, but this is a
runtime-only dependency and binary compatible with the LLVM
implementation. To use that one instead, Intel recommends users
set it with <literal>LD_PRELOAD</literal>. Note that
<literal>mkl</literal> is only available on
<literal>x86_64-linux</literal> and
<literal>x86_64-darwin</literal>. Moreover, Hydra is not build
and distributing pre-compiled binaries using it.
</para>
<para>
For BLAS/LAPACK switching to work correctly, all packages must
depend on <literal>blas</literal> or <literal>lapack</literal>.
This ensures that only one BLAS/LAPACK library is used at one
time. There are two versions versions of BLAS/LAPACK currently
in the wild, <literal>LP64</literal> (integer size = 32 bits)
and <literal>ILP64</literal> (integer size = 64 bits). Some
software needs special flags or patches to work with
<literal>ILP64</literal>. You can check if
<literal>ILP64</literal> is used in Nixpkgs with
<varname>blas.isILP64</varname> and
<varname>lapack.isILP64</varname>. Some software does NOT work
with <literal>ILP64</literal>, and derivations need to specify
an assertion to prevent this. You can prevent
<literal>ILP64</literal> from being used with the following:
</para>
<programlisting>
{ stdenv, blas, lapack, ... }:
assert (!blas.isILP64) &amp;&amp; (!lapack.isILP64);
stdenv.mkDerivation {
...
}
</programlisting>
</section>
</section>
</chapter>

8
nixos/modules/installer/tools/tools.nix
View File

@ -111,10 +111,10 @@ in
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# Select internationalisation properties.
# i18n = {
# consoleFont = "Lat2-Terminus16";
# consoleKeyMap = "us";
# defaultLocale = "en_US.UTF-8";
# i18n.defaultLocale = "en_US.UTF-8";
# console = {
# font = "Lat2-Terminus16";
# keyMap = "us";
# };
# Set your time zone.

1
nixos/modules/programs/cdemu.nix
View File

@ -8,6 +8,7 @@ in {
options = {
programs.cdemu = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
<command>cdemu</command> for members of

1
nixos/modules/programs/criu.nix
View File

@ -8,6 +8,7 @@ in {
options = {
programs.criu = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Install <command>criu</command> along with necessary kernel options.

1
nixos/modules/programs/systemtap.nix
View File

@ -8,6 +8,7 @@ in {
options = {
programs.systemtap = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Install <command>systemtap</command> along with necessary kernel options.

1
nixos/modules/programs/zsh/oh-my-zsh.nix
View File

@ -39,6 +39,7 @@ in
options = {
programs.zsh.ohMyZsh = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Enable oh-my-zsh.

1
nixos/modules/services/amqp/rabbitmq.nix
View File

@ -17,6 +17,7 @@ in {
options = {
services.rabbitmq = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable the RabbitMQ server, an Advanced Message

7
nixos/modules/services/backup/mysql-backup.nix
View File

@ -37,12 +37,7 @@ in
services.mysqlBackup = {
enable = mkOption {
default = false;
description = ''
Whether to enable MySQL backups.
'';
};
enable = mkEnableOption "MySQL backups";
calendar = mkOption {
type = types.str;

7
nixos/modules/services/backup/postgresql-backup.nix
View File

@ -44,12 +44,7 @@ in {
options = {
services.postgresqlBackup = {
enable = mkOption {
default = false;
description = ''
Whether to enable PostgreSQL dumps.
'';
};
enable = mkEnableOption "PostgreSQL dumps";
startAt = mkOption {
default = "*-*-* 01:15:00";

5
nixos/modules/services/databases/clickhouse.nix
View File

@ -11,10 +11,7 @@ with lib;
services.clickhouse = {
enable = mkOption {
default = false;
description = "Whether to enable ClickHouse database server.";
};
enable = mkEnableOption "ClickHouse database server";
};

7
nixos/modules/services/databases/firebird.nix
View File

@ -40,12 +40,7 @@ in
services.firebird = {
enable = mkOption {
default = false;
description = ''
Whether to enable the Firebird super server.
'';
};
enable = mkEnableOption "the Firebird super server";
package = mkOption {
default = pkgs.firebirdSuper;

7
nixos/modules/services/databases/memcached.nix
View File

@ -18,12 +18,7 @@ in
services.memcached = {
enable = mkOption {
default = false;
description = "
Whether to enable Memcached.
";
};
enable = mkEnableOption "Memcached";
user = mkOption {
default = "memcached";

7
nixos/modules/services/databases/mongodb.nix
View File

@ -29,12 +29,7 @@ in
services.mongodb = {
enable = mkOption {
default = false;
description = "
Whether to enable the MongoDB server.
";
};
enable = mkEnableOption "the MongoDB server";
package = mkOption {
default = pkgs.mongodb;

5
nixos/modules/services/databases/virtuoso.nix
View File

@ -13,10 +13,7 @@ with lib;
services.virtuoso = {
enable = mkOption {
default = false;
description = "Whether to enable Virtuoso Opensource database server.";
};
enable = mkEnableOption "Virtuoso Opensource database server";
config = mkOption {
default = "";

7
nixos/modules/services/hardware/ratbagd.nix
View File

@ -10,12 +10,7 @@ in
options = {
services.ratbagd = {
enable = mkOption {
default = false;
description = ''
Whether to enable ratbagd for configuring gaming mice.
'';
};
enable = mkEnableOption "ratbagd for configuring gaming mice";
};
};

7
nixos/modules/services/hardware/thermald.nix
View File

@ -8,12 +8,7 @@ in {
###### interface
options = {
services.thermald = {
enable = mkOption {
default = false;
description = ''
Whether to enable thermald, the temperature management daemon.
'';
};
enable = mkEnableOption "thermald, the temperature management daemon";
debug = mkOption {
type = types.bool;

5
nixos/modules/services/mail/spamassassin.nix
View File

@ -12,10 +12,7 @@ in
options = {
services.spamassassin = {
enable = mkOption {
default = false;
description = "Whether to run the SpamAssassin daemon";
};
enable = mkEnableOption "the SpamAssassin daemon";
debug = mkOption {
default = false;

1
nixos/modules/services/misc/autofs.nix
View File

@ -19,6 +19,7 @@ in
services.autofs = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Mount filesystems on demand. Unmount them automatically.

8
nixos/modules/services/misc/cgminer.nix
View File

@ -31,13 +31,7 @@ in
services.cgminer = {
enable = mkOption {
default = false;
description = ''
Whether to enable cgminer, an ASIC/FPGA/GPU miner for bitcoin and
litecoin.
'';
};
enable = mkEnableOption "cgminer, an ASIC/FPGA/GPU miner for bitcoin and litecoin";
package = mkOption {
default = pkgs.cgminer;

7
nixos/modules/services/misc/devmon.nix
View File

@ -8,12 +8,7 @@ let
in {
options = {
services.devmon = {
enable = mkOption {
default = false;
description = ''
Whether to enable devmon, an automatic device mounting daemon.
'';
};
enable = mkEnableOption "devmon, an automatic device mounting daemon";
};
};

5
nixos/modules/services/misc/disnix.nix
View File

@ -17,10 +17,7 @@ in
services.disnix = {
enable = mkOption {
default = false;
description = "Whether to enable Disnix";
};
enable = mkEnableOption "Disnix";
enableMultiUser = mkOption {
type = types.bool;

5
nixos/modules/services/misc/felix.nix
View File

@ -17,10 +17,7 @@ in
services.felix = {
enable = mkOption {
default = false;
description = "Whether to enable the Apache Felix OSGi service";
};
enable = mkEnableOption "the Apache Felix OSGi service";
bundles = mkOption {
type = types.listOf types.package;

1
nixos/modules/services/misc/ihaskell.nix
View File

@ -15,6 +15,7 @@ in
options = {
services.ihaskell = {
enable = mkOption {
type = types.bool;
default = false;
description = "Autostart an IHaskell notebook service.";
};

5
nixos/modules/services/misc/safeeyes.nix
View File

@ -16,10 +16,7 @@ in
services.safeeyes = {
enable = mkOption {
default = false;
description = "Whether to enable the safeeyes OSGi service";
};
enable = mkEnableOption "the safeeyes OSGi service";
};

1
nixos/modules/services/misc/svnserve.nix
View File

@ -18,6 +18,7 @@ in
services.svnserve = {
enable = mkOption {
type = types.bool;
default = false;
description = "Whether to enable svnserve to serve Subversion repositories through the SVN protocol.";
};

16
nixos/modules/services/misc/synergy.nix
View File

@ -19,12 +19,8 @@ in
# !!! All these option descriptions needs to be cleaned up.
client = {
enable = mkOption {
default = false;
description = "
Whether to enable the Synergy client (receive keyboard and mouse events from a Synergy server).
";
};
enable = mkEnableOption "the Synergy client (receive keyboard and mouse events from a Synergy server)";
screenName = mkOption {
default = "";
description = ''
@ -47,12 +43,8 @@ in
};
server = {
enable = mkOption {
default = false;
description = ''
Whether to enable the Synergy server (send keyboard and mouse events).
'';
};
enable = mkEnableOption "the Synergy server (send keyboard and mouse events)";
configFile = mkOption {
default = "/etc/synergy-server.conf";
description = "The Synergy server configuration file.";

6
nixos/modules/services/network-filesystems/netatalk.nix
View File

@ -43,10 +43,7 @@ in
options = {
services.netatalk = {
enable = mkOption {
default = false;
description = "Whether to enable the Netatalk AFP fileserver.";
};
enable = mkEnableOption "the Netatalk AFP fileserver";
port = mkOption {
default = 548;
@ -65,6 +62,7 @@ in
homes = {
enable = mkOption {
type = types.bool;
default = false;
description = "Enable sharing of the UNIX server user home directories.";
};

5
nixos/modules/services/network-filesystems/rsyncd.nix
View File

@ -29,10 +29,7 @@ in
options = {
services.rsyncd = {
enable = mkOption {
default = false;
description = "Whether to enable the rsync daemon.";
};
enable = mkEnableOption "the rsync daemon";
motd = mkOption {
type = types.str;

6
nixos/modules/services/network-filesystems/xtreemfs.nix
View File

@ -100,11 +100,13 @@ in
dir = {
enable = mkOption {
type = types.bool;
default = true;
description = ''
Whether to enable XtreemFS DIR service.
'';
};
uuid = mkOption {
example = "eacb6bab-f444-4ebf-a06a-3f72d7465e40";
description = ''
@ -218,11 +220,13 @@ in
mrc = {
enable = mkOption {
type = types.bool;
default = true;
description = ''
Whether to enable XtreemFS MRC service.
'';
};
uuid = mkOption {
example = "eacb6bab-f444-4ebf-a06a-3f72d7465e41";
description = ''
@ -354,11 +358,13 @@ in
osd = {
enable = mkOption {
type = types.bool;
default = true;
description = ''
Whether to enable XtreemFS OSD service.
'';
};
uuid = mkOption {
example = "eacb6bab-f444-4ebf-a06a-3f72d7465e42";
description = ''

1
nixos/modules/services/network-filesystems/yandex-disk.nix
View File

@ -21,6 +21,7 @@ in
services.yandex-disk = {
enable = mkOption {
type = types.bool;
default = false;
description = "
Whether to enable Yandex-disk client. See https://disk.yandex.ru/

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

@ -16,6 +16,7 @@ in
services.amule = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to run the AMule daemon. You need to manually run "amuled --ec-config" to configure the service for the first time.

7
nixos/modules/services/networking/babeld.nix
View File

@ -35,12 +35,7 @@ in
services.babeld = {
enable = mkOption {
default = false;
description = ''
Whether to run the babeld network routing daemon.
'';
};
enable = mkEnableOption "the babeld network routing daemon";
interfaceDefaults = mkOption {
default = null;

7
nixos/modules/services/networking/bind.nix
View File

@ -68,12 +68,7 @@ in
services.bind = {
enable = mkOption {
default = false;
description = "
Whether to enable BIND domain name server.
";
};
enable = mkEnableOption "BIND domain name server";
cacheNetworks = mkOption {
default = ["127.0.0.0/24"];

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

@ -48,6 +48,7 @@ in
services.bitlbee = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to run the BitlBee IRC to other chat network gateway.

7
nixos/modules/services/networking/cntlm.nix
View File

@ -33,12 +33,7 @@ in
options.services.cntlm = {
enable = mkOption {
default = false;
description = ''
Whether to enable the cntlm, which start a local proxy.
'';
};
enable = mkEnableOption "cntlm, which starts a local proxy";
username = mkOption {
description = ''

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

@ -39,6 +39,7 @@ in
services.flashpolicyd = {
enable = mkOption {
type = types.bool;
default = false;
description =
''

8
nixos/modules/services/networking/gvpe.nix
View File

@ -42,12 +42,8 @@ in
{
options = {
services.gvpe = {
enable = mkOption {
default = false;
description = ''
Whether to run gvpe
'';
};
enable = lib.mkEnableOption "gvpe";
nodename = mkOption {
default = null;
description =''

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

@ -49,6 +49,7 @@ in
services.hostapd = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Enable putting a wireless interface into infrastructure mode,

7
nixos/modules/services/networking/ircd-hybrid/default.nix
View File

@ -36,12 +36,7 @@ in
services.ircdHybrid = {
enable = mkOption {
default = false;
description = "
Enable IRCD.
";
};
enable = mkEnableOption "IRCD";
serverName = mkOption {
default = "hades.arpa";

8
nixos/modules/services/networking/mailpile.nix
View File

@ -18,12 +18,8 @@ in
options = {
services.mailpile = {
enable = mkOption {
default = false;
description = "
Whether to enable Mailpile the mail client.
";
};
enable = mkEnableOption "Mailpile the mail client";
hostname = mkOption {
default = "localhost";
description = "Listen to this hostname or ip.";

1
nixos/modules/services/networking/ntp/chrony.nix
View File

@ -30,6 +30,7 @@ in
options = {
services.chrony = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to synchronise your machine's time using chrony.

1
nixos/modules/services/networking/ntp/ntpd.nix
View File

@ -40,6 +40,7 @@ in
services.ntp = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to synchronise your machine's time using ntpd, as a peer in

7
nixos/modules/services/networking/openfire.nix
View File

@ -9,12 +9,7 @@ with lib;
services.openfire = {
enable = mkOption {
default = false;
description = "
Whether to enable OpenFire XMPP server.
";
};
enable = mkEnableOption "OpenFire XMPP server";
usePostgreSQL = mkOption {
default = true;

7
nixos/modules/services/networking/prayer.nix
View File

@ -41,12 +41,7 @@ in
services.prayer = {
enable = mkOption {
default = false;
description = ''
Whether to run the prayer webmail http server.
'';
};
enable = mkEnableOption "the prayer webmail http server";
port = mkOption {
default = "2080";

7
nixos/modules/services/networking/quassel.nix
View File

@ -16,12 +16,7 @@ in
services.quassel = {
enable = mkOption {
default = false;
description = ''
Whether to run the Quassel IRC client daemon.
'';
};
enable = mkEnableOption "the Quassel IRC client daemon";
certificateFile = mkOption {
type = types.nullOr types.str;

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

@ -19,6 +19,7 @@ in
options = {
services.radvd.enable = mkOption {
type = types.bool;
default = false;
description =
''

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

@ -17,6 +17,7 @@ in
options = {
services.rdnssd.enable = mkOption {
type = types.bool;
default = false;
#default = config.networking.enableIPv6;
description =

6
nixos/modules/services/networking/sabnzbd.nix
View File

@ -15,10 +15,8 @@ in
options = {
services.sabnzbd = {
enable = mkOption {
default = false;
description = "Whether to enable the sabnzbd server.";
};
enable = mkEnableOption "the sabnzbd server";
configFile = mkOption {
default = "/var/lib/sabnzbd/sabnzbd.ini";
description = "Path to config file.";

1
nixos/modules/services/networking/shairport-sync.nix
View File

@ -17,6 +17,7 @@ in
services.shairport-sync = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Enable the shairport-sync daemon.

1
nixos/modules/services/networking/ssh/lshd.nix
View File

@ -19,6 +19,7 @@ in
services.lshd = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable the GNU lshd SSH2 daemon, which allows

7
nixos/modules/services/networking/xinetd.nix
View File

@ -44,12 +44,7 @@ in
options = {
services.xinetd.enable = mkOption {
default = false;
description = ''
Whether to enable the xinetd super-server daemon.
'';
};
services.xinetd.enable = mkEnableOption "the xinetd super-server daemon";
services.xinetd.extraDefaults = mkOption {
default = "";

7
nixos/modules/services/security/fprot.nix
View File

@ -10,12 +10,7 @@ in {
services.fprot = {
updater = {
enable = mkOption {
default = false;
description = ''
Whether to enable automatic F-Prot virus definitions database updates.
'';
};
enable = mkEnableOption "automatic F-Prot virus definitions database updates";
productData = mkOption {
description = ''

7
nixos/modules/services/system/kerberos/default.nix
View File

@ -51,12 +51,7 @@ in
###### interface
options = {
services.kerberos_server = {
enable = mkOption {
default = false;
description = ''
Enable the kerberos authentification server.
'';
};
enable = lib.mkEnableOption "the kerberos authentification server";
realms = mkOption {
type = types.attrsOf (types.submodule realm);

1
nixos/modules/services/system/localtime.nix
View File

@ -8,6 +8,7 @@ in {
options = {
services.localtime = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Enable <literal>localtime</literal>, simple daemon for keeping the system

1
nixos/modules/services/system/uptimed.nix
View File

@ -10,6 +10,7 @@ in
options = {
services.uptimed = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Enable <literal>uptimed</literal>, allowing you to track

1
nixos/modules/services/web-servers/jboss/default.nix
View File

@ -24,6 +24,7 @@ in
services.jboss = {
enable = mkOption {
type = types.bool;
default = false;
description = "Whether to enable JBoss. WARNING : this package is outdated and is known to have vulnerabilities.";
};

1
nixos/modules/services/x11/desktop-managers/enlightenment.nix
View File

@ -23,6 +23,7 @@ in
options = {
services.xserver.desktopManager.enlightenment.enable = mkOption {
type = types.bool;
default = false;
description = "Enable the Enlightenment desktop environment.";
};

1
nixos/modules/services/x11/desktop-managers/gnome3.nix
View File

@ -72,6 +72,7 @@ in
services.xserver.desktopManager.gnome3 = {
enable = mkOption {
type = types.bool;
default = false;
description = "Enable Gnome 3 desktop manager.";
};

1
nixos/modules/services/x11/desktop-managers/kodi.nix
View File

@ -10,6 +10,7 @@ in
options = {
services.xserver.desktopManager.kodi = {
enable = mkOption {
type = types.bool;
default = false;
description = "Enable the kodi multimedia center.";
};

1
nixos/modules/services/x11/display-managers/startx.nix
View File

@ -15,6 +15,7 @@ in
options = {
services.xserver.displayManager.startx = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable the dummy "startx" pseudo-display manager,

1
nixos/modules/services/x11/hardware/wacom.nix
View File

@ -15,6 +15,7 @@ in
services.xserver.wacom = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable the Wacom touchscreen/digitizer/tablet.

5
nixos/release-combined.nix
View File

@ -20,11 +20,6 @@ let
else pkgs.lib.mapAttrs (n: v: removeMaintainers v) set
else set;
allSupportedNixpkgs = builtins.removeAttrs (removeMaintainers (import ../pkgs/top-level/release.nix {
supportedSystems = supportedSystems ++ limitedSupportedSystems;
nixpkgs = nixpkgsSrc;
})) [ "unstable" ];
in rec {
nixos = removeMaintainers (import ./release.nix {

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

@ -2,14 +2,14 @@
, usePulseAudio ? config.pulseaudio or false, libpulseaudio }:
let
version = "0.4.11";
version = "0.4.12";
in stdenv.mkDerivation {
pname = "openmpt123";
inherit version;
src = fetchurl {
url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz";
sha256 = "1g96bpwh419s429wb387lkmhjsn3ldsjrzrb8h9p3wva5z6943i6";
sha256 = "0q2yf9g6hcwvr2nk3zggkscyf0np6i03q2g7fx10i2kcdr3n9k8c";
};
enableParallelBuilding = true;

6
pkgs/applications/editors/apostrophe/default.nix
View File

@ -11,14 +11,14 @@ let
in stdenv.mkDerivation rec {
pname = "apostrophe";
version = "unstable-2020-03-29";
version = "2.2.0.2";
src = fetchFromGitLab {
owner = "somas";
repo = pname;
domain = "gitlab.gnome.org";
rev = "219fa8976e3b8a6f0cea15cfefe4e336423f2bdb";
sha256 = "192n5qs3x6rx62mqxd6wajwm453pns8kjyz5v3xc891an6bm1kqx";
rev = "v${version}";
sha256 = "13wvfkg0jw9mayd9ifzkqnhf8fmfjgr1lsj4niqbyrw130y9r9f6";
};
nativeBuildInputs = [ meson ninja cmake pkgconfig desktop-file-utils

6
pkgs/applications/editors/vscode/vscode.nix
View File

@ -11,8 +11,8 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "15jg39hmlnicq0zrz77yar1bmn5y6gp2670dya2qm5klhva9hd0f";
x86_64-darwin = "1ghqhn46jpbj3is8q5zcj0biyc7gwinhiz3qdpcnf88ga2blcsz8";
x86_64-linux = "1n083pzp2dsz6z6rcl1ldcwhd4i03sjigdfslfardhc4v5lbvmv8";
x86_64-darwin = "1qk3gscyskf4fwc8i09afr3wsyd1lwwycx6rf02wwh4n9py50b20";
}.${system};
in
callPackage ./generic.nix rec {
@ -21,7 +21,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.44.1";
version = "1.44.2";
pname = "vscode";
executableName = "code" + lib.optionalString isInsiders "-insiders";

6
pkgs/applications/editors/vscode/vscodium.nix
View File

@ -11,8 +11,8 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "16qwhnxpwarnwvlxwvy13g687g1cnfzysq16qkykkhqig0cnalmb";
x86_64-darwin = "1p9qkbj59bfc0kn9fzg99gqxbzwxq297qxivxcjflsapd712s4vm";
x86_64-linux = "141hwj1a2bsgzpfk354dnnmg4ak00fss3xsgqplyk949pbk6v1af";
x86_64-darwin = "0fi8nz1gayzw5dp6d3m7jsmij3jj4yjg5rk1s9w6falpgka76dm1";
}.${system};
sourceRoot = {
@ -27,7 +27,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.44.1";
version = "1.44.2";
pname = "vscodium";
executableName = "codium";

4
pkgs/applications/graphics/xournalpp/default.nix
View File

@ -22,13 +22,13 @@
stdenv.mkDerivation rec {
pname = "xournalpp";
version = "1.0.17";
version = "1.0.18";
src = fetchFromGitHub {
owner = "xournalpp";
repo = pname;
rev = version;
sha256 = "0xw2mcgnm4sa9hrhfgp669lfypw97drxjmz5w8i5whaprpvmkxzw";
sha256 = "0a9ygbmd4dwgck3k8wsrm2grynqa0adb12wwspzmzvpisbadffjy";
};
nativeBuildInputs = [ cmake gettext pkgconfig wrapGAppsHook ];

4
pkgs/applications/misc/kanboard/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "kanboard";
version = "1.2.13";
version = "1.2.14";
src = fetchFromGitHub {
owner = "kanboard";
repo = "kanboard";
rev = "v${version}";
sha256 = "0mm5sx323v1rwykd1dhvk4d3ipgvgvi3wvhrlavbja3lgay3mdwk";
sha256 = "11bwajzidnyagdyip7i8rwni1f66acv0k4lybdm0mc4195anivjh";
};
dontBuild = true;

4
pkgs/applications/misc/sidequest/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, buildFHSUserEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, at-spi2-atk, icu, openssl, zlib }:
let
pname = "sidequest";
version = "0.8.7";
version = "0.10.2";
desktopItem = makeDesktopItem rec {
name = "SideQuest";
@ -16,7 +16,7 @@
src = fetchurl {
url = "https://github.com/the-expanse/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz";
sha256 = "1hbr6ml689zq4k3mzmn2xcn4r4dy717rgq3lgm32pzwgy5w92i2j";
sha256 = "1vfxn4gx5b138gj6nk4w3jlp2l56cqpb8hq2kn5mrf4dhjii8n88";
};
buildInputs = [ makeWrapper ];

17
pkgs/applications/networking/instant-messengers/jackline/default.nix
View File

@ -1,22 +1,23 @@
{ stdenv, fetchFromGitHub, ocamlPackages }:
assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2";
assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.07";
stdenv.mkDerivation {
pname = "jackline";
version = "2019-08-08";
version = "unstable-2020-03-22";
src = fetchFromGitHub {
owner = "hannesm";
repo = "jackline";
rev = "b934594010a563ded9c0f436e3fab8f1cae29856";
sha256 = "076h03jd970xlii90ax6kvgyq67g81gs30yvdzps366n7zzy3yfc";
rev = "52f84525c74c43e8d03fb1e6ff025ccb2699e4aa";
sha256 = "0wir573ah1w16xzdn9rfwk3569zq4ff5frp0ywq70va4gdlb679c";
};
buildInputs = with ocamlPackages; [
ocaml ocamlbuild findlib topkg ppx_sexp_conv
erm_xmpp tls nocrypto x509 ocaml_lwt otr astring
ptime notty sexplib hex uutf
ocaml ocamlbuild findlib topkg ppx_sexp_conv ppx_deriving
erm_xmpp tls mirage-crypto mirage-crypto-pk x509 domain-name
ocaml_lwt otr astring ptime mtime notty sexplib hex uutf
dns-client base64
];
buildPhase = "${ocamlPackages.topkg.run} build --pinned true";
@ -25,7 +26,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
homepage = "https://github.com/hannesm/jackline";
description = "Terminal-based XMPP client in OCaml";
description = "minimalistic secure XMPP client in OCaml";
license = licenses.bsd2;
maintainers = with maintainers; [ sternenseemann ];
};

17
pkgs/applications/networking/instant-messengers/psi-plus/default.nix
View File

@ -6,26 +6,15 @@
stdenv.mkDerivation rec {
pname = "psi-plus";
version = "1.4.984";
version = "1.4.1086";
src = fetchFromGitHub {
owner = "psi-plus";
repo = "psi-plus-snapshots";
rev = version;
sha256 = "1nii2nfi37i6mn79xmygscmm8ax75ky244wxkzlga0ya8i8wfjh7";
sha256 = "0war4hbjs1m7ll6rvpl3lj44lb0p5fi0g2siinnxpjffz2ydi97p";
};
resources = fetchFromGitHub {
owner = "psi-plus";
repo = "resources";
rev = "2f1c12564f7506bf902a26040fdb47ead4df6b73";
sha256 = "1dgm9k052fq7f2bpx13kchg7sxb227dkn115lyspzvhnhprnypz2";
};
postUnpack = ''
cp -a "${resources}/iconsets" "$sourceRoot"
'';
cmakeFlags = [
"-DENABLE_PLUGINS=ON"
];
@ -38,8 +27,6 @@ stdenv.mkDerivation rec {
libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c
];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "XMPP (Jabber) client";
maintainers = with maintainers; [ orivej misuzu ];

15
pkgs/applications/networking/remote/citrix-workspace/default.nix
View File

@ -24,7 +24,7 @@
, gtk_engines
, alsaLib
, zlib
, version ? "19.12.0"
, version ? "20.04.0"
}:
let
@ -71,7 +71,18 @@ let
x86hash = "07rfp90ksnvr8zv7ix7f0z6a59n48s7bd4kqbzilfwxgs4ddqmcy";
x64suffix = "19";
x86suffix = "19";
homepage = "https://www.citrix.com/de-de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-1912.html";
};
"20.04.0" = {
major = "20";
minor = "04";
patch = "0";
x64hash = "E923592216F9541173846F932784E6C062CB09C9E8858219C7489607BF82A0FB";
x86hash = "A2E2E1882723DA6796E68916B3BB2B44DD575A83DEB03CA90A262F6C81B1A53F";
x64suffix = "21";
x86suffix = "21";
homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
};
};

6
pkgs/applications/office/trilium/default.nix
View File

@ -19,7 +19,7 @@ let
maintainers = with maintainers; [ emmanuelrosa dtzWill kampka ];
};
version = "0.40.5";
version = "0.40.7";
in {
@ -30,7 +30,7 @@ in {
src = fetchurl {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
sha256 = "02hmfgv8viy1hn2ix4b0gdzbcj7piddsmjdnb0b5hpwahqrikiyi";
sha256 = "0xi3bb0kbphbgpk2wlsad509g0hwwb259q2vkv0kgyr4i4wcyc1f";
};
# Fetch from source repo, no longer included in release.
@ -78,7 +78,7 @@ in {
src = fetchurl {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
sha256 = "00b7qx2h26qrdhw2a7y0irhbr442yynnzpm1pz55hi33zpckbrc7";
sha256 = "15bspngnnbq6mhp1f82j9hccg0ymhm6i4rddpgz3n7dw5wxdj0sm";
};
nativeBuildInputs = [

4
pkgs/applications/science/astronomy/stellarium/default.nix
View File

@ -6,13 +6,13 @@
mkDerivation rec {
pname = "stellarium";
version = "0.20.0";
version = "0.20.1";
src = fetchFromGitHub {
owner = "Stellarium";
repo = "stellarium";
rev = "v${version}";
sha256 = "1732dxkgyqd4xf0ry7v930vcbv60l8iry596869z1d47j2piibs4";
sha256 = "1x8svan03k1x9jwqflimbpj7jpg6mjrbz26bg1sbhsqdlc8rbhky";
};
nativeBuildInputs = [ cmake perl wrapQtAppsHook ];

8
pkgs/applications/science/biology/mosdepth/default.nix
View File

@ -4,8 +4,8 @@ let
hts-nim = fetchFromGitHub {
owner = "brentp";
repo = "hts-nim";
rev = "v0.2.14";
sha256 = "0d1z4b6mrppmz3hgkxd4wcy79w68icvhi7q7n3m2k17n8f3xbdx3";
rev = "v0.3.4";
sha256 = "0670phk1bq3l9j2zaa8i5wcpc5dyfrc0l2a6c21g0l2mmdczffa7";
};
docopt = fetchFromGitHub {
@ -17,13 +17,13 @@ let
in stdenv.mkDerivation rec {
pname = "mosdepth";
version = "0.2.6";
version = "0.2.9";
src = fetchFromGitHub {
owner = "brentp";
repo = "mosdepth";
rev = "v${version}";
sha256 = "0i9pl9lsli3y84ygxanrr525gfg8fs9h481944cbzsmqmbldwvgk";
sha256 = "01gm9gj2x2zs4yx6wk761fi1papi7qr3gp4ln1kkn8n2f9y9h849";
};
buildInputs = [ nim ];

2
pkgs/applications/science/chemistry/octopus/default.nix
View File

@ -2,7 +2,7 @@
, libyaml, libxc, fftw, blas, lapack, gsl, netcdf, arpack, autoreconfHook
}:
assert (!blas.is64bit) && (!lapack.is64bit);
assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation rec {
pname = "octopus";

2
pkgs/applications/science/machine-learning/shogun/default.nix
View File

@ -13,7 +13,7 @@
assert pythonSupport -> pythonPackages != null;
assert opencvSupport -> opencv != null;
assert (!blas.is64bit) && (!lapack.is64bit);
assert (!blas.isILP64) && (!lapack.isILP64);
let
pname = "shogun";

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

@ -9,7 +9,7 @@
, static ? false
}:
assert (!blas.is64bit) && (!lapack.is64bit);
assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation rec {
name = "R-3.6.3";

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

@ -5,7 +5,7 @@
}:
assert enableGUI -> libGLU != null && libGL != null && xorg != null && fltk != null;
assert (!blas.is64bit) && (!lapack.is64bit);
assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation rec {
pname = "giac${lib.optionalString enableGUI "-with-xcas"}";

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

@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, blas, lapack, gfortran, gmm, fltk, libjpeg
, zlib, libGL, libGLU, xorg, opencascade-occt }:
assert (!blas.is64bit) && (!lapack.is64bit);
assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation rec {
pname = "gmsh";

2
pkgs/applications/science/math/sage/sage-env.nix
View File

@ -54,7 +54,7 @@
, less
}:
assert (!blas.is64bit) && (!lapack.is64bit);
assert (!blas.isILP64) && (!lapack.isILP64);
# This generates a `sage-env` shell file that will be sourced by sage on startup.
# It sets up various environment variables, telling sage where to find its

2
pkgs/applications/science/math/sage/sage-with-env.nix
View File

@ -23,7 +23,7 @@
}:
# lots of segfaults with (64 bit) blas
assert (!blas.is64bit) && (!lapack.is64bit);
assert (!blas.isILP64) && (!lapack.isILP64);
# Wrapper that combined `sagelib` with `sage-env` to produce an actually
# executable sage. No tests are run yet and no documentation is built.

2
pkgs/applications/science/math/sage/sagelib.nix
View File

@ -53,7 +53,7 @@
, pplpy
}:
assert (!blas.is64bit) && (!lapack.is64bit);
assert (!blas.isILP64) && (!lapack.isILP64);
# This is the core sage python package. Everything else is just wrappers gluing
# stuff together. It is not very useful on its own though, since it will not

4
pkgs/applications/version-management/git-and-tools/git/update.sh
View File

@ -4,8 +4,8 @@
set -eu -o pipefail
oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion git" | tr -d '"')"
latestTag="$(git ls-remote --tags --sort="v:refname" git://github.com/git/git.git | grep -v '\{\}' | grep -v '\-rc' | tail -1 | sed 's|^.*/v\(.*\)|\1|')"
targetVersion="${1:-latestTag}"
latestTag="$(git ls-remote --tags --sort="v:refname" https://github.com/git/git.git | grep -v '\{\}' | grep -v '\-rc' | tail -1 | sed 's|^.*/v\(.*\)|\1|')"
targetVersion="${1:-$latestTag}"
if [ ! "${oldVersion}" = "${targetVersion}" ]; then
update-source-version git "${targetVersion}"

6
pkgs/applications/window-managers/dwm/dwm-status.nix
View File

@ -9,19 +9,19 @@ in
rustPlatform.buildRustPackage rec {
pname = "dwm-status";
version = "1.6.3";
version = "1.6.4";
src = fetchFromGitHub {
owner = "Gerschtli";
repo = "dwm-status";
rev = version;
sha256 = "02sprsr7822ynkwpf3xdgmkdrgkw3vgijhlh65bayiv3b5lwb54n";
sha256 = "05dhd2gy7ysrnchdimrdd7jvzs1db9fyrk4ci7850jhrgavfd7c4";
};
nativeBuildInputs = [ makeWrapper pkgconfig ];
buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ];
cargoSha256 = "0xybd6110b29ghl66kxfs64704qlhnn9jb5vl7lfk9sv62cs564i";
cargoSha256 = "0zkbps8vsjcvy7x0sgb07kacszi57dlyq8j6ia6yy0jyqnvlaqa7";
postInstall = lib.optionalString (bins != []) ''
wrapProgram $out/bin/dwm-status --prefix "PATH" : "${stdenv.lib.makeBinPath bins}"

16
pkgs/build-support/alternatives/blas/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv
, lapack-reference, openblasCompat, openblas
, is64bit ? false
, blasProvider ? if is64bit then openblas else openblasCompat }:
, isILP64 ? false
, blasProvider ? if isILP64 then openblas else openblasCompat }:
let
blasFortranSymbols = [
@ -31,12 +31,12 @@ let
else stdenv.hostPlatform.extensions.sharedLibrary;
is64bit = blasProvider.blas64 or false;
isILP64 = blasProvider.blas64 or false;
blasImplementation = lib.getName blasProvider;
in
assert is64bit -> (blasImplementation == "openblas" && blasProvider.blas64) || blasImplementation == "mkl";
assert isILP64 -> (blasImplementation == "openblas" && blasProvider.blas64) || blasImplementation == "mkl";
stdenv.mkDerivation {
pname = "blas";
@ -49,7 +49,7 @@ stdenv.mkDerivation {
};
passthru = {
inherit is64bit;
inherit isILP64;
provider = blasProvider;
implementation = blasImplementation;
};
@ -58,6 +58,8 @@ stdenv.mkDerivation {
dontConfigure = true;
unpackPhase = "src=$PWD";
dontPatchELF = true;
installPhase = (''
mkdir -p $out/lib $dev/include $dev/lib/pkgconfig
@ -132,6 +134,8 @@ Libs: -L$out/lib -lcblas
EOF
'' + stdenv.lib.optionalString (blasImplementation == "mkl") ''
mkdir -p $out/nix-support
echo 'export MKL_INTERFACE_LAYER=${lib.optionalString is64bit "I"}LP64,GNU' > $out/nix-support/setup-hook
echo 'export MKL_INTERFACE_LAYER=${lib.optionalString isILP64 "I"}LP64,GNU' > $out/nix-support/setup-hook
ln -s $out/lib/libblas${canonicalExtension} $out/lib/libmkl_rt${stdenv.hostPlatform.extensions.sharedLibrary}
ln -sf ${blasProvider}/include/* $dev/include
'');
}

14
pkgs/build-support/alternatives/lapack/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv
, lapack-reference, openblasCompat, openblas
, is64bit ? false
, lapackProvider ? if is64bit then openblas else openblasCompat }:
, isILP64 ? false
, lapackProvider ? if isILP64 then openblas else openblasCompat }:
let
@ -14,7 +14,7 @@ let
in
assert is64bit -> (lapackImplementation == "openblas" && lapackProvider.blas64) || lapackImplementation == "mkl";
assert isILP64 -> (lapackImplementation == "openblas" && lapackProvider.blas64) || lapackImplementation == "mkl";
stdenv.mkDerivation {
pname = "lapack";
@ -27,7 +27,7 @@ stdenv.mkDerivation {
};
passthru = {
inherit is64bit;
inherit isILP64;
provider = lapackProvider;
implementation = lapackImplementation;
};
@ -36,6 +36,8 @@ stdenv.mkDerivation {
dontConfigure = true;
unpackPhase = "src=$PWD";
dontPatchELF = true;
installPhase = (''
mkdir -p $out/lib $dev/include $dev/lib/pkgconfig
@ -106,6 +108,8 @@ Libs: -L$out/lib -llapacke
EOF
'' + stdenv.lib.optionalString (lapackImplementation == "mkl") ''
mkdir -p $out/nix-support
echo 'export MKL_INTERFACE_LAYER=${lib.optionalString is64bit "I"}LP64,GNU' > $out/nix-support/setup-hook
echo 'export MKL_INTERFACE_LAYER=${lib.optionalString isILP64 "I"}LP64,GNU' > $out/nix-support/setup-hook
ln -s $out/lib/liblapack${canonicalExtension} $out/lib/libmkl_rt${stdenv.hostPlatform.extensions.sharedLibrary}
ln -sf ${lapackProvider}/include/* $dev/include
'');
}

2
pkgs/development/compilers/bs-platform/build-bs-platform.nix
View File

@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin
cp -rf jscomp lib ${bin_folder} vendor odoc_gen native bsb bsc bsrefmt $out
mkdir $out/lib/ocaml
mkdir -p $out/lib/ocaml
cp jscomp/runtime/js.* jscomp/runtime/*.cm* $out/lib/ocaml
cp jscomp/others/*.ml jscomp/others/*.mli jscomp/others/*.cm* $out/lib/ocaml
cp jscomp/stdlib-406/*.ml jscomp/stdlib-406/*.mli jscomp/stdlib-406/*.cm* $out/lib/ocaml

4
pkgs/development/compilers/bs-platform/default.nix
View File

@ -4,14 +4,14 @@ let
in
(build-bs-platform rec {
inherit stdenv runCommand fetchFromGitHub ninja nodejs python3;
version = "7.2.0";
version = "7.3.1";
ocaml-version = "4.06.1";
src = fetchFromGitHub {
owner = "BuckleScript";
repo = "bucklescript";
rev = version;
sha256 = "1fsx7gvcp6rbqd0qf5fix02mbbmk9rgm09zbwjrx0lp5cjv3n2s4";
sha256 = "14vp6cl5ml7xb3pd0paqajb50qv62l8j5m8hi3b6fh0pm68j1yxd";
fetchSubmodules = true;
};
}).overrideAttrs (attrs: {

4
pkgs/development/compilers/julia/1.3.nix
View File

@ -12,7 +12,7 @@
, CoreServices, ApplicationServices
}:
assert (!blas.is64bit) && (!lapack.is64bit);
assert (!blas.isILP64) && (!lapack.isILP64);
with stdenv.lib;
@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
"SHELL=${stdenv.shell}"
"USE_SYSTEM_BLAS=1"
"USE_BLAS64=${if blas.is64bit then "1" else "0"}"
"USE_BLAS64=${if blas.isILP64 then "1" else "0"}"
"USE_SYSTEM_LAPACK=1"

4
pkgs/development/compilers/julia/shared.nix
View File

@ -22,7 +22,7 @@
with stdenv.lib;
assert (!blas.is64bit) && (!lapack.is64bit);
assert (!blas.isILP64) && (!lapack.isILP64);
let
dsfmtVersion = "2.2.3";
@ -137,7 +137,7 @@ stdenv.mkDerivation rec {
"SHELL=${stdenv.shell}"
"USE_SYSTEM_BLAS=1"
"USE_BLAS64=${if blas.is64bit then "1" else "0"}"
"USE_BLAS64=${if blas.isILP64 then "1" else "0"}"
"USE_SYSTEM_LAPACK=1"

6
pkgs/development/interpreters/octave/default.nix
View File

@ -53,7 +53,7 @@
, darwin
}:
assert (!blas.is64bit) && (!lapack.is64bit);
assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation rec {
version = "5.2.0";
@ -125,12 +125,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
# See https://savannah.gnu.org/bugs/?50339
F77_INTEGER_8_FLAG = if blas.is64bit then "-fdefault-integer-8" else "";
F77_INTEGER_8_FLAG = if blas.isILP64 then "-fdefault-integer-8" else "";
configureFlags = [
"--with-blas=blas"
"--with-lapack=lapack"
(if blas.is64bit then "--enable-64" else "--disable-64")
(if blas.isILP64 then "--enable-64" else "--disable-64")
]
++ (if stdenv.isDarwin then [ "--enable-link-all-dependencies" ] else [ ])
++ stdenv.lib.optionals enableReadline [ "--enable-readline" ]

2
pkgs/development/libraries/fflas-ffpack/default.nix
View File

@ -2,7 +2,7 @@
, gmpxx
}:
assert (!blas.is64bit) && (!lapack.is64bit);
assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation rec {
pname = "fflas-ffpack";

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

@ -10,7 +10,7 @@
, withSage ? false # sage support
}:
assert (!blas.is64bit) && (!lapack.is64bit);
assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation rec {
pname = "linbox";

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

@ -18,7 +18,7 @@ stdenv.mkDerivation {
-e 's,^LAPACK=.*,LAPACK=-L${lapack}/lib -llapack,' \
Makeconf
''
+ stdenv.lib.optionalString blas.is64bit
+ stdenv.lib.optionalString blas.isILP64
''
sed -i Makeconf -e '/^FFLAGS=.*/ s/$/-fdefault-integer-8/'
'';

2
pkgs/development/libraries/science/math/arpack/default.nix
View File

@ -27,7 +27,7 @@ stdenv.mkDerivation {
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
"-DINTERFACE64=${optionalString blas.is64bit "1"}"
"-DINTERFACE64=${optionalString blas.isILP64 "1"}"
];
preCheck = if stdenv.isDarwin then ''

2
pkgs/development/libraries/science/math/ipopt/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, unzip, blas, lapack, gfortran }:
assert (!blas.is64bit) && (!lapack.is64bit);
assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation rec {
pname = "ipopt";

11
pkgs/development/libraries/science/math/magma/default.nix
View File

@ -1,8 +1,4 @@
{ stdenv, fetchurl, cmake, gfortran, cudatoolkit, libpthreadstubs, lapack, blas
, mklSupport ? false, mkl ? null
}:
assert !mklSupport || mkl != null;
{ stdenv, fetchurl, cmake, gfortran, cudatoolkit, libpthreadstubs, lapack, blas }:
with stdenv.lib;
@ -17,13 +13,10 @@ in stdenv.mkDerivation {
name = "magma-${version}.tar.gz";
};
buildInputs = [ gfortran cudatoolkit libpthreadstubs cmake ]
++ (if mklSupport then [ mkl ] else [ lapack blas ]);
buildInputs = [ gfortran cudatoolkit libpthreadstubs cmake lapack blas ];
doCheck = false;
MKLROOT = optionalString mklSupport mkl;
preConfigure = ''
export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++
'';

2
pkgs/development/libraries/science/math/scalapack/default.nix
View File

@ -2,7 +2,7 @@
, gfortran, mpi, blas, lapack
} :
assert (!blas.is64bit) && (!lapack.is64bit);
assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation rec {
pname = "scalapack";

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