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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-02-20 00:36:38 +00:00 committed by GitHub
commit 848226f810
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
93 changed files with 2835 additions and 1177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maintainers/maintainer-list.nix
View File

@ -8878,7 +8878,7 @@
name = "Guillaume Loetscher";
};
sternenseemann = {
email = "post@lukasepple.de";
email = "sternenseemann@systemli.org";
github = "sternenseemann";
githubId = 3154475;
name = "Lukas Epple";

5
nixos/doc/manual/release-notes/rl-2105.xml
View File

@ -91,6 +91,11 @@
</para>
<itemizedlist>
<listitem>
<para>
The <literal>systemConfig</literal> kernel parameter is no longer added to boot loader entries. It has been unused since September 2010, but if do have a system generation from that era, you will now be unable to boot into them.
</para>
</listitem>
<listitem>
<para>
<literal>systemd-journal2gelf</literal> no longer parses json and expects the receiving system to handle it. How to achieve this with Graylog is described in this <link xlink:href="https://github.com/parse-nl/SystemdJournal2Gelf/issues/10">GitHub issue</link>.

2
nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
View File

@ -26,7 +26,7 @@ let
# A clue for the kernel loading
kernelParams = pkgs.writeText "kernel-params.txt" ''
Kernel Parameters:
init=/boot/init systemConfig=/boot/init ${toString config.boot.kernelParams}
init=/boot/init ${toString config.boot.kernelParams}
'';
# System wide nixpkgs config

4
nixos/modules/installer/cd-dvd/system-tarball-pc.nix
View File

@ -23,13 +23,13 @@ let
label nixos
MENU LABEL ^NixOS using nfsroot
KERNEL bzImage
append ip=dhcp nfsroot=/home/pcroot systemConfig=${config.system.build.toplevel} init=${config.system.build.toplevel}/init rw
append ip=dhcp nfsroot=/home/pcroot init=${config.system.build.toplevel}/init rw
# I don't know how to make this boot with nfsroot (using the initrd)
label nixos_initrd
MENU LABEL NixOS booting the poor ^initrd.
KERNEL bzImage
append initrd=initrd ip=dhcp nfsroot=/home/pcroot systemConfig=${config.system.build.toplevel} init=${config.system.build.toplevel}/init rw
append initrd=initrd ip=dhcp nfsroot=/home/pcroot init=${config.system.build.toplevel}/init rw
label memtest
MENU LABEL ^${pkgs.memtest86.name}

2
nixos/modules/misc/crashdump.nix
View File

@ -53,7 +53,7 @@ in
${pkgs.kexectools}/sbin/kexec -p /run/current-system/kernel \
--initrd=/run/current-system/initrd \
--reset-vga --console-vga \
--command-line="systemConfig=$(readlink -f /run/current-system) init=$(readlink -f /run/current-system/init) irqpoll maxcpus=1 reset_devices ${kernelParams}"
--command-line="init=$(readlink -f /run/current-system/init) irqpoll maxcpus=1 reset_devices ${kernelParams}"
'';
kernelParams = [
"crashkernel=${crashdump.reservedMemory}"

1
nixos/modules/module-list.nix
View File

@ -461,6 +461,7 @@
./services/misc/errbot.nix
./services/misc/etcd.nix
./services/misc/etebase-server.nix
./services/misc/etesync-dav.nix
./services/misc/ethminer.nix
./services/misc/exhibitor.nix
./services/misc/felix.nix

92
nixos/modules/services/misc/etesync-dav.nix Normal file
View File

@ -0,0 +1,92 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.etesync-dav;
in
{
options.services.etesync-dav = {
enable = mkEnableOption "etesync-dav";
host = mkOption {
type = types.str;
default = "localhost";
description = "The server host address.";
};
port = mkOption {
type = types.port;
default = 37358;
description = "The server host port.";
};
apiUrl = mkOption {
type = types.str;
default = "https://api.etesync.com/";
description = "The url to the etesync API.";
};
openFirewall = mkOption {
default = false;
type = types.bool;
description = "Whether to open the firewall for the specified port.";
};
sslCertificate = mkOption {
type = types.nullOr types.path;
default = null;
example = "/var/etesync.crt";
description = ''
Path to server SSL certificate. It will be copied into
etesync-dav's data directory.
'';
};
sslCertificateKey = mkOption {
type = types.nullOr types.path;
default = null;
example = "/var/etesync.key";
description = ''
Path to server SSL certificate key. It will be copied into
etesync-dav's data directory.
'';
};
};
config = mkIf cfg.enable {
networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ];
systemd.services.etesync-dav = {
description = "etesync-dav - A CalDAV and CardDAV adapter for EteSync";
after = [ "network-online.target" ];
wantedBy = [ "multi-user.target" ];
path = [ pkgs.etesync-dav ];
environment = {
ETESYNC_LISTEN_ADDRESS = cfg.host;
ETESYNC_LISTEN_PORT = toString cfg.port;
ETESYNC_URL = cfg.apiUrl;
ETESYNC_DATA_DIR = "/var/lib/etesync-dav";
};
serviceConfig = {
Type = "simple";
DynamicUser = true;
StateDirectory = "etesync-dav";
ExecStart = "${pkgs.etesync-dav}/bin/etesync-dav";
ExecStartPre = mkIf (cfg.sslCertificate != null || cfg.sslCertificateKey != null) (
pkgs.writers.writeBash "etesync-dav-copy-keys" ''
${optionalString (cfg.sslCertificate != null) ''
cp ${toString cfg.sslCertificate} $STATE_DIRECTORY/etesync.crt
''}
${optionalString (cfg.sslCertificateKey != null) ''
cp ${toString cfg.sslCertificateKey} $STATE_DIRECTORY/etesync.key
''}
''
);
Restart = "on-failure";
RestartSec = "30min 1s";
};
};
};
}

2
nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh
View File

@ -109,7 +109,7 @@ addEntry() {
exit 1
fi
fi
echo " APPEND systemConfig=$path init=$path/init $extraParams"
echo " APPEND init=$path/init $extraParams"
}
tmpFile="$target/extlinux/extlinux.conf.tmp.$$"

207
nixos/modules/system/boot/loader/grub/install-grub.pl
View File

@ -102,10 +102,10 @@ if (stat($bootPath)->dev != stat("/nix/store")->dev) {
# Discover information about the location of the bootPath
struct(Fs => {
device => '$',
type => '$',
mount => '$',
});
device => '$',
type => '$',
mount => '$',
});
sub PathInMount {
my ($path, $mount) = @_;
my @splitMount = split /\//, $mount;
@ -154,16 +154,16 @@ sub GetFs {
return $bestFs;
}
struct (Grub => {
path => '$',
search => '$',
});
path => '$',
search => '$',
});
my $driveid = 1;
sub GrubFs {
my ($dir) = @_;
my $fs = GetFs($dir);
my $path = substr($dir, length($fs->mount));
if (substr($path, 0, 1) ne "/") {
$path = "/$path";
$path = "/$path";
}
my $search = "";
@ -251,8 +251,8 @@ my $conf .= "# Automatically generated. DO NOT EDIT THIS FILE!\n";
if ($grubVersion == 1) {
$conf .= "
default $defaultEntry
timeout $timeout
default $defaultEntry
timeout $timeout
";
if ($splashImage) {
copy $splashImage, "$bootPath/background.xpm.gz" or die "cannot copy $splashImage to $bootPath: $!\n";
@ -302,51 +302,51 @@ else {
if ($copyKernels == 0) {
$conf .= "
" . $grubStore->search;
" . $grubStore->search;
}
# FIXME: should use grub-mkconfig.
$conf .= "
" . $grubBoot->search . "
if [ -s \$prefix/grubenv ]; then
load_env
fi
" . $grubBoot->search . "
if [ -s \$prefix/grubenv ]; then
load_env
fi
# ‘grub-reboot’ sets a one-time saved entry, which we process here and
# then delete.
if [ \"\${next_entry}\" ]; then
set default=\"\${next_entry}\"
set next_entry=
save_env next_entry
set timeout=1
else
set default=$defaultEntry
set timeout=$timeout
fi
# ‘grub-reboot’ sets a one-time saved entry, which we process here and
# then delete.
if [ \"\${next_entry}\" ]; then
set default=\"\${next_entry}\"
set next_entry=
save_env next_entry
set timeout=1
else
set default=$defaultEntry
set timeout=$timeout
fi
# Setup the graphics stack for bios and efi systems
if [ \"\${grub_platform}\" = \"efi\" ]; then
insmod efi_gop
insmod efi_uga
else
insmod vbe
fi
# Setup the graphics stack for bios and efi systems
if [ \"\${grub_platform}\" = \"efi\" ]; then
insmod efi_gop
insmod efi_uga
else
insmod vbe
fi
";
if ($font) {
copy $font, "$bootPath/converted-font.pf2" or die "cannot copy $font to $bootPath: $!\n";
$conf .= "
insmod font
if loadfont " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/converted-font.pf2; then
insmod gfxterm
if [ \"\${grub_platform}\" = \"efi\" ]; then
set gfxmode=$gfxmodeEfi
set gfxpayload=$gfxpayloadEfi
else
set gfxmode=$gfxmodeBios
set gfxpayload=$gfxpayloadBios
fi
terminal_output gfxterm
fi
insmod font
if loadfont " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/converted-font.pf2; then
insmod gfxterm
if [ \"\${grub_platform}\" = \"efi\" ]; then
set gfxmode=$gfxmodeEfi
set gfxpayload=$gfxpayloadEfi
else
set gfxmode=$gfxmodeBios
set gfxpayload=$gfxpayloadBios
fi
terminal_output gfxterm
fi
";
}
if ($splashImage) {
@ -363,14 +363,14 @@ else {
}
copy $splashImage, "$bootPath/background$suffix" or die "cannot copy $splashImage to $bootPath: $!\n";
$conf .= "
insmod " . substr($suffix, 1) . "
if background_image --mode '$splashMode' " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/background$suffix; then
set color_normal=white/black
set color_highlight=black/white
else
set menu_color_normal=cyan/blue
set menu_color_highlight=white/blue
fi
insmod " . substr($suffix, 1) . "
if background_image --mode '$splashMode' " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/background$suffix; then
set color_normal=white/black
set color_highlight=black/white
else
set menu_color_normal=cyan/blue
set menu_color_highlight=white/blue
fi
";
}
@ -380,21 +380,21 @@ else {
# Copy theme
rcopy($theme, "$bootPath/theme") or die "cannot copy $theme to $bootPath\n";
$conf .= "
# Sets theme.
set theme=" . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/theme/theme.txt
export theme
# Load theme fonts, if any
";
# Sets theme.
set theme=" . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/theme/theme.txt
export theme
# Load theme fonts, if any
";
find( { wanted => sub {
if ($_ =~ /\.pf2$/i) {
$font = File::Spec->abs2rel($File::Find::name, $theme);
$conf .= "
loadfont " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/theme/$font
";
}
}, no_chdir => 1 }, $theme );
}
find( { wanted => sub {
if ($_ =~ /\.pf2$/i) {
$font = File::Spec->abs2rel($File::Find::name, $theme);
$conf .= "
loadfont " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/theme/$font
";
}
}, no_chdir => 1 }, $theme );
}
}
$conf .= "$extraConfig\n";
@ -433,25 +433,25 @@ sub addEntry {
# Include second initrd with secrets
if (-e -x "$path/append-initrd-secrets") {
my $initrdName = basename($initrd);
my $initrdSecretsPath = "$bootPath/kernels/$initrdName-secrets";
my $initrdName = basename($initrd);
my $initrdSecretsPath = "$bootPath/kernels/$initrdName-secrets";
mkpath(dirname($initrdSecretsPath), 0, 0755);
my $oldUmask = umask;
# Make sure initrd is not world readable (won't work if /boot is FAT)
umask 0137;
my $initrdSecretsPathTemp = File::Temp::mktemp("$initrdSecretsPath.XXXXXXXX");
system("$path/append-initrd-secrets", $initrdSecretsPathTemp) == 0 or die "failed to create initrd secrets: $!\n";
# Check whether any secrets were actually added
if (-e $initrdSecretsPathTemp && ! -z _) {
rename $initrdSecretsPathTemp, $initrdSecretsPath or die "failed to move initrd secrets into place: $!\n";
$copied{$initrdSecretsPath} = 1;
$initrd .= " " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/kernels/$initrdName-secrets";
} else {
unlink $initrdSecretsPathTemp;
rmdir dirname($initrdSecretsPathTemp);
}
umask $oldUmask;
mkpath(dirname($initrdSecretsPath), 0, 0755);
my $oldUmask = umask;
# Make sure initrd is not world readable (won't work if /boot is FAT)
umask 0137;
my $initrdSecretsPathTemp = File::Temp::mktemp("$initrdSecretsPath.XXXXXXXX");
system("$path/append-initrd-secrets", $initrdSecretsPathTemp) == 0 or die "failed to create initrd secrets: $!\n";
# Check whether any secrets were actually added
if (-e $initrdSecretsPathTemp && ! -z _) {
rename $initrdSecretsPathTemp, $initrdSecretsPath or die "failed to move initrd secrets into place: $!\n";
$copied{$initrdSecretsPath} = 1;
$initrd .= " " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/kernels/$initrdName-secrets";
} else {
unlink $initrdSecretsPathTemp;
rmdir dirname($initrdSecretsPathTemp);
}
umask $oldUmask;
}
my $xen = -e "$path/xen.gz" ? copyToKernelsDir(Cwd::abs_path("$path/xen.gz")) : undef;
@ -459,9 +459,8 @@ sub addEntry {
# FIXME: $confName
my $kernelParams =
"systemConfig=" . Cwd::abs_path($path) . " " .
"init=" . Cwd::abs_path("$path/init") . " " .
readFile("$path/kernel-params");
"init=" . Cwd::abs_path("$path/init") . " " .
readFile("$path/kernel-params");
my $xenParams = $xen && -e "$path/xen-params" ? readFile("$path/xen-params") : "";
if ($grubVersion == 1) {
@ -503,9 +502,9 @@ foreach my $link (@links) {
my $date = strftime("%F", localtime(lstat($link)->mtime));
my $version =
-e "$link/nixos-version"
? readFile("$link/nixos-version")
: basename((glob(dirname(Cwd::abs_path("$link/kernel")) . "/lib/modules/*"))[0]);
-e "$link/nixos-version"
? readFile("$link/nixos-version")
: basename((glob(dirname(Cwd::abs_path("$link/kernel")) . "/lib/modules/*"))[0]);
if ($cfgName) {
$entryName = $cfgName;
@ -530,8 +529,8 @@ sub addProfile {
sub nrFromGen { my ($x) = @_; $x =~ /\/\w+-(\d+)-link/; return $1; }
my @links = sort
{ nrFromGen($b) <=> nrFromGen($a) }
(glob "$profile-*-link");
{ nrFromGen($b) <=> nrFromGen($a) }
(glob "$profile-*-link");
my $curEntry = 0;
foreach my $link (@links) {
@ -542,9 +541,9 @@ sub addProfile {
}
my $date = strftime("%F", localtime(lstat($link)->mtime));
my $version =
-e "$link/nixos-version"
? readFile("$link/nixos-version")
: basename((glob(dirname(Cwd::abs_path("$link/kernel")) . "/lib/modules/*"))[0]);
-e "$link/nixos-version"
? readFile("$link/nixos-version")
: basename((glob(dirname(Cwd::abs_path("$link/kernel")) . "/lib/modules/*"))[0]);
addEntry("NixOS - Configuration " . nrFromGen($link) . " ($date - $version)", $link);
}
@ -566,7 +565,7 @@ $extraPrepareConfig =~ s/\@bootPath\@/$bootPath/g;
# Run extraPrepareConfig in sh
if ($extraPrepareConfig ne "") {
system((get("shell"), "-c", $extraPrepareConfig));
system((get("shell"), "-c", $extraPrepareConfig));
}
# write the GRUB config.
@ -627,13 +626,13 @@ foreach my $fn (glob "$bootPath/kernels/*") {
#
struct(GrubState => {
name => '$',
version => '$',
efi => '$',
devices => '$',
efiMountPoint => '$',
extraGrubInstallArgs => '@',
});
name => '$',
version => '$',
efi => '$',
devices => '$',
efiMountPoint => '$',
extraGrubInstallArgs => '@',
});
# If you add something to the state file, only add it to the end
# because it is read line-by-line.
sub readGrubState {

1
nixos/modules/system/boot/loader/init-script/init-script-builder.sh
View File

@ -49,7 +49,6 @@ addEntry() {
echo "#!/bin/sh"
echo "# $name"
echo "# created by init-script-builder.sh"
echo "export systemConfig=$(readlink -f $path)"
echo "exec $stage2"
)"

2
nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
View File

@ -101,7 +101,7 @@ def write_entry(profile, generation, machine_id):
entry_file = "@efiSysMountPoint@/loader/entries/nixos-generation-%d.conf" % (generation)
generation_dir = os.readlink(system_dir(profile, generation))
tmp_path = "%s.tmp" % (entry_file)
kernel_params = "systemConfig=%s init=%s/init " % (generation_dir, generation_dir)
kernel_params = "init=%s/init " % generation_dir
with open("%s/kernel-params" % (generation_dir)) as params_file:
kernel_params = kernel_params + params_file.read()

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

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
];
configureFlags = [
"CC=cc"
"CC=${stdenv.cc.targetPrefix}cc"
"--with-slang=${slang}"
"JED_ROOT=${placeholder "out"}/share/jed"
];

4
pkgs/applications/editors/texstudio/default.nix
View File

@ -3,13 +3,13 @@
mkDerivation rec {
pname = "texstudio";
version = "3.0.4";
version = "3.1.0";
src = fetchFromGitHub {
owner = "${pname}-org";
repo = pname;
rev = version;
sha256 = "03q1mdz47crflkvpc364ky52farad7517jhszb1fg1s3c2bnndn0";
sha256 = "sha256-40VgWfSjyERHJapiIXSk89O3X1V8rb8JEWqfnAyf1Sc=";
};
nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ];

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

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ ncurses ];
makeFlags = [ "CC=cc" ];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
checkFlags = [ "test-command" "test-buffer" "test-state" ];
installPhase = ''

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

@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
makeFlags = [
"prefix=${placeholder "out"}"
"CC=cc"
"CXX=c++"
"CC=${stdenv.cc.targetPrefix}cc"
"CXX=${stdenv.cc.targetPrefix}c++"
"CFLAGS=-DENABLE_NLS"
];

2
pkgs/applications/misc/tty-solitaire/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
patchPhase = "sed -i -e '/^CFLAGS *?= *-g *$/d' Makefile";
makeFlags = [ "CC=cc" "PREFIX=${placeholder "out"}" ];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "PREFIX=${placeholder "out"}" ];
meta = with lib; {
description = "Klondike Solitaire in your ncurses terminal";

22
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -31,22 +31,22 @@
}
},
"dev": {
"version": "90.0.4412.3",
"sha256": "1yjpfircdl38nrjh3an469g7q8178jyvawkfpnzc5aqsgkpkl442",
"sha256bin64": "1asdjicb4l4l2ak3fkxcwdx1avpc1m8wvyhxmj1k3bqa4qmvz3hz",
"version": "90.0.4421.5",
"sha256": "0605ibr2fr13rmmxs7lw4dh25i9r6ic08ykdr7002m4rp8kxwsw6",
"sha256bin64": "05mlm9l6q1w9rxid7cvaazzbw79wj9fjw6ka7wpr0gz4r3gmazsb",
"deps": {
"gn": {
"version": "2021-01-25",
"version": "2021-02-09",
"url": "https://gn.googlesource.com/gn",
"rev": "55ad154c961d8326315b1c8147f4e504cd95e9e6",
"sha256": "0x5i1axkg44z412357sdb6kgs1h9ykzy8p5c7s40bybs4hg33lkc"
"rev": "dfcbc6fed0a8352696f92d67ccad54048ad182b3",
"sha256": "1941bzg37c4dpsk3sh6ga3696gpq6vjzpcw9rsnf6kdr9mcgdxvn"
}
}
},
"ungoogled-chromium": {
"version": "88.0.4324.150",
"sha256": "1hrqrggg4g1hjmaajbpydwsij2mfkfj5ccs1lj76nv4qj91yj4mf",
"sha256bin64": "0xyhvhppxk95clk6vycg2yca1yyzpi13rs3lhs4j9a482api6ks0",
"version": "88.0.4324.182",
"sha256": "10av060ix6lgsvv99lyvyy03r0m3zwdg4hddbi6dycrdxk1iyh9h",
"sha256bin64": "1rjg23xiybpnis93yb5zkvglm3r4fds9ip5mgl6f682z5x0yj05b",
"deps": {
"gn": {
"version": "2020-11-05",
@ -55,8 +55,8 @@
"sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9"
},
"ungoogled-patches": {
"rev": "88.0.4324.150-1",
"sha256": "0hzap19pbnfcskpzbqq7dqrankmlrq9q7m1xrf7aygqiir0ksp4y"
"rev": "88.0.4324.182-1",
"sha256": "1c9y1dn9s06pskkjw2r8lsbplak8m2rwh4drixvjpif7b4cgdhay"
}
}
}

2
pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
"DATA_ROOT_DIR_PURPLE=${placeholder "out"}/share"
];
buildFlags = [ "CC=cc" ]; # fix build on darwin
buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; # fix build on darwin
meta = with lib; {
homepage = "https://github.com/matrix-org/purple-matrix";

2
pkgs/applications/science/biology/bcftools/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
makeFlags = [
"HSTDIR=${htslib}"
"prefix=$(out)"
"CC=cc"
"CC=${stdenv.cc.targetPrefix}cc"
];
preCheck = ''

2
pkgs/applications/science/biology/prodigal/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
makeFlags = [
"CC=cc"
"CC=${stdenv.cc.targetPrefix}cc"
"INSTALLDIR=$(out)/bin"
];

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

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
substituteInPlace Makefile --replace "-fno-guess-branch-probability" ""
'';
buildFlags = [ "CC=cc" "CXX=c++" ];
buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "CXX=${stdenv.cc.targetPrefix}c++" ];
installFlags = [ "PREFIX=$(out)" ];
buildInputs = [ gmp mpir cddlib ];

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

@ -13,7 +13,7 @@ stdenv.mkDerivation {
ECM = if ecm == null then "0" else "1";
# Doesn't hurt Linux but lets clang-based platforms like Darwin work fine too
makeFlags = [ "CC=cc" "all" ];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "all" ];
installPhase = ''
mkdir -p $out/bin/

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

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gmp ];
makeFlags = [ "CC=cc" ];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
buildFlags = lib.optional stdenv.isDarwin ["CCFLAGS2=-lgmp -lc -lm" "CCFLAGS=-UUSE_SSE"];
installFlags = [ "INSTALL_DIR=$(out)" ];

4
pkgs/applications/video/kodi/default.nix
View File

@ -248,10 +248,10 @@ in stdenv.mkDerivation {
# Need these tools on the build system when cross compiling,
# hacky, but have found no other way.
preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
CXX=c++ LD=ld make -C tools/depends/native/JsonSchemaBuilder
CXX=${stdenv.cc.targetPrefix}c++ LD=ld make -C tools/depends/native/JsonSchemaBuilder
cmakeFlags+=" -DWITH_JSONSCHEMABUILDER=$PWD/tools/depends/native/JsonSchemaBuilder/bin"
CXX=c++ LD=ld make EXTRA_CONFIGURE= -C tools/depends/native/TexturePacker
CXX=${stdenv.cc.targetPrefix}c++ LD=ld make EXTRA_CONFIGURE= -C tools/depends/native/TexturePacker
cmakeFlags+=" -DWITH_TEXTUREPACKER=$PWD/tools/depends/native/TexturePacker/bin"
'';

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

@ -40,13 +40,8 @@ buildGoPackage rec {
installPhase = ''
install -Dm555 bin/* -t $out/bin
installManPage man/*.[1-9]
'';
# completion installed separately so it can be overridden in docker
# can be moved to installPhase when docker uses containerd >= 1.4
postInstall = ''
installShellFiles --bash contrib/autocomplete/ctr
installShellFiles --zsh --name _ctr contrib/autocomplete/zsh_autocomplete
installShellCompletion --bash contrib/autocomplete/ctr
installShellCompletion --zsh --name _ctr contrib/autocomplete/zsh_autocomplete
'';
passthru.tests = { inherit (nixosTests) docker; };

2
pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
--replace "/usr/bin/install" "install"
'';
makeFlags = [ "CC=cc" ];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
preInstall = ''
runHook preInstall

2
pkgs/data/misc/tzdata/default.nix
View File

@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
preInstall = ''
mv zic.o zic.o.orig
mv zic zic.orig
make $makeFlags cc=cc AR=ar zic
make $makeFlags cc=${stdenv.cc.targetPrefix}cc AR=${stdenv.cc.targetPrefix}ar zic
mv zic zic-native
mv zic.o.orig zic.o
mv zic.orig zic

11
pkgs/development/compilers/go/1.14.nix
View File

@ -11,9 +11,9 @@ let
inherit (lib) optionals optionalString;
go_bootstrap = callPackage ./bootstrap.nix {
inherit Security;
};
version = "1.14.15";
go_bootstrap = buildPackages.callPackage ./bootstrap.nix { };
goBootstrap = runCommand "go-bootstrap" {} ''
mkdir $out
@ -41,7 +41,7 @@ in
stdenv.mkDerivation rec {
pname = "go";
version = "1.14.15";
inherit version;
src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz";
@ -258,5 +258,8 @@ stdenv.mkDerivation rec {
license = licenses.bsd3;
maintainers = teams.golang.members;
platforms = platforms.linux ++ platforms.darwin;
knownVulnerabilities = [
"Support for Go 1.14 ended with the release of Go 1.16: https://golang.org/doc/devel/release.html#policy"
];
};
}

8
pkgs/development/compilers/go/1.15.nix
View File

@ -11,9 +11,9 @@ let
inherit (lib) optionals optionalString;
go_bootstrap = callPackage ./bootstrap.nix {
inherit Security;
};
version = "1.15.8";
go_bootstrap = buildPackages.callPackage ./bootstrap.nix { };
goBootstrap = runCommand "go-bootstrap" {} ''
mkdir $out
@ -41,7 +41,7 @@ in
stdenv.mkDerivation rec {
pname = "go";
version = "1.15.8";
inherit version;
src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz";

8
pkgs/development/compilers/go/1.16.nix
View File

@ -11,9 +11,9 @@ let
inherit (lib) optionals optionalString;
go_bootstrap = callPackage ./bootstrap.nix {
inherit Security;
};
version = "1.16";
go_bootstrap = buildPackages.callPackage ./bootstrap.nix { };
goBootstrap = runCommand "go-bootstrap" {} ''
mkdir $out
@ -41,7 +41,7 @@ in
stdenv.mkDerivation rec {
pname = "go";
version = "1.16";
inherit version;
src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz";

93
pkgs/development/compilers/go/1.4.nix
View File

@ -1,93 +0,0 @@
{ stdenv, lib, fetchurl, fetchpatch, tzdata, iana-etc, libcCross
, pkg-config
, pcre
, Security }:
let
libc = if stdenv ? cross then libcCross else stdenv.cc.libc;
in
stdenv.mkDerivation rec {
pname = "go";
version = "1.4-bootstrap-${builtins.substring 0 7 revision}";
revision = "bdd4b9503e47c2c38a9d0a9bb2f5d95ec5ff8ef6";
src = fetchurl {
url = "https://github.com/golang/go/archive/${revision}.tar.gz";
sha256 = "1zdyf883awaqdzm4r3fs76nbpiqx3iswl2p4qxclw2sl5vvynas5";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ pcre ];
depsTargetTargetPropagated = lib.optional stdenv.isDarwin Security;
hardeningDisable = [ "all" ];
# The tests try to do stuff with 127.0.0.1 and localhost
__darwinAllowLocalNetworking = true;
# I'm not sure what go wants from its 'src', but the go installation manual
# describes an installation keeping the src.
preUnpack = ''
mkdir -p $out/share
cd $out/share
'';
prePatch = ''
# Ensure that the source directory is named go
cd ..
if [ ! -d go ]; then
mv * go
fi
cd go
patchShebangs ./ # replace /bin/bash
sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
'' + lib.optionalString stdenv.isLinux ''
# prepend the nix path to the zoneinfo files but also leave the original value for static binaries
# that run outside a nix server
sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go
# Find the loader dynamically
LOADER="$(find ${lib.getLib libc}/lib -name ld-linux\* | head -n 1)"
# Replace references to the loader
find src/cmd -name asm.c -exec sed -i "s,/lib/ld-linux.*\.so\.[0-9],$LOADER," {} \;
'';
patches = [
./remove-tools-1.4.patch
];
GOOS = if stdenv.isDarwin then "darwin" else "linux";
GOARCH = if stdenv.isDarwin then "amd64"
else if stdenv.hostPlatform.system == "i686-linux" then "386"
else if stdenv.hostPlatform.system == "x86_64-linux" then "amd64"
else if stdenv.isAarch32 then "arm"
else throw "Unsupported system";
GOARM = lib.optionalString (stdenv.hostPlatform.system == "armv5tel-linux") "5";
GO386 = 387; # from Arch: don't assume sse2 on i686
CGO_ENABLED = 0;
# The go build actually checks for CC=*/clang and does something different, so we don't
# just want the generic `cc` here.
CC = if stdenv.isDarwin then "clang" else "cc";
installPhase = ''
mkdir -p "$out/bin"
export GOROOT="$(pwd)/"
export GOBIN="$out/bin"
export PATH="$GOBIN:$PATH"
cd ./src
./all.bash
'';
meta = with lib; {
homepage = "http://golang.org/";
description = "The Go Programming language";
license = licenses.bsd3;
maintainers = with maintainers; [ cstrahan ];
platforms = platforms.linux ++ platforms.darwin;
};
}

4
pkgs/development/compilers/go/2-dev.nix
View File

@ -11,9 +11,7 @@ let
inherit (lib) optionals optionalString;
go_bootstrap = callPackage ./bootstrap.nix {
inherit Security;
};
go_bootstrap = buildPackages.callPackage ./bootstrap.nix { };
goBootstrap = runCommand "go-bootstrap" {} ''
mkdir $out

41
pkgs/development/compilers/go/binary.nix Normal file
View File

@ -0,0 +1,41 @@
{ lib, stdenv, fetchurl, version, hashes }:
let
toGoKernel = platform:
if platform.isDarwin then "darwin"
else platform.parsed.kernel.name;
toGoCPU = platform: {
"i686" = "386";
"x86_64" = "amd64";
"aarch64" = "arm64";
"armv6l" = "arm";
"armv7l" = "arm";
"powerpc64le" = "ppc64le";
}.${platform.parsed.cpu.name} or (throw "Unsupported CPU ${platform.parsed.cpu.name}");
toGoPlatform = platform: "${toGoKernel platform}-${toGoCPU platform}";
platform = toGoPlatform stdenv.hostPlatform;
in
stdenv.mkDerivation rec {
name = "go-${version}-${platform}-bootstrap";
src = fetchurl {
url = "https://golang.org/dl/go${version}.${platform}.tar.gz";
sha256 = hashes.${platform} or (throw "Missing Go bootstrap hash for platform ${platform}");
};
# We must preserve the signature on Darwin
dontStrip = stdenv.hostPlatform.isDarwin;
installPhase = ''
mkdir -p $out/share/go $out/bin
mv bin/* $out/bin
cp -r . $out/share/go
${lib.optionalString stdenv.isLinux (''
patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
$out/bin/go
'')}
'' ;
}

30
pkgs/development/compilers/go/bootstrap.nix
View File

@ -1,17 +1,15 @@
{ stdenv, srcOnly, fetchurl, callPackage, Security }:
let
go_bootstrap = if stdenv.isAarch64 then
srcOnly {
name = "go-1.8-linux-arm64-bootstrap";
src = fetchurl {
url = "https://cache.xor.us/go-1.8-linux-arm64-bootstrap.tar.xz";
sha256 = "0sk6g03x9gbxk2k1djnrgy8rzw1zc5f6ssw0hbxk6kjr85lpmld6";
};
}
else
callPackage ./1.4.nix {
inherit Security;
{ callPackage }:
callPackage ./binary.nix {
version = "1.16";
hashes = {
# Use `print-hashes.sh ${version}` to generate the list below
darwin-amd64 = "6000a9522975d116bf76044967d7e69e04e982e9625330d9a539a8b45395f9a8";
darwin-arm64 = "4dac57c00168d30bbd02d95131d5de9ca88e04f2c5a29a404576f30ae9b54810";
linux-386 = "ea435a1ac6d497b03e367fdfb74b33e961d813883468080f6e239b3b03bea6aa";
linux-amd64 = "013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2";
linux-arm64 = "3770f7eb22d05e25fbee8fb53c2a4e897da043eb83c69b9a14f8d98562cd8098";
linux-armv6l = "d1d9404b1dbd77afa2bdc70934e10fbfcf7d785c372efc29462bb7d83d0a32fd";
linux-ppc64le = "27a1aaa988e930b7932ce459c8a63ad5b3333b3a06b016d87ff289f2a11aacd6";
linux-s390x = "be4c9e4e2cf058efc4e3eb013a760cb989ddc4362f111950c990d1c63b27ccbe";
};
in
go_bootstrap
}

15
pkgs/development/compilers/go/print-hashes.sh Executable file
View File

@ -0,0 +1,15 @@
#!/usr/bin/env bash
set -euo pipefail
BASEURL=https://golang.org/dl/
VERSION=${1:-}
if [[ -z $VERSION ]]
then
echo "No version supplied"
exit -1
fi
curl -s "${BASEURL}?mode=json&include=all" | \
jq '.[] | select(.version == "go'${VERSION}'")' | \
jq -r '.files[] | select(.kind == "archive" and (.os == "linux" or .os == "darwin")) | (.os + "-" + .arch + " = \"" + .sha256 + "\";")'

81
pkgs/development/compilers/go/remove-tools-1.4.patch
View File

@ -1,81 +0,0 @@
diff --git a/misc/makerelease/makerelease.go b/misc/makerelease/makerelease.go
index 3b511b1..a46ebd8 100644
--- a/misc/makerelease/makerelease.go
+++ b/misc/makerelease/makerelease.go
@@ -65,9 +65,6 @@ const (
// These must be the command that cmd/go knows to install to $GOROOT/bin
// or $GOROOT/pkg/tool.
var toolPaths = []string{
- "golang.org/x/tools/cmd/cover",
- "golang.org/x/tools/cmd/godoc",
- "golang.org/x/tools/cmd/vet",
}
var preBuildCleanFiles = []string{
diff --git a/src/cmd/dist/build.c b/src/cmd/dist/build.c
index b6c61b4..2006bc2 100644
--- a/src/cmd/dist/build.c
+++ b/src/cmd/dist/build.c
@@ -210,7 +210,9 @@ init(void)
workdir = xworkdir();
xatexit(rmworkdir);
- bpathf(&b, "%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch);
+ xgetenv(&b, "GOTOOLDIR");
+ if (b.len == 0)
+ bpathf(&b, "%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch);
tooldir = btake(&b);
bfree(&b);
diff --git a/src/cmd/go/pkg.go b/src/cmd/go/pkg.go
index b71feb7..8468ea8 100644
--- a/src/cmd/go/pkg.go
+++ b/src/cmd/go/pkg.go
@@ -401,9 +401,9 @@ var goTools = map[string]targetDir{
"cmd/pack": toTool,
"cmd/pprof": toTool,
"cmd/yacc": toTool,
- "golang.org/x/tools/cmd/cover": toTool,
- "golang.org/x/tools/cmd/godoc": toBin,
- "golang.org/x/tools/cmd/vet": toTool,
+ "nixos.org/x/tools/cmd/cover": toTool,
+ "nixos.org/x/tools/cmd/godoc": toBin,
+ "nixos.org/x/tools/cmd/vet": toTool,
"code.google.com/p/go.tools/cmd/cover": stalePath,
"code.google.com/p/go.tools/cmd/godoc": stalePath,
"code.google.com/p/go.tools/cmd/vet": stalePath,
diff --git a/src/go/build/build.go b/src/go/build/build.go
index 311ecb0..f151d8f 100644
--- a/src/go/build/build.go
+++ b/src/go/build/build.go
@@ -1367,7 +1367,7 @@ func init() {
}
// ToolDir is the directory containing build tools.
-var ToolDir = filepath.Join(runtime.GOROOT(), "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH)
+var ToolDir = runtime.GOTOOLDIR()
// IsLocalImport reports whether the import path is
// a local import path, like ".", "..", "./foo", or "../foo".
diff --git a/src/runtime/extern.go b/src/runtime/extern.go
index 6cc5df8..9a9a964 100644
--- a/src/runtime/extern.go
+++ b/src/runtime/extern.go
@@ -152,6 +152,17 @@ func GOROOT() string {
return defaultGoroot
}
+// GOTOOLDIR returns the root of the Go tree.
+// It uses the GOTOOLDIR environment variable, if set,
+// or else the root used during the Go build.
+func GOTOOLDIR() string {
+ s := gogetenv("GOTOOLDIR")
+ if s != "" {
+ return s
+ }
+ return GOROOT() + "/pkg/tool/" + GOOS + "_" + GOARCH
+}
+
// Version returns the Go tree's version string.
// It is either the commit hash and date at the time of the build or,
// when possible, a release tag like "go1.3".

2
pkgs/development/compilers/mosml/default.nix
View File

@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gmp perl ];
makeFlags = [ "PREFIX=$(out)" ] ++ lib.optionals stdenv.isDarwin [ "CC=cc" ];
makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ];
src = fetchurl {
url = "https://github.com/kfl/mosml/archive/ver-${version}.tar.gz";

2
pkgs/development/compilers/owl-lisp/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ which ];
makeFlags = [ "PREFIX=${placeholder "out"}" "CC=cc" ];
makeFlags = [ "PREFIX=${placeholder "out"}" "CC=${stdenv.cc.targetPrefix}cc" ];
# tests are run as part of the compilation process
doCheck = false;

12
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -1408,7 +1408,12 @@ self: super: {
# 2020-11-19: Checks nearly fixed, but still disabled because of flaky tests:
# https://github.com/haskell/haskell-language-server/issues/610
# https://github.com/haskell/haskell-language-server/issues/611
haskell-language-server = dontCheck super.haskell-language-server;
haskell-language-server = overrideCabal (dontCheck super.haskell-language-server) {
# 2020-02-19: Override is necessary because of wrong bound on upstream, remove after next hackage update
preConfigure = ''
substituteInPlace haskell-language-server.cabal --replace "hls-explicit-imports-plugin ==0.1.0.1" "hls-explicit-imports-plugin ==0.1.0.0"
'';
};
# 2021-02-08: Jailbreaking because of
# https://github.com/haskell/haskell-language-server/issues/1329
@ -1502,6 +1507,8 @@ self: super: {
# 2020-11-19: Jailbreaking until: https://github.com/snapframework/heist/pull/124
heist = doJailbreak super.heist;
hinit = generateOptparseApplicativeCompletion "hi" (super.hinit.override { haskeline = self.haskeline_0_8_1_1; });
# 2020-11-19: Jailbreaking until: https://github.com/snapframework/snap/pull/219
snap = doJailbreak super.snap;
@ -1581,4 +1588,7 @@ self: super: {
# Test suite fails, upstream not reachable for simple fix (not responsive on github)
vivid-osc = dontCheck super.vivid-osc;
vivid-supercollider = dontCheck super.vivid-supercollider;
# Overly strict version bounds: https://github.com/Profpatsch/yarn-lock/issues/8
yarn-lock = doJailbreak super.yarn-lock;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

7
pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
View File

@ -92,11 +92,4 @@ self: super: {
# Break out of "Cabal < 3.2" constraint.
stylish-haskell = doJailbreak super.stylish-haskell;
# Agda 2.6.1.2 only declares a transformers dependency for ghc < 8.10.3.
# https://github.com/agda/agda/issues/5109
Agda = appendPatch super.Agda (pkgs.fetchpatch {
url = "https://github.com/agda/agda/commit/76278c23d447b49f59fac581ca4ac605792aabbc.patch";
sha256 = "1g34g8a09j73h89pk4cdmri0nb0qg664hkff45amcr9kyz14a9f3";
});
}

376
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

File diff suppressed because it is too large Load Diff

6
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -207,6 +207,7 @@ self: super: builtins.intersectAttrs super {
network-transport-tcp = dontCheck super.network-transport-tcp;
network-transport-zeromq = dontCheck super.network-transport-zeromq; # https://github.com/tweag/network-transport-zeromq/issues/30
pipes-mongodb = dontCheck super.pipes-mongodb; # http://hydra.cryp.to/build/926195/log/raw
pixiv = dontCheck super.pixiv;
raven-haskell = dontCheck super.raven-haskell; # http://hydra.cryp.to/build/502053/log/raw
riak = dontCheck super.riak; # http://hydra.cryp.to/build/498763/log/raw
scotty-binding-play = dontCheck super.scotty-binding-play;
@ -226,6 +227,7 @@ self: super: builtins.intersectAttrs super {
http-client-tls = dontCheck super.http-client-tls;
http-conduit = dontCheck super.http-conduit;
transient-universe = dontCheck super.transient-universe;
telegraph = dontCheck super.telegraph;
typed-process = dontCheck super.typed-process;
js-jquery = dontCheck super.js-jquery;
hPDB-examples = dontCheck super.hPDB-examples;
@ -806,4 +808,8 @@ self: super: builtins.intersectAttrs super {
# tests depend on a specific version of solc
hevm = dontCheck (doJailbreak super.hevm);
# hadolint enables static linking by default in the cabal file, so we have to explicitly disable it.
# https://github.com/hadolint/hadolint/commit/e1305042c62d52c2af4d77cdce5d62f6a0a3ce7b
hadolint = disableCabalFlag super.hadolint "static";
}

2641
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

2
pkgs/development/libraries/java/junixsocket/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
ANT_ARGS =
# Note that our OpenJDK on Darwin is currently 32-bit, so we have to build a 32-bit dylib.
(if stdenv.is64bit then [ "-Dskip32=true" ] else [ "-Dskip64=true" ])
++ [ "-Dgcc=cc" "-Dant.build.javac.source=1.6" ]
++ [ "-Dgcc=${stdenv.cc.targetPrefix}cc" "-Dant.build.javac.source=1.6" ]
++ lib.optional stdenv.isDarwin "-DisMac=true";
installPhase =

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

@ -61,7 +61,7 @@ let
"--enable-avplay"
"--enable-shared"
"--enable-runtime-cpudetect"
"--cc=cc"
"--cc=${stdenv.cc.targetPrefix}cc"
(enableFeature enableGPL "gpl")
(enableFeature enableGPL "swscale")
(enableFeature mp3Support "libmp3lame")

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

@ -16,7 +16,7 @@ stdenv.mkDerivation {
--replace -Wl,-soname, -Wl,-install_name,$out/lib/
'';
makeFlags = [ "PREFIX=$(out)" "CXX=c++" ];
makeFlags = [ "PREFIX=$(out)" "CXX=${stdenv.cc.targetPrefix}c++" ];
meta = {
description = "Cross platform (Linux/FreeBSD/Unix/Win32) streaming socket C++";

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

@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
else
"generic" # "chooses options that should be OK for most platforms"
}"
"CXX=c++"
"CXX=${stdenv.cc.targetPrefix}c++"
] ++ lib.optionals withGf2x [
"NTL_GF2X_LIB=on"
"GF2X_PREFIX=${gf2x}"

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

@ -22,7 +22,7 @@ in stdenv.mkDerivation {
++ lib.optionals stdenv.isLinux [ libaio ];
dontPatchELF = true;
makeFlags = [ "PREFIX=$(out)" "CC=cc" "LD=cc"];
makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc"];
postFixup = ''
${lib.optionalString (stdenv.isLinux) ''

1
pkgs/development/libraries/physics/rivet/default.nix
View File

@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
mathastext
pgf
relsize
sansmath
sfmath
siunitx
xcolor

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

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
libbasename = "libzn_poly";
libext = stdenv.targetPlatform.extensions.sharedLibrary;
makeFlags = [ "CC=cc" ];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
# Tuning (either autotuning or with hand-written paramters) is possible
# but not implemented here.

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

@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "0ah54nizb6iwcx277w104wsfnx05vrp4sh56d2pfxhf8xghg54m6";
};
makeFlags = [ "PREFIX=${placeholder "out"}" "CC=cc" ];
makeFlags = [ "PREFIX=${placeholder "out"}" "CC=${stdenv.cc.targetPrefix}cc" ];
nativeBuildInputs = [ installShellFiles ];

11
pkgs/development/ocaml-modules/git/default.nix
View File

@ -1,23 +1,26 @@
{ stdenv, lib, fetchurl, buildDunePackage
, alcotest, mtime, mirage-crypto-rng, tls, git-binary
, angstrom, astring, cstruct, decompress, digestif, encore, duff, fmt, checkseum
, fpath, ke, logs, lwt, ocamlgraph, uri, rresult
, fpath, ke, logs, lwt, ocamlgraph, uri, rresult, base64
, result, bigstringaf, optint, mirage-flow, domain-name, emile
, mimic, carton, carton-lwt, carton-git, ipaddr, psq, crowbar, alcotest-lwt
}:
buildDunePackage rec {
pname = "git";
version = "3.2.0";
version = "3.3.0";
minimumOCamlVersion = "4.08";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz";
sha256 = "14rq7h1n5v2n0507ycbac8sq21xnzhgirxmlmqv4j5k3aajdcj16";
sha256 = "090b67e8f8a02fb52b4d0c7aa445b5ff7353fdb2da00fb37b908f089c6776cd0";
};
buildInputs = [
base64
];
propagatedBuildInputs = [
angstrom astring checkseum cstruct decompress digestif encore duff fmt fpath
ke logs lwt ocamlgraph uri rresult result bigstringaf optint mirage-flow
@ -31,7 +34,7 @@ buildDunePackage rec {
meta = {
description = "Git format and protocol in pure OCaml";
license = lib.licenses.isc;
maintainers = [ lib.maintainers.vbgl ];
maintainers = with lib.maintainers; [ sternenseemann vbgl ];
homepage = "https://github.com/mirage/ocaml-git";
};
}

18
pkgs/development/ocaml-modules/git/unix.nix
View File

@ -6,6 +6,7 @@
, tcpip, awa-mirage, mirage-flow
, alcotest, alcotest-lwt, base64, cstruct
, ke, mirage-crypto-rng, ocurl, git-binary
, ptime
}:
buildDunePackage {
@ -14,6 +15,14 @@ buildDunePackage {
useDune2 = true;
patches = [
# https://github.com/mirage/ocaml-git/pull/472
(fetchpatch {
url = "https://github.com/sternenseemann/ocaml-git/commit/54998331eb9d5c61afe8901fabe0c74c2877f096.patch";
sha256 = "12kd45mlfaj4hxh33k9920a22mq1q2sdrin2j41w1angvg00d3my";
})
];
buildInputs = [
awa awa-mirage cmdliner git-cohttp-unix
mirage-clock mirage-clock-unix tcpip
@ -26,17 +35,10 @@ buildDunePackage {
];
checkInputs = [
alcotest alcotest-lwt base64 cstruct ke
mirage-crypto-rng ocurl git-binary
mirage-crypto-rng ocurl git-binary ptime
];
doCheck = true;
patches = [
(fetchpatch {
url = "https://github.com/mirage/ocaml-git/commit/09b41073fa869c0a595e1d8ed7224d539682af1c.patch";
sha256 = "1avbxv60gbrll9gny1pl6jwbx5b8282h3frhzy2ghb0fx1pggp6w";
})
];
meta = {
description = "Unix backend for the Git protocol(s)";
inherit (git.meta) homepage license maintainers;

3
pkgs/development/ocaml-modules/irmin/default.nix
View File

@ -1,5 +1,5 @@
{ lib, buildDunePackage
, astring, base64, digestif, fmt, jsonm, logs, ocaml_lwt, ocamlgraph, uri
, astring, digestif, fmt, jsonm, logs, ocaml_lwt, ocamlgraph, uri
, repr, ppx_irmin, bheap
}:
@ -13,7 +13,6 @@ buildDunePackage {
propagatedBuildInputs = [
astring
base64
digestif
fmt
jsonm

14
pkgs/development/ocaml-modules/irmin/graphql.nix
View File

@ -1,4 +1,6 @@
{ lib, buildDunePackage, cohttp-lwt, graphql-cohttp, graphql-lwt, irmin }:
{ lib, buildDunePackage, cohttp-lwt, graphql-cohttp, graphql-lwt, irmin
, alcotest, alcotest-lwt, logs, yojson, cohttp-lwt-unix
}:
buildDunePackage rec {
@ -10,8 +12,14 @@ buildDunePackage rec {
propagatedBuildInputs = [ cohttp-lwt graphql-cohttp graphql-lwt irmin ];
# test requires network
doCheck = false;
doCheck = true;
checkInputs = [
alcotest
alcotest-lwt
logs
cohttp-lwt-unix
yojson
];
meta = irmin.meta // {
description = "GraphQL server for Irmin";

3
pkgs/development/ocaml-modules/irmin/layers.nix
View File

@ -12,9 +12,6 @@ buildDunePackage {
lwt
];
# mutual dependency on irmin-test
doCheck = false;
meta = irmin.meta // {
description = "Combine different Irmin stores into a single, layered store";
};

9
pkgs/development/ocaml-modules/irmin/ppx.nix
View File

@ -2,11 +2,11 @@
buildDunePackage rec {
pname = "ppx_irmin";
version = "2.4.0";
version = "2.5.1";
src = fetchurl {
url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz";
sha256 = "1b6lav5br1b83cwdc3gj9mqkzhlbfjrbyjx0107zvj54m82dbrxb";
sha256 = "131pcgmpys6danprcbxzf4pdsl0ka74bpmmxz8db4507cvxhsz3n";
};
minimumOCamlVersion = "4.08";
@ -18,13 +18,10 @@ buildDunePackage rec {
ppxlib
];
# tests depend on irmin, would create mutual dependency
doCheck = false;
meta = {
homepage = "https://irmin.org/";
description = "PPX deriver for Irmin generics";
license = lib.licenses.isc;
maintainers = [ lib.maintainers.vbgl ];
maintainers = with lib.maintainers; [ vbgl sternenseemann ];
};
}

1
pkgs/development/python-modules/dask-gateway-server/default.nix
View File

@ -33,6 +33,7 @@ buildPythonPackage rec {
preBuild = ''
export HOME=$(mktemp -d)
export GO111MODULE=off
'';
# tests requires cluster for testing

2
pkgs/development/tools/misc/elfkickers/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "02354yn1lh1dxny35ky2d0b44iq302krsqpwk5grr4glma00hhq6";
};
makeFlags = [ "CC=cc prefix=$(out)" ];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc prefix=$(out)" ];
enableParallelBuilding = true;

2
pkgs/development/tools/misc/micronucleus/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ libusb-compat-0_1 ];
makeFlags = lib.optionals stdenv.isDarwin [ "CC=cc" ];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
installPhase = ''
mkdir -p $out/bin

2
pkgs/development/tools/misc/sloccount/default.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
done
'';
makeFlags = [ "PREFIX=$(out)" "CC=cc" ];
makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ];
doCheck = true;
checkPhase = ''HOME="$TMPDIR" PATH="$PWD:$PATH" make test'';

2
pkgs/development/tools/misc/stm32flash/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "01p396daqw3zh6nijffbfbwyqza33bi2k4q3m5yjzs02xwi99alp";
};
buildFlags = [ "CC=cc" ];
buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
installPhase = ''
# Manually copy, make install copies to /usr/local/bin

2
pkgs/games/assaultcube/default.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [ file zlib ] ++ optionals client [ openal SDL SDL_image libogg libvorbis ];
targets = (optionalString server "server") + (optionalString client " client");
makeFlags = [ "-C source/src" "CXX=c++" targets ];
makeFlags = [ "-C source/src" "CXX=${stdenv.cc.targetPrefix}c++" targets ];
desktop = makeDesktopItem {
name = "AssaultCube";

4
pkgs/games/crawl/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, which, sqlite, lua5_1, perl, python3, zlib, pkg-config, ncurses
, dejavu_fonts, libpng, SDL2, SDL2_image, SDL2_mixer, libGLU, libGL, freetype, pngcrush, advancecomp
, tileMode ? false, enableSound ? tileMode
, tileMode ? false, enableSound ? tileMode, buildPackages
# MacOS / Darwin builds
, darwin ? null
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
fontsPath = lib.optionalString tileMode dejavu_fonts;
makeFlags = [ "prefix=${placeholder "out"}" "FORCE_CC=cc" "FORCE_CXX=c++" "HOSTCXX=c++"
makeFlags = [ "prefix=${placeholder "out"}" "FORCE_CC=${stdenv.cc.targetPrefix}cc" "FORCE_CXX=${stdenv.cc.targetPrefix}c++" "HOSTCXX=${buildPackages.stdenv.cc.targetPrefix}c++"
"FORCE_PKGCONFIG=y"
"SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}"
"DATADIR=${placeholder "out"}"

2
pkgs/games/nethack/default.nix
View File

@ -60,7 +60,7 @@ in stdenv.mkDerivation rec {
-e 's,^WINTTYLIB=.*,WINTTYLIB=-lncurses,' \
-i sys/unix/hints/linux
sed \
-e 's,^CC=.*$,CC=cc,' \
-e 's,^CC=.*$,CC=${stdenv.cc.targetPrefix}cc,' \
-e 's,^HACKDIR=.*$,HACKDIR=\$(PREFIX)/games/lib/\$(GAME)dir,' \
-e 's,^SHELLDIR=.*$,SHELLDIR=\$(PREFIX)/games,' \
-e 's,^CFLAGS=-g,CFLAGS=,' \

2
pkgs/games/zdoom/bcc-git.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation {
};
enableParallelBuilding = true;
makeFlags = ["CC=cc"];
makeFlags = ["CC=${stdenv.cc.targetPrefix}cc"];
patches = [ ./bcc-warning-fix.patch ];

2
pkgs/misc/emulators/simh/default.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
dontConfigure = true;
makeFlags = [ "GCC=cc" "CC_STD=-std=c99" "LDFLAGS=-lm" ];
makeFlags = [ "GCC=${stdenv.cc.targetPrefix}cc" "CC_STD=-std=c99" "LDFLAGS=-lm" ];
preInstall = ''
install -d ${placeholder "out"}/bin

2
pkgs/os-specific/linux/libvolume_id/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation {
};
preBuild = "
makeFlagsArray=(prefix=$out E=echo RANLIB=ranlib INSTALL='install -c')
makeFlagsArray=(prefix=$out E=echo RANLIB=${stdenv.cc.targetPrefix}ranlib INSTALL='install -c')
";
# Work around a broken Makefile.

5
pkgs/os-specific/linux/nvme-cli/default.nix
View File

@ -1,4 +1,6 @@
{ lib, stdenv, fetchFromGitHub, pkg-config }:
{ lib, stdenv, fetchFromGitHub, pkg-config
, libuuid
}:
stdenv.mkDerivation rec {
pname = "nvme-cli";
@ -12,6 +14,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libuuid ];
makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];

2
pkgs/tools/X11/setroot/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libX11 imlib2 ]
++ lib.optional enableXinerama libXinerama;
buildFlags = [ "CC=cc" (if enableXinerama then "xinerama=1" else "xinerama=0") ] ;
buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" (if enableXinerama then "xinerama=1" else "xinerama=0") ] ;
installFlags = [ "DESTDIR=$(out)" "PREFIX=" ];

4
pkgs/tools/archivers/unar/default.nix
View File

@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
postPatch = ''
for f in Makefile.linux ../UniversalDetector/Makefile.linux ; do
substituteInPlace $f \
--replace "= gcc" "=cc" \
--replace "= g++" "=c++" \
--replace "= gcc" "=${stdenv.cc.targetPrefix}cc" \
--replace "= g++" "=${stdenv.cc.targetPrefix}c++" \
--replace "-DGNU_RUNTIME=1" "" \
--replace "-fgnu-runtime" "-fobjc-nonfragile-abi"
done

2
pkgs/tools/cd-dvd/bchunk/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "12dxx98kbpc5z4dgni25280088bhlsb677rp832r82zzc1drpng7";
};
makeFlags = lib.optionals stdenv.cc.isClang [ "CC=cc" "LD=cc" ];
makeFlags = lib.optionals stdenv.cc.isClang [ "CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc" ];
installPhase = ''
install -Dt $out/bin bchunk

2
pkgs/tools/cd-dvd/cue2pops/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation {
dontConfigure = true;
makeFlags = [ "CC=cc" ];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
installPhase = ''
install --directory --mode=755 $out/bin

2
pkgs/tools/compression/hactool/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
mv config.mk.template config.mk
'';
makeFlags = lib.optionals stdenv.isDarwin [ "CC=cc" ];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
installPhase = ''
install -D hactool $out/bin/hactool

14
pkgs/tools/compression/lrzip/default.nix
View File

@ -1,15 +1,19 @@
{lib, stdenv, fetchurl, zlib, lzo, bzip2, nasm, perl}:
{lib, stdenv, fetchurl, zlib, lzo, bzip2, lz4, nasm, perl}:
stdenv.mkDerivation rec {
version = "0.631";
version = "0.640";
pname = "lrzip";
src = fetchurl {
url = "http://ck.kolivas.org/apps/lrzip/${pname}-${version}.tar.bz2";
sha256 = "0mb449vmmwpkalq732jdyginvql57nxyd31sszb108yps1lf448d";
url = "http://ck.kolivas.org/apps/lrzip/${pname}-${version}.tar.xz";
sha256 = "175466drfpz8rsfr0pzfn5rqrj3wmcmcs3i2sfmw366w2kbjm4j9";
};
buildInputs = [ zlib lzo bzip2 nasm perl ];
buildInputs = [ zlib lzo bzip2 lz4 nasm perl ];
configureFlags = [
"--disable-asm"
];
meta = {
homepage = "http://ck.kolivas.org/apps/lrzip/";

2
pkgs/tools/graphics/pngcrush/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0l43c59d6v9l0g07z3q3ywhb8xb3vz74llv3mna0izk9bj6aqkiv";
};
makeFlags = [ "CC=cc" "LD=cc" ]; # gcc and/or clang compat
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc" ]; # gcc and/or clang compat
configurePhase = ''
sed -i s,/usr,$out, Makefile

2
pkgs/tools/misc/convbin/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "0n502zj8igm583kbfvyv7zhd97vb71jac41ncb9jr2yz2v5ir8j9";
};
makeFlags = [ "CC=cc" ];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
checkPhase = ''
pushd test

2
pkgs/tools/misc/convfont/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "1lj24yq5gj9hxhy1srk73521q95zyqzkws0q4v271hf5wmqaxa2f";
};
makeFlags = [ "CC=cc" ];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
installPhase = ''
install -Dm755 convfont $out/bin/convfont

2
pkgs/tools/misc/convimg/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
makeFlags = [ "CC=cc" ];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
checkPhase = ''
pushd test

2
pkgs/tools/misc/moreutils/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = with perlPackages; [ perl IPCRun TimeDate TimeDuration ];
buildFlags = [ "CC=cc" ];
buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
installFlags = [ "PREFIX=$(out)" ];
postInstall = ''

2
pkgs/tools/misc/tldr/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ curl libzip ];
nativeBuildInputs = [ pkg-config ];
makeFlags = ["CC=cc" "LD=cc" "CFLAGS="];
makeFlags = ["CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc" "CFLAGS="];
installFlags = [ "PREFIX=$(out)" ];

2
pkgs/tools/misc/unclutter/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation {
buildInputs = [xlibsWrapper];
buildFlags = [ "CC=cc" ];
buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
installPhase = ''
mkdir -pv "$out/bin"

2
pkgs/tools/networking/connect/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "00yld6yinc8s4xv3b8kbvzn2f4rja5dmp6ysv3n4847qn4k60dh7";
};
makeFlags = [ "CC=cc" ]; # gcc and/or clang compat
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; # gcc and/or clang compat
installPhase = ''
install -D -m ugo=rx connect $out/bin/connect

2
pkgs/tools/networking/flvstreamer/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildPhase = ''
make CC=cc posix
make CC=${stdenv.cc.targetPrefix}cc posix
'';
installPhase = ''

2
pkgs/tools/networking/haproxy/default.nix
View File

@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
"USE_GETADDRINFO=1"
] ++ lib.optionals withPrometheusExporter [
"EXTRA_OBJS=contrib/prometheus-exporter/service-prometheus.o"
] ++ lib.optional stdenv.isDarwin "CC=cc";
] ++ [ "CC=${stdenv.cc.targetPrefix}cc" ];
enableParallelBuilding = true;

2
pkgs/tools/security/apg/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
configurePhase = ''
substituteInPlace Makefile --replace /usr/local "$out"
'';
makeFlags = lib.optionals stdenv.isDarwin ["CC=cc"];
makeFlags = ["CC=${stdenv.cc.targetPrefix}cc"];
patches = [
./apg.patch

2
pkgs/tools/security/masscan/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper installShellFiles ];
makeFlags = [ "PREFIX=$(out)" "GITVER=${version}" "CC=cc" ];
makeFlags = [ "PREFIX=$(out)" "GITVER=${version}" "CC=${stdenv.cc.targetPrefix}cc" ];
preInstall = ''
mkdir -p $out/bin

2
pkgs/tools/security/sslscan/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ openssl ];
makeFlags = [ "PREFIX=$(out)" "CC=cc" ];
makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ];
meta = with lib; {
description = "Tests SSL/TLS services and discover supported cipher suites";

2
pkgs/tools/security/stricat/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1axg8r4g5n5kdqj5013pgck80nni3z172xkg506vz4zx1zcmrm4r";
};
buildFlags = [ "CC=cc" ];
buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
installPhase = ''
mkdir -p $out/bin

2
pkgs/tools/text/boxes/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
"GLOBALCONF=${placeholder "out"}/share/boxes/boxes-config"
'';
makeFlags = lib.optionals stdenv.isDarwin [ "CC=cc" ];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
installPhase = ''
install -Dm755 -t $out/bin src/boxes

2
pkgs/tools/video/yamdi/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "4a6630f27f6c22bcd95982bf3357747d19f40bd98297a569e9c77468b756f715";
};
buildFlags = [ "CC=cc" ];
buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
installPhase = ''
install -D {,$out/bin/}yamdi

54
pkgs/top-level/all-packages.nix
View File

@ -284,6 +284,7 @@ in
grsync = callPackage ../applications/misc/grsync { };
dockerTools = callPackage ../build-support/docker {
go = buildPackages.go_1_15;
writePython3 = buildPackages.writers.writePython3;
};
@ -1295,7 +1296,9 @@ in
gaia = callPackage ../development/libraries/gaia { };
galene = callPackage ../servers/web-apps/galene {};
galene = callPackage ../servers/web-apps/galene {
buildGoModule = buildGo115Module;
};
gamecube-tools = callPackage ../development/tools/gamecube-tools { };
@ -1361,6 +1364,8 @@ in
hime = callPackage ../tools/inputmethods/hime {};
hinit = haskell.lib.justStaticExecutables haskellPackages.hinit;
hostctl = callPackage ../tools/system/hostctl { };
hpe-ltfs = callPackage ../tools/backup/hpe-ltfs { };
@ -2805,6 +2810,7 @@ in
step-ca = callPackage ../tools/security/step-ca {
inherit (darwin.apple_sdk.frameworks) PCSC;
buildGoModule = buildGo115Module;
};
step-cli = callPackage ../tools/security/step-cli { };
@ -3293,7 +3299,9 @@ in
ibus-engines = recurseIntoAttrs {
anthy = callPackage ../tools/inputmethods/ibus-engines/ibus-anthy { };
bamboo = callPackage ../tools/inputmethods/ibus-engines/ibus-bamboo { };
bamboo = callPackage ../tools/inputmethods/ibus-engines/ibus-bamboo {
go = go_1_15;
};
hangul = callPackage ../tools/inputmethods/ibus-engines/ibus-hangul { };
@ -8664,7 +8672,9 @@ in
uwsgi = callPackage ../servers/uwsgi { };
v2ray = callPackage ../tools/networking/v2ray { };
v2ray = callPackage ../tools/networking/v2ray {
buildGoModule = buildGo115Module;
};
vacuum = callPackage ../applications/networking/instant-messengers/vacuum {};
@ -10198,31 +10208,31 @@ in
inherit (darwin.apple_sdk.frameworks) Security Foundation;
} // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) {
stdenv = gcc8Stdenv;
buildPackages = buildPackages // { stdenv = gcc8Stdenv; };
buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; };
});
go_1_15 = callPackage ../development/compilers/go/1.15.nix ({
inherit (darwin.apple_sdk.frameworks) Security Foundation;
} // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) {
stdenv = gcc8Stdenv;
buildPackages = buildPackages // { stdenv = gcc8Stdenv; };
buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; };
});
go_1_16 = callPackage ../development/compilers/go/1.16.nix ({
inherit (darwin.apple_sdk.frameworks) Security Foundation;
} // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) {
stdenv = gcc8Stdenv;
buildPackages = buildPackages // { stdenv = gcc8Stdenv; };
buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; };
});
go_2-dev = callPackage ../development/compilers/go/2-dev.nix ({
inherit (darwin.apple_sdk.frameworks) Security Foundation;
} // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) {
stdenv = gcc8Stdenv;
buildPackages = buildPackages // { stdenv = gcc8Stdenv; };
buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; };
});
go = go_1_15;
go = go_1_16;
go-repo-root = callPackage ../development/tools/go-repo-root { };
@ -17069,7 +17079,9 @@ in
tremor = callPackage ../development/libraries/tremor { };
trillian = callPackage ../tools/misc/trillian { };
trillian = callPackage ../tools/misc/trillian {
buildGoModule = buildGo115Module;
};
twolame = callPackage ../development/libraries/twolame { };
@ -17524,7 +17536,7 @@ in
go = buildPackages.go_1_16;
};
buildGoPackage = buildGo115Package;
buildGoPackage = buildGo116Package;
buildGo114Module = callPackage ../development/go-modules/generic {
go = buildPackages.go_1_14;
@ -17536,7 +17548,7 @@ in
go = buildPackages.go_1_16;
};
buildGoModule = buildGo115Module;
buildGoModule = buildGo116Module;
go2nix = callPackage ../development/tools/go2nix { };
@ -17875,7 +17887,9 @@ in
grafana-agent = callPackage ../servers/monitoring/grafana-agent { };
grafana-loki = callPackage ../servers/monitoring/loki { };
grafana-loki = callPackage ../servers/monitoring/loki {
buildGoModule = buildGo115Module;
};
grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { };
@ -18083,7 +18097,9 @@ in
nsq = callPackage ../servers/nsq { };
oauth2_proxy = callPackage ../servers/oauth2_proxy { };
oauth2_proxy = callPackage ../servers/oauth2_proxy {
buildGoModule = buildGo115Module;
};
openbgpd = callPackage ../servers/openbgpd { };
@ -18361,7 +18377,9 @@ in
postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { };
prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { };
prometheus = callPackage ../servers/monitoring/prometheus { };
prometheus = callPackage ../servers/monitoring/prometheus {
buildGoPackage = buildGo115Package;
};
prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { };
prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { };
prometheus-aws-s3-exporter = callPackage ../servers/monitoring/prometheus/aws-s3-exporter.nix { };
@ -21620,7 +21638,9 @@ in
coursera-dl = callPackage ../applications/misc/coursera-dl {};
coyim = callPackage ../applications/networking/instant-messengers/coyim {};
coyim = callPackage ../applications/networking/instant-messengers/coyim {
buildGoPackage = buildGo115Package;
};
cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor {
python3Packages = python37Packages;
@ -23903,7 +23923,9 @@ in
ninjas2 = callPackage ../applications/audio/ninjas2 {};
nncp = callPackage ../tools/misc/nncp { };
nncp = callPackage ../tools/misc/nncp {
go = go_1_15;
};
notion = callPackage ../applications/window-managers/notion { };

77
pkgs/top-level/perl-packages.nix
View File

@ -8914,6 +8914,20 @@ let
};
};
gotofile = buildPerlPackage {
pname = "goto-file";
version = "0.005";
src = fetchurl {
url = "mirror://cpan/authors/id/E/EX/EXODIST/goto-file-0.005.tar.gz";
sha256 = "c6cdd5ee4a6cdcbdbf314d92a4f9985dbcdf9e4258048cae76125c052aa31f77";
};
buildInputs = [ Test2Suite ];
meta = {
description = "Stop parsing the current file and move on to a different one";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
Graph = buildPerlPackage {
pname = "Graph";
version = "0.9712";
@ -11798,6 +11812,20 @@ let
};
};
LongJump = buildPerlPackage {
pname = "Long-Jump";
version = "0.000001";
src = fetchurl {
url = "mirror://cpan/authors/id/E/EX/EXODIST/Long-Jump-0.000001.tar.gz";
sha256 = "d5d6456d86992b559d8f66fc90960f919292cd3803c13403faac575762c77af4";
};
buildInputs = [ Test2Suite ];
meta = {
description = "Mechanism for returning to a specific point from a deeply nested stack";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
LWP = buildPerlPackage {
pname = "libwww-perl";
version = "6.49";
@ -19794,6 +19822,55 @@ let
};
};
Test2Harness = buildPerlPackage {
pname = "Test2-Harness";
version = "1.000042";
src = fetchurl {
url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Harness-1.000042.tar.gz";
sha256 = "aaf231a68af1a6ffd6a11188875fcf572e373e43c8285945227b9d687b43db2d";
};
checkPhase = ''
patchShebangs ./t ./scripts/yath
./scripts/yath test -j $NIX_BUILD_CORES
'';
propagatedBuildInputs = [ DataUUID Importer LongJump ScopeGuard TermTable Test2PluginMemUsage Test2PluginUUID Test2Suite gotofile ];
meta = {
description = "A new and improved test harness with better Test2 integration";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
Test2PluginMemUsage = buildPerlPackage {
pname = "Test2-Plugin-MemUsage";
version = "0.002003";
src = fetchurl {
url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Plugin-MemUsage-0.002003.tar.gz";
sha256 = "5e0662d5a823ae081641f5ce82843111eec1831cd31f883a6c6de54afdf87c25";
};
buildInputs = [ Test2Suite ];
meta = {
description = "Collect and display memory usage information";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
Test2PluginUUID = buildPerlPackage {
pname = "Test2-Plugin-UUID";
version = "0.002001";
src = fetchurl {
url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Plugin-UUID-0.002001.tar.gz";
sha256 = "4c6c8d484d7153d8779dc155a992b203095b5c5aa1cfb1ee8bcedcd0601878c9";
};
buildInputs = [ Test2Suite ];
propagatedBuildInputs = [ DataUUID ];
meta = {
description = "Use REAL UUIDs in Test2";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
Test2PluginNoWarnings = buildPerlPackage {
pname = "Test2-Plugin-NoWarnings";
version = "0.09";