Merge pull request #131345 from NixOS/staging-next

Staging next
This commit is contained in:
Frederik Rietdijk 2021-07-29 10:45:20 +02:00 committed by GitHub
commit 3888701716
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
209 changed files with 10157 additions and 9878 deletions

View File

@ -48,6 +48,7 @@ let
rc-manager =
if config.networking.resolvconf.enable then "resolvconf"
else "unmanaged";
firewall-backend = cfg.firewallBackend;
})
(mkSection "keyfile" {
unmanaged-devices =
@ -243,6 +244,15 @@ in {
'';
};
firewallBackend = mkOption {
type = types.enum [ "iptables" "nftables" "none" ];
default = "iptables";
description = ''
Which firewall backend should be used for configuring masquerading with shared mode.
If set to none, NetworkManager doesn't manage the configuration at all.
'';
};
logLevel = mkOption {
type = types.enum [ "OFF" "ERR" "WARN" "INFO" "DEBUG" "TRACE" ];
default = "WARN";

View File

@ -103,6 +103,7 @@ in
}];
boot.blacklistedKernelModules = [ "ip_tables" ];
environment.systemPackages = [ pkgs.nftables ];
networking.networkmanager.firewallBackend = mkDefault "nftables";
systemd.services.nftables = {
description = "nftables firewall";
before = [ "network-pre.target" ];

View File

@ -204,6 +204,7 @@ in
k3s = handleTest ./k3s.nix {};
kafka = handleTest ./kafka.nix {};
kbd-setfont-decompress = handleTest ./kbd-setfont-decompress.nix {};
kbd-update-search-paths-patch = handleTest ./kbd-update-search-paths-patch.nix {};
kea = handleTest ./kea.nix {};
keepalived = handleTest ./keepalived.nix {};
keepassxc = handleTest ./keepassxc.nix {};

View File

@ -0,0 +1,18 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "kbd-update-search-paths-patch";
machine = { pkgs, options, ... }: {
console = {
packages = options.console.packages.default ++ [ pkgs.terminus_font ];
};
};
testScript = ''
command = "${pkgs.kbd}/bin/setfont ter-112n 2>&1"
(status, out) = machine.execute(command)
pattern = re.compile(r".*Unable to find file:.*")
match = pattern.match(out)
if match:
raise Exception("command `{}` failed".format(command))
'';
})

View File

