Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-03-25 00:17:22 +00:00 committed by GitHub
commit eb499aa20e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
53 changed files with 363 additions and 154 deletions

View file

@ -0,0 +1,19 @@
# FUSE {#sec-fuse}
Some packages rely on
[FUSE](https://www.kernel.org/doc/html/latest/filesystems/fuse.html) to provide
support for additional filesystems not supported by the kernel.
In general, FUSE software are primarily developed for Linux but many of them can
also run on macOS. Nixpkgs supports FUSE packages on macOS, but it requires
[macFUSE](https://osxfuse.github.io) to be installed outside of Nix. macFUSE
currently isn't packaged in Nixpkgs mainly because it includes a kernel
extension, which isn't supported by Nix outside of NixOS.
If a package fails to run on macOS with an error message similar to the
following, it's a likely sign that you need to have macFUSE installed.
dyld: Library not loaded: /usr/local/lib/libfuse.2.dylib
Referenced from: /nix/store/w8bi72bssv0bnxhwfw3xr1mvn7myf37x-sshfs-fuse-2.10/bin/sshfs
Reason: image not found
[1] 92299 abort /nix/store/w8bi72bssv0bnxhwfw3xr1mvn7myf37x-sshfs-fuse-2.10/bin/sshfs

View file

@ -12,6 +12,7 @@
<xi:include href="emacs.section.xml" />
<xi:include href="firefox.section.xml" />
<xi:include href="fish.section.xml" />
<xi:include href="fuse.section.xml" />
<xi:include href="ibus.section.xml" />
<xi:include href="kakoune.section.xml" />
<xi:include href="linux.section.xml" />

View file

@ -40,7 +40,7 @@ in
configFile = mkOption {
type = types.nullOr types.path;
default = null;
example = literalExample "$${pkgs.my-configs}/lesskey";
example = literalExample "\${pkgs.my-configs}/lesskey";
description = ''
Path to lesskey configuration file.

View file

@ -1,4 +1,4 @@
{ mkDerivation, lib, fetchFromGitHub
{ mkDerivation, lib, fetchFromGitHub, fetchpatch
, cmake, extra-cmake-modules, pkg-config, libxcb, libpthreadstubs
, libXdmcp, libXau, qtbase, qtdeclarative, qtquickcontrols2, qttools, pam, systemd
}:
@ -19,6 +19,12 @@ in mkDerivation {
patches = [
./sddm-ignore-config-mtime.patch
# Load `/etc/profile` for `environment.variables` with zsh default shell.
# See: https://github.com/sddm/sddm/pull/1382
(fetchpatch {
url = "https://github.com/sddm/sddm/commit/e1dedeeab6de565e043f26ac16033e613c222ef9.patch";
sha256 = "sha256-OPyrUI3bbH+PGDBfoL4Ohb4wIvmy9TeYZhE0JxR/D58=";
})
];
postPatch =

View file

@ -75,7 +75,6 @@ in stdenv.mkDerivation rec {
patches = [ ./cflags-prune.diff ] ++ lib.optional ftNixSupport ./ft-nix-support.patch;
configureFlags = [
"--enable-gui=${guiSupport}"
"--with-features=${features}"
"--disable-xsmp" # XSMP session management
"--disable-xsmp_interact" # XSMP interaction
@ -95,6 +94,7 @@ in stdenv.mkDerivation rec {
"--disable-carbon_check"
"--disable-gtktest"
]
++ lib.optional (guiSupport == "gtk2" || guiSupport == "gtk3") "--enable-gui=${guiSupport}"
++ lib.optional stdenv.isDarwin
(if darwinSupport then "--enable-darwin" else "--disable-darwin")
++ lib.optionals luaSupport [
@ -127,8 +127,22 @@ in stdenv.mkDerivation rec {
++ lib.optional (guiSupport == "gtk3") wrapGAppsHook
;
buildInputs = [ ncurses libX11 libXext libSM libXpm libXt libXaw libXau
libXmu glib libICE ]
buildInputs = [
ncurses
glib
]
# All X related dependencies
++ lib.optionals (guiSupport == "gtk2" || guiSupport == "gtk3") [
libSM
libICE
libX11
libXext
libXpm
libXt
libXaw
libXau
libXmu
]
++ lib.optional (guiSupport == "gtk2") gtk2-x11
++ lib.optional (guiSupport == "gtk3") gtk3-x11
++ lib.optionals darwinSupport [ CoreServices CoreData Cocoa Foundation libobjc ]

View file

@ -1,16 +1,16 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "terraform-docs";
version = "0.11.2";
version = "0.12.0";
src = fetchFromGitHub {
owner = "terraform-docs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-x2YTd4ZnimTRkFWbwFp4qz6BymD6ESVxBy6YE+QqQ6k=";
sha256 = "sha256-6jUYntnMB/LxyZuRkSaOVcrzJOIoucdaY+5GVHwJL8Y=";
};
vendorSha256 = "sha256-drfhfY03Ao0fqleBdzbAnPsE4kVrJMcUbec0txaEIP0=";
vendorSha256 = "sha256-HO2E8i5A/2Xi7Pq+Mqb/2ogK1to8IvZjRuDXfzGvOXk=";
subPackages = [ "." ];

View file

@ -1086,10 +1086,11 @@
"version": "2.3.0"
},
"yandex": {
"owner": "terraform-providers",
"owner": "yandex-cloud",
"repo": "terraform-provider-yandex",
"rev": "v0.40.0",
"sha256": "0dymhdrdm00m9xn4xka3zbvjqnckhl06vz5zm6rqivkmw8m2q0mz",
"version": "0.40.0"
"rev": "v0.54.0",
"sha256": "0q9m7520zl7q1liri6x849xjp221wbc9l2w6dj19mmgfwspqv02l",
"vendorSha256": "0rzldsb8gyhvnsd26wg9byqngzzj64pi86v2hb4i63rlfmnn77xi",
"version": "0.54.0"
}
}

View file

@ -157,8 +157,8 @@ in rec {
});
terraform_0_14 = pluggable (generic {
version = "0.14.8";
sha256 = "0kpw8w28pfyr136z5d4pxw7g9ch6rk2lfwh3lwz25mngq1lljmn0";
version = "0.14.9";
sha256 = "0r9d28mbj7h9prr39gm5kd49l7sm8l1ab9rwrkpyhwgr119zf35b";
vendorSha256 = "1d93aqkjdrvabkvix6h1qaxpjzv7w1wa7xa44czdnjs2lapx4smm";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "terragrunt";
version = "0.28.15";
version = "0.28.16";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
sha256 = "sha256-PhTFgYoSaGv54uak8QB7p963OBSgo9s1UM9/XBmYC8g=";
sha256 = "sha256-xt04gYxInW9UNxPG4kmMagfAQyQ+T0/u7m39grFCdAc=";
};
vendorSha256 = "sha256-vHKqowc3euQQyvgfaTbIgSXOhPcf2nSoteQK0a574Kc=";

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "SPAdes";
version = "3.15.1";
version = "3.15.2";
src = fetchurl {
url = "http://cab.spbu.ru/files/release${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-2wZzdFRZ7zyhWwYL+c/5qhKDgj+LPtnge3UNHWJ9Ykk=";
sha256 = "03cxz4m1n4rc81lqb4p1pz2ammms7f31wvi4daywfkc13aal6fz9";
};
nativeBuildInputs = [ cmake ];
@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "St. Petersburg genome assembler: assembly toolkit containing various assembly pipelines";
license = licenses.gpl2;
license = licenses.gpl2Only;
homepage = "http://cab.spbu.ru/software/spades/";
platforms = platforms.unix;
platforms = with platforms; [ "x86_64-linux" "x86_64-darwin"];
maintainers = [ maintainers.bzizou ];
};
}

View file

@ -101,6 +101,9 @@ stdenv.mkDerivation rec {
excludes = ["tst/testinstall/stringobj.tst"];
sha256 = "1mz5b4mbw2jdd1ypp5s0dy6pp0jsvwsxr2dm4kbkls20r1r192sc";
})
# fixes aarch64 gc crashes: https://github.com/gap-system/gap/pull/3965
./mark-genstackfuncbags-as-noinline.patch
];
postPatch = ''

View file

@ -0,0 +1,13 @@
diff --git a/src/gasman.c b/src/gasman.c
index 417811401..314a74190 100644
--- a/src/gasman.c
+++ b/src/gasman.c
@@ -1861,7 +1861,7 @@ void SparcStackFuncBags( void )
#endif
-void GenStackFuncBags ( void )
+NOINLINE void GenStackFuncBags ( void )
{
Bag * top; /* top of stack */
Bag * p; /* loop variable */

View file

@ -87,6 +87,14 @@ stdenv.mkDerivation rec {
rev = "2959ac792ebd6107fe87c9af1541083de5ba02d6";
sha256 = "sha256-bWIpEGir9Kawak5CJegBMNcHm/CqhWmdru+emeSsvO0=";
})
# fix intermittent errors in doctest/test.py: https://trac.sagemath.org/ticket/26912
(fetchSageDiff {
base = "9.3.beta8";
name = "set-cysignals-crash-ndebug.patch";
rev = "ca5257a5d0f32efc9f8f07e126020856270b1a18";
sha256 = "sha256-KViw63xE3O0eUiOYzoxNrr4NL+csql9GPJLDJCf/EZs=";
})
];
# Patches needed because of package updates. We could just pin the versions of
@ -153,6 +161,14 @@ stdenv.mkDerivation rec {
rev = "75c1516f0abb9e6f8c335e38e4031f6ef674ed30";
sha256 = "sha256-RukkieIZcXNrju904H2oyGKdtpdE+9vNzvyjN2IBNg0=";
})
# cypari 2.1.2 update (https://trac.sagemath.org/ticket/31029)
(fetchSageDiff {
base = "9.3.beta3";
name = "cypari-2.1.2-update.patch";
rev = "b9aadfd08e81d74ca7c229bb80eb853b592887d0";
sha256 = "sha256-eKaMy7kpu+YKdL8bPStgocxBCTfc2Z/10RrGy2LENFw=";
})
];
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;

