mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-20 08:59:32 +03:00
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1506218
This commit is contained in:
Vladimír Čunát
commit
71f4ba29a3
@ -817,6 +817,11 @@
|
||||
github = "cdepillabout";
|
||||
name = "Dennis Gosnell";
|
||||
};
|
||||
ceedubs = {
|
||||
email = "ceedubs@gmail.com";
|
||||
github = "ceedubs";
|
||||
name = "Cody Allen";
|
||||
};
|
||||
cfouche = {
|
||||
email = "chaddai.fouche@gmail.com";
|
||||
github = "Chaddai";
|
||||
|
||||
@ -91,6 +91,11 @@
|
||||
in <literal>nixos/modules/virtualisation/google-compute-config.nix</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>./services/misc/beanstalkd.nix</literal>
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
|
||||
@ -543,6 +548,20 @@
|
||||
use <literal>nixos-rebuild boot; reboot</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
Symlinks in <filename>/etc</filename> (except <filename>/etc/static</filename>)
|
||||
are now relative instead of absolute. This makes possible to examine
|
||||
NixOS container's <filename>/etc</filename> directory from host system
|
||||
(previously it pointed to host <filename>/etc</filename> when viewed from host,
|
||||
and to container <filename>/etc</filename> when viewed from container chroot).
|
||||
</para>
|
||||
<para>
|
||||
This also makes <filename>/etc/os-release</filename> adhere to
|
||||
<link xlink:href="https://www.freedesktop.org/software/systemd/man/os-release.html">the standard</link>
|
||||
for NixOS containers.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
Flat volumes are now disabled by default in <literal>hardware.pulseaudio</literal>.
|
||||
@ -613,6 +632,28 @@
|
||||
<varname>environment.systemPackages</varname> implicitly.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>intel</literal> driver has been removed from the default list of
|
||||
<link linkend="opt-services.xserver.videoDrivers">X.org video drivers</link>.
|
||||
The <literal>modesetting</literal> driver should take over automatically,
|
||||
it is better maintained upstream and has less problems with advanced X11 features.
|
||||
Some performance regressions on some GPU models might happen.
|
||||
Some OpenCL and VA-API applications might also break
|
||||
(Beignet seems to provide OpenCL support with
|
||||
<literal>modesetting</literal> driver, too).
|
||||
Users who need this functionality more than multi-output XRandR are advised
|
||||
to add `intel` to `videoDrivers` and report an issue (or provide additional
|
||||
details in an existing one)
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
Openmpi has been updated to version 4.0.0, which removes some deprecated MPI-1 symbols.
|
||||
This may break some older applications that still rely on those symbols.
|
||||
An upgrade guide can be found <link xlink:href="https://www.open-mpi.org/faq/?category=mpi-removed">here</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
@ -361,6 +361,7 @@
|
||||
./services/misc/apache-kafka.nix
|
||||
./services/misc/autofs.nix
|
||||
./services/misc/autorandr.nix
|
||||
./services/misc/beanstalkd.nix
|
||||
./services/misc/bees.nix
|
||||
./services/misc/bepasty.nix
|
||||
./services/misc/canto-daemon.nix
|
||||
|
||||
@ -64,6 +64,8 @@ in
|
||||
${cfg.extraOpts}
|
||||
'';
|
||||
WorkingDirectory = top.dataDir;
|
||||
Restart = "on-failure";
|
||||
RestartSec = 5;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -76,6 +76,8 @@ in
|
||||
WorkingDirectory = top.dataDir;
|
||||
User = "kubernetes";
|
||||
Group = "kubernetes";
|
||||
Restart = "on-failure";
|
||||
RestartSec = 5;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
52
nixos/modules/services/misc/beanstalkd.nix
Normal file
52
nixos/modules/services/misc/beanstalkd.nix
Normal file
@ -0,0 +1,52 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.beanstalkd;
|
||||
pkg = pkgs.beanstalkd;
|
||||
in
|
||||
|
||||
{
|
||||
# interface
|
||||
|
||||
options = {
|
||||
services.beanstalkd = {
|
||||
enable = mkEnableOption "Enable the Beanstalk work queue.";
|
||||
|
||||
listen = {
|
||||
port = mkOption {
|
||||
type = types.int;
|
||||
description = "TCP port that will be used to accept client connections.";
|
||||
default = 11300;
|
||||
};
|
||||
|
||||
address = mkOption {
|
||||
type = types.str;
|
||||
description = "IP address to listen on.";
|
||||
default = "127.0.0.1";
|
||||
example = "0.0.0.0";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# implementation
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
environment.systemPackages = [ pkg ];
|
||||
|
||||
systemd.services.beanstalkd = {
|
||||
description = "Beanstalk Work Queue";
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
DynamicUser = true;
|
||||
Restart = "always";
|
||||
ExecStart = "${pkg}/bin/beanstalkd -l ${cfg.listen.address} -p ${toString cfg.listen.port}";
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
}
|
||||
@ -31,6 +31,15 @@ in
|
||||
default = null;
|
||||
description = ''
|
||||
The path to the file used for signing derivation data.
|
||||
Generate with:
|
||||
|
||||
```
|
||||
nix-store --generate-binary-cache-key key-name secret-key-file public-key-file
|
||||
```
|
||||
|
||||
Make sure user `nix-serve` has read access to the private key file.
|
||||
|
||||
For more details see <citerefentry><refentrytitle>nix-store</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@ -240,7 +240,7 @@ in
|
||||
videoDrivers = mkOption {
|
||||
type = types.listOf types.str;
|
||||
# !!! We'd like "nv" here, but it segfaults the X server.
|
||||
default = [ "ati" "cirrus" "intel" "vesa" "vmware" "modesetting" ];
|
||||
default = [ "ati" "cirrus" "vesa" "vmware" "modesetting" ];
|
||||
example = [
|
||||
"ati_unfree" "amdgpu" "amdgpu-pro"
|
||||
"nv" "nvidia" "nvidiaLegacy340" "nvidiaLegacy304"
|
||||
|
||||
@ -10,6 +10,11 @@ users_=($users)
|
||||
groups_=($groups)
|
||||
set +f
|
||||
|
||||
# Create relative symlinks, so that the links can be followed if
|
||||
# the NixOS installation is not mounted as filesystem root.
|
||||
# Absolute symlinks violate the os-release format
|
||||
# at https://www.freedesktop.org/software/systemd/man/os-release.html
|
||||
# and break e.g. systemd-nspawn and os-prober.
|
||||
for ((i = 0; i < ${#targets_[@]}; i++)); do
|
||||
source="${sources_[$i]}"
|
||||
target="${targets_[$i]}"
|
||||
@ -19,14 +24,14 @@ for ((i = 0; i < ${#targets_[@]}; i++)); do
|
||||
# If the source name contains '*', perform globbing.
|
||||
mkdir -p $out/etc/$target
|
||||
for fn in $source; do
|
||||
ln -s "$fn" $out/etc/$target/
|
||||
ln -s --relative "$fn" $out/etc/$target/
|
||||
done
|
||||
|
||||
else
|
||||
|
||||
|
||||
mkdir -p $out/etc/$(dirname $target)
|
||||
if ! [ -e $out/etc/$target ]; then
|
||||
ln -s $source $out/etc/$target
|
||||
ln -s --relative $source $out/etc/$target
|
||||
else
|
||||
echo "duplicate entry $target -> $source"
|
||||
if test "$(readlink $out/etc/$target)" != "$source"; then
|
||||
@ -34,13 +39,13 @@ for ((i = 0; i < ${#targets_[@]}; i++)); do
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
if test "${modes_[$i]}" != symlink; then
|
||||
echo "${modes_[$i]}" > $out/etc/$target.mode
|
||||
echo "${users_[$i]}" > $out/etc/$target.uid
|
||||
echo "${groups_[$i]}" > $out/etc/$target.gid
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
done
|
||||
|
||||
|
||||
@ -4,6 +4,7 @@ use File::Copy;
|
||||
use File::Path;
|
||||
use File::Basename;
|
||||
use File::Slurp;
|
||||
use File::Spec;
|
||||
|
||||
my $etc = $ARGV[0] or die;
|
||||
my $static = "/etc/static";
|
||||
@ -17,6 +18,20 @@ sub atomicSymlink {
|
||||
return 1;
|
||||
}
|
||||
|
||||
# Create relative symlinks, so that the links can be followed if
|
||||
# the NixOS installation is not mounted as filesystem root.
|
||||
# Absolute symlinks violate the os-release format
|
||||
# at https://www.freedesktop.org/software/systemd/man/os-release.html
|
||||
# and break e.g. systemd-nspawn and os-prober.
|
||||
sub atomicRelativeSymlink {
|
||||
my ($source, $target) = @_;
|
||||
my $tmp = "$target.tmp";
|
||||
unlink $tmp;
|
||||
my $rel = File::Spec->abs2rel($source, dirname $target);
|
||||
symlink $rel, $tmp or return 0;
|
||||
rename $tmp, $target or return 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
# Atomically update /etc/static to point at the etc files of the
|
||||
# current configuration.
|
||||
@ -103,7 +118,7 @@ sub link {
|
||||
if (-e "$_.mode") {
|
||||
my $mode = read_file("$_.mode"); chomp $mode;
|
||||
if ($mode eq "direct-symlink") {
|
||||
atomicSymlink readlink("$static/$fn"), $target or warn;
|
||||
atomicRelativeSymlink readlink("$static/$fn"), $target or warn;
|
||||
} else {
|
||||
my $uid = read_file("$_.uid"); chomp $uid;
|
||||
my $gid = read_file("$_.gid"); chomp $gid;
|
||||
@ -117,7 +132,7 @@ sub link {
|
||||
push @copied, $fn;
|
||||
print CLEAN "$fn\n";
|
||||
} elsif (-l "$_") {
|
||||
atomicSymlink "$static/$fn", $target or warn;
|
||||
atomicRelativeSymlink "$static/$fn", $target or warn;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -25,6 +25,7 @@ in
|
||||
atd = handleTest ./atd.nix {};
|
||||
avahi = handleTest ./avahi.nix {};
|
||||
bcachefs = handleTestOn ["x86_64-linux"] ./bcachefs.nix {}; # linux-4.18.2018.10.12 is unsupported on aarch64
|
||||
beanstalkd = handleTest ./beanstalkd.nix {};
|
||||
beegfs = handleTestOn ["x86_64-linux"] ./beegfs.nix {}; # beegfs is unsupported on aarch64
|
||||
bind = handleTest ./bind.nix {};
|
||||
bittorrent = handleTest ./bittorrent.nix {};
|
||||
|
||||
43
nixos/tests/beanstalkd.nix
Normal file
43
nixos/tests/beanstalkd.nix
Normal file
@ -0,0 +1,43 @@
|
||||
import ./make-test.nix ({ pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
produce = pkgs.writeScript "produce.py" ''
|
||||
#!${pkgs.python2.withPackages (p: [p.beanstalkc])}/bin/python
|
||||
import beanstalkc
|
||||
|
||||
queue = beanstalkc.Connection(host='localhost', port=11300, parse_yaml=False);
|
||||
queue.put('this is a job')
|
||||
queue.put('this is another job')
|
||||
'';
|
||||
|
||||
consume = pkgs.writeScript "consume.py" ''
|
||||
#!${pkgs.python2.withPackages (p: [p.beanstalkc])}/bin/python
|
||||
import beanstalkc
|
||||
|
||||
queue = beanstalkc.Connection(host='localhost', port=11300, parse_yaml=False);
|
||||
|
||||
job = queue.reserve(timeout=0)
|
||||
print job.body
|
||||
job.delete()
|
||||
'';
|
||||
|
||||
in
|
||||
{
|
||||
name = "beanstalkd";
|
||||
meta.maintainers = [ lib.maintainers.aanderse ];
|
||||
|
||||
machine =
|
||||
{ ... }:
|
||||
{ services.beanstalkd.enable = true;
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
startAll;
|
||||
|
||||
$machine->waitForUnit('beanstalkd.service');
|
||||
|
||||
$machine->succeed("${produce}");
|
||||
$machine->succeed("${consume}") eq "this is a job\n" or die;
|
||||
$machine->succeed("${consume}") eq "this is another job\n" or die;
|
||||
'';
|
||||
})
|
||||
@ -87,8 +87,8 @@ in {
|
||||
$hass->succeed("curl http://localhost:8123/api/states/binary_sensor.mqtt_binary_sensor -H 'x-ha-access: ${apiPassword}' | grep -qF '\"state\": \"on\"'");
|
||||
|
||||
# Toggle a binary sensor using hass-cli
|
||||
$hass->succeed("${hassCli} --output json entity get binary_sensor.mqtt_binary_sensor | grep -qF '\"state\": \"on\"'");
|
||||
$hass->succeed("${hassCli} entity edit binary_sensor.mqtt_binary_sensor --json='{\"state\": \"off\"}'");
|
||||
$hass->succeed("${hassCli} --output json state get binary_sensor.mqtt_binary_sensor | grep -qF '\"state\": \"on\"'");
|
||||
$hass->succeed("${hassCli} state edit binary_sensor.mqtt_binary_sensor --json='{\"state\": \"off\"}'");
|
||||
$hass->succeed("curl http://localhost:8123/api/states/binary_sensor.mqtt_binary_sensor -H 'x-ha-access: ${apiPassword}' | grep -qF '\"state\": \"off\"'");
|
||||
|
||||
# Print log to ease debugging
|
||||
|
||||
@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
|
||||
maintainers = with stdenv.lib.maintainers; [ chaoflow ];
|
||||
platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -60583,7 +60583,7 @@
|
||||
owner = "immerrr";
|
||||
repo = "lua-mode";
|
||||
rev = "99312b8d6c500ba3067da6d81efcfbbea05a1cbd";
|
||||
sha256 = "04m9njcpdmar3njjz4x2qq26xk0k6qprcfzx8whlmvapqf8w19iz";
|
||||
sha256 = "1gi8k2yydwm1knq4pgmn6dp92g97av4ncb6acrnz07iba2r34dyn";
|
||||
};
|
||||
recipe = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/lua-mode";
|
||||
@ -107584,4 +107584,4 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
}
|
||||
}
|
||||
|
||||
@ -124,6 +124,7 @@ let
|
||||
kmbox = callPackage ./kmbox.nix {};
|
||||
kmime = callPackage ./kmime.nix {};
|
||||
kmix = callPackage ./kmix.nix {};
|
||||
kmplot = callPackage ./kmplot.nix {};
|
||||
kolourpaint = callPackage ./kolourpaint.nix {};
|
||||
kompare = callPackage ./kompare.nix {};
|
||||
konsole = callPackage ./konsole.nix {};
|
||||
|
||||
15
pkgs/applications/kde/kmplot.nix
Normal file
15
pkgs/applications/kde/kmplot.nix
Normal file
@ -0,0 +1,15 @@
|
||||
{ mkDerivation, lib, extra-cmake-modules, kdoctools
|
||||
, kcrash, kguiaddons, ki18n, kparts, kwidgetsaddons, kdbusaddons
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
name = "kmplot";
|
||||
meta = {
|
||||
license = with lib.licenses; [ gpl2Plus fdl12 ];
|
||||
maintainers = [ lib.maintainers.orivej ];
|
||||
};
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [
|
||||
kcrash kguiaddons ki18n kparts kwidgetsaddons kdbusaddons
|
||||
];
|
||||
}
|
||||
@ -3,7 +3,7 @@
|
||||
, kconfig, kconfigwidgets, kcoreaddons, kdeclarative, ki18n
|
||||
, kitemviews, kcmutils, kio, knewstuff, ktexteditor, kwidgetsaddons
|
||||
, kwindowsystem, kxmlgui, qtscript, qtdeclarative, kqtquickcharts
|
||||
, qtx11extras, qtgraphicaleffects, xorg
|
||||
, qtx11extras, qtgraphicaleffects, qtxmlpatterns, xorg
|
||||
}:
|
||||
|
||||
|
||||
@ -19,7 +19,8 @@
|
||||
kconfig kconfigwidgets kcoreaddons kdeclarative ki18n
|
||||
kitemviews kcmutils kio knewstuff ktexteditor kwidgetsaddons
|
||||
kwindowsystem kxmlgui qtscript qtdeclarative kqtquickcharts
|
||||
qtx11extras qtgraphicaleffects xorg.libxkbfile xorg.libxcb
|
||||
qtx11extras qtgraphicaleffects qtxmlpatterns
|
||||
xorg.libxkbfile xorg.libxcb
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -17,6 +17,8 @@
|
||||
libXrandr,
|
||||
libGL,
|
||||
xclip,
|
||||
wayland,
|
||||
libxkbcommon,
|
||||
# Darwin Frameworks
|
||||
cf-private,
|
||||
AppKit,
|
||||
@ -40,6 +42,9 @@ let
|
||||
libXrandr
|
||||
libGL
|
||||
libXi
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
wayland
|
||||
libxkbcommon
|
||||
];
|
||||
in buildRustPackage rec {
|
||||
name = "alacritty-${version}";
|
||||
|
||||
@ -24,7 +24,7 @@ buildGoPackage rec {
|
||||
description = "Automatically convert your existing AutoScaling groups to up to 90% cheaper spot instances with minimal configuration changes";
|
||||
license = licenses.free;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -24,7 +24,7 @@ buildGoPackage rec {
|
||||
The interface is inspired by htop and shortcut keys are inspired by vim.
|
||||
'';
|
||||
homepage = https://cointop.sh;
|
||||
platforms = stdenv.lib.platforms.linux; # cannot test others
|
||||
platforms = stdenv.lib.platforms.unix; # cannot test others
|
||||
maintainers = [ ];
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
};
|
||||
|
||||
@ -1,29 +1,17 @@
|
||||
{stdenv, fetchpatch, fetchFromGitHub, python3Packages}:
|
||||
{stdenv, fetchpatch, fetchFromGitHub, python3}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.1";
|
||||
version = "1.6";
|
||||
name = "ddgr-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jarun";
|
||||
repo = "ddgr";
|
||||
rev = "v${version}";
|
||||
sha256 = "1q66kwip5y0kfkfldm1x54plz85mjyvv1xpxjqrs30r2lr0najgf";
|
||||
sha256 = "04ybbjsf9hpn2p5cjjm15cwvv0mwrmdi19iifrym6ps3rmll0p3c";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
(python3Packages.python.withPackages (ps: with ps; [
|
||||
requests
|
||||
]))
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
sha256 = "1rxr3biq0mk4m0m7dsxr70dhz4fg5siil5x5fy9nymcmhvcm1cdc";
|
||||
name = "Fix-zsh-completion.patch";
|
||||
url = "https://github.com/jarun/ddgr/commit/10c1a911a3d5cbf3e96357c932b0211d3165c4b8.patch";
|
||||
})
|
||||
];
|
||||
buildInputs = [ python3 ];
|
||||
|
||||
makeFlags = "PREFIX=$(out)";
|
||||
|
||||
@ -40,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = https://github.com/jarun/ddgr;
|
||||
description = "Search DuckDuckGo from the terminal";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ markus1189 ];
|
||||
maintainers = with maintainers; [ ceedubs markus1189 ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
name = "udiskie-${version}";
|
||||
version = "1.7.5";
|
||||
version = "1.7.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coldfix";
|
||||
repo = "udiskie";
|
||||
rev = version;
|
||||
sha256 = "1mcdn8ha5d5nsmrzk6xnnsqrmk94rdrzym9sqm38zk5r8gpyl1k4";
|
||||
sha256 = "1j17z26vy44il2s9zgchvhq280vq8ag64ddi35f35b444wz2azlb";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -3,14 +3,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xterm-342";
|
||||
name = "xterm-344";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"ftp://ftp.invisible-island.net/xterm/${name}.tgz"
|
||||
"https://invisible-mirror.net/archives/xterm/${name}.tgz"
|
||||
];
|
||||
sha256 = "1y8ldzl4h1872fxvpvi2zwa9y3d34872vfdvfasap79lpn8208l0";
|
||||
sha256 = "1xfdmib8n6gw5s90vbvdhm630k8i2dbprknp4as4mqls27vbiknc";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
||||
@ -18,7 +18,7 @@ buildGoPackage rec {
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://www.nomadproject.io/;
|
||||
description = "A Distributed, Highly Available, Datacenter-Aware Scheduler";
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ rushmorem pradeepchhetri ];
|
||||
};
|
||||
|
||||
@ -83,6 +83,6 @@ in buildGoPackage rec {
|
||||
license = licenses.asl20;
|
||||
homepage = http://www.openshift.org;
|
||||
maintainers = with maintainers; [offline bachp moretea];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -24,7 +24,7 @@ buildGoPackage rec {
|
||||
description = "Agent to enable remote management of your Amazon EC2 instance configuration";
|
||||
homepage = "https://github.com/aws/amazon-ssm-agent";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ copumpkin ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -20,6 +20,6 @@ buildGoPackage rec {
|
||||
homepage = https://github.com/odeke-em/drive;
|
||||
description = "Google Drive client for the commandline";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -17,7 +17,7 @@ buildGoPackage rec {
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/prasmussen/gdrive;
|
||||
description = "A command line utility for interacting with Google Drive";
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.rzetterberg ];
|
||||
};
|
||||
|
||||
@ -56,11 +56,11 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "signal-desktop-${version}";
|
||||
version = "1.21.2";
|
||||
version = "1.22.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
sha256 = "0nr9d4z9c451nbzhjz3a1szx490rw1r01qf84xw72z7d7awn25ci";
|
||||
sha256 = "1j5kh0fvbl3nnxdpnwvamrnxfwbp6nzbij39b2lc5wp1m1yaaky5";
|
||||
};
|
||||
|
||||
phases = [ "unpackPhase" "installPhase" ];
|
||||
|
||||
@ -36,6 +36,6 @@ buildPythonPackage rec {
|
||||
description = "A Twitter client for the console";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ garbas ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,15 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "owncloud-client-${version}";
|
||||
version = "2.4.3";
|
||||
version = "2.5.3.11470";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz";
|
||||
sha256 = "1gz6xg1vm054ksrsakzfkzxgpskm0xkhsqwq0fj3i2kas09zzczk";
|
||||
sha256 = "0cznis8qadsnlgm046lxn8vmbxli6zp4b8nk93n53mkfxlcw355n";
|
||||
};
|
||||
|
||||
patches = [ ./find-sql.patch ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig cmake ];
|
||||
buildInputs = [ qtbase qtwebkit qtkeychain sqlite ];
|
||||
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
*** a/cmake/modules/QtVersionAbstraction.cmake
|
||||
--- b/cmake/modules/QtVersionAbstraction.cmake
|
||||
***************
|
||||
*** 8,13 ****
|
||||
--- 8,14 ----
|
||||
find_package(Qt5Core REQUIRED)
|
||||
find_package(Qt5Network REQUIRED)
|
||||
find_package(Qt5Xml REQUIRED)
|
||||
+ find_package(Qt5Sql REQUIRED)
|
||||
find_package(Qt5Concurrent REQUIRED)
|
||||
if(UNIT_TESTING)
|
||||
find_package(Qt5Test REQUIRED)
|
||||
@ -28,7 +28,7 @@ python3Packages.buildPythonPackage rec {
|
||||
description = "Quick access to Zotero references";
|
||||
homepage = http://www.cogsci.nl/software/qnotero;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = [ stdenv.lib.maintainers.nico202 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,11 +9,11 @@
|
||||
|
||||
python2Packages.buildPythonApplication rec {
|
||||
name = "zim-${version}";
|
||||
version = "0.69";
|
||||
version = "0.69.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://zim-wiki.org/downloads/${name}.tar.gz";
|
||||
sha256 = "1j04l1914iw87b0jd3r1czrh0q491fdgbqbi0biacxiri5q0i6a1";
|
||||
sha256 = "1yzb8x4mjp96zshcw7xbd4mvqn8zmbcm7cndskpxyk5yccyn5awq";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python2Packages; [ pyGtkGlade pyxdg pygobject2 ];
|
||||
|
||||
@ -33,8 +33,9 @@ in stdenv.mkDerivation rec {
|
||||
cp -r . "$out"
|
||||
rm -r $out/Libs
|
||||
|
||||
cp -r "${maps.minigames}"/* "${maps.melee}"/* "${maps.ladder2017season1}"/* "${maps.ladder2017season2}"/* "${maps.ladder2017season3}"/* \
|
||||
"${maps.ladder2017season4}"/* "${maps.ladder2018season1}"/* "${maps.ladder2018season2}"/* "$out"/Maps/
|
||||
cp -ur "${maps.minigames}"/* "${maps.melee}"/* "${maps.ladder2017season1}"/* "${maps.ladder2017season2}"/* "${maps.ladder2017season3}"/* \
|
||||
"${maps.ladder2017season4}"/* "${maps.ladder2018season1}"/* "${maps.ladder2018season2}"/* \
|
||||
"${maps.ladder2018season3}"/* "${maps.ladder2018season4}"/* "${maps.ladder2019season1}"/* "$out"/Maps/
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ fetchzip
|
||||
{ fetchzip, unzip
|
||||
}:
|
||||
let
|
||||
fetchzip' = args: (fetchzip args).overrideAttrs (old: { UNZIP = "-P iagreetotheeula"; });
|
||||
fetchzip' = args: (fetchzip args).overrideAttrs (old: { UNZIP = "-j -P iagreetotheeula"; });
|
||||
in
|
||||
{
|
||||
minigames = fetchzip {
|
||||
@ -17,32 +17,47 @@ in
|
||||
};
|
||||
ladder2017season1 = fetchzip' {
|
||||
url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season1.zip";
|
||||
sha256 = "194p0mb0bh63sjy84q21x4v5pb6d7hidivfi28aalr2gkwhwqfvh";
|
||||
sha256 = "0ngg4g74s2ryhylny93fm8yq9rlrhphwnjg2s6f3qr85a2b3zdpd";
|
||||
stripRoot = false;
|
||||
};
|
||||
ladder2017season2 = fetchzip' {
|
||||
url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season2.zip";
|
||||
sha256 = "1pvp7zi16326x3l45mk7s959ggnkg2j1w9rfmaxxa8mawr9c6i39";
|
||||
sha256 = "01kycnvqagql9pkjkcgngfcnry2pc4kcygdkk511m0qr34909za5";
|
||||
stripRoot = false;
|
||||
};
|
||||
ladder2017season3 = fetchzip' {
|
||||
url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season3_Updated.zip";
|
||||
sha256 = "1sjskfp6spmh7l2za1z55v7binx005qxw3w11xdvjpn20cyhkh8a";
|
||||
sha256 = "0wix3lwmbyxfgh8ldg0n66i21p0dbavk2dxjngz79rx708m8qvld";
|
||||
stripRoot = false;
|
||||
};
|
||||
ladder2017season4 = fetchzip' {
|
||||
url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season4.zip";
|
||||
sha256 = "1zf4mfq6r1ylf8bmd0qpv134dcrfgrsi4afxfqwnf39ijdq4z26g";
|
||||
sha256 = "1sidnmk2rc9j5fd3a4623pvaika1mm1rwhznb2qklsqsq1x2qckp";
|
||||
stripRoot = false;
|
||||
};
|
||||
ladder2018season1 = fetchzip' {
|
||||
url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season1.zip";
|
||||
sha256 = "0p51xj98qg816qm9ywv9zar5llqvqs6bcyns6d5fp2j39fg08v6f";
|
||||
sha256 = "0mp0ilcq0gmd7ahahc5i8c7bdr3ivk6skx0b2cgb1z89l5d76irq";
|
||||
stripRoot = false;
|
||||
};
|
||||
ladder2018season2 = fetchzip' {
|
||||
url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season2_Updated.zip";
|
||||
sha256 = "1wjn6vpbymjvjxqf10h7az34fnmhb5dpi878nsydlax25v9lgzqx";
|
||||
sha256 = "176rs848cx5src7qbr6dnn81bv1i86i381fidk3v81q9bxlmc2rv";
|
||||
stripRoot = false;
|
||||
};
|
||||
ladder2018season3 = fetchzip' {
|
||||
url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season3.zip";
|
||||
sha256 = "1r3wv4w53g9zq6073ajgv74prbdsd1x3zfpyhv1kpxbffyr0x0zp";
|
||||
stripRoot = false;
|
||||
};
|
||||
ladder2018season4 = fetchzip' {
|
||||
url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season4.zip";
|
||||
sha256 = "0k47rr6pzxbanlqnhliwywkvf0w04c8hxmbanksbz6aj5wpkcn1s";
|
||||
stripRoot = false;
|
||||
};
|
||||
ladder2019season1 = fetchzip' {
|
||||
url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2019Season1.zip";
|
||||
sha256 = "1dlk9zza8h70lbjvg2ykc5wr9vsvvdk02szwrkgdw26mkssl2rg9";
|
||||
stripRoot = false;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg
|
||||
, zlib, libGLU_combined, libGLU, xorg }:
|
||||
|
||||
let version = "4.1.3"; in
|
||||
let version = "4.1.5"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "gmsh-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://gmsh.info/src/gmsh-${version}-source.tgz";
|
||||
sha256 = "0padylvicyhcm4vqkizpknjfw8qxh39scw3mj5xbs9bs8c442kmx";
|
||||
sha256 = "654d38203f76035a281006b77dcb838987a44fd549287f11c53a1e9cdf598f46";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake openblasCompat gmm fltk libjpeg zlib libGLU_combined
|
||||
|
||||
@ -19,7 +19,7 @@ buildGoPackage rec {
|
||||
description = "The agent that runs on AWS EC2 container instances and starts containers on behalf of Amazon ECS";
|
||||
homepage = "https://github.com/aws/amazon-ecs-agent";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ copumpkin ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -283,6 +283,7 @@ rec {
|
||||
let
|
||||
storePathToLayer = substituteAll
|
||||
{ inherit (stdenv) shell;
|
||||
isExecutable = true;
|
||||
src = ./store-path-to-layer.sh;
|
||||
};
|
||||
in
|
||||
|
||||
27
pkgs/data/fonts/undefined-medium/default.nix
Normal file
27
pkgs/data/fonts/undefined-medium/default.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ stdenv, fetchzip }:
|
||||
|
||||
fetchzip rec {
|
||||
name = "undefined-medium-1.0";
|
||||
|
||||
url = https://github.com/andirueckel/undefined-medium/archive/v1.0.zip;
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts
|
||||
unzip -j $downloadedFile ${name}/fonts/otf/\*.otf -d $out/share/fonts/opentype
|
||||
'';
|
||||
|
||||
sha256 = "0v3p1g9f1c0d6b9lhrvm1grzivm7ddk7dvn96zl5hdzr2y60y1rw";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://undefined-medium.com/;
|
||||
description = "A pixel grid-based monospace typeface";
|
||||
longDescription = ''
|
||||
undefined medium is a free and open-source pixel grid-based
|
||||
monospace typeface suitable for programming, writing, and
|
||||
whatever else you can think of … it’s pretty undefined.
|
||||
'';
|
||||
license = licenses.ofl;
|
||||
maintainers = [ maintainers.rycee ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
{ fetchurl }:
|
||||
|
||||
fetchurl {
|
||||
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/e95fefd56a6b8de585e92cd34de4870e31fb7bc7.tar.gz";
|
||||
sha256 = "08pzxwsc4incrl5mv8572xs9332206p2cw2mynxks33n7nh98vmx";
|
||||
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/f59e85c25b8e9f07459338884e25d16752839b54.tar.gz";
|
||||
sha256 = "0yapmana2kzsixmgghj76w3s546d258rbzw7qmfqhi6bxyhc6a86";
|
||||
}
|
||||
|
||||
@ -10,7 +10,7 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "screenshot-tool"; # This will be renamed to "screenshot" soon. See -> https://github.com/elementary/screenshot/pull/93
|
||||
version = "1.6.1";
|
||||
version = "1.6.2";
|
||||
|
||||
name = "elementary-${pname}-${version}";
|
||||
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "elementary";
|
||||
repo = "screenshot";
|
||||
rev = version;
|
||||
sha256 = "1vvj550md7vw7n057h8cy887a0nmsbwry67dxrxyz6bsvpk8sb6g";
|
||||
sha256 = "1z61j96jk9zjr3bn5hgsp25m4v8h1rqwxm0kg8c34bvl06f13v8q";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wingpanel-indicator-nightlight";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "17pa048asbkhzz5945hjp96dnghdl72nqp1zq0b999nawnfrb339";
|
||||
sha256 = "0kw83ws91688xg96k9034dnz15szx2kva9smh1nb7xmdbpzn3qph";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -1,199 +1,165 @@
|
||||
{ stdenv, fetchFromGitHub
|
||||
, makeWrapper, unzip, which
|
||||
{ stdenv, lib, fetchFromGitHub, fetchpatch
|
||||
, makeWrapper, unzip, which, writeTextFile
|
||||
, curl, tzdata, gdb, darwin, git
|
||||
, callPackage, targetPackages, ldc
|
||||
, version ? "2.084.0"
|
||||
, dmdSha256 ? "1v61spdamncl8c1bzjc19b03p4jl0ih5zq9b7cqsy9ix7qaxmikf"
|
||||
, druntimeSha256 ? "0vp414j6s11l9s54v81np49mv60ywmd7nnk41idkbwrq0nz4sfrq"
|
||||
, phobosSha256 ? "1wp7z1x299b0w9ny1ah2wrfhrs05vc4bk51csgw9774l3dqcnv53"
|
||||
, version ? "2.084.1"
|
||||
, dmdSha256 ? "10ll5072rkv3ln7i5l88h2f9mzda567kw2jwh6466vm6ylzl4jms"
|
||||
, druntimeSha256 ? "0i0g2cnzh097pmvb86gvyj79canaxppw33hp7ylqnd11q4kqc8pb"
|
||||
, phobosSha256 ? "1hxpismj9gy5n1bc9kl9ykgd4lfmkq9i8xgrq09j0fybfwn9j1gc"
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
dmdBuild = stdenv.mkDerivation rec {
|
||||
name = "dmdBuild-${version}";
|
||||
inherit version;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
srcs = [
|
||||
(fetchFromGitHub {
|
||||
owner = "dlang";
|
||||
repo = "dmd";
|
||||
rev = "v${version}";
|
||||
sha256 = dmdSha256;
|
||||
name = "dmd";
|
||||
})
|
||||
(fetchFromGitHub {
|
||||
owner = "dlang";
|
||||
repo = "druntime";
|
||||
rev = "v${version}";
|
||||
sha256 = druntimeSha256;
|
||||
name = "druntime";
|
||||
})
|
||||
(fetchFromGitHub {
|
||||
owner = "dlang";
|
||||
repo = "phobos";
|
||||
rev = "v${version}";
|
||||
sha256 = phobosSha256;
|
||||
name = "phobos";
|
||||
})
|
||||
];
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
# https://issues.dlang.org/show_bug.cgi?id=19553
|
||||
hardeningDisable = [ "fortify" ];
|
||||
|
||||
postUnpack = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace dmd/test/compilable/extra-files/ddocYear.html \
|
||||
--replace "2018" "__YEAR__"
|
||||
|
||||
substituteInPlace dmd/test/runnable/test16096.sh \
|
||||
--replace "{EXT}" "{EXE}"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ ldc makeWrapper unzip which gdb git ]
|
||||
|
||||
++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
|
||||
Foundation
|
||||
]);
|
||||
|
||||
buildInputs = [ curl tzdata ];
|
||||
|
||||
bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits;
|
||||
osname = if stdenv.hostPlatform.isDarwin then
|
||||
"osx"
|
||||
else
|
||||
stdenv.hostPlatform.parsed.kernel.name;
|
||||
top = "$(echo $NIX_BUILD_TOP)";
|
||||
pathToDmd = "${top}/dmd/generated/${osname}/release/${bits}/dmd";
|
||||
|
||||
# Buid and install are based on http://wiki.dlang.org/Building_DMD
|
||||
buildPhase = ''
|
||||
cd dmd
|
||||
make -j$NIX_BUILD_CORES -f posix.mak INSTALL_DIR=$out BUILD=release ENABLE_RELEASE=1 PIC=1 HOST_DMD=ldmd2
|
||||
cd ../druntime
|
||||
make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd}
|
||||
cd ../phobos
|
||||
echo ${tzdata}/share/zoneinfo/ > TZDatabaseDirFile
|
||||
echo ${curl.out}/lib/libcurl.so > LibcurlPathFile
|
||||
make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$(pwd)"
|
||||
cd ..
|
||||
'';
|
||||
|
||||
# Disable tests on Darwin for now because of
|
||||
# https://github.com/NixOS/nixpkgs/issues/41099
|
||||
doCheck = true;
|
||||
|
||||
checkPhase = ''
|
||||
cd dmd
|
||||
make -j$NIX_BUILD_CORES -C test -f Makefile PIC=1 CC=$CXX DMD=${pathToDmd} BUILD=release SHARED=0 SHELL=$SHELL
|
||||
cd ../druntime
|
||||
make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=1 DMD=${pathToDmd} BUILD=release
|
||||
cd ..
|
||||
'';
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
installPhase = ''
|
||||
cd dmd
|
||||
mkdir $out
|
||||
mkdir $out/bin
|
||||
cp ${pathToDmd} $out/bin
|
||||
|
||||
mkdir -p $out/share/man/man1
|
||||
mkdir -p $out/share/man/man5
|
||||
cp -r docs/man/man1/* $out/share/man/man1/
|
||||
cp -r docs/man/man5/* $out/share/man/man5/
|
||||
|
||||
cd ../druntime
|
||||
mkdir $out/include
|
||||
mkdir $out/include/d2
|
||||
cp -r import/* $out/include/d2
|
||||
|
||||
cd ../phobos
|
||||
mkdir $out/lib
|
||||
cp generated/${osname}/release/${bits}/libphobos2.* $out/lib
|
||||
|
||||
cp -r std $out/include/d2
|
||||
cp -r etc $out/include/d2
|
||||
|
||||
wrapProgram $out/bin/dmd \
|
||||
--prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \
|
||||
--set-default CC "${targetPackages.stdenv.cc}/bin/cc"
|
||||
|
||||
cd $out/bin
|
||||
tee dmd.conf << EOF
|
||||
[Environment]
|
||||
DFLAGS=-I$out/include/d2 -L-L$out/lib ${stdenv.lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"} -fPIC
|
||||
EOF
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Official reference compiler for the D language";
|
||||
homepage = http://dlang.org/;
|
||||
# Everything is now Boost licensed, even the backend.
|
||||
# https://github.com/dlang/dmd/pull/6680
|
||||
license = licenses.boost;
|
||||
maintainers = with maintainers; [ ThomasMader ];
|
||||
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
|
||||
};
|
||||
dmdConfFile = writeTextFile {
|
||||
name = "dmd.conf";
|
||||
text = (lib.generators.toINI {} {
|
||||
"Environment" = {
|
||||
DFLAGS = ''-I$@out@/include/d2 -L-L$@out@/lib -fPIC ${stdenv.lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"}'';
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
# Need to test Phobos in a fixed-output derivation, otherwise the
|
||||
# network stuff in Phobos would fail if sandbox mode is enabled.
|
||||
#
|
||||
# Disable tests on Darwin for now because of
|
||||
# https://github.com/NixOS/nixpkgs/issues/41099
|
||||
phobosUnittests = if !stdenv.hostPlatform.isDarwin then
|
||||
stdenv.mkDerivation rec {
|
||||
name = "phobosUnittests-${version}";
|
||||
version = dmdBuild.version;
|
||||
|
||||
enableParallelBuilding = dmdBuild.enableParallelBuilding;
|
||||
preferLocalBuild = true;
|
||||
inputString = dmdBuild.outPath;
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = builtins.hashString "sha256" inputString;
|
||||
|
||||
srcs = dmdBuild.srcs;
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
nativeBuildInputs = dmdBuild.nativeBuildInputs;
|
||||
buildInputs = dmdBuild.buildInputs;
|
||||
|
||||
buildPhase = ''
|
||||
cd phobos
|
||||
echo ${tzdata}/share/zoneinfo/ > TZDatabaseDirFile
|
||||
echo ${curl.out}/lib/libcurl.so > LibcurlPathFile
|
||||
make -j$NIX_BUILD_CORES -f posix.mak unittest BUILD=release ENABLE_RELEASE=1 PIC=1 DMD=${dmdBuild}/bin/dmd DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$(pwd)"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
echo -n $inputString > $out
|
||||
'';
|
||||
}
|
||||
else
|
||||
"";
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
inherit phobosUnittests;
|
||||
name = "dmd-${version}";
|
||||
phases = "installPhase";
|
||||
buildInputs = dmdBuild.buildInputs;
|
||||
inherit version;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
srcs = [
|
||||
(fetchFromGitHub {
|
||||
owner = "dlang";
|
||||
repo = "dmd";
|
||||
rev = "v${version}";
|
||||
sha256 = dmdSha256;
|
||||
name = "dmd";
|
||||
})
|
||||
(fetchFromGitHub {
|
||||
owner = "dlang";
|
||||
repo = "druntime";
|
||||
rev = "v${version}";
|
||||
sha256 = druntimeSha256;
|
||||
name = "druntime";
|
||||
})
|
||||
(fetchFromGitHub {
|
||||
owner = "dlang";
|
||||
repo = "phobos";
|
||||
rev = "v${version}";
|
||||
sha256 = phobosSha256;
|
||||
name = "phobos";
|
||||
})
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-loader-import.patch";
|
||||
url = "https://github.com/dlang/dmd/commit/e7790436c4af1910b8c079dac9bb69627d7dea4b.patch";
|
||||
sha256 = "0w69hajx8agywc7m2hph5m27g2yclz8ml0gjjyjk9k6ii3jv45kx";
|
||||
})
|
||||
];
|
||||
|
||||
patchFlags = [ "--directory=dmd" "-p1" ];
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
# https://issues.dlang.org/show_bug.cgi?id=19553
|
||||
hardeningDisable = [ "fortify" ];
|
||||
|
||||
postUnpack = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
substituteInPlace phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" ""
|
||||
''
|
||||
|
||||
+ stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
substituteInPlace phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ ldc makeWrapper unzip which gdb git ]
|
||||
|
||||
++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
|
||||
Foundation
|
||||
]);
|
||||
|
||||
buildInputs = [ curl tzdata ];
|
||||
|
||||
bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits;
|
||||
osname = if stdenv.hostPlatform.isDarwin then
|
||||
"osx"
|
||||
else
|
||||
stdenv.hostPlatform.parsed.kernel.name;
|
||||
top = "$(echo $NIX_BUILD_TOP)";
|
||||
pathToDmd = "${top}/dmd/generated/${osname}/release/${bits}/dmd";
|
||||
|
||||
# Buid and install are based on http://wiki.dlang.org/Building_DMD
|
||||
buildPhase = ''
|
||||
cd dmd
|
||||
make -j$NIX_BUILD_CORES -f posix.mak INSTALL_DIR=$out BUILD=release ENABLE_RELEASE=1 PIC=1 HOST_DMD=ldmd2
|
||||
cd ../druntime
|
||||
make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd}
|
||||
cd ../phobos
|
||||
echo ${tzdata}/share/zoneinfo/ > TZDatabaseDirFile
|
||||
echo ${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} > LibcurlPathFile
|
||||
make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$(pwd)"
|
||||
cd ..
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkPhase = ''
|
||||
cd dmd
|
||||
# https://github.com/NixOS/nixpkgs/pull/55998#issuecomment-465871846
|
||||
#make -j$NIX_BUILD_CORES -C test -f Makefile PIC=1 CC=$CXX DMD=${pathToDmd} BUILD=release SHELL=$SHELL
|
||||
cd ../druntime
|
||||
make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=1 DMD=${pathToDmd} BUILD=release
|
||||
cd ../phobos
|
||||
make -j$NIX_BUILD_CORES -f posix.mak unittest BUILD=release ENABLE_RELEASE=1 PIC=1 DMD=${pathToDmd} DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$(pwd)"
|
||||
cd ..
|
||||
'';
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir $out
|
||||
cp -r --symbolic-link ${dmdBuild}/* $out/
|
||||
cd dmd
|
||||
mkdir $out
|
||||
mkdir $out/bin
|
||||
cp ${pathToDmd} $out/bin
|
||||
|
||||
mkdir -p $out/share/man/man1
|
||||
mkdir -p $out/share/man/man5
|
||||
cp -r docs/man/man1/* $out/share/man/man1/
|
||||
cp -r docs/man/man5/* $out/share/man/man5/
|
||||
|
||||
cd ../druntime
|
||||
mkdir $out/include
|
||||
mkdir $out/include/d2
|
||||
cp -r import/* $out/include/d2
|
||||
|
||||
cd ../phobos
|
||||
mkdir $out/lib
|
||||
cp generated/${osname}/release/${bits}/libphobos2.* $out/lib
|
||||
|
||||
cp -r std $out/include/d2
|
||||
cp -r etc $out/include/d2
|
||||
|
||||
wrapProgram $out/bin/dmd \
|
||||
--prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \
|
||||
--set-default CC "${targetPackages.stdenv.cc}/bin/cc"
|
||||
|
||||
substitute ${dmdConfFile} "$out/bin/dmd.conf" --subst-var out
|
||||
'';
|
||||
meta = dmdBuild.meta;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Official reference compiler for the D language";
|
||||
homepage = http://dlang.org/;
|
||||
# Everything is now Boost licensed, even the backend.
|
||||
# https://github.com/dlang/dmd/pull/6680
|
||||
license = licenses.boost;
|
||||
maintainers = with maintainers; [ ThomasMader ];
|
||||
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -105,4 +105,5 @@ in stdenv.mkDerivation {
|
||||
|
||||
meta.platforms = passthru.bootPkgs.ghc.meta.platforms;
|
||||
meta.maintainers = [lib.maintainers.elvishjerricco];
|
||||
meta.broken = true;
|
||||
}
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
, python, libconfig, lit, gdb, unzip, darwin, bash
|
||||
, callPackage, makeWrapper, targetPackages
|
||||
, bootstrapVersion ? false
|
||||
, version ? "1.12.0"
|
||||
, ldcSha256 ? "1fdma1w8j37wkr0pqdar11slkk36qymamxnk6d9k8ybhjmxaaawm"
|
||||
, version ? "1.14.0"
|
||||
, ldcSha256 ? "147vlzzzjx2n6zyz9wj54gj046i1mw5p5wixwzi5wkllgxghyy9c"
|
||||
}:
|
||||
|
||||
let
|
||||
@ -18,208 +18,156 @@ let
|
||||
else
|
||||
"";
|
||||
|
||||
ldcBuild = stdenv.mkDerivation rec {
|
||||
name = "ldcBuild-${version}";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz";
|
||||
sha256 = ldcSha256;
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
patchShebangs .
|
||||
''
|
||||
|
||||
+ stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) ''
|
||||
# http://forum.dlang.org/thread/xtbbqthxutdoyhnxjhxl@forum.dlang.org
|
||||
rm -r ldc-${version}-src/tests/dynamiccompile
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/34817
|
||||
rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818
|
||||
rm -r ldc-${version}-src/tests/debuginfo/classtypes_gdb.d
|
||||
rm -r ldc-${version}-src/tests/debuginfo/nested_gdb.d
|
||||
|
||||
rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/test16096.sh
|
||||
rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/ldc_output_filenames.sh
|
||||
rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/crlf.sh
|
||||
rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/issue15574.sh
|
||||
rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/test6461.sh
|
||||
''
|
||||
|
||||
+ stdenv.lib.optionalString (!bootstrapVersion) ''
|
||||
echo ${tzdata}/share/zoneinfo/ > ldc-${version}-src/TZDatabaseDirFile
|
||||
|
||||
# Remove cppa test for now because it doesn't work.
|
||||
rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/cppa.d
|
||||
rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/extra-files/cppb.cpp
|
||||
'';
|
||||
|
||||
datetimePath = if bootstrapVersion then
|
||||
"phobos/std/datetime.d"
|
||||
else
|
||||
"phobos/std/datetime/timezone.d";
|
||||
|
||||
postPatch = ''
|
||||
# https://issues.dlang.org/show_bug.cgi?id=15391
|
||||
substituteInPlace runtime/phobos/std/net/curl.d \
|
||||
--replace libcurl.so ${curl.out}/lib/libcurl.so
|
||||
|
||||
substituteInPlace tests/d2/dmd-testsuite/Makefile \
|
||||
--replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash"
|
||||
''
|
||||
|
||||
+ stdenv.lib.optionalString (bootstrapVersion && stdenv.hostPlatform.isDarwin) ''
|
||||
# Was not able to compile on darwin due to "__inline_isnanl"
|
||||
# being undefined.
|
||||
substituteInPlace dmd2/root/port.c --replace __inline_isnanl __inline_isnan
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake makeWrapper llvm bootstrapLdc python lit gdb unzip ]
|
||||
|
||||
++ stdenv.lib.optional (bootstrapVersion) [
|
||||
libconfig
|
||||
]
|
||||
|
||||
++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
|
||||
Foundation
|
||||
]);
|
||||
|
||||
|
||||
buildInputs = [ curl tzdata ];
|
||||
|
||||
#"-DINCLUDE_INSTALL_DIR=$out/include/dlang/ldc"
|
||||
# Xcode 9.0.1 fixes that bug according to ldc release notes
|
||||
#"-DRT_ARCHIVE_WITH_LDC=OFF"
|
||||
#"-DD_FLAGS=TZ_DATABASE_DIR=${tzdata}/share/zoneinfo/"
|
||||
#"-DCMAKE_BUILD_TYPE=Release"
|
||||
#"-DCMAKE_SKIP_RPATH=ON"
|
||||
|
||||
#-DINCLUDE_INSTALL_DIR=$out/include/dlang/ldc
|
||||
#
|
||||
cmakeFlagsString = stdenv.lib.optionalString (!bootstrapVersion) ''
|
||||
"-DD_FLAGS=-d-version=TZDatabaseDir;-J$PWD"
|
||||
'';
|
||||
|
||||
preConfigure = stdenv.lib.optionalString (!bootstrapVersion) ''
|
||||
cmakeFlagsArray=(
|
||||
${cmakeFlagsString}
|
||||
)
|
||||
'';
|
||||
|
||||
postConfigure = ''
|
||||
export DMD=$PWD/bin/ldmd2
|
||||
'';
|
||||
|
||||
makeFlags = [ "DMD=$DMD" ];
|
||||
|
||||
doCheck = !bootstrapVersion;
|
||||
|
||||
checkPhase = ''
|
||||
# Build and run LDC D unittests.
|
||||
ctest --output-on-failure -R "ldc2-unittest"
|
||||
# Run LIT testsuite.
|
||||
ctest -V -R "lit-tests"
|
||||
# Run DMD testsuite.
|
||||
DMD_TESTSUITE_MAKE_ARGS=-j$NIX_BUILD_CORES ctest -V -R "dmd-testsuite"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/ldc2 \
|
||||
--prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \
|
||||
--set-default CC "${targetPackages.stdenv.cc}/bin/cc"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "The LLVM-based D compiler";
|
||||
homepage = https://github.com/ldc-developers/ldc;
|
||||
# from https://github.com/ldc-developers/ldc/blob/master/LICENSE
|
||||
license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ];
|
||||
maintainers = with maintainers; [ ThomasMader ];
|
||||
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
|
||||
};
|
||||
};
|
||||
|
||||
# Need to test Phobos in a fixed-output derivation, otherwise the
|
||||
# network stuff in Phobos would fail if sandbox mode is enabled.
|
||||
#
|
||||
# Disable tests on Darwin for now because of
|
||||
# https://github.com/NixOS/nixpkgs/issues/41099
|
||||
# https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818
|
||||
ldcUnittests = if (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) then
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ldcUnittests-${version}";
|
||||
|
||||
enableParallelBuilding = ldcBuild.enableParallelBuilding;
|
||||
preferLocalBuild = true;
|
||||
inputString = ldcBuild.outPath;
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = builtins.hashString "sha256" inputString;
|
||||
|
||||
src = ldcBuild.src;
|
||||
|
||||
postUnpack = ldcBuild.postUnpack;
|
||||
|
||||
postPatch = ldcBuild.postPatch;
|
||||
|
||||
nativeBuildInputs = ldcBuild.nativeBuildInputs
|
||||
|
||||
++ [
|
||||
ldcBuild
|
||||
];
|
||||
|
||||
buildInputs = ldcBuild.buildInputs;
|
||||
|
||||
preConfigure = ''
|
||||
cmakeFlagsArray=(
|
||||
${ldcBuild.cmakeFlagsString}
|
||||
"-DD_COMPILER=${ldcBuild.out}/bin/ldmd2"
|
||||
)
|
||||
'';
|
||||
|
||||
postConfigure = ldcBuild.postConfigure;
|
||||
|
||||
makeFlags = ldcBuild.makeFlags;
|
||||
|
||||
buildCmd = if bootstrapVersion then
|
||||
"ctest -V -R \"build-druntime-ldc-unittest|build-phobos2-ldc-unittest\""
|
||||
else
|
||||
"make -j$NIX_BUILD_CORES DMD=${ldcBuild.out}/bin/ldc2 phobos2-test-runner phobos2-test-runner-debug";
|
||||
|
||||
testCmd = if bootstrapVersion then
|
||||
"ctest -j$NIX_BUILD_CORES --output-on-failure -E \"dmd-testsuite|lit-tests|ldc2-unittest|llvm-ir-testsuite\""
|
||||
else
|
||||
"ctest -j$NIX_BUILD_CORES --output-on-failure -E \"dmd-testsuite|lit-tests|ldc2-unittest\"";
|
||||
|
||||
buildPhase = ''
|
||||
${buildCmd}
|
||||
ln -s ${ldcBuild.out}/bin/ldmd2 $PWD/bin/ldmd2
|
||||
${testCmd}
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
echo -n $inputString > $out
|
||||
'';
|
||||
}
|
||||
else
|
||||
"";
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
inherit ldcUnittests;
|
||||
name = "ldc-${version}";
|
||||
phases = "installPhase";
|
||||
buildInputs = ldcBuild.buildInputs;
|
||||
|
||||
installPhase = ''
|
||||
mkdir $out
|
||||
cp -r --symbolic-link ${ldcBuild}/* $out/
|
||||
enableParallelBuilding = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz";
|
||||
sha256 = ldcSha256;
|
||||
};
|
||||
|
||||
# https://issues.dlang.org/show_bug.cgi?id=19553
|
||||
hardeningDisable = [ "fortify" ];
|
||||
|
||||
postUnpack = ''
|
||||
patchShebangs .
|
||||
''
|
||||
|
||||
+ stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) ''
|
||||
# https://github.com/NixOS/nixpkgs/issues/34817
|
||||
rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall
|
||||
''
|
||||
|
||||
+ stdenv.lib.optionalString (!bootstrapVersion) ''
|
||||
echo ${tzdata}/share/zoneinfo/ > ldc-${version}-src/TZDatabaseDirFile
|
||||
|
||||
echo ${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} > ldc-${version}-src/LibcurlPathFile
|
||||
'';
|
||||
|
||||
meta = ldcBuild.meta;
|
||||
postPatch = ''
|
||||
# Setting SHELL=$SHELL when dmd testsuite is run doesn't work on Linux somehow
|
||||
substituteInPlace tests/d2/dmd-testsuite/Makefile --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash"
|
||||
''
|
||||
|
||||
+ stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isLinux) ''
|
||||
substituteInPlace runtime/phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" ""
|
||||
''
|
||||
|
||||
+ stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) ''
|
||||
substituteInPlace runtime/phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)"
|
||||
''
|
||||
|
||||
+ stdenv.lib.optionalString (bootstrapVersion && stdenv.hostPlatform.isDarwin) ''
|
||||
# Was not able to compile on darwin due to "__inline_isnanl"
|
||||
# being undefined.
|
||||
# TODO Remove with version > 0.17.6
|
||||
substituteInPlace dmd2/root/port.c --replace __inline_isnanl __inline_isnan
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake makeWrapper llvm unzip ]
|
||||
|
||||
++ stdenv.lib.optional (!bootstrapVersion) [
|
||||
bootstrapLdc python lit
|
||||
]
|
||||
|
||||
++ stdenv.lib.optional (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) [
|
||||
# https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818
|
||||
gdb
|
||||
]
|
||||
|
||||
++ stdenv.lib.optional (bootstrapVersion) [
|
||||
libconfig
|
||||
]
|
||||
|
||||
++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
|
||||
Foundation
|
||||
]);
|
||||
|
||||
|
||||
buildInputs = [ curl tzdata ];
|
||||
|
||||
cmakeFlagsString = stdenv.lib.optionalString (!bootstrapVersion) ''
|
||||
"-DD_FLAGS=-d-version=TZDatabaseDir;-d-version=LibcurlPath;-J$PWD"
|
||||
"-DCMAKE_BUILD_TYPE=Release"
|
||||
'';
|
||||
|
||||
preConfigure = stdenv.lib.optionalString (!bootstrapVersion) ''
|
||||
cmakeFlagsArray=(
|
||||
${cmakeFlagsString}
|
||||
)
|
||||
'';
|
||||
|
||||
postConfigure = ''
|
||||
export DMD=$PWD/bin/ldmd2
|
||||
'';
|
||||
|
||||
makeFlags = [ "DMD=$DMD" ];
|
||||
|
||||
fixNames = if stdenv.hostPlatform.isDarwin then ''
|
||||
fixDarwinDylibNames() {
|
||||
local flags=()
|
||||
|
||||
for fn in "$@"; do
|
||||
flags+=(-change "$(basename "$fn")" "$fn")
|
||||
done
|
||||
|
||||
for fn in "$@"; do
|
||||
if [ -L "$fn" ]; then continue; fi
|
||||
echo "$fn: fixing dylib"
|
||||
install_name_tool -id "$fn" "''${flags[@]}" "$fn"
|
||||
done
|
||||
}
|
||||
|
||||
fixDarwinDylibNames $(find "$(pwd)/lib" -name "*.dylib")
|
||||
''
|
||||
else
|
||||
"";
|
||||
|
||||
# https://github.com/ldc-developers/ldc/issues/2497#issuecomment-459633746
|
||||
additionalExceptions = if stdenv.hostPlatform.isDarwin then
|
||||
"|druntime-test-shared"
|
||||
else
|
||||
"";
|
||||
|
||||
doCheck = !bootstrapVersion;
|
||||
|
||||
checkPhase = stdenv.lib.optionalString doCheck ''
|
||||
# Build default lib test runners
|
||||
make -j$NIX_BUILD_CORES all-test-runners
|
||||
|
||||
${fixNames}
|
||||
|
||||
# Run dmd testsuite
|
||||
export DMD_TESTSUITE_MAKE_ARGS="-j$NIX_BUILD_CORES DMD=$DMD CC=$CXX"
|
||||
ctest -V -R "dmd-testsuite"
|
||||
|
||||
# Build and run LDC D unittests.
|
||||
ctest --output-on-failure -R "ldc2-unittest"
|
||||
|
||||
# Run LIT testsuite.
|
||||
ctest -V -R "lit-tests"
|
||||
|
||||
# Run default lib unittests
|
||||
ctest -j$NIX_BUILD_CORES --output-on-failure -E "ldc2-unittest|lit-tests|dmd-testsuite${additionalExceptions}"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/ldc2 \
|
||||
--prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \
|
||||
--set-default CC "${targetPackages.stdenv.cc}/bin/cc"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "The LLVM-based D compiler";
|
||||
homepage = https://github.com/ldc-developers/ldc;
|
||||
# from https://github.com/ldc-developers/ldc/blob/master/LICENSE
|
||||
license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ];
|
||||
maintainers = with maintainers; [ ThomasMader ];
|
||||
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -18,8 +18,8 @@ let
|
||||
else "amd64";
|
||||
|
||||
major = "11";
|
||||
update = ".0.1";
|
||||
build = "13";
|
||||
update = ".0.2";
|
||||
build = "9";
|
||||
repover = "jdk-${major}${update}+${build}";
|
||||
|
||||
openjdk = stdenv.mkDerivation {
|
||||
@ -27,7 +27,7 @@ let
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/${repover}.tar.gz";
|
||||
sha256 = "1ri3fv67rvs9xxhc3ynklbprhxbdsgpwafbw6wqj950xy5crgysm";
|
||||
sha256 = "0xc7nksvj72cgw8zrmvlcwaasinpij1j1959398a4nqvzpvpxg30";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@ -953,17 +953,13 @@ self: super: {
|
||||
# Tries to read a file it is not allowed to in the test suite
|
||||
load-env = dontCheck super.load-env;
|
||||
|
||||
# hledger needs a newer megaparsec version than we have in LTS 12.x.
|
||||
hledger-lib = super.hledger-lib.overrideScope (self: super: {
|
||||
# cassava-megaparsec = self.cassava-megaparsec_2_0_0;
|
||||
# hspec-megaparsec = self.hspec-megaparsec_2_0_0;
|
||||
# megaparsec = self.megaparsec_7_0_4;
|
||||
});
|
||||
|
||||
# Copy hledger man pages from data directory into the proper place. This code
|
||||
# should be moved into the cabal2nix generator.
|
||||
hledger = overrideCabal super.hledger (drv: {
|
||||
postInstall = ''
|
||||
# Don't install files that don't belong into this package to avoid
|
||||
# conflicts when hledger and hledger-ui end up in the same profile.
|
||||
rm embeddedfiles/hledger-{api,ui,web}.*
|
||||
for i in $(seq 1 9); do
|
||||
for j in embeddedfiles/*.$i; do
|
||||
mkdir -p $out/share/man/man$i
|
||||
@ -974,7 +970,7 @@ self: super: {
|
||||
cp -v embeddedfiles/*.info* $out/share/info/
|
||||
'';
|
||||
});
|
||||
hledger-ui = (overrideCabal super.hledger-ui (drv: {
|
||||
hledger-ui = overrideCabal super.hledger-ui (drv: {
|
||||
postInstall = ''
|
||||
for i in $(seq 1 9); do
|
||||
for j in *.$i; do
|
||||
@ -985,11 +981,6 @@ self: super: {
|
||||
mkdir -p $out/share/info
|
||||
cp -v *.info* $out/share/info/
|
||||
'';
|
||||
})).overrideScope (self: super: {
|
||||
# cassava-megaparsec = self.cassava-megaparsec_2_0_0;
|
||||
# config-ini = self.config-ini_0_2_4_0;
|
||||
# hspec-megaparsec = self.hspec-megaparsec_2_0_0;
|
||||
# megaparsec = self.megaparsec_7_0_4;
|
||||
});
|
||||
hledger-web = overrideCabal super.hledger-web (drv: {
|
||||
postInstall = ''
|
||||
|
||||
@ -45,7 +45,6 @@ self: super: {
|
||||
unordered-containers = dontCheck super.unordered-containers;
|
||||
|
||||
# Test suite does not compile.
|
||||
cereal = dontCheck super.cereal;
|
||||
data-clist = doJailbreak super.data-clist; # won't cope with QuickCheck 2.12.x
|
||||
dates = doJailbreak super.dates; # base >=4.9 && <4.12
|
||||
Diff = dontCheck super.Diff;
|
||||
@ -54,7 +53,6 @@ self: super: {
|
||||
hpc-coveralls = doJailbreak super.hpc-coveralls; # https://github.com/guillaume-nargeot/hpc-coveralls/issues/82
|
||||
http-api-data = doJailbreak super.http-api-data;
|
||||
persistent-sqlite = dontCheck super.persistent-sqlite;
|
||||
psqueues = dontCheck super.psqueues; # won't cope with QuickCheck 2.12.x
|
||||
system-fileio = dontCheck super.system-fileio; # avoid dependency on broken "patience"
|
||||
unicode-transforms = dontCheck super.unicode-transforms;
|
||||
wl-pprint-extras = doJailbreak super.wl-pprint-extras; # containers >=0.4 && <0.6 is too tight; https://github.com/ekmett/wl-pprint-extras/issues/17
|
||||
|
||||
@ -52,7 +52,6 @@ self: super: {
|
||||
unordered-containers = dontCheck super.unordered-containers;
|
||||
|
||||
# Test suite does not compile.
|
||||
cereal = dontCheck super.cereal;
|
||||
data-clist = doJailbreak super.data-clist; # won't cope with QuickCheck 2.12.x
|
||||
dates = doJailbreak super.dates; # base >=4.9 && <4.12
|
||||
Diff = dontCheck super.Diff;
|
||||
@ -60,7 +59,6 @@ self: super: {
|
||||
hpc-coveralls = doJailbreak super.hpc-coveralls; # https://github.com/guillaume-nargeot/hpc-coveralls/issues/82
|
||||
http-api-data = doJailbreak super.http-api-data;
|
||||
persistent-sqlite = dontCheck super.persistent-sqlite;
|
||||
psqueues = dontCheck super.psqueues; # won't cope with QuickCheck 2.12.x
|
||||
system-fileio = dontCheck super.system-fileio; # avoid dependency on broken "patience"
|
||||
unicode-transforms = dontCheck super.unicode-transforms;
|
||||
wl-pprint-extras = doJailbreak super.wl-pprint-extras; # containers >=0.4 && <0.6 is too tight; https://github.com/ekmett/wl-pprint-extras/issues/17
|
||||
|
||||
@ -487,6 +487,9 @@ self: super: builtins.intersectAttrs super {
|
||||
# https://github.com/plow-technologies/servant-streaming/issues/12
|
||||
servant-streaming-server = dontCheck super.servant-streaming-server;
|
||||
|
||||
# https://github.com/haskell-servant/servant/pull/1128
|
||||
servant-client-core = appendPatch super.servant-client-core ./patches/servant-client-core-streamBody.patch;
|
||||
|
||||
# tests run executable, relying on PATH
|
||||
# without this, tests fail with "Couldn't launch intero process"
|
||||
intero = overrideCabal super.intero (drv: {
|
||||
|
||||
@ -19,6 +19,7 @@ in
|
||||
, buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? [], benchmarkToolDepends ? []
|
||||
, configureFlags ? []
|
||||
, buildFlags ? []
|
||||
, haddockFlags ? []
|
||||
, description ? ""
|
||||
, doCheck ? !isCross && stdenv.lib.versionOlder "7.4" ghc.version
|
||||
, doBenchmark ? false
|
||||
@ -372,7 +373,8 @@ stdenv.mkDerivation ({
|
||||
${optionalString (doHaddock && isLibrary) ''
|
||||
${setupCommand} haddock --html \
|
||||
${optionalString doHoogle "--hoogle"} \
|
||||
${optionalString (isLibrary && hyperlinkSource) "--hyperlink-source"}
|
||||
${optionalString (isLibrary && hyperlinkSource) "--hyperlink-source"} \
|
||||
${stdenv.lib.concatStringsSep " " haddockFlags}
|
||||
''}
|
||||
runHook postHaddock
|
||||
'';
|
||||
|
||||
234
pkgs/development/haskell-modules/hackage-packages.nix
generated
234
pkgs/development/haskell-modules/hackage-packages.nix
generated
@ -28729,8 +28729,8 @@ self: {
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "arbor-monad-metric";
|
||||
version = "1.1.1";
|
||||
sha256 = "1ypacqjd7hf5s7r4w432v9yndxxb40w9kwhxhlqzc4wim798vj3h";
|
||||
version = "1.2.0";
|
||||
sha256 = "0mn6pc5h1rwd3w2cw393skm62yxii21j5f7q9rlpdw7np9xgwfcf";
|
||||
libraryHaskellDepends = [
|
||||
base containers generic-lens lens mtl resourcet stm text
|
||||
transformers
|
||||
@ -29818,7 +29818,7 @@ self: {
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"asif_4_0_0" = callPackage
|
||||
"asif_4_0_1" = callPackage
|
||||
({ mkDerivation, attoparsec, base, binary, bytestring, conduit
|
||||
, conduit-combinators, conduit-extra, containers, cpu, directory
|
||||
, either, exceptions, foldl, generic-lens, hedgehog, hspec, hw-bits
|
||||
@ -29828,8 +29828,8 @@ self: {
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "asif";
|
||||
version = "4.0.0";
|
||||
sha256 = "1xf5x7jm01w30l2cwb3m9sv5qimnc2n6a6dhrykq81ajcf5ix0p6";
|
||||
version = "4.0.1";
|
||||
sha256 = "172vqpdv9jjqj8vzq2v2pfvkmjpkhlpl03mafqk5cvdj72a7vy3s";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
@ -60432,8 +60432,8 @@ self: {
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "datadog-tracing";
|
||||
version = "1.0.1";
|
||||
sha256 = "007cpk9iwxy4jgj6fr1yih090dxgbj9d6jpc6kf3610p0a14nlzq";
|
||||
version = "1.1.0";
|
||||
sha256 = "1zrdbgljm35r8nqw0lg4pq1ywcv76ifplgdh860zq9sjdz5f5lxi";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
@ -61738,10 +61738,8 @@ self: {
|
||||
({ mkDerivation, base, tasty, tasty-hunit }:
|
||||
mkDerivation {
|
||||
pname = "decimal-literals";
|
||||
version = "0.1.0.0";
|
||||
sha256 = "0zsykb1ydihcd6x7v5xx1i0v5wn6a48g7ndzi68iwhivmj0qxyi7";
|
||||
revision = "3";
|
||||
editedCabalFile = "0v53iwn2f5fhjhzf8zgzxrc1inp1bb0qjsghf1jlcp98az7avsjb";
|
||||
version = "0.1.0.1";
|
||||
sha256 = "0lbpnc4c266fbqjzzrnig648zzsqfaphlxqwyly9xd15qggzasb0";
|
||||
libraryHaskellDepends = [ base ];
|
||||
testHaskellDepends = [ base tasty tasty-hunit ];
|
||||
description = "Preprocessing decimal literals more or less as they are (instead of via fractions)";
|
||||
@ -84030,6 +84028,19 @@ self: {
|
||||
license = stdenv.lib.licenses.mit;
|
||||
}) {};
|
||||
|
||||
"genvalidity_0_7_0_1" = callPackage
|
||||
({ mkDerivation, base, hspec, hspec-core, QuickCheck, validity }:
|
||||
mkDerivation {
|
||||
pname = "genvalidity";
|
||||
version = "0.7.0.1";
|
||||
sha256 = "1fgd551nv6y5qs2ya9576yl3dfwnb38z6pg2pg9fbdjnk18wikzz";
|
||||
libraryHaskellDepends = [ base QuickCheck validity ];
|
||||
testHaskellDepends = [ base hspec hspec-core QuickCheck ];
|
||||
description = "Testing utilities for the validity library";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"genvalidity-aeson" = callPackage
|
||||
({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec
|
||||
, genvalidity-scientific, genvalidity-text
|
||||
@ -97487,26 +97498,28 @@ self: {
|
||||
|
||||
"halive" = callPackage
|
||||
({ mkDerivation, base, bytestring, containers, directory, filepath
|
||||
, foreign-store, fsnotify, ghc, ghc-boot, ghc-paths, gl, linear
|
||||
, mtl, process, random, sdl2, signal, stm, text, time, transformers
|
||||
, foreign-store, fsnotify, ghc, ghc-boot, ghc-paths, gl, hspec
|
||||
, lens, linear, mtl, pretty-show, process, random, sdl2, signal
|
||||
, stm, text, time, transformers
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "halive";
|
||||
version = "0.1.3";
|
||||
sha256 = "0rffds6m31b80vv2l2qpbzx3pfya4kz6nlp9w6frc6k94zdba378";
|
||||
version = "0.1.6";
|
||||
sha256 = "19mlbl8psb5gxw6xsgiw5kxw4fvmfl552acalj05s6h9gsl4hcnh";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
base containers directory filepath foreign-store fsnotify ghc
|
||||
ghc-boot ghc-paths mtl process signal stm time transformers
|
||||
ghc-boot ghc-paths mtl process signal stm text time transformers
|
||||
];
|
||||
executableHaskellDepends = [
|
||||
base directory filepath fsnotify ghc ghc-paths process stm
|
||||
transformers
|
||||
];
|
||||
testHaskellDepends = [
|
||||
base bytestring containers filepath foreign-store gl linear mtl
|
||||
random sdl2 stm text time
|
||||
base bytestring containers directory filepath foreign-store ghc
|
||||
ghc-paths gl hspec lens linear mtl pretty-show random sdl2 stm text
|
||||
time
|
||||
];
|
||||
description = "A live recompiler";
|
||||
license = stdenv.lib.licenses.bsd2;
|
||||
@ -102618,8 +102631,8 @@ self: {
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "haskoin-store";
|
||||
version = "0.10.1";
|
||||
sha256 = "0z9qsjnzkvzgf0asrdigyph4i3623hkq10542xh0kjq56hnglcn2";
|
||||
version = "0.11.0";
|
||||
sha256 = "03rhbp4rc4ycmnj5gsa79pjzgmp659xwbajaqfns4xgb3d0nhylx";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
@ -118412,8 +118425,8 @@ self: {
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "http-conduit-downloader";
|
||||
version = "1.0.31";
|
||||
sha256 = "1ng41s2y176223blzxdywlv7hmbdh7i5nwr63la7jfnd9rcdr83c";
|
||||
version = "1.0.33";
|
||||
sha256 = "07pn2p143rfmvax3zx53hlgh0rfynn60g0z6cw6vazrxap4v3pr3";
|
||||
libraryHaskellDepends = [
|
||||
base bytestring conduit connection data-default HsOpenSSL
|
||||
http-client http-conduit http-types mtl network network-uri
|
||||
@ -133831,6 +133844,50 @@ self: {
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"language-puppet_1_4_3" = callPackage
|
||||
({ mkDerivation, aeson, ansi-wl-pprint, async, attoparsec, base
|
||||
, base16-bytestring, bytestring, case-insensitive, containers
|
||||
, cryptonite, directory, filecache, filepath, formatting, Glob
|
||||
, hashable, hruby, hslogger, hspec, hspec-megaparsec, http-api-data
|
||||
, http-client, lens, lens-aeson, megaparsec, memory, mtl
|
||||
, operational, optparse-applicative, parsec, parser-combinators
|
||||
, pcre-utils, protolude, random, regex-pcre-builtin, scientific
|
||||
, servant, servant-client, split, stm, strict-base-types, temporary
|
||||
, text, time, transformers, unix, unordered-containers, vector
|
||||
, yaml
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "language-puppet";
|
||||
version = "1.4.3";
|
||||
sha256 = "1sh0i487w7mz5c0scly1s11xzha4dbp2wdiwdks3203c5yrjdfq7";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
enableSeparateDataOutput = true;
|
||||
libraryHaskellDepends = [
|
||||
aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
|
||||
case-insensitive containers cryptonite directory filecache filepath
|
||||
formatting hashable hruby hslogger http-api-data http-client lens
|
||||
lens-aeson megaparsec memory mtl operational parsec
|
||||
parser-combinators pcre-utils protolude random regex-pcre-builtin
|
||||
scientific servant servant-client split stm strict-base-types text
|
||||
time transformers unix unordered-containers vector yaml
|
||||
];
|
||||
executableHaskellDepends = [
|
||||
aeson ansi-wl-pprint async base bytestring containers Glob hslogger
|
||||
http-client lens mtl optparse-applicative regex-pcre-builtin
|
||||
strict-base-types text transformers unordered-containers vector
|
||||
yaml
|
||||
];
|
||||
testHaskellDepends = [
|
||||
base Glob hslogger hspec hspec-megaparsec lens megaparsec mtl
|
||||
pcre-utils scientific strict-base-types temporary text transformers
|
||||
unordered-containers vector
|
||||
];
|
||||
description = "Tools to parse and evaluate the Puppet DSL";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"language-python" = callPackage
|
||||
({ mkDerivation, alex, array, base, containers, happy, monads-tf
|
||||
, pretty, transformers, utf8-string
|
||||
@ -137351,6 +137408,35 @@ self: {
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"line-bot-sdk" = callPackage
|
||||
({ mkDerivation, aeson, base, base64-bytestring, bytestring
|
||||
, cryptohash-sha256, errors, hspec, hspec-wai, hspec-wai-json
|
||||
, http-client, http-client-tls, http-types, scientific, servant
|
||||
, servant-client, servant-client-core, servant-server
|
||||
, string-conversions, text, time, transformers, wai, wai-extra
|
||||
, warp
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "line-bot-sdk";
|
||||
version = "0.1.0.0";
|
||||
sha256 = "0kcnxldqks6nvifzsdlkrkfypmj2yzavs675bw96x721mxb63czp";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
aeson base base64-bytestring bytestring cryptohash-sha256 errors
|
||||
http-client http-client-tls http-types scientific servant
|
||||
servant-client servant-client-core servant-server
|
||||
string-conversions text time transformers wai wai-extra
|
||||
];
|
||||
executableHaskellDepends = [
|
||||
base servant servant-client servant-server time transformers wai
|
||||
wai-extra warp
|
||||
];
|
||||
testHaskellDepends = [ aeson base hspec hspec-wai hspec-wai-json ];
|
||||
description = "Haskell SDK for LINE Messaging API";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
"line-break" = callPackage
|
||||
({ mkDerivation, base }:
|
||||
mkDerivation {
|
||||
@ -166727,15 +166813,16 @@ self: {
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "pinch";
|
||||
version = "0.3.4.0";
|
||||
sha256 = "10rmk6f9cb2l7dyybwpbin0i5dqdg59d17m627kj9abyrlhcyf8a";
|
||||
version = "0.3.4.1";
|
||||
sha256 = "1yrw0g68j7jl9q19byq10nfg4rvn3wr49sganx8k4mr46j8pa0sk";
|
||||
libraryHaskellDepends = [
|
||||
array base bytestring containers deepseq ghc-prim hashable
|
||||
semigroups text unordered-containers vector
|
||||
];
|
||||
libraryToolDepends = [ hspec-discover ];
|
||||
testHaskellDepends = [
|
||||
base bytestring containers hspec hspec-discover QuickCheck
|
||||
semigroups text unordered-containers vector
|
||||
base bytestring containers hspec QuickCheck semigroups text
|
||||
unordered-containers vector
|
||||
];
|
||||
testToolDepends = [ hspec-discover ];
|
||||
description = "An alternative implementation of Thrift for Haskell";
|
||||
@ -174242,6 +174329,24 @@ self: {
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
"protocol-radius-test_0_1_0_0" = callPackage
|
||||
({ mkDerivation, base, bytestring, cereal, containers
|
||||
, protocol-radius, QuickCheck, quickcheck-simple, transformers
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "protocol-radius-test";
|
||||
version = "0.1.0.0";
|
||||
sha256 = "1zgfq76k86jf1jpm14mpb8iaiya0d6vz0lrmbwc0fn34hqhkcd88";
|
||||
libraryHaskellDepends = [
|
||||
base bytestring cereal containers protocol-radius QuickCheck
|
||||
quickcheck-simple transformers
|
||||
];
|
||||
testHaskellDepends = [ base quickcheck-simple ];
|
||||
description = "testsuit of protocol-radius haskell package";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"protolude" = callPackage
|
||||
({ mkDerivation, array, async, base, bytestring, containers
|
||||
, deepseq, ghc-prim, hashable, mtl, mtl-compat, stm, text
|
||||
@ -174337,6 +174442,18 @@ self: {
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
"proxied_0_3_1" = callPackage
|
||||
({ mkDerivation, base }:
|
||||
mkDerivation {
|
||||
pname = "proxied";
|
||||
version = "0.3.1";
|
||||
sha256 = "0ldcyvzg5i4axkn5qwgkc8vrc0f0715842ca41d7237p1bh98s4r";
|
||||
libraryHaskellDepends = [ base ];
|
||||
description = "Make functions consume Proxy instead of undefined";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"proxy" = callPackage
|
||||
({ mkDerivation, base }:
|
||||
mkDerivation {
|
||||
@ -178681,7 +178798,7 @@ self: {
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"rattletrap_6_2_2" = callPackage
|
||||
"rattletrap_6_2_3" = callPackage
|
||||
({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits
|
||||
, bytestring, clock, containers, filepath, http-client
|
||||
, http-client-tls, HUnit, template-haskell, temporary, text
|
||||
@ -178689,8 +178806,8 @@ self: {
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "rattletrap";
|
||||
version = "6.2.2";
|
||||
sha256 = "06gbvkg6wn7dql954bzbw8l1460hk2f9055404q0a949qlmmqb3p";
|
||||
version = "6.2.3";
|
||||
sha256 = "0h542a6i1rc1zh2xy4fc9cdaq424hka77mxndg2ka8a0c0mj0jfp";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
@ -195483,8 +195600,8 @@ self: {
|
||||
({ mkDerivation, base, optparse-applicative }:
|
||||
mkDerivation {
|
||||
pname = "simple-cmd-args";
|
||||
version = "0.1.0";
|
||||
sha256 = "1cwh2ikk1iccbm5yq7hihk3yhfg4zbxsi8q1jpjavzlcs18sfnll";
|
||||
version = "0.1.0.1";
|
||||
sha256 = "1fs528gr70ppwfz1yalvjdfdxf7b7zxcc9cvsmdba8r1m489qp9d";
|
||||
libraryHaskellDepends = [ base optparse-applicative ];
|
||||
description = "Simple command args parsing and execution";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
@ -214478,6 +214595,8 @@ self: {
|
||||
pname = "these-skinny";
|
||||
version = "0.7.4";
|
||||
sha256 = "0hlxf94ir99y0yzm9pq8cvs7vbar4bpj1w1ibs96hrx2biwfbnkr";
|
||||
revision = "1";
|
||||
editedCabalFile = "057hgdbc5ch43cn5qz0kr02iws9p1l24z23pifll29iazzl1jk6c";
|
||||
libraryHaskellDepends = [ base deepseq ];
|
||||
description = "A fork of the 'these' package without the dependency bloat";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
@ -224696,8 +224815,8 @@ self: {
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "uuagc";
|
||||
version = "0.9.52.1";
|
||||
sha256 = "1191a1jr1s76wjdrfzafy1ibf7a7xpg54dvwhwz4kr1jrc9jn2cq";
|
||||
version = "0.9.52.2";
|
||||
sha256 = "1wqva95nmz9yx9b60jjwkpb73pq9m4g9l4iq739xnj6llwckpb8y";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
@ -225268,6 +225387,19 @@ self: {
|
||||
license = stdenv.lib.licenses.mit;
|
||||
}) {};
|
||||
|
||||
"validity_0_9_0_1" = callPackage
|
||||
({ mkDerivation, base, hspec }:
|
||||
mkDerivation {
|
||||
pname = "validity";
|
||||
version = "0.9.0.1";
|
||||
sha256 = "112wchq5l39fi9bkfkljic7bh1rd5gvz4lwjjw9pajg0zj51pyib";
|
||||
libraryHaskellDepends = [ base ];
|
||||
testHaskellDepends = [ base hspec ];
|
||||
description = "Validity typeclass";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"validity-aeson" = callPackage
|
||||
({ mkDerivation, aeson, base, validity, validity-scientific
|
||||
, validity-text, validity-unordered-containers, validity-vector
|
||||
@ -226900,6 +227032,17 @@ self: {
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"vinyl-named-sugar" = callPackage
|
||||
({ mkDerivation, base, vinyl }:
|
||||
mkDerivation {
|
||||
pname = "vinyl-named-sugar";
|
||||
version = "0.1.0.0";
|
||||
sha256 = "19wbdavf5zb967r4qkw6ksd2yakp4cnlq1hffzzywssm50zakc3h";
|
||||
libraryHaskellDepends = [ base vinyl ];
|
||||
description = "Syntax sugar for vinyl records using overloaded labels";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
}) {};
|
||||
|
||||
"vinyl-operational" = callPackage
|
||||
({ mkDerivation, base, operational, operational-extra, vinyl-plus
|
||||
}:
|
||||
@ -227488,28 +227631,29 @@ self: {
|
||||
, hedgehog-fn, hoist-error, hw-balancedparens, hw-bits, hw-json
|
||||
, hw-prim, hw-rankselect, lens, mmorph, mtl, nats, natural, parsers
|
||||
, scientific, semigroupoids, semigroups, tagged, tasty
|
||||
, tasty-expected-failure, tasty-hedgehog, tasty-hunit
|
||||
, template-haskell, text, transformers, vector, witherable
|
||||
, wl-pprint-annotated, zippers
|
||||
, tasty-expected-failure, tasty-golden, tasty-hedgehog, tasty-hunit
|
||||
, template-haskell, text, transformers, unordered-containers
|
||||
, vector, witherable, wl-pprint-annotated, zippers
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "waargonaut";
|
||||
version = "0.5.2.2";
|
||||
sha256 = "06kkgn6p28c29f9i3qs2wxmbsg449d7awi4h7giakws6ny1min95";
|
||||
version = "0.6.0.0";
|
||||
sha256 = "1nbykbgx9qzwzcilg2kmrr51fggczynn6kv7a60vsxxckkqlgy8j";
|
||||
setupHaskellDepends = [ base Cabal cabal-doctest ];
|
||||
libraryHaskellDepends = [
|
||||
base bifunctors bytestring containers contravariant digit
|
||||
distributive errors generics-sop hoist-error hw-balancedparens
|
||||
hw-bits hw-json hw-prim hw-rankselect lens mmorph mtl nats natural
|
||||
parsers scientific semigroupoids semigroups tagged text
|
||||
transformers vector witherable wl-pprint-annotated zippers
|
||||
attoparsec base bifunctors bytestring containers contravariant
|
||||
digit distributive errors generics-sop hoist-error
|
||||
hw-balancedparens hw-bits hw-json hw-prim hw-rankselect lens mmorph
|
||||
mtl nats natural parsers scientific semigroupoids semigroups tagged
|
||||
text transformers unordered-containers vector witherable
|
||||
wl-pprint-annotated zippers
|
||||
];
|
||||
testHaskellDepends = [
|
||||
attoparsec base bytestring containers contravariant digit directory
|
||||
distributive doctest filepath generics-sop hedgehog hedgehog-fn
|
||||
lens mtl natural scientific semigroupoids semigroups tagged tasty
|
||||
tasty-expected-failure tasty-hedgehog tasty-hunit template-haskell
|
||||
text vector zippers
|
||||
tasty-expected-failure tasty-golden tasty-hedgehog tasty-hunit
|
||||
template-haskell text unordered-containers vector zippers
|
||||
];
|
||||
description = "JSON wrangling";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
|
||||
@ -0,0 +1,82 @@
|
||||
diff --git a/src/Servant/Client/Core/Internal/HasClient.hs b/src/Servant/Client/Core/Internal/HasClient.hs
|
||||
index 712007006..6be92ec6d 100644
|
||||
--- a/src/Servant/Client/Core/Internal/HasClient.hs
|
||||
+++ b/src/Servant/Client/Core/Internal/HasClient.hs
|
||||
@@ -16,6 +16,8 @@ module Servant.Client.Core.Internal.HasClient where
|
||||
import Prelude ()
|
||||
import Prelude.Compat
|
||||
|
||||
+import Control.Concurrent.MVar
|
||||
+ (modifyMVar, newMVar)
|
||||
import qualified Data.ByteString as BS
|
||||
import qualified Data.ByteString.Lazy as BL
|
||||
import Data.Foldable
|
||||
@@ -36,13 +38,14 @@ import qualified Network.HTTP.Types as H
|
||||
import Servant.API
|
||||
((:<|>) ((:<|>)), (:>), AuthProtect, BasicAuth, BasicAuthData,
|
||||
BuildHeadersTo (..), Capture', CaptureAll, Description,
|
||||
- EmptyAPI, FramingUnrender (..), FromSourceIO (..), Header',
|
||||
- Headers (..), HttpVersion, IsSecure, MimeRender (mimeRender),
|
||||
+ EmptyAPI, FramingRender (..), FramingUnrender (..),
|
||||
+ FromSourceIO (..), Header', Headers (..), HttpVersion,
|
||||
+ IsSecure, MimeRender (mimeRender),
|
||||
MimeUnrender (mimeUnrender), NoContent (NoContent), QueryFlag,
|
||||
QueryParam', QueryParams, Raw, ReflectMethod (..), RemoteHost,
|
||||
ReqBody', SBoolI, Stream, StreamBody', Summary, ToHttpApiData,
|
||||
- Vault, Verb, WithNamedContext, contentType, getHeadersHList,
|
||||
- getResponse, toQueryParam, toUrlPiece)
|
||||
+ ToSourceIO (..), Vault, Verb, WithNamedContext, contentType,
|
||||
+ getHeadersHList, getResponse, toQueryParam, toUrlPiece)
|
||||
import Servant.API.ContentTypes
|
||||
(contentTypes)
|
||||
import Servant.API.Modifiers
|
||||
@@ -538,7 +541,7 @@ instance (MimeRender ct a, HasClient m api)
|
||||
hoistClientMonad pm (Proxy :: Proxy api) f (cl a)
|
||||
|
||||
instance
|
||||
- ( HasClient m api
|
||||
+ ( HasClient m api, MimeRender ctype chunk, FramingRender framing, ToSourceIO chunk a
|
||||
) => HasClient m (StreamBody' mods framing ctype a :> api)
|
||||
where
|
||||
|
||||
@@ -547,7 +550,39 @@ instance
|
||||
hoistClientMonad pm _ f cl = \a ->
|
||||
hoistClientMonad pm (Proxy :: Proxy api) f (cl a)
|
||||
|
||||
- clientWithRoute _pm Proxy _req _body = error "HasClient @StreamBody"
|
||||
+ clientWithRoute pm Proxy req body
|
||||
+ = clientWithRoute pm (Proxy :: Proxy api)
|
||||
+ $ setRequestBody (RequestBodyStreamChunked givesPopper) (contentType ctypeP) req
|
||||
+ where
|
||||
+ ctypeP = Proxy :: Proxy ctype
|
||||
+ framingP = Proxy :: Proxy framing
|
||||
+
|
||||
+ sourceIO = framingRender
|
||||
+ framingP
|
||||
+ (mimeRender ctypeP :: chunk -> BL.ByteString)
|
||||
+ (toSourceIO body)
|
||||
+
|
||||
+ -- not pretty.
|
||||
+ givesPopper :: (IO BS.ByteString -> IO ()) -> IO ()
|
||||
+ givesPopper needsPopper = S.unSourceT sourceIO $ \step0 -> do
|
||||
+ ref <- newMVar step0
|
||||
+
|
||||
+ -- Note sure we need locking, but it's feels safer.
|
||||
+ let popper :: IO BS.ByteString
|
||||
+ popper = modifyMVar ref nextBs
|
||||
+
|
||||
+ needsPopper popper
|
||||
+
|
||||
+ nextBs S.Stop = return (S.Stop, BS.empty)
|
||||
+ nextBs (S.Error err) = fail err
|
||||
+ nextBs (S.Skip s) = nextBs s
|
||||
+ nextBs (S.Effect ms) = ms >>= nextBs
|
||||
+ nextBs (S.Yield lbs s) = case BL.toChunks lbs of
|
||||
+ [] -> nextBs s
|
||||
+ (x:xs) | BS.null x -> nextBs step'
|
||||
+ | otherwise -> return (step', x)
|
||||
+ where
|
||||
+ step' = S.Yield (BL.fromChunks xs) s
|
||||
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurlBoot, buildPackages
|
||||
{ lib, stdenv, fetchurl, buildPackages
|
||||
, enableThreading ? stdenv ? glibc, makeWrapper
|
||||
}:
|
||||
|
||||
@ -27,7 +27,7 @@ let
|
||||
|
||||
name = "perl-${version}";
|
||||
|
||||
src = fetchurlBoot {
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/src/5.0/${name}.tar.gz";
|
||||
inherit sha256;
|
||||
};
|
||||
@ -46,7 +46,7 @@ let
|
||||
]
|
||||
++ optional (versionOlder version "5.29.6")
|
||||
# Fix parallel building: https://rt.perl.org/Public/Bug/Display.html?id=132360
|
||||
(fetchurlBoot {
|
||||
(fetchurl {
|
||||
url = "https://rt.perl.org/Public/Ticket/Attachment/1502646/807252/0001-Fix-missing-build-dependency-for-pods.patch";
|
||||
sha256 = "1bb4mldfp8kq1scv480wm64n2jdsqa3ar46cjp1mjpby8h5dr2r0";
|
||||
})
|
||||
@ -159,7 +159,7 @@ let
|
||||
} // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec {
|
||||
crossVersion = "276849e62f472c1b241d9e7b38a28e4cc9f98563"; # Dez 02, 2018
|
||||
|
||||
perl-cross-src = fetchurlBoot {
|
||||
perl-cross-src = fetchurl {
|
||||
url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz";
|
||||
sha256 = "1fpr1m9lgkwdp1vmdr0s6gvmcpd0m8q6jwn024bkczc2h37bdynd";
|
||||
};
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, pkgs, fetchFromGitHub, automake, autoconf, libtool
|
||||
{ stdenv, fetchpatch, fetchFromGitHub, autoreconfHook
|
||||
, openblas, gfortran, openssh, openmpi
|
||||
} :
|
||||
|
||||
@ -15,11 +15,22 @@ in stdenv.mkDerivation {
|
||||
sha256 = "07i2idaas7pq3in5mdqq5ndvxln5q87nyfgk3vzw85r72c4fq5jh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ automake autoconf libtool ];
|
||||
# upstream patches for openmpi-4 compatibility
|
||||
patches = [ (fetchpatch {
|
||||
name = "MPI_Type_struct-was-deprecated-in-MPI-2";
|
||||
url = "https://github.com/GlobalArrays/ga/commit/36e6458993b1df745f43b7db86dc17087758e0d2.patch";
|
||||
sha256 = "058qi8x0ananqx980p03yxpyn41cnmm0ifwsl50qp6sc0bnbnclh";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "MPI_Errhandler_set-was-deprecated-in-MPI-2";
|
||||
url = "https://github.com/GlobalArrays/ga/commit/f1ea5203d2672c1a1d0275a012fb7c2fb3d033d8.patch";
|
||||
sha256 = "06n7ds9alk5xa6hd7waw3wrg88yx2azhdkn3cjs2k189iw8a7fqk";
|
||||
})];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [ openmpi openblas gfortran openssh ];
|
||||
|
||||
preConfigure = ''
|
||||
autoreconf -ivf
|
||||
configureFlagsArray+=( "--enable-i8" \
|
||||
"--with-mpi" \
|
||||
"--with-mpi3" \
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
let
|
||||
pname = "libhandy";
|
||||
version = "0.0.7";
|
||||
version = "0.0.8";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
|
||||
owner = "Librem5";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1k9v6q2dz9x8lfcyzmsksrkq6md7m9jdkjlfan7nqlcj3mqhd7m9";
|
||||
sha256 = "04jyllwdrapw24f34pjc2gbmfapjfin8iw0g3qfply7ciy08k1wj";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ stdenv, fetchurlBoot, openssl, zlib, windows }:
|
||||
{ stdenv, fetchurl, openssl, zlib, windows }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libssh2-1.8.0";
|
||||
|
||||
src = fetchurlBoot {
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/download/${name}.tar.gz";
|
||||
sha256 = "1m3n8spv79qhjq4yi0wgly5s5rc8783jb1pyra9bkx1md0plxwrr";
|
||||
};
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, gfortran, perl, libnl, rdma-core, zlib
|
||||
, numactl
|
||||
{ stdenv, fetchurl, fetchpatch, gfortran, perl, libnl
|
||||
, rdma-core, zlib, numactl, libevent, hwloc
|
||||
|
||||
# Enable the Sun Grid Engine bindings
|
||||
, enableSGE ? false
|
||||
@ -9,22 +9,30 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "3.1.3";
|
||||
version = "4.0.0";
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "openmpi-${version}";
|
||||
|
||||
src = with stdenv.lib.versions; fetchurl {
|
||||
url = "http://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${name}.tar.bz2";
|
||||
sha256 = "1dks11scivgaskjs5955y9wprsl12wr3gn5r7wfl0l8gq03l7q4b";
|
||||
sha256 = "0srnjwzsmyhka9hhnmqm86qck4w3xwjm8g6sbns58wzbrwv8l2rg";
|
||||
};
|
||||
|
||||
patches = [ (fetchpatch {
|
||||
# Fix a bug that ignores OMPI_MCA_rmaps_base_oversubscribe (upstream patch).
|
||||
# This bug breaks the test from libs, such as scalapack,
|
||||
# on machines with less than 4 cores.
|
||||
url = https://github.com/open-mpi/ompi/commit/98c8492057e6222af6404b352430d0dd7553d253.patch;
|
||||
sha256 = "1mpd8sxxprgfws96qqlzvqf58pn2vv2d0qa8g8cpv773sgw3b3gj";
|
||||
}) ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs ./
|
||||
'';
|
||||
|
||||
buildInputs = with stdenv; [ gfortran zlib ]
|
||||
++ lib.optionals isLinux [ libnl numactl ]
|
||||
++ lib.optionals isLinux [ libnl numactl libevent hwloc ]
|
||||
++ lib.optional (isLinux || isFreeBSD) rdma-core;
|
||||
|
||||
nativeBuildInputs = [ perl ];
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
{ stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, libX11, libXext, qttools }:
|
||||
{ stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, kwindowsystem, libX11, libXext, qttools }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qtstyleplugin-kvantum";
|
||||
version = "0.10.8";
|
||||
version = "0.10.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tsujan";
|
||||
repo = "Kvantum";
|
||||
rev = "V${version}";
|
||||
sha256 = "0w4iqpkagrwvhahdl280ni06b7x1i621n3z740g84ysp2n3dv09l";
|
||||
sha256 = "1zpq6wsl57kfx0jf0rkxf15ic22ihazj03i3kfiqb07vcrs2cka9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake qttools ];
|
||||
buildInputs = [ qtbase qtsvg qtx11extras libX11 libXext ];
|
||||
buildInputs = [ qtbase qtsvg qtx11extras kwindowsystem libX11 libXext ];
|
||||
|
||||
sourceRoot = "source/Kvantum";
|
||||
|
||||
|
||||
@ -12,6 +12,9 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0p1r61ss1fq0bs8ynnx7xq4wwsdvs32ljvwjnx6yxr8gd6pawx0c";
|
||||
};
|
||||
|
||||
# patch to rename outdated MPI functions
|
||||
patches = [ ./openmpi4.patch ];
|
||||
|
||||
nativeBuildInputs = [ cmake openssh ];
|
||||
buildInputs = [ mpi gfortran openblasCompat ];
|
||||
|
||||
@ -41,8 +44,8 @@ stdenv.mkDerivation rec {
|
||||
homepage = http://www.netlib.org/scalapack/;
|
||||
description = "Library of high-performance linear algebra routines for parallel distributed memory machines";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ costrouc markuskowa ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
143
pkgs/development/libraries/science/math/scalapack/openmpi4.patch
Normal file
143
pkgs/development/libraries/science/math/scalapack/openmpi4.patch
Normal file
@ -0,0 +1,143 @@
|
||||
diff --git a/BLACS/SRC/blacs_get_.c b/BLACS/SRC/blacs_get_.c
|
||||
index e979767..d4b04cf 100644
|
||||
--- a/BLACS/SRC/blacs_get_.c
|
||||
+++ b/BLACS/SRC/blacs_get_.c
|
||||
@@ -23,7 +23,7 @@ F_VOID_FUNC blacs_get_(int *ConTxt, int *what, int *val)
|
||||
case SGET_MSGIDS:
|
||||
if (BI_COMM_WORLD == NULL) Cblacs_pinfo(val, &val[1]);
|
||||
iptr = &val[1];
|
||||
- ierr=MPI_Attr_get(MPI_COMM_WORLD, MPI_TAG_UB, (BVOID **) &iptr,val);
|
||||
+ ierr=MPI_Comm_get_attr(MPI_COMM_WORLD, MPI_TAG_UB, (BVOID **) &iptr,val);
|
||||
val[0] = 0;
|
||||
val[1] = *iptr;
|
||||
break;
|
||||
diff --git a/BLACS/SRC/cgamn2d_.c b/BLACS/SRC/cgamn2d_.c
|
||||
index 2db6ccb..6958f32 100644
|
||||
--- a/BLACS/SRC/cgamn2d_.c
|
||||
+++ b/BLACS/SRC/cgamn2d_.c
|
||||
@@ -221,7 +221,7 @@ F_VOID_FUNC cgamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n,
|
||||
{
|
||||
#endif
|
||||
i = 2;
|
||||
- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType);
|
||||
+ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType);
|
||||
ierr=MPI_Type_commit(&MyType);
|
||||
bp->N = bp2->N = 1;
|
||||
bp->dtype = bp2->dtype = MyType;
|
||||
diff --git a/BLACS/SRC/cgamx2d_.c b/BLACS/SRC/cgamx2d_.c
|
||||
index 707c0b6..f802d01 100644
|
||||
--- a/BLACS/SRC/cgamx2d_.c
|
||||
+++ b/BLACS/SRC/cgamx2d_.c
|
||||
@@ -221,7 +221,7 @@ F_VOID_FUNC cgamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n,
|
||||
{
|
||||
#endif
|
||||
i = 2;
|
||||
- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType);
|
||||
+ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType);
|
||||
ierr=MPI_Type_commit(&MyType);
|
||||
bp->N = bp2->N = 1;
|
||||
bp->dtype = bp2->dtype = MyType;
|
||||
diff --git a/BLACS/SRC/dgamn2d_.c b/BLACS/SRC/dgamn2d_.c
|
||||
index dff23b4..a2627ac 100644
|
||||
--- a/BLACS/SRC/dgamn2d_.c
|
||||
+++ b/BLACS/SRC/dgamn2d_.c
|
||||
@@ -221,7 +221,7 @@ F_VOID_FUNC dgamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n,
|
||||
{
|
||||
#endif
|
||||
i = 2;
|
||||
- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType);
|
||||
+ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType);
|
||||
ierr=MPI_Type_commit(&MyType);
|
||||
bp->N = bp2->N = 1;
|
||||
bp->dtype = bp2->dtype = MyType;
|
||||
diff --git a/BLACS/SRC/dgamx2d_.c b/BLACS/SRC/dgamx2d_.c
|
||||
index a51f731..2a644d0 100644
|
||||
--- a/BLACS/SRC/dgamx2d_.c
|
||||
+++ b/BLACS/SRC/dgamx2d_.c
|
||||
@@ -221,7 +221,7 @@ F_VOID_FUNC dgamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n,
|
||||
{
|
||||
#endif
|
||||
i = 2;
|
||||
- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType);
|
||||
+ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType);
|
||||
ierr=MPI_Type_commit(&MyType);
|
||||
bp->N = bp2->N = 1;
|
||||
bp->dtype = bp2->dtype = MyType;
|
||||
diff --git a/BLACS/SRC/igamn2d_.c b/BLACS/SRC/igamn2d_.c
|
||||
index 16bc003..f6a7859 100644
|
||||
--- a/BLACS/SRC/igamn2d_.c
|
||||
+++ b/BLACS/SRC/igamn2d_.c
|
||||
@@ -218,7 +218,7 @@ F_VOID_FUNC igamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n,
|
||||
{
|
||||
#endif
|
||||
i = 2;
|
||||
- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType);
|
||||
+ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType);
|
||||
ierr=MPI_Type_commit(&MyType);
|
||||
bp->N = bp2->N = 1;
|
||||
bp->dtype = bp2->dtype = MyType;
|
||||
diff --git a/BLACS/SRC/igamx2d_.c b/BLACS/SRC/igamx2d_.c
|
||||
index 8165cbe..a7cfcc6 100644
|
||||
--- a/BLACS/SRC/igamx2d_.c
|
||||
+++ b/BLACS/SRC/igamx2d_.c
|
||||
@@ -218,7 +218,7 @@ F_VOID_FUNC igamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n,
|
||||
{
|
||||
#endif
|
||||
i = 2;
|
||||
- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType);
|
||||
+ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType);
|
||||
ierr=MPI_Type_commit(&MyType);
|
||||
bp->N = bp2->N = 1;
|
||||
bp->dtype = bp2->dtype = MyType;
|
||||
diff --git a/BLACS/SRC/sgamn2d_.c b/BLACS/SRC/sgamn2d_.c
|
||||
index d6c95e5..569c797 100644
|
||||
--- a/BLACS/SRC/sgamn2d_.c
|
||||
+++ b/BLACS/SRC/sgamn2d_.c
|
||||
@@ -221,7 +221,7 @@ F_VOID_FUNC sgamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n,
|
||||
{
|
||||
#endif
|
||||
i = 2;
|
||||
- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType);
|
||||
+ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType);
|
||||
ierr=MPI_Type_commit(&MyType);
|
||||
bp->N = bp2->N = 1;
|
||||
bp->dtype = bp2->dtype = MyType;
|
||||
diff --git a/BLACS/SRC/sgamx2d_.c b/BLACS/SRC/sgamx2d_.c
|
||||
index 4b0af6f..8897ece 100644
|
||||
--- a/BLACS/SRC/sgamx2d_.c
|
||||
+++ b/BLACS/SRC/sgamx2d_.c
|
||||
@@ -221,7 +221,7 @@ F_VOID_FUNC sgamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n,
|
||||
{
|
||||
#endif
|
||||
i = 2;
|
||||
- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType);
|
||||
+ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType);
|
||||
ierr=MPI_Type_commit(&MyType);
|
||||
bp->N = bp2->N = 1;
|
||||
bp->dtype = bp2->dtype = MyType;
|
||||
diff --git a/BLACS/SRC/zgamn2d_.c b/BLACS/SRC/zgamn2d_.c
|
||||
index 9de2b23..37897df 100644
|
||||
--- a/BLACS/SRC/zgamn2d_.c
|
||||
+++ b/BLACS/SRC/zgamn2d_.c
|
||||
@@ -221,7 +221,7 @@ F_VOID_FUNC zgamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n,
|
||||
{
|
||||
#endif
|
||||
i = 2;
|
||||
- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType);
|
||||
+ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType);
|
||||
ierr=MPI_Type_commit(&MyType);
|
||||
bp->N = bp2->N = 1;
|
||||
bp->dtype = bp2->dtype = MyType;
|
||||
diff --git a/BLACS/SRC/zgamx2d_.c b/BLACS/SRC/zgamx2d_.c
|
||||
index 414c381..0e9d474 100644
|
||||
--- a/BLACS/SRC/zgamx2d_.c
|
||||
+++ b/BLACS/SRC/zgamx2d_.c
|
||||
@@ -221,7 +221,7 @@ F_VOID_FUNC zgamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n,
|
||||
{
|
||||
#endif
|
||||
i = 2;
|
||||
- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType);
|
||||
+ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType);
|
||||
ierr=MPI_Type_commit(&MyType);
|
||||
bp->N = bp2->N = 1;
|
||||
bp->dtype = bp2->dtype = MyType;
|
||||
@ -18,6 +18,8 @@ let
|
||||
|
||||
doCheck = true;
|
||||
|
||||
patches = stdenv.lib.optionals stdenv.isDarwin [ ./skip-flaky-darwin-test.patch ];
|
||||
|
||||
# the configure script thinks that Darwin has ___exp10
|
||||
# but it’s not available on my systems (or hydra apparently)
|
||||
postConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
|
||||
@ -0,0 +1,33 @@
|
||||
diff -Naur xapian-core.old/tests/api_db.cc xapian-core.new/tests/api_db.cc
|
||||
--- xapian-core.old/tests/api_db.cc
|
||||
+++ xapian-core.new/tests/api_db.cc
|
||||
@@ -998,6 +998,7 @@
|
||||
|
||||
// test for keepalives
|
||||
DEFINE_TESTCASE(keepalive1, remote) {
|
||||
+ SKIP_TEST("Fails in darwin nix build environment");
|
||||
Xapian::Database db(get_remote_database("apitest_simpledata", 5000));
|
||||
|
||||
/* Test that keep-alives work */
|
||||
diff -Naur xapian-core.old/tests/api_scalability.cc xapian-core.new/tests/api_scalability.cc
|
||||
--- xapian-core.old/tests/api_scalability.cc
|
||||
+++ xapian-core.new/tests/api_scalability.cc
|
||||
@@ -53,6 +53,7 @@
|
||||
}
|
||||
|
||||
DEFINE_TESTCASE(bigoaddvalue1, writable) {
|
||||
+ SKIP_TEST("Fails in darwin nix build environment");
|
||||
// O(n*n) is bad, but O(n*log(n)) is acceptable.
|
||||
test_scalability(bigoaddvalue1_helper, 5000, O_N_LOG_N);
|
||||
return true;
|
||||
diff -Naur xapian-core.old/tests/api_serialise.cc xapian-core.new/tests/api_serialise.cc
|
||||
--- xapian-core.old/tests/api_serialise.cc
|
||||
+++ xapian-core.new/tests/api_serialise.cc
|
||||
@@ -110,6 +110,7 @@
|
||||
|
||||
// Test for serialising a document obtained from a database.
|
||||
DEFINE_TESTCASE(serialise_document2, writable) {
|
||||
+ SKIP_TEST("Fails in darwin nix build environment");
|
||||
Xapian::Document origdoc;
|
||||
origdoc.add_term("foo", 2);
|
||||
origdoc.add_posting("foo", 10);
|
||||
@ -2,50 +2,50 @@ GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
CFPropertyList (3.0.0)
|
||||
activesupport (4.2.10)
|
||||
activesupport (4.2.11)
|
||||
i18n (~> 0.7)
|
||||
minitest (~> 5.1)
|
||||
thread_safe (~> 0.3, >= 0.3.4)
|
||||
tzinfo (~> 1.1)
|
||||
atomos (0.1.3)
|
||||
claide (1.0.2)
|
||||
cocoapods (1.5.3)
|
||||
cocoapods (1.6.0)
|
||||
activesupport (>= 4.0.2, < 5)
|
||||
claide (>= 1.0.2, < 2.0)
|
||||
cocoapods-core (= 1.5.3)
|
||||
cocoapods-core (= 1.6.0)
|
||||
cocoapods-deintegrate (>= 1.0.2, < 2.0)
|
||||
cocoapods-downloader (>= 1.2.0, < 2.0)
|
||||
cocoapods-downloader (>= 1.2.2, < 2.0)
|
||||
cocoapods-plugins (>= 1.0.0, < 2.0)
|
||||
cocoapods-search (>= 1.0.0, < 2.0)
|
||||
cocoapods-stats (>= 1.0.0, < 2.0)
|
||||
cocoapods-trunk (>= 1.3.0, < 2.0)
|
||||
cocoapods-trunk (>= 1.3.1, < 2.0)
|
||||
cocoapods-try (>= 1.1.0, < 2.0)
|
||||
colored2 (~> 3.1)
|
||||
escape (~> 0.0.4)
|
||||
fourflusher (~> 2.0.1)
|
||||
fourflusher (>= 2.2.0, < 3.0)
|
||||
gh_inspector (~> 1.0)
|
||||
molinillo (~> 0.6.5)
|
||||
molinillo (~> 0.6.6)
|
||||
nap (~> 1.0)
|
||||
ruby-macho (~> 1.1)
|
||||
xcodeproj (>= 1.5.7, < 2.0)
|
||||
cocoapods-core (1.5.3)
|
||||
ruby-macho (~> 1.3, >= 1.3.1)
|
||||
xcodeproj (>= 1.8.0, < 2.0)
|
||||
cocoapods-core (1.6.0)
|
||||
activesupport (>= 4.0.2, < 6)
|
||||
fuzzy_match (~> 2.0.4)
|
||||
nap (~> 1.0)
|
||||
cocoapods-deintegrate (1.0.2)
|
||||
cocoapods-downloader (1.2.1)
|
||||
cocoapods-downloader (1.2.2)
|
||||
cocoapods-plugins (1.0.0)
|
||||
nap
|
||||
cocoapods-search (1.0.0)
|
||||
cocoapods-stats (1.0.0)
|
||||
cocoapods-stats (1.1.0)
|
||||
cocoapods-trunk (1.3.1)
|
||||
nap (>= 0.8, < 2.0)
|
||||
netrc (~> 0.11)
|
||||
cocoapods-try (1.1.0)
|
||||
colored2 (3.1.2)
|
||||
concurrent-ruby (1.0.5)
|
||||
concurrent-ruby (1.1.4)
|
||||
escape (0.0.4)
|
||||
fourflusher (2.0.1)
|
||||
fourflusher (2.2.0)
|
||||
fuzzy_match (2.0.4)
|
||||
gh_inspector (1.1.3)
|
||||
i18n (0.9.5)
|
||||
@ -55,11 +55,11 @@ GEM
|
||||
nanaimo (0.2.6)
|
||||
nap (1.1.0)
|
||||
netrc (0.11.0)
|
||||
ruby-macho (1.2.0)
|
||||
ruby-macho (1.3.1)
|
||||
thread_safe (0.3.6)
|
||||
tzinfo (1.2.5)
|
||||
thread_safe (~> 0.1)
|
||||
xcodeproj (1.6.0)
|
||||
xcodeproj (1.8.0)
|
||||
CFPropertyList (>= 2.3.3, < 4.0)
|
||||
atomos (~> 0.1.3)
|
||||
claide (>= 1.0.2, < 2.0)
|
||||
@ -73,4 +73,4 @@ DEPENDENCIES
|
||||
cocoapods
|
||||
|
||||
BUNDLED WITH
|
||||
1.16.3
|
||||
1.17.2
|
||||
|
||||
@ -1,12 +1,14 @@
|
||||
{
|
||||
activesupport = {
|
||||
dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0s12j8vl8vrxfngkdlz9g8bpz9akq1z42d57mx5r537b2pji8nr7";
|
||||
sha256 = "0pqr25wmhvvlg8av7bi5p5c7r5464clhhhhv45j63bh7xw4ad6n4";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.2.10";
|
||||
version = "4.2.11";
|
||||
};
|
||||
atomos = {
|
||||
source = {
|
||||
@ -34,21 +36,25 @@
|
||||
};
|
||||
cocoapods = {
|
||||
dependencies = ["activesupport" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-stats" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0x5cz19p0j9k1hvn35lxnv3dn8i65n4qvi5nzjaf53pdgh52401h";
|
||||
sha256 = "173zvbld289ikvicwj2gqsv9hkvbxz7cswx21c7mh0gznsad1gsx";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.5.3";
|
||||
version = "1.6.0";
|
||||
};
|
||||
cocoapods-core = {
|
||||
dependencies = ["activesupport" "fuzzy_match" "nap"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0xnxcd2xnvf60f8w27glq5jcn9wdhzch9nkdb24ihhmpxfgj3f39";
|
||||
sha256 = "1q0xd24pqa1biqrg597yhsrgzgi4msk3nr00gfxi40nfqnryvmyl";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.5.3";
|
||||
version = "1.6.0";
|
||||
};
|
||||
cocoapods-deintegrate = {
|
||||
source = {
|
||||
@ -59,12 +65,14 @@
|
||||
version = "1.0.2";
|
||||
};
|
||||
cocoapods-downloader = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0g1v3k52g2mjlml8miq06c61764lqdy0gc0h2f4ymajz0pqg1zik";
|
||||
sha256 = "09fd4zaqkz8vz3djplacngcs4n0j6j956wgq43s1y6bwl0zyjmd3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
};
|
||||
cocoapods-plugins = {
|
||||
dependencies = ["nap"];
|
||||
@ -84,12 +92,14 @@
|
||||
version = "1.0.0";
|
||||
};
|
||||
cocoapods-stats = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0sfcwq2vq6cadj1811jdjys3d28pmk2r2a83px6w94rz6i19axid";
|
||||
sha256 = "1xhdh5v94p6l612rwrk290nd2hdfx8lbaqfbkmj34md218kilqww";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
};
|
||||
cocoapods-trunk = {
|
||||
dependencies = ["nap" "netrc"];
|
||||
@ -117,12 +127,14 @@
|
||||
version = "3.1.2";
|
||||
};
|
||||
concurrent-ruby = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf";
|
||||
sha256 = "1ixcx9pfissxrga53jbdpza85qd5f6b5nq1sfqa9rnfq82qnlbp1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.5";
|
||||
version = "1.1.4";
|
||||
};
|
||||
escape = {
|
||||
source = {
|
||||
@ -133,12 +145,14 @@
|
||||
version = "0.0.4";
|
||||
};
|
||||
fourflusher = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1dzmkxyzrk475c1yk5zddwhhj28b6fnj4jkk1h5gr1c2mrar72d5";
|
||||
sha256 = "1d2ksz077likjv8dcxy1rnqcjallbfa7yk2wvix3228gq7a4jkq3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.1";
|
||||
version = "2.2.0";
|
||||
};
|
||||
fuzzy_match = {
|
||||
source = {
|
||||
@ -206,12 +220,14 @@
|
||||
version = "0.11.0";
|
||||
};
|
||||
ruby-macho = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0xi0ll217h3caiamplqaypmipmrkriqrvmq207ngyzhgmh1jfc8q";
|
||||
sha256 = "106xrrinbhxd8z6x94j32abgd2w3rml0afj2rk2n6jshyj6141al";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.0";
|
||||
version = "1.3.1";
|
||||
};
|
||||
thread_safe = {
|
||||
source = {
|
||||
@ -232,11 +248,13 @@
|
||||
};
|
||||
xcodeproj = {
|
||||
dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1f4shbzff3wsk1jq0v9bs10496qdx69k2jfpf11p4q2ik3jdnsv7";
|
||||
sha256 = "1hyahdwz0nfmzw9v6h5rwvnj5hxa0jwqyagmpn1k1isxb1vks70w";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.6.0";
|
||||
version = "1.8.0";
|
||||
};
|
||||
}
|
||||
@ -1,10 +1,11 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p bash ruby bundler bundix
|
||||
|
||||
rm Gemfile.lock
|
||||
bundler install
|
||||
bundix
|
||||
BUNDIX_CACHE="$(mktemp -d)"
|
||||
|
||||
if [ "clean" == "$1" ]; then
|
||||
rm -rf ~/.gem
|
||||
fi
|
||||
rm -f Gemfile.lock
|
||||
bundler package --path "$BUNDIX_CACHE"
|
||||
bundix --bundle-pack-path="$BUNDIX_CACHE"
|
||||
|
||||
rm -rf "$BUNDIX_CACHE"
|
||||
rm -rf .bundle
|
||||
|
||||
@ -105,7 +105,7 @@ stdenv.mkDerivation ({
|
||||
<string>${codeSignIdentity}</string>
|
||||
<key>provisioningProfiles</key>
|
||||
<dict>
|
||||
<key>${stdenv.lib.toLower bundleId}</key>
|
||||
<key>${bundleId}</key>
|
||||
<string>$PROVISIONING_PROFILE</string>
|
||||
</dict>
|
||||
<key>signingStyle</key>
|
||||
@ -129,9 +129,9 @@ stdenv.mkDerivation ({
|
||||
|
||||
${stdenv.lib.optionalString enableWirelessDistribution ''
|
||||
# Add another hacky build product that enables wireless adhoc installations
|
||||
appname="$(basename "$out/*.ipa" .ipa)"
|
||||
sed -e "s|@INSTALL_URL@|${installURL}?bundleId=${bundleId}\&version=${appVersion}\&title=$appname|" ${./install.html.template} > $out/$appname.html
|
||||
echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products
|
||||
appname="$(basename "$(echo $out/*.ipa)" .ipa)"
|
||||
sed -e "s|@INSTALL_URL@|${installURL}?bundleId=${bundleId}\&version=${appVersion}\&title=$appname|" ${./install.html.template} > $out/''${appname}.html
|
||||
echo "doc install \"$out/''${appname}.html\"" >> $out/nix-support/hydra-build-products
|
||||
''}
|
||||
''}
|
||||
${stdenv.lib.optionalString generateXCArchive ''
|
||||
|
||||
@ -1,27 +1,38 @@
|
||||
{ stdenv, fetchurl, pkgconfig, ocaml, findlib, gtk3, gtkspell3, gtksourceview }:
|
||||
{ stdenv,lib, fetchFromGitHub, pkgconfig, ocaml, findlib, dune, gtk3, cairo2 }:
|
||||
|
||||
if !stdenv.lib.versionAtLeast ocaml.version "4.05"
|
||||
if !lib.versionAtLeast ocaml.version "4.05"
|
||||
then throw "lablgtk3 is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
# This package uses the dune.configurator library
|
||||
# It thus needs said library to be compiled with this OCaml compiler
|
||||
let __dune = dune; in
|
||||
let dune = __dune.override { ocamlPackages = { inherit ocaml findlib; }; }; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.0.beta3";
|
||||
name = "ocaml${ocaml.version}-lablgtk3-${version}";
|
||||
src = fetchurl {
|
||||
url = https://forge.ocamlcore.org/frs/download.php/1775/lablgtk-3.0.beta3.tar.gz;
|
||||
sha256 = "174mwwdz1s91a6ycbas7nc0g87c2l6zqv68zi5ab33yb76l46a6w";
|
||||
version = "3.0.beta4";
|
||||
pname = "lablgtk3";
|
||||
name = "ocaml${ocaml.version}-${pname}-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "garrigue";
|
||||
repo = "lablgtk";
|
||||
rev = version;
|
||||
sha256 = "1lppb7k4xb1a35i7klm9mz98hw8l2f8s7rivgzysi1sviqy1ds5d";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ ocaml findlib gtk3 gtkspell3 gtksourceview ];
|
||||
buildInputs = [ ocaml findlib dune gtk3 ];
|
||||
propagatedBuildInputs = [ cairo2 ];
|
||||
|
||||
buildFlags = "world";
|
||||
buildPhase = "dune build -p ${pname}";
|
||||
inherit (dune) installPhase;
|
||||
|
||||
meta = {
|
||||
description = "OCaml interface to gtk+-3";
|
||||
homepage = "http://lablgtk.forge.ocamlcore.org/";
|
||||
license = stdenv.lib.licenses.lgpl21;
|
||||
maintainers = [ stdenv.lib.maintainers.vbgl ];
|
||||
license = lib.licenses.lgpl21;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
inherit (ocaml.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
8
pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix
Normal file
8
pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix
Normal file
@ -0,0 +1,8 @@
|
||||
{ buildDunePackage, gtkspell3, lablgtk3 }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "lablgtk3-gtkspell3";
|
||||
buildInputs = [ gtkspell3 ] ++ lablgtk3.buildInputs;
|
||||
propagatedBuildInputs = [ lablgtk3 ];
|
||||
inherit (lablgtk3) src version meta nativeBuildInputs;
|
||||
}
|
||||
9
pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix
Normal file
9
pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix
Normal file
@ -0,0 +1,9 @@
|
||||
{ stdenv, ocaml, gtksourceview, lablgtk3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-lablgtk3-sourceview3-${version}";
|
||||
buildPhase = "dune build -p lablgtk3-sourceview3";
|
||||
buildInputs = lablgtk3.buildInputs ++ [ gtksourceview ];
|
||||
propagatedBuildInputs = [ lablgtk3 ];
|
||||
inherit (lablgtk3) src version meta nativeBuildInputs installPhase;
|
||||
}
|
||||
@ -26,6 +26,6 @@ buildPythonPackage rec {
|
||||
homepage = https://launchpad.net/aafigure/;
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ bjornfor ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
description = "Generate activity-diagram image from spec-text file (similar to Graphviz)";
|
||||
homepage = http://blockdiag.com/;
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ bjornfor ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -32,6 +32,6 @@ buildPythonPackage rec {
|
||||
homepage = https://github.com/altair-viz/altair;
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ teh ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Python library for translating ASN.1 into other forms";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ leenaars ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -14,7 +14,7 @@ buildPythonPackage rec {
|
||||
description = "Module for binary data manipulation";
|
||||
homepage = "https://github.com/scott-griffiths/bitstring";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ bjornfor ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -34,7 +34,7 @@ buildPythonPackage rec {
|
||||
downloadPage = https://pypi.python.org/pypi/filebrowser_safe/;
|
||||
license = licenses.free;
|
||||
maintainers = with maintainers; [ prikhi ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
||||
downloadPage = http://pypi.python.org/pypi/grappelli_safe/;
|
||||
license = licenses.free;
|
||||
maintainers = with maintainers; [ prikhi ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
description = "Tools for i3 users and developers";
|
||||
homepage = "https://github.com/ziberna/i3-py";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
28
pkgs/development/python-modules/imageio-ffmpeg/default.nix
Normal file
28
pkgs/development/python-modules/imageio-ffmpeg/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy3k
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "imageio-ffmpeg";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
sha256 = "191k77hd69lfmd8p4w02c2ajjdsall6zijn01gyhqi11n48wpsib";
|
||||
inherit pname version;
|
||||
};
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
# No test infrastructure in repository.
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "FFMPEG wrapper for Python";
|
||||
homepage = https://github.com/imageio/imageio-ffmpeg;
|
||||
license = licenses.bsd2;
|
||||
maintainers = [ maintainers.pmiddend ];
|
||||
};
|
||||
|
||||
}
|
||||
@ -1,11 +1,14 @@
|
||||
{ stdenv
|
||||
, buildPythonPackage
|
||||
, pathlib
|
||||
, fetchPypi
|
||||
, pillow
|
||||
, psutil
|
||||
, imageio-ffmpeg
|
||||
, pytest
|
||||
, numpy
|
||||
, isPy3k
|
||||
, ffmpeg
|
||||
, futures
|
||||
, enum34
|
||||
}:
|
||||
@ -15,14 +18,17 @@ buildPythonPackage rec {
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchPypi {
|
||||
sha256 = "42e65aadfc3d57a1043615c92bdf6319b67589e49a0aae2b985b82144aceacad";
|
||||
sha256 = "1bdcrr5190jvk0msw2lswj4pbdhrcggjpj8m6q2a2mrxzjnmmrj2";
|
||||
inherit pname version;
|
||||
};
|
||||
|
||||
checkInputs = [ pytest psutil ];
|
||||
checkInputs = [ pytest psutil ] ++ stdenv.lib.optionals isPy3k [
|
||||
imageio-ffmpeg ffmpeg
|
||||
];
|
||||
propagatedBuildInputs = [ numpy pillow ] ++ stdenv.lib.optionals (!isPy3k) [
|
||||
futures
|
||||
enum34
|
||||
pathlib
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
@ -34,8 +40,12 @@ buildPythonPackage rec {
|
||||
|
||||
# For some reason, importing imageio also imports xml on Nix, see
|
||||
# https://github.com/imageio/imageio/issues/395
|
||||
|
||||
# Also, there are tests that test the downloading of ffmpeg if it's not installed.
|
||||
# "Uncomment" those by renaming.
|
||||
postPatch = ''
|
||||
substituteInPlace tests/test_meta.py --replace '"urllib",' "\"urllib\",\"xml\""
|
||||
substituteInPlace tests/test_meta.py --replace '"urllib",' "\"urllib\",\"xml\","
|
||||
substituteInPlace tests/test_ffmpeg.py --replace 'test_get_exe_installed' 'get_exe_installed'
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
homepage = https://imread.readthedocs.io/en/latest/;
|
||||
maintainers = with maintainers; [ luispedro ];
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -25,6 +25,6 @@ buildPythonPackage rec {
|
||||
|
||||
meta = {
|
||||
maintainers = [ ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -20,6 +20,6 @@ buildPythonPackage rec {
|
||||
homepage = https://github.com/schwehr/libais;
|
||||
description = "Library for decoding maritime Automatic Identification System messages";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux; # It currently fails to build on darwin
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
description = "C++ implementation of 3mf loading with SIP python bindings";
|
||||
homepage = https://github.com/Ultimaker/libSavitar;
|
||||
license = licenses.lgpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ abbradar orivej ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -28,6 +28,6 @@ buildPythonPackage rec {
|
||||
homepage = http://mahotas.readthedocs.io/;
|
||||
maintainers = with maintainers; [ luispedro ];
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -64,7 +64,7 @@ buildPythonPackage rec {
|
||||
downloadPage = https://github.com/stephenmcd/mezzanine/releases;
|
||||
license = licenses.free;
|
||||
maintainers = with maintainers; [ prikhi ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -24,6 +24,6 @@ buildPythonPackage rec {
|
||||
'';
|
||||
homepage = https://bitbucket.org/userzimmermann/python-moretools;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -13,11 +13,18 @@ buildPythonPackage rec {
|
||||
inherit mpi;
|
||||
};
|
||||
|
||||
patches = [ (fetchpatch {
|
||||
# Disable tests failing with 3.1.x and MPI_THREAD_MULTIPLE
|
||||
url = "https://bitbucket.org/mpi4py/mpi4py/commits/c2b6b7e642a182f9b00a2b8e9db363214470548a/raw";
|
||||
sha256 = "0n6bz3kj4vcqb6q7d0mlj5vl6apn7i2bvfc9mpg59vh3wy47119q";
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Disable tests failing with 3.1.x and MPI_THREAD_MULTIPLE (upstream patch)
|
||||
url = "https://bitbucket.org/mpi4py/mpi4py/commits/c2b6b7e642a182f9b00a2b8e9db363214470548a/raw";
|
||||
sha256 = "0n6bz3kj4vcqb6q7d0mlj5vl6apn7i2bvfc9mpg59vh3wy47119q";
|
||||
})
|
||||
(fetchpatch {
|
||||
# Open MPI: Workaround removal of MPI_{LB|UB} (upstream patch)
|
||||
url = "https://bitbucket.org/mpi4py/mpi4py/commits/39ca784226460f9e519507269ebb29635dc8bd90/raw";
|
||||
sha256 = "02kxikdlsrlq8yr5hca42536mxbrq4k4j8nqv7p1p2r0q21a919q";
|
||||
})
|
||||
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
description = "Generate network-diagram image from spec-text file (similar to Graphviz)";
|
||||
homepage = http://blockdiag.com/;
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ bjornfor ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
description = "Library for OAuth version 1.0";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ garbas ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -32,7 +32,7 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/Tigge/openant";
|
||||
description = "ANT and ANT-FS Python Library";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
homepage = https://github.com/mfenniak/pg8000;
|
||||
description = "PostgreSQL interface library, for asyncio";
|
||||
maintainers = with maintainers; [ garbas domenkozar ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Fast and feature-rich Python interface to LevelDB";
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
homepage = https://github.com/wbolster/plyvel;
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
|
||||
@ -18,6 +18,6 @@ buildPythonPackage rec {
|
||||
homepage = https://github.com/balloob/pychromecast;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
homepage = https://pypi.python.org/pypi/PyICU/;
|
||||
description = "Python extension wrapping the ICU C++ API";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux; # Maybe other non-darwin Unix
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.rycee ];
|
||||
};
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/ntzrmtthihu777/pyinputevent";
|
||||
description = "Python interface to the Input Subsystem's input_event and uinput";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
description = "Python ODBC module to connect to almost any database";
|
||||
homepage = "https://github.com/mkleehammer/pyodbc";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ bjornfor ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -17,6 +17,6 @@ buildPythonPackage rec {
|
||||
homepage = https://github.com/svinota/pyroute2;
|
||||
license = licenses.asl20;
|
||||
maintainers = [maintainers.mic92];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user