@ -47,8 +47,6 @@ in mkDerivation rec {
substituteInPlace dfasma.pro --replace "CONFIG += file_sdif" "";
'';
enableParallelBuilding = true;
meta = with lib; {
description = "Analyse and compare audio files in time and frequency";
longDescription = ''

View File

@ -38,8 +38,6 @@ mkDerivation rec {
PREFIXSHORTCUT=$out"
'';
enableParallelBuilding = true;
meta = {
description = "Free Musical Instrument Tuner";
longDescription = ''

View File

@ -19,8 +19,6 @@ mkDerivation rec {
installFlags = [ "INSTALL_ROOT=$(out)" ];
enableParallelBuilding = true;
meta = with lib; {
description = "Graphical open-source sequencer";
homepage = "https://www.iannix.org/";

View File

@ -111,8 +111,6 @@ mkDerivation rec {
wavpack
];
enableParallelBuilding = true;
qtWrapperArgs = [
"--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive"
];

View File

@ -45,8 +45,6 @@ stdenv.mkDerivation rec {
tagparser
];
enableParallelBuilding = true;
meta = with pkgs.lib; {
homepage = "https://github.com/Martchus/tageditor";
description = "A tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska";

View File

@ -12,8 +12,6 @@ mkDerivation rec {
nativeBuildInputs = [ pkg-config qmake qttools ];
buildInputs = [ hunspell qtbase qtmultimedia ];
enableParallelBuilding = true;
qmakeFlags = [ "PREFIX=/" ];
installFlags = [ "INSTALL_ROOT=$(out)" ];

View File

@ -19,8 +19,6 @@ mkDerivation rec {
"METAINFODIR=${placeholder "out"}/share/metainfo"
];
enableParallelBuilding = true;
meta = with lib; {
description = "TeX and LaTeX editor";
longDescription=''

View File

@ -15,8 +15,6 @@ mkDerivation rec {
nativeBuildInputs = [ pkg-config qmake ];
buildInputs = [ python qtbase qttools ];
enableParallelBuilding = true;
meta = with lib; {
description = "Free, easy to use and flexible tile map editor";
homepage = "https://www.mapeditor.org/";

View File

@ -18,13 +18,13 @@ in
stdenv.mkDerivation rec {
pname = "imagemagick";
version = "7.1.0-2";
version = "7.1.0-4";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = version;
sha256 = "sha256-0nTz9UBspROrNj72amyZmFYK/y9Xg4+qNt4raZiK3AI=";
sha256 = "sha256-CvrSeoKaTigR+4egelwLRr2++CQ5OWUePwX9e1/G1GM=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

View File

@ -47,7 +47,6 @@ stdenv.mkDerivation rec {
QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}";
buildInputs = [ qtbase poppler ];
enableParallelBuilding = true;
qmakeFlags = [
"DESKTOP_INSTALL_DIR=${placeholder "out"}/share/applications"

View File

@ -18,8 +18,6 @@ mkDerivation rec {
buildInputs = [ poppler libunarr libGLU qtmultimedia qtscript ];
propagatedBuildInputs = [ qtquickcontrols qtgraphicaleffects qtdeclarative ];
enableParallelBuilding = true;
meta = {
description = "A comic reader for cross-platform reading and managing your digital comic collection";
homepage = "http://www.yacreader.com";

View File

@ -7,7 +7,7 @@ let
self = py;
# not compatible with prompt_toolkit >=2.0
prompt_toolkit = super.prompt_toolkit.overridePythonAttrs (oldAttrs: rec {
prompt-toolkit = super.prompt-toolkit.overridePythonAttrs (oldAttrs: rec {
name = "${oldAttrs.pname}-${version}";
version = "1.0.18";
src = oldAttrs.src.override {
@ -37,7 +37,7 @@ buildPythonApplication rec {
colorama
requests
pygments
prompt_toolkit
prompt-toolkit
six
];

View File

@ -14,8 +14,6 @@ mkDerivation rec {
buildInputs = [ boost qtbase qtwebkit poppler hunspell ];
enableParallelBuilding = true;
nativeBuildInputs = [ qmake ];
postPatch = ''

View File

@ -13,7 +13,6 @@ mkDerivation {
buildInputs = [ qtbase vcg glew ];
enableParallelBuilding = true;
nativeBuildInputs = [ qmake ];
qmakeFlags = [ "openBrf.pro" ];

View File

@ -39,8 +39,6 @@ mkDerivation rec {
variables.pri
'';
enableParallelBuilding = true;
postInstall = ''
ln -sf $out/lib/*/libqlcplus* $out/lib
'';

View File

@ -24,8 +24,6 @@ mkDerivation rec {
nativeBuildInputs = [ qmake qttools ];
enableParallelBuilding = true;
patches = [
# Fix path to pass-otp plugin `/usr/lib/password-store/extensions/otp.bash` being hardcoded.
# TODO: Remove when https://github.com/IJHack/QtPass/pull/499 is merged and available.

View File

@ -64,8 +64,6 @@ let
mv lib $out/
'';
enableParallelBuilding = true;
meta = with lib; {
inherit (src.meta) homepage;
description = "QtLocation plugin for Google maps tile API";

View File

@ -17,7 +17,7 @@ buildPythonApplication rec {
arrow
icalendar
glibcLocales
prompt_toolkit
prompt-toolkit
urwid
watchdog
];

View File

@ -1,6 +1,18 @@
{ lib, stdenv, fetchurl, jdk, makeWrapper, autoPatchelfHook, makeDesktopItem, glib, libsecret }:
let
stdenv.mkDerivation rec {
pname = "apache-directory-studio";
version = "2.0.0-M17";
versionWithDate = "2.0.0.v20210717-M17";
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "mirror://apache/directory/studio/${versionWithDate}/ApacheDirectoryStudio-${versionWithDate}-linux.gtk.x86_64.tar.gz";
sha256 = "19zdspzv4n3mfgb1g45s3wh0vbvn6a9zjd4xi5x2afmdjkzlwxi4";
}
else throw "Unsupported system: ${stdenv.hostPlatform.system}";
desktopItem = makeDesktopItem {
name = "apache-directory-studio";
exec = "ApacheDirectoryStudio";
@ -10,20 +22,6 @@ let
genericName = "Apache Directory Studio";
categories = "Java;Network";
};
version = "2.0.0-M17";
versionWithDate = "2.0.0.v20210717-M17";
in
stdenv.mkDerivation rec {
pname = "apache-directory-studio";
inherit version;
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "mirror://apache/directory/studio/${versionWithDate}/ApacheDirectoryStudio-${versionWithDate}-linux.gtk.x86_64.tar.gz";
sha256 = "19zdspzv4n3mfgb1g45s3wh0vbvn6a9zjd4xi5x2afmdjkzlwxi4";
}
else throw "Unsupported system: ${stdenv.hostPlatform.system}";
buildInputs = [ glib libsecret ];
nativeBuildInputs = [ makeWrapper autoPatchelfHook ];

View File

@ -1,9 +1,9 @@
{ lib, fetchFromGitHub, buildGoPackage }:
buildGoPackage rec {
name = "captive-browser";
pname = "captive-browser";
version = "2019-04-16";
goPackagePath = name;
goPackagePath = pname;
src = fetchFromGitHub {
owner = "FiloSottile";

View File

@ -10,7 +10,7 @@
}:
stdenv.mkDerivation rec {
name = "ungoogled-chromium-${version}";
pname = "ungoogled-chromium";
version = rev;

View File

@ -80,12 +80,12 @@ let
source = lib.findFirst (sourceMatches systemLocale) defaultSource sources;
name = "firefox-${channel}-bin-unwrapped-${version}";
pname = "firefox-${channel}-bin-unwrapped";
in
stdenv.mkDerivation {
inherit name;
inherit pname version;
src = fetchurl { inherit (source) url sha256; };
@ -189,7 +189,7 @@ stdenv.mkDerivation {
# update with:
# $ nix-shell maintainers/scripts/update.nix --argstr package firefox-bin-unwrapped
passthru.updateScript = import ./update.nix {
inherit name channel writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell;
inherit pname version channel writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell;
baseUrl =
if channel == "devedition"
then "http://archive.mozilla.org/pub/devedition/releases/"

View File

@ -11,7 +11,6 @@ mkDerivation rec {
sha256 = "1x11m1kwqindzc0dkpfifcglsb362impaxs85kgzx50p898sz9ll";
};
enableParallelBuilding = true;
nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase ];
qmakeFlags = [ "CONFIG-=app_bundle" ];

View File

@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
name = "widevine";
pname = "widevine";
version = "4.10.1582.1";
src = fetchurl {

View File

@ -1,7 +1,8 @@
{ stdenv, kubernetes, installShellFiles }:
stdenv.mkDerivation {
name = "kubectl-${kubernetes.version}";
pname = "kubectl";
version = kubernetes.version;
# kubectl is currently part of the main distribution but will eventially be
# split out (see homepage)

View File

@ -1,7 +1,6 @@
{ lib, buildGoModule, fetchFromGitHub}:
buildGoModule rec {
name = "kuttl";
pname = "kuttl";
version = "0.9.0";
cli = "kubectl-kuttl";

View File

@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, makeWrapper, hadoop, jre, bash }:
stdenv.mkDerivation rec {
name = "pig-0.17.0";
pname = "pig";
version = "0.17.0";
src = fetchurl {
url = "mirror://apache/pig/${name}/${name}.tar.gz";
url = "mirror://apache/pig/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "1wwpg0w47f49rnivn2d26vrxgyfl9gpqx3vmzbl5lhx6x5l3fqbd";
};

View File

@ -10,8 +10,8 @@ let
packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) defaultOverrides;
};
in python.pkgs.buildPythonPackage rec {
name = "${pname}-${version}";
pname = "gns3-gui";
inherit version;
src = fetchFromGitHub {
owner = "GNS3";

View File

@ -31,7 +31,7 @@ in python.pkgs.buildPythonPackage {
propagatedBuildInputs = with python.pkgs; [
aiohttp-cors yarl aiohttp multidict setuptools
jinja2 psutil zipstream sentry-sdk jsonschema distro async_generator aiofiles
prompt_toolkit py-cpuinfo
prompt-toolkit py-cpuinfo
];
# Requires network access

View File

@ -1,11 +1,12 @@
{ lib, stdenv, fetchurl, flex, bison, libpcap, libdnet, libnfnetlink, libnetfilter_queue}:
stdenv.mkDerivation rec {
name = "daq-2.2.2";
pname = "daq";
version = "2.2.2";
src = fetchurl {
name = "${name}.tar.gz";
url = "https://snort.org/downloads/archive/snort/${name}.tar.gz";
name = "${pname}-${version}.tar.gz";
url = "https://snort.org/downloads/archive/snort/${pname}-${version}.tar.gz";
sha256 = "0yvzscy7vqj7s5rccza0f7p6awghfm3yaxihx1h57lqspg51in3w";
};

View File

@ -5,10 +5,11 @@
with lib;
stdenv.mkDerivation rec {
name = "bitlbee-3.6";
pname = "bitlbee";
version = "3.6";
src = fetchurl {
url = "mirror://bitlbee/src/${name}.tar.gz";
url = "mirror://bitlbee/src/bitlbee-${version}.tar.gz";
sha256 = "0zhhcbcr59sx9h4maf8zamzv2waya7sbsl7w74gbyilvy93dw5cz";
};

View File

@ -1,10 +1,11 @@
{lib, stdenv, fetchurl, ncurses, openssl, tcl, tk}:
stdenv.mkDerivation {
name = "gtmess-0.97";
stdenv.mkDerivation rec {
pname = "gtmess";
version = "0.97";
src = fetchurl {
url = "mirror://sourceforge/gtmess/gtmess-0.97.tar.gz";
url = "mirror://sourceforge/gtmess/gtmess-${version}.tar.gz";
sha256 = "1ipmqsrj0r1ssbgs2fpr4x5vnzlxlqhx9jrnadp1jw7s0sxpjqv0";
};

View File

@ -1,6 +1,6 @@
{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pythonOlder,
attrs, aiohttp, appdirs, click, keyring, Logbook, peewee, janus,
prompt_toolkit, matrix-nio, dbus-python, pydbus, notify2, pygobject3,
prompt-toolkit, matrix-nio, dbus-python, pydbus, notify2, pygobject3,
setuptools, fetchpatch, installShellFiles,
pytest, faker, pytest-aiohttp, aioresponses,
@ -40,7 +40,7 @@ buildPythonApplication rec {
Logbook
matrix-nio
peewee
prompt_toolkit
prompt-toolkit
setuptools
] ++ lib.optional enableDbusUi [
dbus-python

View File

@ -1,10 +1,13 @@
{ lib, stdenv, fetchurl, pidgin} :
{ lib, stdenv, fetchFromGitHub, pidgin} :
stdenv.mkDerivation {
name = "pidgin-msn-pecan-0.1.4";
src = fetchurl {
url = "http://msn-pecan.googlecode.com/files/msn-pecan-0.1.4.tar.bz2";
sha256 = "0d43z2ay9is1r2kkc9my8pz0fwdyzv7k19vdmbird18lg7rlbjd2";
stdenv.mkDerivation rec {
pname = "pidgin-msn-pecan";
version = "0.1.4";
src = fetchFromGitHub {
owner = "felipec";
repo = "msn-pecan";
rev = "v${version}";
sha256 = "0133rpiy4ik6rx9qn8m38vp7w505hnycggr53g3a2hfpk5xj03zh";
};
meta = {

View File

@ -1,9 +1,10 @@
{ lib, stdenv, fetchurl, libotr, pidgin, intltool } :
stdenv.mkDerivation rec {
name = "pidgin-otr-4.0.2";
pname = "pidgin-otr";
version = "4.0.2";
src = fetchurl {
url = "http://www.cypherpunks.ca/otr/${name}.tar.gz";
url = "https://otr.cypherpunks.ca/pidgin-otr-${version}.tar.gz";
sha256 = "1i5s9rrgbyss9rszq6c6y53hwqyw1k86s40cpsfx5ccl9bprxdgl";
};

View File

@ -2,11 +2,12 @@
, autoreconfHook } :
stdenv.mkDerivation rec {
name = "pidgin-osd-0.2.0";
pname = "pidgin-osd";
version = "0.2.0";
src = fetchFromGitHub {
owner = "edanaher";
repo = "pidgin-osd";
rev = name;
rev = "${pname}-${version}";
sha256 = "07wa9anz99hnv6kffpcph3fbq8mjbyq17ij977ggwgw37zb9fzb5";
};

View File

@ -10,12 +10,13 @@ let
};
in stdenv.mkDerivation rec {
name = "purple-facebook-0.9.5";
pname = "purple-facebook";
version = "0.9.5";
src = fetchFromGitHub {
owner = "dequis";
repo = "purple-facebook";
rev = "v0.9.5-9ff9acf9fa14";
rev = "v${version}-9ff9acf9fa14";
sha256 = "0a1860bkzrmyxahm9rlxi80z335w491wzdaqaw6j9ccavbymhwhs";
};

View File

@ -1,9 +1,10 @@
{ lib, stdenv, fetchurl, pidgin, intltool, python } :
stdenv.mkDerivation rec {
name = "purple-plugin-pack-2.7.0";
pname = "purple-plugin-pack";
version = "2.7.0";
src = fetchurl {
url = "https://bitbucket.org/rekkanoryo/purple-plugin-pack/downloads/${name}.tar.bz2";
url = "https://bitbucket.org/rekkanoryo/purple-plugin-pack/downloads/purple-plugin-pack-${version}.tar.bz2";
sha256 = "0g5hmy7fwgjq59j52h9yps28jsjjrfkd4r18gyx6hfd3g3kzbg1b";
};

View File

@ -1,10 +1,12 @@
{ lib, stdenv, fetchgit, pidgin, glib, libxml2 }:
{ lib, stdenv, fetchFromGitHub, pidgin, glib, libxml2 }:
stdenv.mkDerivation {
name = "purple-xmpp-upload-2017-12-31";
pname = "purple-xmpp-upload";
version = "unstable-2017-12-31";
src = fetchgit {
url = "https://github.com/Junker/purple-xmpp-http-upload";
src = fetchFromGitHub {
owner = "Junker";
repo = "purple-xmpp-http-upload";
rev = "178096cbfc9df165c2dc1677666439969d212b37";
sha256 = "12l9rqlgb4i50xxrfnvwz9sqfk0d3c0m6l09mnvfixqi8illyvlp";
};

View File

@ -1,41 +0,0 @@
{ lib, stdenv, fetchurl, pkg-config, pidgin, libnotify, gdk-pixbuf, glib, dbus
, dbus-glib }:
stdenv.mkDerivation rec {
name = "skype4pidgin-novas0x2a-20120411-6c53f7c48f";
src = fetchurl {
url = "https://github.com/novas0x2a/skype4pidgin/tarball/6c53f7c48f";
name = "${name}.tar.gz";
sha256 = "116jfh5ravaixivqx4a4bz0lbb9c49d5r83nwmripja56zdbpgr0";
};
NIX_CFLAGS_COMPILE = "-I${libnotify}/include/libnotify";
patchPhase = ''
sed -i -e 's/ [^ ]*-gcc/ gcc/' -e 's/-march[^ ]*//' \
-e 's/GLIB_CFLAGS =.*/GLIB_CFLAGS=`pkg-config --cflags glib-2.0 gdk-pixbuf-2.0 libnotify purple dbus-glib-1`/' Makefile
pkg-config --cflags glib-2.0 gdk-pixbuf-2.0 libnotify
'';
buildPhase = "make libskype.so libskype_dbus.so";
installPhase = ''
mkdir -p $out/pixmaps/pidgin/protocols/{16,22,48} $out/bin $out/lib/pidgin
cp icons/16/skypeout.png $out/pixmaps/pidgin/protocols/16
cp icons/22/skypeout.png $out/pixmaps/pidgin/protocols/22
cp icons/48/skypeout.png $out/pixmaps/pidgin/protocols/48
cp libskype.so libskype_dbus.so $out/lib/pidgin
'';
postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ pidgin libnotify gdk-pixbuf glib dbus dbus-glib ];
meta = {
homepage = "https://github.com/novas0x2a/skype4pidgin";
license = lib.licenses.gpl3Plus;
description = "Plugin to use a running skype account through pidgin";
platforms = lib.platforms.linux;
};
}

View File

@ -7,7 +7,8 @@ let
configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf);
in stdenv.mkDerivation {
name = "ratox-0.4.20180303";
pname = "ratox";
version = "0.4.20180303";
src = fetchgit {
url = "git://git.2f30.org/ratox.git";

View File

@ -4,14 +4,12 @@
# Enabling the plugin and using it with a recent irssi, segafults on join:
# http://marc.info/?l=silc-devel&m=125610477802211
let
basename = "silc-client-1.1.11";
in
stdenv.mkDerivation {
name = basename + lib.optionalString enablePlugin "-irssi-plugin";
stdenv.mkDerivation rec {
pname = "silc-client" + lib.optionalString enablePlugin "-irssi-plugin";
version = "1.1.11";
src = fetchurl {
url = "mirror://sourceforge/silc/silc/client/sources/${basename}.tar.bz2";
url = "mirror://sourceforge/silc/silc/client/sources/silc-client-${version}.tar.bz2";
sha256 = "13cp3fmdnj8scjak0d2xal3bfvs2k7ssrwdhp0zl6jar5rwc7prn";
};

View File

@ -2,10 +2,11 @@
, sqlite, libsoup, libnice, gnutls}:
stdenv.mkDerivation rec {
name = "telepathy-gabble-0.18.4";
pname = "telepathy-gabble";
version = "0.18.4";
src = fetchurl {
url = "https://telepathy.freedesktop.org/releases/telepathy-gabble/${name}.tar.gz";
url = "https://telepathy.freedesktop.org/releases/telepathy-gabble/telepathy-gabble-${version}.tar.gz";
sha256 = "174nlkqm055vrhv11gy73m20jbsggcb0ddi51c7s9m3j5ibr2p0i";
};

View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "telepathy-haze";
name = "${pname}-0.8.0";
version = "0.8.0";
src = fetchurl {
url = "https://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
url = "https://telepathy.freedesktop.org/releases/telepathy-haze/telepathy-haze${version}.tar.gz";
sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy";
};

View File

@ -2,11 +2,11 @@
, dconf, makeWrapper, intltool, libxslt, gobject-introspection, dbus }:
stdenv.mkDerivation rec {
project = "telepathy-logger";
name = "${project}-0.8.2";
pname = "telepathy-logger";
version = "0.8.2";
src = fetchurl {
url = "https://telepathy.freedesktop.org/releases/${project}/${name}.tar.bz2";
url = "https://telepathy.freedesktop.org/releases/telepathy-logger/telepathy-logger-${version}.tar.bz2";
sha256 = "1bjx85k7jyfi5pvl765fzc7q2iz9va51anrc2djv7caksqsdbjlg";
};

View File

@ -3,10 +3,10 @@
stdenv.mkDerivation rec {
pname = "telepathy-salut";
name = "${pname}-0.8.1";
version = "0.8.1";
src = fetchurl {
url = "https://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
url = "https://telepathy.freedesktop.org/releases/telepathy-salut/telepathy-salut-${version}.tar.gz";
sha256 = "13k112vrr3zghzr03pnbqc1id65qvpj0sn0virlbf4dmr2511fbh";
};

View File

@ -15,8 +15,6 @@ mkDerivation rec {
fetchSubmodules = true;
};
enableParallelBuilding = true;
buildInputs = [ qtbase qtquickcontrols ];
nativeBuildInputs = [ qmake ];

View File

@ -1,10 +1,11 @@
{lib, stdenv, fetchurl, ncurses}:
stdenv.mkDerivation {
name = "iptraf-3.0.1";
stdenv.mkDerivation rec {
pname = "iptraf";
version = "3.0.1";
src = fetchurl {
url = "ftp://iptraf.seul.org/pub/iptraf/iptraf-3.0.1.tar.gz";
url = "ftp://iptraf.seul.org/pub/iptraf/iptraf-${version}tar.gz";
sha256 = "12n059j9iihhpf6spmlaspqzxz3wqan6kkpnhmlj08jdijpnk84m";
};

View File

@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
buildInputs = [ libcommuni qtbase ];
enableParallelBuilding = true;
dontWrapQtApps = true;
preConfigure = ''

View File

@ -1,10 +1,11 @@
{lib, stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "ii-1.8";
pname = "ii";
version = "1.8";
src = fetchurl {
url = "https://dl.suckless.org/tools/${name}.tar.gz";
url = "https://dl.suckless.org/tools/${pname}-${version}.tar.gz";
sha256 = "1lk8vjl7i8dcjh4jkg8h8bkapcbs465sy8g9c0chfqsywbmf3ndr";
};

View File

@ -1,12 +1,14 @@
{ lib, stdenv, fetchurl, irssi, gmp, automake, autoconf, libtool, openssl, glib, pkg-config }:
{ lib, stdenv, fetchFromGitHub, irssi, gmp, automake, autoconf, libtool, openssl, glib, pkg-config }:
stdenv.mkDerivation rec {
name = "fish-irssi-20130413-e98156bebd";
pname = "fish-irssi";
version = "unstable-2013-04-13";
src = fetchurl {
url = "https://github.com/falsovsky/FiSH-irssi/tarball/e98156bebd";
name = "${name}.tar.gz";
sha256 = "1ndr51qrg66h1mfzacwzl1vd6lj39pdc4p4z5iihrj4r2f6gk11a";
src = fetchFromGitHub {
owner = "falsovsky";
repo = "FiSH-irssi";
rev = "e98156bebd8c150bf100b3a0356e7103bb5c20e6";
sha256 = "0mqq7q3rnkzx4j352g1l8sv3g687d76ikjl9c7g6xw96y91kqvdp";
};
preConfigure = ''

View File

@ -32,7 +32,7 @@ let
edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))];
in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec {
name = "quassel${tag}-${version}";
pname = "quassel${tag}";
version = "0.13.1";
src = fetchFromGitHub {

View File

@ -1,7 +1,8 @@
{ lib, stdenv, curl, fetchFromGitHub, cjson, olm, luaffi }:
stdenv.mkDerivation {
name = "weechat-matrix-bridge-2018-11-19";
pname = "weechat-matrix-bridge";
version = "unstable-2018-11-19";
src = fetchFromGitHub {
owner = "torhve";
repo = "weechat-matrix-protocol-script";

View File

@ -1,8 +1,8 @@
{ lib, stdenv, fetchurl, ncurses, autoreconfHook, flex }:
let rev = "431604647f89d5aac7b199a7883e98e56e4ccf9e";
in stdenv.mkDerivation rec {
pname = "mmh-unstable";
version = "2019-09-08";
pname = "mmh";
version = "unstable-2019-09-08";
src = fetchurl {
url = "http://git.marmaro.de/?p=mmh;a=snapshot;h=${rev};sf=tgz";

View File

@ -1,15 +1,12 @@
{ lib, stdenv, fetchurl, makeWrapper, unzip, jre, runtimeShell }:
let
stdenv.mkDerivation rec {
version = "1.9";
name = "msgviewer-${version}";
uname = "MSGViewer-${version}";
in stdenv.mkDerivation {
inherit name;
pname = "msgviewer";
uname = "MSGViewer";
src = fetchurl {
url = "mirror://sourceforge/msgviewer/${uname}/${uname}.zip";
url = "mirror://sourceforge/msgviewer/${uname}-${version}/${uname}-${version}.zip";
sha256 = "0igmr8c0757xsc94xlv2470zv2mz57zaj52dwr9wj8agmj23jbjz";
};
@ -17,8 +14,8 @@ in stdenv.mkDerivation {
dir=$out/lib/msgviewer
mkdir -p $out/bin $dir
unzip $src -d $dir
mv $dir/${uname}/* $dir
rmdir $dir/${uname}
mv $dir/${uname}-${version}/* $dir
rmdir $dir/${uname}-${version}
cat <<_EOF > $out/bin/msgviewer
#!${runtimeShell} -eu
exec ${lib.getBin jre}/bin/java -jar $dir/MSGViewer.jar "\$@"

View File

@ -4,7 +4,8 @@
let
binPath = lib.makeBinPath [ which file ];
in stdenv.mkDerivation {
name = "mumble-overlay-${mumble.version}";
pname = "mumble-overlay";
version = mumble.version;
inherit (mumble) src;

View File

@ -1,7 +1,8 @@
{ lib, stdenv, fetchurl, curl, libmrss, podofo, libiconv }:
stdenv.mkDerivation {
name = "offrss-1.3";
stdenv.mkDerivation rec {
pname = "offrss";
version = "1.3";
installPhase = ''
mkdir -p $out/bin
@ -22,7 +23,7 @@ stdenv.mkDerivation {
'';
src = fetchurl {
url = "http://vicerveza.homeunix.net/~viric/soft/offrss/offrss-1.3.tar.gz";
url = "http://vicerveza.homeunix.net/~viric/soft/offrss/offrss-${version}.tar.gz";
sha256 = "1akw1x84jj2m9z60cvlvmz21qwlaywmw18pl7lgp3bj5nw6250p6";
};

View File

@ -1,7 +1,8 @@
{ lib, stdenv, fetchgit, libowfat, zlib, nixosTests }:
stdenv.mkDerivation {
name = "opentracker-2018-05-26";
pname = "opentracker";
version = "unstable-2018-05-26";
src = fetchgit {
url = "https://erdgeist.org/gitweb/opentracker";

View File

@ -28,16 +28,15 @@ let
pname = "pcloud";
version = "1.9.3";
code = "XZh0QTXZIYkI66plpzLAJ4G2mwDvJFvKvEzy";
name = "${pname}-${version}";
# Archive link's code thanks to: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=pcloud-drive
src = fetchzip {
url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${name}.zip";
url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${pname}-${version}.zip";
hash = "sha256-NFbSYZRysRIg6q0aaDocpK7xJbiCWc1S0McXKlCRGjU=";
};
appimageContents = appimageTools.extractType2 {
inherit name;
name = "${pname}-${version}";
src = "${src}/pcloud";
};

View File

@ -24,8 +24,6 @@ mkDerivation rec {
makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" "build_client" "build_man" ];
enableParallelBuilding = true;
installTargets = [ "install_client" "install_man" ];
qtWrapperArgs = [ "--suffix PATH : ${nx-libs}/bin:${openssh}/libexec" ];

View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, libosip }:
stdenv.mkDerivation rec {
name = "siproxd-0.8.2";
pname = "siproxd";
version = "0.8.2";
src = fetchurl {
url = "mirror://sourceforge/siproxd/${name}.tar.gz";
url = "mirror://sourceforge/siproxd/siproxd-${version}.tar.gz";
sha256 = "1l6cyxxhra825jiiw9npa7jrbfgbyfpk4966cqkrw66cn28y8v2j";
};

View File

@ -2,9 +2,10 @@
popt, itstool, libxml2 }:
stdenv.mkDerivation rec {
name = "etherape-0.9.20";
pname = "etherape";
version = "0.9.20";
src = fetchurl {
url = "mirror://sourceforge/etherape/${name}.tar.gz";
url = "mirror://sourceforge/etherape/etherape-${version}.tar.gz";
sha256 = "sha256-9UsQtWOXB1yYofGS4rMIF+ISWBsJKd0DBOFfqOr1n5Y=";
};

View File

@ -1,4 +1,4 @@
{ lib, fetchurl }:
{ lib, fetchurl, fetchpatch }:
rec {
version = "3.2.3";
@ -12,6 +12,13 @@ rec {
url = "mirror://samba/rsync/rsync-patches-${version}.tar.gz";
sha256 = "1wj21v57v135n6fnmlm2dxmb9lhrrg62jgkggldp1gb7d6s4arny";
};
extraPatches = [
(fetchpatch {
name = "CVE-2020-14387.patch";
url = "https://git.samba.org/?p=rsync.git;a=patch;h=c3f7414;hp=4c4fce51072c9189cfb11b52aa54fed79f5741bd";
sha256 = "000lyx48lns84p53nsdlr45mb9558lrvnsz3yic0y3z6h2izv82x";
})
];
meta = with lib; {
description = "Fast incremental file transfer utility";

View File

@ -1,39 +1,47 @@
{ lib, stdenv, fetchurl, perl, libiconv, zlib, popt
, enableACLs ? lib.meta.availableOn stdenv.hostPlatform acl, acl ? null
, enableLZ4 ? true, lz4 ? null
, enableOpenSSL ? true, openssl ? null
, enableXXHash ? true, xxHash ? null
, enableZstd ? true, zstd ? null
{ lib
, stdenv
, fetchurl
, fetchpatch
, perl
, libiconv
, zlib
, popt
, enableACLs ? lib.meta.availableOn stdenv.hostPlatform acl
, acl
, enableLZ4 ? true
, lz4
, enableOpenSSL ? true
, openssl
, enableXXHash ? true
, xxHash
, enableZstd ? true
, zstd
, enableCopyDevicesPatch ? false
, nixosTests
}:
assert enableACLs -> acl != null;
assert enableLZ4 -> lz4 != null;
assert enableOpenSSL -> openssl != null;
assert enableXXHash -> xxHash != null;
assert enableZstd -> zstd != null;
let
base = import ./base.nix { inherit lib fetchurl; };
base = import ./base.nix { inherit lib fetchurl fetchpatch; };
in
stdenv.mkDerivation rec {
name = "rsync-${base.version}";
pname = "rsync";
version = base.version;
mainSrc = base.src;
patchesSrc = base.upstreamPatchTarball;
srcs = [mainSrc] ++ lib.optional enableCopyDevicesPatch patchesSrc;
patches = lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff";
srcs = [ mainSrc ] ++ lib.optional enableCopyDevicesPatch patchesSrc;
patches = lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff"
++ base.extraPatches;
buildInputs = [libiconv zlib popt]
++ lib.optional enableACLs acl
++ lib.optional enableZstd zstd
++ lib.optional enableLZ4 lz4
++ lib.optional enableOpenSSL openssl
++ lib.optional enableXXHash xxHash;
nativeBuildInputs = [perl];
buildInputs = [ libiconv zlib popt ]
++ lib.optional enableACLs acl
++ lib.optional enableZstd zstd
++ lib.optional enableLZ4 lz4
++ lib.optional enableOpenSSL openssl
++ lib.optional enableXXHash xxHash;
nativeBuildInputs = [ perl ];
configureFlags = [
"--with-nobody-group=nogroup"
@ -42,13 +50,13 @@ stdenv.mkDerivation rec {
# links them even.
"--with-included-zlib=no"
]
# Work around issue with cross-compilation:
# configure.sh: error: cannot run test program while cross compiling
# Remove once 3.2.4 or more recent is released.
# The following PR should fix the cross-compilation issue.
# Test using `nix-build -A pkgsCross.aarch64-multiplatform.rsync`.
# https://github.com/WayneD/rsync/commit/b7fab6f285ff0ff3816b109a8c3131b6ded0b484
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-simd=no"
# Work around issue with cross-compilation:
# configure.sh: error: cannot run test program while cross compiling
# Remove once 3.2.4 or more recent is released.
# The following PR should fix the cross-compilation issue.
# Test using `nix-build -A pkgsCross.aarch64-multiplatform.rsync`.
# https://github.com/WayneD/rsync/commit/b7fab6f285ff0ff3816b109a8c3131b6ded0b484
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-simd=no"
;
passthru.tests = { inherit (nixosTests) rsyncd; };

View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, perl, rsync }:
{ lib, stdenv, fetchurl, perl, rsync, fetchpatch }:
let
base = import ./base.nix { inherit lib fetchurl; };
base = import ./base.nix { inherit lib fetchurl fetchpatch; };
in
stdenv.mkDerivation {
name = "rrsync-${base.version}";
pname = "rrsync";
version = base.version;
src = base.src;
@ -15,6 +16,8 @@ stdenv.mkDerivation {
dontConfigure = true;
dontBuild = true;
patches = base.extraPatches;
postPatch = ''
substituteInPlace support/rrsync --replace /usr/bin/rsync ${rsync}/bin/rsync
'';

View File

@ -2,7 +2,7 @@
let
zncDerivation = a@{
name, src, module_name,
pname, src, module_name,
buildPhase ? "${znc}/bin/znc-buildmod ${module_name}.cpp",
installPhase ? "install -D ${module_name}.so $out/lib/znc/${module_name}.so", ...
} : stdenv.mkDerivation (a // {
@ -18,7 +18,7 @@ let
in {
backlog = zncDerivation rec {
name = "znc-backlog-${version}";
pname = "znc-backlog";
version = "git-2017-06-13";
module_name = "backlog";
@ -38,7 +38,7 @@ in {
};
clientbuffer = zncDerivation rec {
name = "znc-clientbuffer-${version}";
pname = "znc-clientbuffer";
version = "git-2020-04-24";
module_name = "clientbuffer";
@ -58,7 +58,7 @@ in {
};
clientaway = zncDerivation rec {
name = "znc-clientaway-${version}";
pname = "znc-clientaway";
version = "git-2017-04-28";
module_name = "clientaway";
@ -78,7 +78,7 @@ in {
};
fish = zncDerivation rec {
name = "znc-fish-${version}";
pname = "znc-fish";
version = "git-2017-06-26";
module_name = "fish";
@ -98,7 +98,7 @@ in {
};
ignore = zncDerivation rec {
name = "znc-ignore-${version}";
pname = "znc-ignore";
version = "git-2017-04-28";
module_name = "ignore";
@ -118,7 +118,7 @@ in {
};
palaver = zncDerivation rec {
name = "znc-palaver-${version}";
pname = "znc-palaver";
version = "2020-07-18";
module_name = "palaver";
@ -138,7 +138,7 @@ in {
};
playback = zncDerivation rec {
name = "znc-playback-${version}";
pname = "znc-playback";
version = "git-2015-08-04";
module_name = "playback";
@ -158,7 +158,7 @@ in {
};
privmsg = zncDerivation rec {
name = "znc-privmsg-${version}";
pname = "znc-privmsg";
version = "git-2015-02-22";
module_name = "privmsg";
@ -176,7 +176,7 @@ in {
};
push = zncDerivation rec {
name = "znc-push-${version}";
pname = "znc-push";
version = "git-2016-10-12";
module_name = "push";

View File

@ -68,8 +68,6 @@ gnuradio3_8.pkgs.mkDerivation rec {
gnuradio3_8.qt.wrapQtAppsHook
];
enableParallelBuilding = true;
meta = with lib; {
description = "SDR transceiver application for analog and digital modes";
homepage = "http://qradiolink.org/";

View File

@ -10,8 +10,6 @@ mkDerivation rec {
sha256 = "0f9hx6sy418cb23fadll298pqbc5l2lxsdivi4vgqbkvx7sw58zi";
};
enableParallelBuilding = true;
nativeBuildInputs = [
qmake
pkg-config

View File

@ -0,0 +1,117 @@
{ lib, stdenv, fetchFromGitHub, python3, gfortran, blas, lapack
, fftw, libint, libvori, libxc, mpi, gsl, scalapack, openssh, makeWrapper
, libxsmm, spglib, which
} :
let
cp2kVersion = "psmp";
arch = "Linux-x86-64-gfortran";
in stdenv.mkDerivation rec {
pname = "cp2k";
version = "8.2.0";
src = fetchFromGitHub {
owner = "cp2k";
repo = "cp2k";
rev = "v${version}";
sha256 = "0kykq5p318hxjzd4gzqjwv9gqshbdvbg0gnjbd9bdfjx1r6jkjn3";
fetchSubmodules = true;
};
nativeBuildInputs = [ python3 which openssh makeWrapper ];
buildInputs = [
gfortran
fftw
gsl
libint
libvori
libxc
libxsmm
spglib
scalapack
blas
lapack
];
propagatedBuildInputs = [ mpi ];
propagatedUserEnvPkgs = [ mpi ];
makeFlags = [
"ARCH=${arch}"
"VERSION=${cp2kVersion}"
];
doCheck = true;
enableParallelBuilding = true;
postPatch = ''
patchShebangs tools exts/dbcsr/tools/build_utils exts/dbcsr/.cp2k
substituteInPlace exts/dbcsr/.cp2k/Makefile --replace '/usr/bin/env python3' '${python3}/bin/python'
'';
configurePhase = ''
cat > arch/${arch}.${cp2kVersion} << EOF
CC = mpicc
CPP =
FC = mpif90
LD = mpif90
AR = ar -r
DFLAGS = -D__FFTW3 -D__LIBXC -D__LIBINT -D__parallel -D__SCALAPACK \
-D__MPI_VERSION=3 -D__F2008 -D__LIBXSMM -D__SPGLIB \
-D__MAX_CONTR=4 -D__LIBVORI
CFLAGS = -fopenmp
FCFLAGS = \$(DFLAGS) -O2 -ffree-form -ffree-line-length-none \
-ftree-vectorize -funroll-loops -msse2 \
-std=f2008 \
-fopenmp -ftree-vectorize -funroll-loops \
-I${libxc}/include -I${libxsmm}/include \
-I${libint}/include
LIBS = -lfftw3 -lfftw3_threads \
-lscalapack -lblas -llapack \
-lxcf03 -lxc -lxsmmf -lxsmm -lsymspg \
-lint2 -lstdc++ -lvori \
-lgomp -lpthread -lm \
-fopenmp
LDFLAGS = \$(FCFLAGS) \$(LIBS)
EOF
'';
checkPhase = ''
export OMP_NUM_THREADS=1
export HYDRA_IFACE=lo # Fix to make mpich run in a sandbox
export OMPI_MCA_rmaps_base_oversubscribe=1
export CP2K_DATA_DIR=data
mpirun -np 2 exe/${arch}/libcp2k_unittest.${cp2kVersion}
'';
installPhase = ''
mkdir -p $out/bin $out/share/cp2k
cp exe/${arch}/* $out/bin
for i in cp2k cp2k_shell graph; do
wrapProgram $out/bin/$i.${cp2kVersion} \
--set-default CP2K_DATA_DIR $out/share/cp2k
done
wrapProgram $out/bin/cp2k.popt \
--set-default CP2K_DATA_DIR $out/share/cp2k \
--set OMP_NUM_THREADS 1
cp -r data/* $out/share/cp2k
'';
passthru = { inherit mpi; };
meta = with lib; {
description = "Quantum chemistry and solid state physics program";
homepage = "https://www.cp2k.org";
license = licenses.gpl2Plus;
maintainers = [ maintainers.sheepforce ];
platforms = [ "x86_64-linux" ];
};
}

View File

@ -9,8 +9,6 @@ mkDerivation rec {
sha256 = "02x3r9iv3ndwxa65mxn9m5dlhcrnjiq7cffi6rmb456gs3v3dnav";
};
enableParallelBuilding = true;
nativeBuildInputs = [ qmake ];
meta = with lib; {

View File

@ -30,8 +30,6 @@ mkDerivation rec {
--replace /usr $out
'';
enableParallelBuilding = true;
meta = {
description = "Ground station software for autonomous vehicles";
longDescription = ''

View File

@ -17,7 +17,6 @@ mkDerivation rec {
gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad wayland
];
enableParallelBuilding = true;
buildInputs = [ SDL2 ] ++ gstInputs ++ qtInputs;
nativeBuildInputs = [ pkg-config qmake qttools ];

View File

@ -29,8 +29,6 @@ mkDerivation rec {
ln -s $out/bin/cool-retro-term.app/Contents/MacOS/cool-retro-term $out/bin/cool-retro-term
'';
enableParallelBuilding = true;
meta = {
description = "Terminal emulator which mimics the old cathode display";
longDescription = ''

View File

@ -34,7 +34,6 @@ mkDerivation rec {
sha256 = "UdeHbNkJ0U9FeTmpbcU4JxiyIHkrlC8ErhtY6zdCZEk=";
};
enableParallelBuilding = true;
nativeBuildInputs = [ pkg-config qmake ];
buildInputs = [
SDL2

View File

@ -37,7 +37,7 @@ fi
for flag in "${!hardeningEnableMap[@]}"; do
case $flag in
pie)
if [[ ! ("$*" =~ " -shared " || "$*" =~ " -static ") ]]; then
if [[ ! ("$*" =~ " -shared " || "$*" =~ " -static " || "$*" =~ " -r " || "$*" =~ " -Ur " || "$*" =~ " -i ") ]]; then
if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling LDFlags -pie >&2; fi
hardeningLDFlags+=('-pie')
fi

View File

@ -29,6 +29,7 @@ isExecutable() {
isExeResult="$(LANG=C $READELF -h -l "$1" 2> /dev/null \
| grep '^ *Type: *EXEC\>\|^ *INTERP\>')"
# not using grep -q, because it can cause Broken pipe
# https://unix.stackexchange.com/questions/305547/broken-pipe-when-grepping-output-but-only-with-i-flag
[ -n "$isExeResult" ]
}

View File

@ -1,13 +1,13 @@
{ lib, fetchzip }:
let
version = "2.1.52";
version = "2.1.53";
in fetchzip {
name = "mailcap-${version}";
url = "https://releases.pagure.org/mailcap/mailcap-${version}.tar.xz";
sha256 = "sha256-2GRNg3zoMPMaOk2zoAx5sVIzjbQhnYJuaO8nrzWujVc=";
sha256 = "sha256-6JPj2tZgoTEZ8hNEi9ZZhElBNm9SRTSXifMmCicwiLo=";
postFetch = ''
tar -xavf $downloadedFile --strip-components=1

View File

@ -26,6 +26,9 @@ let cpuName = stdenv.hostPlatform.parsed.cpu.name;
mv $sourceRoot $out
# jni.h expects jni_md.h to be in the header search path.
ln -s $out/Contents/Home/include/darwin/*_md.h $out/Contents/Home/include/
rm -rf $out/Home/demo
# Remove some broken manpages.

View File

@ -66,6 +66,9 @@ let result = stdenv.mkDerivation rec {
mv $sourceRoot $out
# jni.h expects jni_md.h to be in the header search path.
ln -s $out/include/linux/*_md.h $out/include/
rm -rf $out/demo
# Remove some broken manpages.

View File

@ -185,7 +185,10 @@ let
--replace file:/dev/random file:/dev/./urandom \
--replace NativePRNGBlocking SHA1PRNG
'';
}.${javaVersionPlatform};
}.${javaVersionPlatform} + ''
# jni.h expects jni_md.h to be in the header search path.
ln -s $out/include/linux/*_md.h $out/include/
'';
dontStrip = true;

View File

@ -50,7 +50,6 @@ in stdenv.mkDerivation rec {
] ++ lib.optional enableCUDA "-DTERRA_ENABLE_CUDA=ON";
doCheck = true;
enableParallelBuilding = true;
hardeningDisable = [ "fortify" ];
outputs = [ "bin" "dev" "out" "static" ];

View File

@ -70,6 +70,9 @@ in stdenv.mkDerivation {
mkdir -p $out
cp -r ./* "$out/"
# jni.h expects jni_md.h to be in the header search path.
ln -s $out/include/linux/*_md.h $out/include/
mkdir -p $out/nix-support
printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs

View File

@ -72,6 +72,9 @@ in stdenv.mkDerivation {
mkdir -p $out
cp -r ./* "$out/"
# jni.h expects jni_md.h to be in the header search path.
ln -s $out/include/linux/*_md.h $out/include/
mkdir -p $out/nix-support
printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs

View File

@ -122,19 +122,19 @@ with pkgs;
sourceVersion = {
major = "3";
minor = "8";
patch = "10";
patch = "11";
suffix = "";
};
sha256 = "1n8rjb3jn0j8dvi1qn94rxayc9rh982d8wgkrjy41n1x15k4mwka";
sha256 = "1chg8b0m1yrz50lizid20zha0dmj40z0iih3jqcrg7pyxca126pv";
};
python39 = {
sourceVersion = {
major = "3";
minor = "9";
patch = "5";
patch = "6";
suffix = "";
};
sha256 = "10vdf46q5ldnzkprm8pldvr5a9hrdpxjv7mpzgdw6vj3cl318nhc";
sha256 = "12hhw2685i68pwfx5hdkqngzhbji4ccyjmqb5rzvkigg6fpj0y9r";
};
};
@ -158,10 +158,10 @@ in {
sourceVersion = {
major = "3";
minor = "6";
patch = "13";
patch = "14";
suffix = "";
};
sha256 = "pHpDpTq7QihqLBGWU0P/VnEbnmTo0RvyxnAaT7jOGg8=";
sha256 = "1bnm0bx7xf1jpfm0bmzlq19vwm0bvcbl7klx4rvgq05xryhafqr6";
inherit (darwin) configd;
inherit passthruFun;
};
@ -171,10 +171,10 @@ in {
sourceVersion = {
major = "3";
minor = "7";
patch = "10";
patch = "11";
suffix = "";
};
sha256 = "+NgudXLIbsnVXIYnquUEAST9IgOvQAw4PIIbmAMG7ms=";
sha256 = "0d57b5a47wapzpkkq5rbvvi4caylc35j5910b64rxxn4nmm1kd6x";
inherit (darwin) configd;
inherit passthruFun;
};

View File

@ -7,22 +7,17 @@
stdenv.mkDerivation rec {
pname = "attr";
version = "2.4.48";
version = "2.5.1";
src = fetchurl {
url = "mirror://savannah/attr/${pname}-${version}.tar.gz";
sha256 = "1rr4adzwax4bzr2c00f06zcsljv5y6p9wymz1g89ww7cb2rp5bay";
sha256 = "1y6sibbkrcjygv8naadnsg6xmsqwfh6cwrqk01l0v2i5kfacdqds";
};
outputs = [ "bin" "dev" "out" "man" "doc" ];
nativeBuildInputs = [ gettext ];
patches = [
# fix fakechroot: https://github.com/dex4er/fakechroot/issues/57
./syscall.patch
];
postPatch = ''
for script in install-sh include/install-sh; do
patchShebangs $script

View File

@ -1,120 +0,0 @@
From 14adc898a36948267bfe5c63b399996879e94c98 Mon Sep 17 00:00:00 2001
From: Andreas Gruenbacher <agruenba@redhat.com>
Date: Fri, 17 Aug 2018 14:07:31 +0200
Subject: Switch back to syscall()
Switch back to syscall() for the *xattr system calls. The current
mechanism of forwarding those calls to glibc breaks libraries like
libfakeroot (fakeroot) and libasan (the gcc address sanitizer; gcc
-fsanitize=address).
Those libraries provide wrappers for functions defined in other shared
libraries, usually glibc, do their own processing, and forward calls to
the original symbols looke dup via dlsym(RTLD_NEXT, "symbol_name"). In
our case, dlsym returns the libattr_*xattr wrappers. However, when our
wrappers try calling glibc, they end up calling the libfakeroot /
libasan wrappers instead because those override the original symbols =>
recursion.
The libattr_*xattr wrappers will only be used when symbols are looked up
at runtime (dlopen / dlsym). Programs linking against libattr will
directly use the glibc provided symbols. Therefore, the slightly worse
performance of syscall() won't affect any of the "normal" users of
libattr.
---
libattr/syscalls.c | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/libattr/syscalls.c b/libattr/syscalls.c
index 3013aa0..721ad7f 100644
--- a/libattr/syscalls.c
+++ b/libattr/syscalls.c
@@ -22,6 +22,8 @@
#include "config.h"
+#include <unistd.h>
+#include <sys/syscall.h>
#include <sys/xattr.h>
#ifdef HAVE_VISIBILITY_ATTRIBUTE
@@ -31,67 +33,67 @@
int libattr_setxattr(const char *path, const char *name,
void *value, size_t size, int flags)
{
- return setxattr(path, name, value, size, flags);
+ return syscall(__NR_setxattr, path, name, value, size, flags);
}
int libattr_lsetxattr(const char *path, const char *name,
void *value, size_t size, int flags)
{
- return lsetxattr(path, name, value, size, flags);
+ return syscall(__NR_lsetxattr, path, name, value, size, flags);
}
int libattr_fsetxattr(int filedes, const char *name,
void *value, size_t size, int flags)
{
- return fsetxattr(filedes, name, value, size, flags);
+ return syscall(__NR_fsetxattr, filedes, name, value, size, flags);
}
ssize_t libattr_getxattr(const char *path, const char *name,
void *value, size_t size)
{
- return getxattr(path, name, value, size);
+ return syscall(__NR_getxattr, path, name, value, size);
}
ssize_t libattr_lgetxattr(const char *path, const char *name,
void *value, size_t size)
{
- return lgetxattr(path, name, value, size);
+ return syscall(__NR_lgetxattr, path, name, value, size);
}
ssize_t libattr_fgetxattr(int filedes, const char *name,
void *value, size_t size)
{
- return fgetxattr(filedes, name, value, size);
+ return syscall(__NR_fgetxattr, filedes, name, value, size);
}
ssize_t libattr_listxattr(const char *path, char *list, size_t size)
{
- return listxattr(path, list, size);
+ return syscall(__NR_listxattr, path, list, size);
}
ssize_t libattr_llistxattr(const char *path, char *list, size_t size)
{
- return llistxattr(path, list, size);
+ return syscall(__NR_llistxattr, path, list, size);
}
ssize_t libattr_flistxattr(int filedes, char *list, size_t size)
{
- return flistxattr(filedes, list, size);
+ return syscall(__NR_flistxattr, filedes, list, size);
}
int libattr_removexattr(const char *path, const char *name)
{
- return removexattr(path, name);
+ return syscall(__NR_removexattr, path, name);
}
int libattr_lremovexattr(const char *path, const char *name)
{
- return lremovexattr(path, name);
+ return syscall(__NR_lremovexattr, path, name);
}
int libattr_fremovexattr(int filedes, const char *name)
{
- return fremovexattr(filedes, name);
+ return syscall(__NR_fremovexattr, filedes, name);
}
#ifdef HAVE_VISIBILITY_ATTRIBUTE

View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "eigen";
version = "3.3.7";
version = "3.3.9";
src = fetchFromGitLab {
owner = "libeigen";
repo = pname;
rev = version;
hash = "sha256-oXJ4V5rakL9EPtQF0Geptl0HMR8700FdSrOB09DbbMQ=";
sha256 = "sha256-JMIG7CLMndUsECfbKpXE3BtVFuAjn+CZvf8GXZpLkFQ=";
};
patches = [

View File

@ -8,7 +8,16 @@
# guard against in-source builds
@@ -408,13 +408,6 @@ install(FILES
@@ -407,7 +407,7 @@ set(PKGCONFIG_INSTALL_DIR
CACHE STRING "The directory relative to CMAKE_PREFIX_PATH where eigen3.pc is installed"
)
-foreach(var INCLUDE_INSTALL_DIR CMAKEPACKAGE_INSTALL_DIR PKGCONFIG_INSTALL_DIR)
+foreach(var CMAKEPACKAGE_INSTALL_DIR PKGCONFIG_INSTALL_DIR)
if(IS_ABSOLUTE "${${var}}")
message(FATAL_ERROR "${var} must be relative to CMAKE_PREFIX_PATH. Got: ${${var}}")
endif()
@@ -429,13 +429,6 @@ install(FILES
DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel
)
@ -22,7 +31,7 @@
add_subdirectory(Eigen)
add_subdirectory(doc EXCLUDE_FROM_ALL)
@@ -510,8 +503,15 @@ set ( EIGEN_VERSION_MAJOR ${EIGEN_WORLD_VERSION} )
@@ -531,8 +524,15 @@ set ( EIGEN_VERSION_MAJOR ${EIGEN_WORLD_VERSION} )
set ( EIGEN_VERSION_MINOR ${EIGEN_MAJOR_VERSION} )
set ( EIGEN_VERSION_PATCH ${EIGEN_MINOR_VERSION} )
set ( EIGEN_DEFINITIONS "")

View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, lib, llvmPackages ? null, precision ? "double", perl }:
{ fetchurl, stdenv, lib, gfortran, llvmPackages ? null, precision ? "double", perl }:
with lib;
@ -25,6 +25,8 @@ stdenv.mkDerivation {
++ optional withDoc "info"; # it's dev-doc only
outputBin = "dev"; # fftw-wisdom
nativeBuildInputs = [ gfortran ];
buildInputs = lib.optionals stdenv.cc.isClang [
# TODO: This may mismatch the LLVM version sin the stdenv, see #79818.
llvmPackages.openmp

View File

@ -14,7 +14,7 @@ let
in stdenv.mkDerivation rec {
pname = "freetype";
version = "2.10.4";
version = "2.11.0";
meta = with lib; {
description = "A font rendering engine";
@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://savannah/${pname}/${pname}-${version}.tar.xz";
sha256 = "112pyy215chg7f7fmp2l9374chhhpihbh8wgpj5nj6avj3c59a46";
sha256 = "sha256-i+45vTloxIBLcGFKCjrVlyma0OgkvIqtXOiq9IBnvec=";
};
propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype

View File

@ -5,14 +5,14 @@
stdenv.mkDerivation rec {
pname = "libgit2";
version = "1.1.0";
version = "1.1.1";
# keep the version in sync with python3.pkgs.pygit2 and libgit2-glib
src = fetchFromGitHub {
owner = "libgit2";
repo = "libgit2";
rev = "v${version}";
sha256 = "1vj7q7b8j3smiyi1acbc5x86lqk00igdm2adjnqs9n011i13rykl";
sha256 = "sha256-SxceIxT0aeiiiZCeSIe6EOa+MyVpQVaiv/ZZn6fkwIc=";
};
cmakeFlags = [

View File

@ -20,14 +20,12 @@ stdenv.mkDerivation rec {
sha256 = "1l4yw9fqc1blvx1sq1jnfvp1jijla3ca2jw90p4x9m8hvfpc933c";
};
patches =
# TODO: apply unconditionally on a rebuild; probably included in > 1.16.0
lib.optional (stdenv.is32bit && stdenv.isLinux) (fetchpatch {
patches = [
(fetchpatch { # probably included in > 1.16.0
name = "test_t-edit-sign.diff"; # we experienced segmentation fault in this test
url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=81a33ea5e1b86d586b956e893a5b25c4cd41c969";
sha256 = "1xxvv0kc9wdj5hzpddzs3cn8dhmm2cb29224a7h9vairraq5272h";
})
++ [
(fetchpatch { # gpg: Send --with-keygrip when listing keys
name = "c4cf527ea227edb468a84bf9b8ce996807bd6992.patch";
url = "http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=c4cf527ea227edb468a84bf9b8ce996807bd6992";

View File

@ -19,17 +19,19 @@ stdenv.mkDerivation rec {
sha256 = "11an29br55dp0b26kfqlrfxj19glfrmhcdpds2n1w9n04gq3pf7i";
};
strictDeps = true;
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [
glib
meson
ninja
pkg-config
python3
gobject-introspection
];
buildInputs = [
glib
gobject-introspection
mesonFlags = [
"-Dintrospection=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}"
];
postPatch = ''

View File

@ -25,7 +25,6 @@
, fribidi
, xorg
, epoxy
, json-glib
, libxkbcommon
, libxml2
, gmp
@ -60,7 +59,7 @@ in
stdenv.mkDerivation rec {
pname = "gtk+3";
version = "3.24.27";
version = "3.24.30";
outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc";
outputBin = "dev";
@ -72,7 +71,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
sha256 = "09ksflq5j257bf5zn8q2nnf2flicg9qqgfy7za79z7rkf1shc77p";
sha256 = "sha256-unW//zIK0fTPvukrqBPsM2MizDxmDUBqrQFLBwh6O6k=";
};
patches = [
@ -111,7 +110,6 @@ stdenv.mkDerivation rec {
buildInputs = [
libxkbcommon
epoxy
json-glib
isocodes
] ++ lib.optionals stdenv.isDarwin [
AppKit

View File

@ -24,7 +24,7 @@
}:
let
version = "2.8.1";
version = "2.8.2";
inherit (lib) optional optionals optionalString;
mesonFeatureFlag = opt: b:
"-D${opt}=${if b then "enabled" else "disabled"}";
@ -38,7 +38,7 @@ stdenv.mkDerivation {
owner = "harfbuzz";
repo = "harfbuzz";
rev = version;
sha256 = "107l9jhvwy6pnq5032kr7r21md65qg09j7iikr4jihf9pvh7gn5w";
sha256 = "sha256-uqcwfe5Oa3S0tyZDzqhIQfRFEv/HaiVWzVvwjqpLo5g=";
};
postPatch = ''

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libaom";
version = "3.1.1";
version = "3.1.2";
src = fetchzip {
url = "https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz";
sha256 = "11fy2xw35ladkjcz71samhcpqlqr3y0n1n17nk90i13aydrll66f";
sha256 = "1c7yrhb56qj5c3lz54n1f9cbrvdr32g2yrrdiiy72sib8ycq9hz2";
stripRoot = false;
};

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