View file

@ -7,16 +7,17 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-sound-output-device-chooser";
version = "32";
version = "35";
src = fetchFromGitHub {
owner = "kgshank";
repo = "gse-sound-output-device-chooser";
rev = version;
sha256 = "1s83scr80qv5xmlfsy6dnsj96lwg2rr4pbsw9inld3ylblgvi35l";
sha256 = "sha256-Yl5ut6kJAkAAdCBiNFpwDgshXCLMmFH3/zhnFGpyKqs=";
};
patches = [
# Fix paths to libpulse and python
(substituteAll {
src = ./fix-paths.patch;
libpulse = "${libpulseaudio}/lib/libpulse.so";
@ -36,7 +37,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "GNOME Shell extension adding audio device chooser to panel";
license = licenses.gpl3;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ jtojnar ];
homepage = "https://github.com/kgshank/gse-sound-output-device-chooser";
};

View file

@ -2,20 +2,20 @@ diff --git a/sound-output-device-chooser@kgshank.net/convenience.js b/sound-outp
index 54ad06f..0860531 100644
--- a/sound-output-device-chooser@kgshank.net/convenience.js
+++ b/sound-output-device-chooser@kgshank.net/convenience.js
@@ -129,7 +129,7 @@ function refreshCards() {
if(_settings.get_boolean(Prefs.NEW_PROFILE_ID)) {
@@ -142,7 +142,7 @@ function refreshCards() {
if (newProfLogic) {
_log("New logic");
let pyLocation = Me.dir.get_child('utils/pa_helper.py').get_path();
- let pythonExec = 'python';
let pyLocation = Me.dir.get_child("utils/pa_helper.py").get_path();
- let pythonExec = ["python", "python3", "python2"].find(cmd => isCmdFound(cmd));
+ let pythonExec = '@python@';
let pyVer = 3;
while(!isCmdFound(pythonExec) && pyVer >=2){
_log(pythonExec + " is not found. Try next");
if (!pythonExec) {
_log("ERROR: Python not found. fallback to default mode");
_settings.set_boolean(Prefs.NEW_PROFILE_ID, false);
diff --git a/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py b/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py
index c4d2484..262608d 100644
--- a/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py
+++ b/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py
@@ -86,7 +86,7 @@ else:
@@ -82,7 +82,7 @@ else:
_libraries = {}

View file

@ -1,17 +1,17 @@
From 449896c45b23f50c168d8d2789832024c906ec36 Mon Sep 17 00:00:00 2001
From af569c9ed8079169b524b31461e2789baa09ef7a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 27 Jan 2020 05:31:13 -0600
Subject: [PATCH 1/2] follow symlinks
Subject: [PATCH 1/3] follow symlinks
---
plugins/kdecorations/aurorae/src/aurorae.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugins/kdecorations/aurorae/src/aurorae.cpp b/plugins/kdecorations/aurorae/src/aurorae.cpp
index fd723a8..fb95633 100644
index 5242cb7..2e4ddae 100644
--- a/plugins/kdecorations/aurorae/src/aurorae.cpp
+++ b/plugins/kdecorations/aurorae/src/aurorae.cpp
@@ -211,7 +211,7 @@ void Helper::init()
@@ -201,7 +201,7 @@ void Helper::init()
// so let's try to locate our plugin:
QString pluginPath;
for (const QString &path : m_engine->importPathList()) {
@ -21,5 +21,5 @@ index fd723a8..fb95633 100644
it.next();
QFileInfo fileInfo = it.fileInfo();
--
2.23.1
2.29.2

View file

@ -1,17 +1,17 @@
From d584b075d71c4486710c0bbed6d44038f2ff5075 Mon Sep 17 00:00:00 2001
From 5c90dd84f541bd4789525f12f12ad24411b99018 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 27 Jan 2020 05:31:23 -0600
Subject: [PATCH 2/2] xwayland
Subject: [PATCH 2/3] xwayland
---
xwl/xwayland.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xwl/xwayland.cpp b/xwl/xwayland.cpp
index 5f17d39..b4b69ba 100644
index 57efdde..a211a58 100644
--- a/xwl/xwayland.cpp
+++ b/xwl/xwayland.cpp
@@ -145,7 +145,7 @@ void Xwayland::init()
@@ -124,7 +124,7 @@ void Xwayland::start()
m_xwaylandProcess = new Process(this);
m_xwaylandProcess->setProcessChannelMode(QProcess::ForwardedErrorChannel);
@ -21,5 +21,5 @@ index 5f17d39..b4b69ba 100644
env.insert("WAYLAND_SOCKET", QByteArray::number(wlfd));
env.insert("EGL_PLATFORM", QByteArrayLiteral("DRM"));
--
2.23.1
2.29.2

View file

@ -0,0 +1,26 @@
From 8d49f5ef8692c352a62f4f8b1bc68e6e210bbee6 Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Wed, 23 Dec 2020 18:02:14 +0300
Subject: [PATCH 3/3] plugins/qpa: allow using nixos wrapper
Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
---
plugins/qpa/main.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugins/qpa/main.cpp b/plugins/qpa/main.cpp
index efd236b..a69c046 100644
--- a/plugins/qpa/main.cpp
+++ b/plugins/qpa/main.cpp
@@ -23,7 +23,7 @@ public:
QPlatformIntegration *KWinIntegrationPlugin::create(const QString &system, const QStringList &paramList)
{
Q_UNUSED(paramList)
- if (!QCoreApplication::applicationFilePath().endsWith(QLatin1String("kwin_wayland")) && !qEnvironmentVariableIsSet("KWIN_FORCE_OWN_QPA")) {
+ if (!QCoreApplication::applicationFilePath().endsWith(QLatin1String("kwin_wayland")) && !QCoreApplication::applicationFilePath().endsWith(QLatin1String(".kwin_wayland-wrapped")) && !qEnvironmentVariableIsSet("KWIN_FORCE_OWN_QPA")) {
// Not KWin
return nullptr;
}
--
2.29.2

View file

@ -37,6 +37,7 @@ mkDerivation {
patches = [
./0001-follow-symlinks.patch
./0002-xwayland.patch
./0003-plugins-qpa-allow-using-nixos-wrapper.patch
];
CXXFLAGS = [
''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"''

View file

@ -6,13 +6,13 @@
mkDerivation rec {
pname = "kdiagram";
version = "2.7.0";
version = "2.8.0";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "graphics";
repo = pname;
rev = "v${version}";
sha256 = "NSBNHPr8JzBn3y3ivhL0RjiXjDuPwZsTTOeI22pq3vc=";
sha256 = "sha256-Se131GZE12wqdfN/V4id1pphUvteSrmMaKZ0+lqg1z8=";
};
nativeBuildInputs = [ extra-cmake-modules qttools ];
propagatedBuildInputs = [ qtbase qtsvg ];

View file

@ -4,7 +4,7 @@
}:
let
version = "1.9.1";
version = "1.10.0";
in
mkDerivation {
@ -24,7 +24,7 @@ mkDerivation {
};
src = fetchurl {
url = "https://github.com/KDAB/KDSoap/releases/download/kdsoap-${version}/kdsoap-${version}.tar.gz";
sha256 = "09rxx7h98niawz7i94g279c2rgh7xmq1hqxwlyzwsaqsx4kfl850";
sha256 = "sha256-DGBuzENEZtutsoKYIMoWOvYMx8oib1U7XUAyGWc3M48=";
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [ cmake ];

View file

@ -5,7 +5,7 @@ buildEnv {
paths = [ qtbase ] ++ paths;
pathsToLink = [ "/bin" "/mkspecs" "/include" "/lib" "/share" ];
extraOutputsToInstall = [ "dev" ];
extraOutputsToInstall = [ "out" "dev" ];
postBuild = ''
rm "$out/bin/qmake"

View file

@ -0,0 +1,44 @@
{ lib
, asysocks
, buildPythonPackage
, fetchPypi
, minikerberos
, prompt_toolkit
, pythonOlder
, six
, tqdm
, winacl
, winsspi
}:
buildPythonPackage rec {
pname = "aiosmb";
version = "0.2.37";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "0daf1fk7406vpywc0yxv0wzf4nw986js9lc2agfyfxz0q7s29lf0";
};
propagatedBuildInputs = [
minikerberos
winsspi
six
asysocks
tqdm
prompt_toolkit
winacl
];
# Project doesn't have tests
doCheck = false;
pythonImportsCheck = [ "aiosmb" ];
meta = with lib; {
description = "Python SMB library";
homepage = "https://github.com/skelsec/aiosmb";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -2,33 +2,31 @@
, buildPythonPackage
, fetchFromGitHub
, numpy
, pandas
, pytestrunner
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "awkward0";
version = "0.15.2";
version = "0.15.5";
src = fetchFromGitHub {
owner = "scikit-hep";
repo = "awkward-0.x";
rev = version;
sha256 = "sha256-C6/byIGcabGjws5QI9sh5BO2M4Lhqkooh4mSjUEKCKU=";
sha256 = "039pxzgll2yz8xpr6bw788ymvgvqgna5kgl9m6d9mzi4yhbjsjpx";
};
nativeBuildInputs = [ pytestrunner ];
propagatedBuildInputs = [ numpy ];
checkInputs = [ pandas pytestCheckHook ];
checkInputs = [ pytestCheckHook ];
checkPhase = ''
# Almost all tests in this file fail
rm tests/test_persist.py
py.test
'';
# Can't find a fixture
disabledTests = [ "test_import_pandas" ];
pythonImportsCheck = [ "awkward0" ];
meta = with lib; {
description = "Manipulate jagged, chunky, and/or bitmasked arrays as easily as Numpy";

View file

@ -18,6 +18,26 @@ buildPythonPackage rec {
sha256 = "16f410izp2c4qhn4n3l5l3qirmkf43h2amjqms8hkl0shgfqwq2n";
};
patches = [
# 1/3 Fix compatibility with pytest 6. Will be part of the next release after 18.6
(fetchpatch {
url = "https://github.com/cherrypy/cherrypy/pull/1897/commits/59c0e19d7df8680e36afc96756dce72435121448.patch";
sha256 = "1jachbvp505gndccdhny0c3grzdrmvmbzq4kw55jx93ay94ni6p0";
})
# 2/3 Fix compatibility with pytest 6. Will be part of the next release after 18.6
(fetchpatch {
url = "https://github.com/cherrypy/cherrypy/pull/1897/commits/4a6287b73539adcb7b0ae72d69644a1ced1f7eaa.patch";
sha256 = "0nz40qmgxknkbjsdzfzcqfxdsmsxx3v104fb0h04yvs76mqvw3i4";
})
# 3/3 Fix compatibility with pytest 6. Will be part of the next release after 18.6
(fetchpatch {
url = "https://github.com/cherrypy/cherrypy/commit/3bae7f06868553b006915f05ff14d86163f59a7d.patch";
sha256 = "1z0bv23ybyw87rf1i8alsdi3gc2bzmdj9d0kjsghdkvi3zdp4n8q";
})
];
nativeBuildInputs = [ setuptools_scm ];
propagatedBuildInputs = [
# required
cheroot portend more-itertools zc_lockfile
@ -26,8 +46,6 @@ buildPythonPackage rec {
routes
];
nativeBuildInputs = [ setuptools_scm ];
checkInputs = [
objgraph pytest pytestcov pathpy requests_toolbelt pytest-services
];

View file

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, python
, fetchpatch
, fetchPypi
, pari
, gmp
@ -11,13 +12,23 @@
buildPythonPackage rec {
pname = "cypari2";
# upgrade may break sage, please test the sage build or ping @timokau on upgrade
version = "2.1.1";
version = "2.1.2";
src = fetchPypi {
inherit pname version;
sha256 = "df1ef62e771ec36e5a456f5fc8b51bc6745b70f0efdd0c7a30c3f0b5f1fb93db";
sha256 = "03cd45edab8716ebbfdb754e65fea72e873c73dc91aec098fe4a01e35324ac7a";
};
patches = [
# patch to avoid some segfaults in sage's totallyreal.pyx test.
# (https://trac.sagemath.org/ticket/27267). depends on Cython patch.
(fetchpatch {
name = "use-trashcan-for-gen.patch";
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/cypari/patches/trashcan.patch?id=b6ea17ef8e4d652de0a85047bac8d41e90b25555";
sha256 = "sha256-w4kktWb9/aR9z4CjrUvAMOxEwRN2WkubaKzQttN8rU8=";
})
];
# This differs slightly from the default python installPhase in that it pip-installs
# "." instead of "*.whl".
# That is because while the default install phase succeeds to build the package,
@ -48,7 +59,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Cython bindings for PARI";
license = licenses.gpl2;
license = licenses.gpl2Plus;
maintainers = teams.sage.members;
homepage = "https://github.com/defeo/cypari2";
};

View file

@ -1,5 +1,4 @@
{ lib
, fetchpatch
, fetchPypi
, buildPythonPackage
, cython
@ -10,23 +9,13 @@ assert pariSupport -> pari != null;
buildPythonPackage rec {
pname = "cysignals";
version = "1.10.2";
version = "1.10.3";
src = fetchPypi {
inherit pname version;
sha256 = "1ckxzch3wk5cg80mppky5jib5z4fzslny3001r5zg4ar1ixbc1w1";
sha256 = "sha256-XEYGxDV3UCgxb3Jf23y4lOPK4Lb9L4YqDSlxdIRptDo=";
};
patches = [
# fixes intermittent crashes in Sage tests (including in interfaces/singular.py)
# will be included in cysignals 1.10.3: https://github.com/sagemath/cysignals/pull/127
(fetchpatch {
name = "fix-verify_exc_value.patch";
url = "https://github.com/sagemath/cysignals/commit/49a7eee4bba3ab8f340cf56c371fa4f5ed702dcc.patch";
sha256 = "sha256-Pfc5tL9VDSP6ftDoHoIb+MDi5rjYqr0PRfIajFuuYVs=";
})
];
# explicit check:
# build/src/cysignals/implementation.c:27:2: error: #error "cysignals must be compiled without _FORTIFY_SOURCE"
hardeningDisable = [

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchPypi, fetchpatch, buildPythonPackage, pkg-config, pytest, fuse, attr, which
, contextlib2, macfuse-stubs, DiskArbitration
, contextlib2
}:
buildPythonPackage rec {
@ -21,9 +21,7 @@ buildPythonPackage rec {
nativeBuildInputs = [ pkg-config ];
buildInputs =
lib.optionals stdenv.isLinux [ fuse ]
++ lib.optionals stdenv.isDarwin [ DiskArbitration macfuse-stubs ];
buildInputs = [ fuse ];
checkInputs = [ pytest which ] ++
lib.optionals stdenv.isLinux [ attr ];

View file

@ -3,11 +3,13 @@
, fetchPypi
, nose
, pygments
, isPy3k
}:
buildPythonPackage rec {
version = "0.9.2";
pname = "piep";
disabled = isPy3k;
src = fetchPypi {
inherit pname version;

View file

@ -1,7 +1,8 @@
{ lib
, aiosmb
, aiowinreg
, buildPythonPackage
, fetchFromGitHub
, fetchPypi
, minidump
, minikerberos
, msldap
@ -10,16 +11,15 @@
buildPythonPackage rec {
pname = "pypykatz";
version = "0.4.3";
version = "0.4.7";
src = fetchFromGitHub {
owner = "skelsec";
repo = pname;
rev = version;
sha256 = "sha256-ows6zJyygdAwgKNKKCURWX+kl42f3CN23/xZrLjkfrw=";
src = fetchPypi {
inherit pname version;
sha256 = "0il5sj47wyf9gn76alm8v1l63rqw2vsd27v6f7q1dpn0wq209syi";
};
propagatedBuildInputs = [
aiosmb
aiowinreg
minikerberos
msldap

View file

@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, isPy27
, pythonOlder
, nose
, lxml
, requests
@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pyxnat";
version = "1.4";
disabled = isPy27;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
@ -19,6 +19,14 @@ buildPythonPackage rec {
propagatedBuildInputs = [ lxml requests ];
# future is not used, and pathlib is installed part of python38+
# w/o an external package
prePatch = ''
substituteInPlace setup.py \
--replace "pathlib>=1.0" "" \
--replace "future>=0.16" ""
'';
checkInputs = [ nose ];
checkPhase = "nosetests pyxnat/tests";
doCheck = false; # requires a docker container running an XNAT server

View file

@ -0,0 +1,36 @@
{ lib
, buildPythonPackage
, fetchPypi
, python-dateutil
, pythonOlder
, pytz
, requests
}:
buildPythonPackage rec {
pname = "solaredge";
version = "0.0.4";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "0q4gib0l3qnlpncg84ki027vr1apjlr47vd6845rpk7zkm8lqgfz";
};
propagatedBuildInputs = [
python-dateutil
pytz
requests
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "solaredge" ];
meta = with lib; {
description = "Python wrapper for Solaredge monitoring service";
homepage = "https://github.com/bertouttier/solaredge";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -5,12 +5,12 @@ let
libpath = with xorg; lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio libGL ];
in mkDerivation rec {
pname = "multimc";
version = "unstable-2021-01-17";
version = "0.6.12";
src = fetchFromGitHub {
owner = "MultiMC";
repo = "MultiMC5";
rev = "02887536f773643313f15442fc82cebf616da54a";
sha256 = "1aykvavcv415lq488hx4ig2a79g5a561jg92gw14fb964r43782i";
rev = version;
sha256 = "h2T023vrqemWhHiA2/gFleuUhIOucjwTgoExliFiYig=";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake file makeWrapper ];

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, cpio, xar, undmg, libtapi }:
{ lib, stdenv, fetchurl, cpio, xar, undmg, libtapi, DiskArbitration }:
stdenv.mkDerivation rec {
pname = "macfuse-stubs";
@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cpio xar undmg libtapi ];
propagatedBuildInputs = [ DiskArbitration ];
postUnpack = ''
xar -xf 'Install macFUSE.pkg'
@ -40,6 +41,11 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://osxfuse.github.io";
description = "Build time stubs for FUSE on macOS";
longDescription = ''
macFUSE is required for this package to work on macOS. To install macFUSE,
use the installer from the <link xlink:href="https://osxfuse.github.io/">
project website</link>.
'';
platforms = platforms.darwin;
maintainers = with maintainers; [ midchildan ];

View file

@ -766,7 +766,7 @@
"snmp" = ps: with ps; [ pysnmp ];
"sochain" = ps: with ps; [ ]; # missing inputs: python-sochain-api
"socialblade" = ps: with ps; [ ]; # missing inputs: socialbladeclient
"solaredge" = ps: with ps; [ stringcase ]; # missing inputs: solaredge
"solaredge" = ps: with ps; [ solaredge stringcase ];
"solaredge_local" = ps: with ps; [ ]; # missing inputs: solaredge-local
"solarlog" = ps: with ps; [ ]; # missing inputs: sunwatcher
"solax" = ps: with ps; [ solax ];

View file

@ -298,6 +298,7 @@ in with py.pkgs; buildPythonApplication rec {
"sensor"
"smarttub"
"smtp"
"solaredge"
"sql"
"ssdp"
"stream"

View file

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "rtsp-simple-server";
version = "0.15.0";
version = "0.15.1";
src = fetchFromGitHub {
owner = "aler9";
repo = pname;
rev = "v${version}";
sha256 = "sha256-U0wZ0NrvCQjMLDDjO6Jf6uu5FlHar7Td2zhoU2+MMkM=";
sha256 = "sha256-uahgIphp2/iE11v33sPNrm0evz6dQvzjEQ9uMVEuTTI=";
};
vendorSha256 = "sha256-dfAuq4iw3NQ4xaabPv7MQ88CYXgivRBeyvbmJ3SSjbI=";
vendorSha256 = "sha256-nAeP9ZmYu5VPKR628aJVNS8t41V/AYkgwOcO/d0nQv4=";
# Tests need docker
doCheck = false;

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "wordpress";
version = "5.5.3";
version = "5.6.2";
src = fetchurl {
url = "https://wordpress.org/${pname}-${version}.tar.gz";
sha256 = "sTkmdr9Mulw7XwNEMJBU81rwNV/agNpBjCznGuObrtQ=";
sha256 = "sha256-W9/U3i6jALXolDFraiI/a+PNPoNHim0rZHzaqSy4gkI=";
};
installPhase = ''

View file

@ -10,18 +10,7 @@
, zstd
}:
let
shdeps = [
bzip2
coreutils
cpio
gnutar
gzip
xz
zstd
];
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
pname = "rpm2targz";
version = "2021.03.16";
@ -31,9 +20,17 @@ in stdenv.mkDerivation rec {
hash = "sha256-rcV+o9V2wWKznqSW2rA8xgnpQ02kpK4te6mYvLRC5vQ=";
};
buildInputs = shdeps;
postPatch = ''
postPatch = let
shdeps = [
bzip2
coreutils
cpio
gnutar
gzip
xz
zstd
];
in ''
substituteInPlace rpm2targz --replace "=\"rpmoffset\"" "=\"$out/bin/rpmoffset\""
# rpm2targz relies on the executable name
# to guess what compressor it should use
@ -41,9 +38,7 @@ in stdenv.mkDerivation rec {
sed -i -e '2iexport PATH="${lib.makeBinPath shdeps}"' rpm2targz
'';
preBuild = ''
makeFlagsArray+=(prefix=$out)
'';
installFlags = [ "prefix=$(out)" ];
meta = with lib; {
description = "Convert a .rpm file to a .tar.gz archive";

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fuse, pkg-config, macfuse-stubs }:
{ lib, stdenv, fetchurl, fuse, pkg-config }:
stdenv.mkDerivation rec {
version = "1.15.1";
@ -10,9 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config ];
buildInputs = if stdenv.isDarwin
then [ macfuse-stubs ]
else [ fuse ];
buildInputs = [ fuse ];
postFixup = ''
ln -s $out/bin/bindfs $out/bin/mount.fuse.bindfs
'';

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, curl, openssl, libxml2, fuse, macfuse-stubs }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, curl, openssl, libxml2, fuse }:
stdenv.mkDerivation rec {
pname = "s3fs-fuse";
@ -11,9 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-Agb0tq7B98Ioe0G/XEZCYcFQKnMuYXX9x0yg4Gvu3/k=";
};
buildInputs = [ curl openssl libxml2 ]
++ lib.optionals stdenv.isLinux [ fuse ]
++ lib.optionals stdenv.isDarwin [ macfuse-stubs ];
buildInputs = [ curl openssl libxml2 fuse ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
configureFlags = [

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, fuse, macfuse-stubs }:
{ lib, stdenv, fetchFromGitHub, cmake, fuse }:
stdenv.mkDerivation rec {
pname = "unionfs-fuse";
@ -21,11 +21,11 @@ stdenv.mkDerivation rec {
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace CMakeLists.txt \
--replace '/usr/local/include/osxfuse/fuse' '${macfuse-stubs}/include/fuse'
--replace '/usr/local/include/osxfuse/fuse' '${fuse}/include/fuse'
'';
nativeBuildInputs = [ cmake ];
buildInputs = [ (if stdenv.isDarwin then macfuse-stubs else fuse) ];
buildInputs = [ fuse ];
# Put the unionfs mount helper in place as mount.unionfs-fuse. This makes it
# possible to do:

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tfk8s";
version = "0.1.0";
version = "0.1.2";
src = fetchFromGitHub {
owner = "jrhouston";
repo = "tfk8s";
rev = version;
sha256 = "sha256-JzTWbkICOIfsHgMvpXz4bIWaXKKDAD8INSorMvnXiBw=";
rev = "v${version}";
sha256 = "sha256-gszvWetreafIP9I8hi9zz24TOTSsGzDsm/vXJS6n4Q4=";
};
vendorSha256 = "sha256-r0c3y+nRc/hCTAT31DasQjxZN86BT8jnJmsLM7Ugrq4=";
vendorSha256 = "sha256-wS5diDQFkt8IAp13d8Yeh8ihLvKWdR0Mbw0fMZpqqKE=";
runVend = true;
buildFlagsArray = [

View file

@ -18,11 +18,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
version = "2021.03.14";
version = "2021.03.25";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
sha256 = "1bh74f9q6dv17ah5x8zcxw03dq6jbh959xd39kw374cf9ifrgnd3";
sha256 = "0ps8ydx4hbj6sl0m760zdm9pvhccjmwvx680i4akz3lk4z9wy0x3";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "minio-client";
version = "2021-03-12T03-36-59Z";
version = "2021-03-23T05-46-11Z";
src = fetchFromGitHub {
owner = "minio";
repo = "mc";
rev = "RELEASE.${version}";
sha256 = "sha256-aIJjr7KaT4E4Q1Ho4D0emduJWFxdCXCodq7J43r0DMQ=";
sha256 = "sha256-AtE9Zy8tRvcE+gYc0pqJDEFnXL4jSbJ4b6l3ZOe69Y4=";
};
vendorSha256 = "sha256-aoRdtv/Q7vjn0M7iSYAuyu/3pEH30x6D39xTHqQPvuo=";
vendorSha256 = "sha256-cIr8d5jz4EfBFuOBZG4Kz20wSXy1Cni77V+JR6vLHwQ=";
doCheck = false;

View file

@ -20,11 +20,11 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake ];
buildInputs = [ fping libowlevelzs net-snmp ];
buildInputs = [ libowlevelzs net-snmp ];
postPatch = ''
substituteInPlace src/confent.cxx \
--replace /usr/sbin/fping "${lib.makeBinPath [fping]}/fping"
--replace /usr/sbin/fping "${fping}/bin/fping"
'';
meta = with lib; {

View file

@ -1,4 +1,4 @@
{ bash, coreutils, fetchurl, fping, lib, stdenvNoCC }:
{ coreutils, fetchurl, fping, lib, stdenvNoCC }:
stdenvNoCC.mkDerivation rec {
pname = "zs-wait4host";
@ -9,8 +9,6 @@ stdenvNoCC.mkDerivation rec {
sha256 = "9F1264BDoGlRR7bWlRXhfyvxWio4ydShKmabUQEIz9I=";
};
buildInputs = [ bash coreutils fping ];
postPatch = ''
for i in zs-wait4host zs-wait4host-inf; do
substituteInPlace "$i" \

View file

@ -10,7 +10,7 @@ let
common =
{ lib, stdenv, perl, curl, bzip2, sqlite, openssl ? null, xz
, bash, coreutils, gzip, gnutar
, bash, coreutils, util-linuxMinimal, gzip, gnutar
, pkg-config, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json
, autoreconfHook, autoconf-archive, bison, flex
, jq, libarchive, libcpuid
@ -41,6 +41,7 @@ common =
nativeBuildInputs =
[ pkg-config ]
++ lib.optionals (is24 && stdenv.isLinux) [ util-linuxMinimal ]
++ lib.optionals is24
[ autoreconfHook
autoconf-archive
@ -139,8 +140,13 @@ common =
doInstallCheck = true; # not cross
# socket path becomes too long otherwise
preInstallCheck = lib.optional stdenv.isDarwin ''
preInstallCheck = lib.optionalString stdenv.isDarwin ''
export TMPDIR=$NIX_BUILD_TOP
'' +
# tests/ca/substitute.sh is flakey for some reason, so we skip it
# for now. https://github.com/NixOS/nix/issues/4667
lib.optionalString is24 ''
echo "exit 99" > tests/ca/substitute.sh
'';
separateDebugInfo = stdenv.isLinux;

View file

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "nuclei";
version = "2.3.1";
version = "2.3.2";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = pname;
rev = "v${version}";
sha256 = "sha256-NM/Ggd5MKctQKE0MNawyE+Xciuj9++6DXXkMrrpfkhA=";
sha256 = "sha256-QF9w3ZrW+Mbl6EOC1n2848+q71AhxXTf0j//Us9L1r8=";
};
vendorSha256 = "sha256-h+MuMfIKXgXzLU6hNMxfPXawic9UZrwzVlzjjRF7X3o=";
vendorSha256 = "sha256-qmuua7HXnwuy24CSqHKALqNDmXBvSIXYTVu3kaGVoeU=";
preBuild = ''
mv v2/* .

View file

@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "prs";
version = "0.2.4";
version = "0.2.5";
src = fetchFromGitLab {
owner = "timvisee";
repo = "prs";
rev = "v${version}";
sha256 = "sha256-8rISyZdxxGqpZlOc4ziY33tMRK/w4fiTVCiK5RVBDvw=";
sha256 = "sha256-XJcNhIMu60H5LmoRzMqhPq33cCU9PBPfIIUtaSnmrH8=";
};
cargoSha256 = "sha256-sxYm6uNTvBZsjzHywduq0fhnqZMbECLqxq8yg3ZxtVU=";
cargoSha256 = "sha256-4l/KQMtGfZX5Rg35AJxvwzg3aAzuPK2iKrHDRgIw+bg=";
postPatch = ''
# The GPGME backend is recommended

View file

@ -1,5 +1,4 @@
{ bash
, coreutils
{ coreutils
, fetchurl
, gnugrep
, lib
@ -18,7 +17,6 @@ stdenvNoCC.mkDerivation rec {
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ bash coreutils gnugrep moreutils ];
installPhase = ''
runHook preInstall
@ -27,8 +25,8 @@ stdenvNoCC.mkDerivation rec {
'';
postInstall = ''
wrapProgram $out/bin/zstxtns-merge --prefix PATH ":" "${lib.makeBinPath [coreutils gnugrep moreutils]}"
wrapProgram $out/bin/zstxtns-unmerge --prefix PATH ":" "${lib.makeBinPath [coreutils gnugrep]}"
wrapProgram $out/bin/zstxtns-merge --set PATH "${lib.makeBinPath [coreutils gnugrep moreutils]}"
wrapProgram $out/bin/zstxtns-unmerge --set PATH "${lib.makeBinPath [coreutils gnugrep]}"
'';
meta = with lib; {

View file

@ -19284,7 +19284,7 @@ in
fusePackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/fuse {
util-linux = util-linuxMinimal;
});
fuse = lowPrio fusePackages.fuse_2;
fuse = lowPrio (if stdenv.isDarwin then macfuse-stubs else fusePackages.fuse_2);
fuse3 = fusePackages.fuse_3;
fuse-common = hiPrio fusePackages.fuse_3.common;
@ -19423,6 +19423,7 @@ in
macfuse-stubs = callPackage ../os-specific/darwin/macfuse {
inherit (darwin) libtapi;
inherit (darwin.apple_sdk.frameworks) DiskArbitration;
};
osxsnarf = callPackage ../os-specific/darwin/osxsnarf { };

View file

@ -322,6 +322,8 @@ in {
aioshelly = callPackage ../development/python-modules/aioshelly { };
aiosmb = callPackage ../development/python-modules/aiosmb { };
aiosmtpd = callPackage ../development/python-modules/aiosmtpd { };
aiosqlite = callPackage ../development/python-modules/aiosqlite { };
@ -3976,7 +3978,6 @@ in {
llfuse = callPackage ../development/python-modules/llfuse {
inherit (pkgs) fuse;
inherit (pkgs.darwin.apple_sdk.frameworks) DiskArbitration;
};
llvmlite = callPackage ../development/python-modules/llvmlite {
@ -7776,6 +7777,8 @@ in {
softlayer = callPackage ../development/python-modules/softlayer { };
solaredge = callPackage ../development/python-modules/solaredge { };
solax = callPackage ../development/python-modules/solax { };
solo-python = disabledIf (!pythonAtLeast "3.6") (callPackage ../development/python-modules/solo-python { });