swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-11-06 10:16:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2021-12-26 12:01:52 +00:00 committed by GitHub
parent c91fe49957 7096340b0c
commit d6eafc33fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 127 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/audio/lsp-plugins/default.nix
View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "lsp-plugins";
version = "1.1.30";
version = "1.1.31";
src = fetchFromGitHub {
owner = "sadko4u";
repo = pname;
rev = version;
sha256 = "0g0nx05dyjwz2149v3pj6sa9divr26jyqvg2kk1qk48s2n4najkz";
sha256 = "sha256-P1woSkenSlVUwWr3q0sNv8K2fVtTa6zWwKfSHQgg9Xw=";
};
nativeBuildInputs = [ pkg-config php makeWrapper ];

6
pkgs/applications/blockchains/alfis/default.nix
View file

@ -14,16 +14,16 @@
rustPlatform.buildRustPackage rec {
pname = "alfis";
version = "0.6.9";
version = "0.6.10";
src = fetchFromGitHub {
owner = "Revertron";
repo = "Alfis";
rev = "v${version}";
sha256 = "1nnzy46hp1q9kcxzjx24d60frjhn3x46nksbqvdfcfrfn5pqrabh";
sha256 = "sha256-JJTU3wZ3cG5TmgHYShWJaNAZBA4z3qZXPfb7WUX6/80=";
};
cargoSha256 = "02liz8sqnqla77bqxfa8hj93qfj2x482q2bijz66rmazfig3b045";
cargoSha256 = "sha256-BsFe1Fp+Q5Gqa1w4xov0tVLDKV7S+6b5fKBl09ggLB0=";
checkFlags = [
# these want internet access, disable them

10
pkgs/applications/networking/soulseek/nicotine-plus/default.nix
View file

@ -5,13 +5,13 @@ with lib;
python3Packages.buildPythonApplication rec {
pname = "nicotine-plus";
version = "3.1.1";
version = "3.2.0";
src = fetchFromGitHub {
owner = "Nicotine-Plus";
repo = "nicotine-plus";
rev = version;
hash = "sha256-NfI2RfxAYhA1qefml1ayfYWjbkrzUL4l9p2Rm/ROnzQ=";
hash = "sha256-E8b2VRlnMWmBHu919QDPBYuMbrjov9t//bHi1Y/F0Ak=";
};
nativeBuildInputs = [ gettext wrapGAppsHook ];
@ -23,6 +23,12 @@ python3Packages.buildPythonApplication rec {
mv $out/bin/nicotine $out/bin/nicotine-plus
'';
preFixup = ''
gappsWrapperArgs+=(
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}"
)
'';
doCheck = false;
meta = {

4
pkgs/applications/networking/tmpmail/default.nix
View file

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "tmpmail";
version = "1.1.4";
version = "1.1.9";
src = fetchFromGitHub {
owner = "sdushantha";
repo = "tmpmail";
rev = "v${version}";
sha256 = "sha256-Rcu1qNmUZhMRvPiaWrDlzLtGksv09XBiF2GJUxXKs1Y=";
sha256 = "sha256-sWcsmBUHSfo7sICXyhNhbfRFSHumObnWc7stWxcwVTg=";
};
dontConfigure = true;

6
pkgs/development/libraries/boehm-gc/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl
, autoreconfHook
, enableLargeConfig ? false # doc: https://github.com/ivmai/bdwgc/blob/v8.2.0/doc/README.macros (LARGE_CONFIG)
, enableLargeConfig ? false # doc: https://github.com/ivmai/bdwgc/blob/v8.0.6/doc/README.macros (LARGE_CONFIG)
, nix
, nix_2_3
, nixUnstable
@ -8,14 +8,14 @@
stdenv.mkDerivation rec {
pname = "boehm-gc";
version = "8.2.0";
version = "8.0.6";
src = fetchurl {
urls = [
"https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz"
"https://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz"
];
sha256 = "sha256-JUD3NWy3T2xbdTJsbTigZu3XljYf19TtJuSU2YVv7Y8=";
sha256 = "3b4914abc9fa76593596773e4da671d7ed4d5390e3d46fbf2e5f155e121bea11";
};
outputs = [ "out" "dev" "doc" ];

4
pkgs/development/libraries/libplctag/default.nix
View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "libplctag";
version = "2.4.6";
version = "2.4.7";
src = fetchFromGitHub {
owner = "libplctag";
repo = "libplctag";
rev = "v${version}";
sha256 = "sha256-e7WDXaFu4ujrxqSvAq2Y2MbUR1ItlKOYm9dNSPbdaMo=";
sha256 = "sha256-DLx9VBmyn5L30i6qPK4LD+3cOo7zG2YLOui6+krU9So=";
};
nativeBuildInputs = [ cmake ];

6
pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix
View file

@ -2,15 +2,15 @@
buildDunePackage rec {
pname = "ocaml-migrate-parsetree";
version = "2.2.0";
version = "2.3.0";
useDune2 = true;
minimalOCamlVersion = "4.02";
src = fetchurl {
url = "https://github.com/ocaml-ppx/${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
sha256 = "188v3z09bg4gyv80c138fa3a3j2w54w5gc4r1ajw7klr70yqz9mj";
url = "https://github.com/ocaml-ppx/${pname}/releases/download/v${version}/${pname}-${version}.tbz";
sha256 = "sha256:02mzh1rcvc2xpq4iz01z7kvzsgxns3774ggxi96f147i8yr2d08h";
};
meta = {

4
pkgs/development/python-modules/cffi/default.nix
View file

@ -30,7 +30,9 @@ if isPyPy then null else buildPythonPackage rec {
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang
"-Wno-unused-command-line-argument -Wno-unreachable-code -Wno-c++11-narrowing";
doCheck = !stdenv.hostPlatform.isMusl;
# Lots of tests fail on aarch64-darwin due to "Cannot allocate write+execute memory":
# * https://cffi.readthedocs.io/en/latest/using.html#callbacks
doCheck = !stdenv.hostPlatform.isMusl && !(stdenv.isDarwin && stdenv.isAarch64);
checkInputs = [ pytestCheckHook ];

4
pkgs/development/tools/frugal/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "frugal";
version = "3.14.10";
version = "3.14.11";
src = fetchFromGitHub {
owner = "Workiva";
repo = pname;
rev = "v${version}";
sha256 = "sha256-K/Nptw0AEP7awS/xXCg6T2Ff3WQc7fKTUB/uEg1WOA4=";
sha256 = "sha256-XUG9Md6T0/+yn3KGqJO09FFlpuli2wJqOf/SEIVKXac=";
};
subPackages = [ "." ];

4
pkgs/development/tools/vala-language-server/default.nix
View file

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "vala-language-server";
version = "0.48.3";
version = "0.48.4";
src = fetchFromGitHub {
owner = "Prince781";
repo = pname;
rev = version;
sha256 = "sha256-MhVwK4RtEAJcwcJe71ganCaXQHa9jzxyknzc9kJi274=";
sha256 = "sha256-vCQ/j0DxG9sSEquPh9TtZ5hTADPh0d8sDIDSJdUDK4s=";
};
passthru = {

12
pkgs/os-specific/linux/acpid/default.nix
View file

@ -2,23 +2,15 @@
stdenv.mkDerivation rec {
pname = "acpid";
version = "2.0.32";
version = "2.0.33";
src = fetchurl {
url = "mirror://sourceforge/acpid2/acpid-${version}.tar.xz";
sha256 = "0zhmxnhnhg4v1viw82yjr22kram6k5k1ixznhayk8cnw7q5x7lpj";
sha256 = "sha256-CFb3Gz6zShtmPQqOY2Pfy8UZ5j2EczBJiJhljily2+g=";
};
nativeBuildInputs = [ autoreconfHook ];
# remove when https://sourceforge.net/p/acpid2/code/merge-requests/1/ is merged
postPatch = ''
substituteInPlace configure.ac \
--replace "AC_FUNC_MALLOC" "" \
--replace "AC_FUNC_REALLOC" "" \
--replace "strrchr strtol" "strrchr strtol malloc realloc"
'';
meta = with lib; {
homepage = "https://sourceforge.net/projects/acpid2/";
description = "A daemon for delivering ACPI events to userspace programs";

4
pkgs/os-specific/linux/libtraceevent/default.nix
View file

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "libtraceevent";
version = "1.4.0";
version = "1.5.0";
src = fetchgit {
url = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git";
rev = "libtraceevent-${version}";
sha256 = "1x36qsrcssjywjpwkgyp9hz6y878kivma9pz7zrhxdsrqv2d2zs1";
sha256 = "sha256-ysdsuJ9MvmNY0/XSV+aO7Gh8buWed25DQhBE/5HIASU=";
};
# Don't build and install html documentation

8
pkgs/servers/uwsgi/default.nix
View file

@ -59,16 +59,17 @@ in
stdenv.mkDerivation rec {
pname = "uwsgi";
version = "2.0.19.1";
version = "2.0.20";
src = fetchurl {
url = "https://projects.unbit.it/downloads/${pname}-${version}.tar.gz";
sha256 = "0256v72b7zr6ds4srpaawk1px3bp0djdwm239w3wrxpw7dzk1gjn";
sha256 = "1yfz5h07rxzrqf1rdj5fzhk47idgglxj7kqr8zl8lgcpv1kriaw8";
};
patches = [
./no-ext-session-php_session.h-on-NixOS.patch
./additional-php-ldflags.patch
./missing-arginfo-php8.patch # https://github.com/unbit/uwsgi/issues/2356
];
nativeBuildInputs = [ python3 pkg-config ];
@ -96,6 +97,9 @@ stdenv.mkDerivation rec {
substituteInPlace "$f" \
--replace pkg-config "$PKG_CONFIG"
done
${lib.optionalString (lib.versionAtLeast php.version "8") ''
sed -e "s/ + php_version//" -i plugins/php/uwsgiplugin.py
''}
'';
configurePhase = ''

49
pkgs/servers/uwsgi/missing-arginfo-php8.patch Normal file
View file

@ -0,0 +1,49 @@
diff --git a/plugins/php/php_plugin.c b/plugins/php/php_plugin.c
index ca0ef6c1..00c39b09 100644
--- a/plugins/php/php_plugin.c
+++ b/plugins/php/php_plugin.c
@@ -257,6 +257,9 @@ PHP_MINIT_FUNCTION(uwsgi_php_minit) {
return SUCCESS;
}
+ZEND_BEGIN_ARG_INFO_EX(arginfo_void, 0, 0, 0)
+ZEND_END_ARG_INFO()
+
PHP_FUNCTION(uwsgi_version) {
RETURN_STRING(UWSGI_VERSION);
}
@@ -488,20 +491,20 @@ PHP_FUNCTION(uwsgi_signal) {
}
zend_function_entry uwsgi_php_functions[] = {
- PHP_FE(uwsgi_version, NULL)
- PHP_FE(uwsgi_setprocname, NULL)
- PHP_FE(uwsgi_worker_id, NULL)
- PHP_FE(uwsgi_masterpid, NULL)
- PHP_FE(uwsgi_signal, NULL)
-
- PHP_FE(uwsgi_rpc, NULL)
-
- PHP_FE(uwsgi_cache_get, NULL)
- PHP_FE(uwsgi_cache_set, NULL)
- PHP_FE(uwsgi_cache_update, NULL)
- PHP_FE(uwsgi_cache_del, NULL)
- PHP_FE(uwsgi_cache_clear, NULL)
- PHP_FE(uwsgi_cache_exists, NULL)
+ PHP_FE(uwsgi_version, arginfo_void)
+ PHP_FE(uwsgi_setprocname, arginfo_void)
+ PHP_FE(uwsgi_worker_id, arginfo_void)
+ PHP_FE(uwsgi_masterpid, arginfo_void)
+ PHP_FE(uwsgi_signal, arginfo_void)
+
+ PHP_FE(uwsgi_rpc, arginfo_void)
+
+ PHP_FE(uwsgi_cache_get, arginfo_void)
+ PHP_FE(uwsgi_cache_set, arginfo_void)
+ PHP_FE(uwsgi_cache_update, arginfo_void)
+ PHP_FE(uwsgi_cache_del, arginfo_void)
+ PHP_FE(uwsgi_cache_clear, arginfo_void)
+ PHP_FE(uwsgi_cache_exists, arginfo_void)
{ NULL, NULL, NULL},
};

6
pkgs/tools/misc/steampipe/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "steampipe";
version = "0.10.0";
version = "0.11.0";
src = fetchFromGitHub {
owner = "turbot";
repo = "steampipe";
rev = "v${version}";
sha256 = "sha256-Hg9GvHB2eTcOUUC/WLpks9TUWivoV6KxXcWWBWne5Lg=";
sha256 = "sha256-P/Fys9/V71+VL5Az3EGGaW+tdeQbr2wO+jvVSVZmJT0=";
};
vendorSha256 = "sha256-akMUJcAoUGHz3FzDJlMUYtHXrtvU0JMiRfqhTm4IEpA=";
vendorSha256 = "sha256-PYaq74NNEOJ1jZ6PoS6zcTiUN4JA9JDjO7GB9tqgT6c=";
# tests are failing for no obvious reasons
doCheck = false;

32
pkgs/tools/misc/woeusb-ng/default.nix Normal file
View file

@ -0,0 +1,32 @@
{ lib, python3Packages, fetchFromGitHub, p7zip, parted, grub2 }:
with python3Packages;
buildPythonApplication rec {
pname = "woeusb-ng";
version = "0.2.10";
propagatedBuildInputs = [ p7zip parted grub2 termcolor wxPython_4_0 six ];
src = fetchFromGitHub {
owner = "WoeUSB";
repo = "WoeUSB-ng";
rev = "v${version}";
sha256 = "sha256-Nsdk3SMRzj1fqLrp5Na5V3rRDMcIReL8uDb8K2GQNWI=";
};
postInstall = ''
# TODO: the gui requires additional polkit-actions to work correctly, therefore it is currently disabled
rm $out/bin/woeusbgui
'';
# checks fail, because of polkit-actions and should be reenabled when the gui is fixed.
doCheck = false;
meta = with lib; {
description = "A tool to create a Windows USB stick installer from a real Windows DVD or image";
homepage = "https://github.com/WoeUSB/WoeUSB-ng";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ stunkymonkey ];
platforms = platforms.linux;
};
}

3
pkgs/top-level/all-packages.nix
View file

@ -11023,6 +11023,8 @@ with pkgs;
woeusb = callPackage ../tools/misc/woeusb { };
woeusb-ng = callPackage ../tools/misc/woeusb-ng { };
wslu = callPackage ../tools/system/wslu { };
chase = callPackage ../tools/system/chase { };
@ -27138,6 +27140,7 @@ with pkgs;
monotone = callPackage ../applications/version-management/monotone {
lua = lua5;
boost = boost170;
};
monotoneViz = callPackage ../applications/version-management/monotone-viz {