b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2022-02-20 06:01:57 +00:00 committed by GitHub
parent 53c6fbbdc9 e67f8001d5
commit fd240cb362
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 267 additions and 160 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/audio/ocenaudio/default.nix
View file

@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "ocenaudio";
version = "3.11.2";
version = "3.11.5";
src = fetchurl {
url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}";
sha256 = "sha256-kvmBOw8fQZSC1jC8FRVq4v+i7mM6ol2IrDTqfJtuZYc=";
sha256 = "sha256-YkSsvhBbju/NEkT7RspZQYnLkcx/5POA8VtxCAL3Wcc=";
};
nativeBuildInputs = [

4
pkgs/applications/editors/xed-editor/default.nix
View file

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "xed-editor";
version = "3.0.2";
version = "3.2.2";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "xed";
rev = version;
sha256 = "sha256-VIudVgENibOz8RK0oK80U74wy592q3vKEnl3zuS7oSI=";
sha256 = "sha256-PW7y3+Sa9FH5r5xvziysvxM08RJCPvnLs3wsm5IqToQ=";
};
nativeBuildInputs = [

6
pkgs/applications/misc/pueue/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "pueue";
version = "1.0.6";
version = "2.0.0";
src = fetchFromGitHub {
owner = "Nukesor";
repo = pname;
rev = "v${version}";
sha256 = "sha256-xEbmCVZ28CHVvI6tGCQWzMFrmVyCQ2Xmzh2Lz3tGU14=";
sha256 = "sha256-eFO9v+CZ3sFJJ0Ksa2sV5snjBz9lUkElGSj4DfEUebs=";
};
cargoSha256 = "sha256-8g/dNCm5I5/qCAPOGQ9a453DND8LoeSpX9Nb8LwUme4=";
cargoSha256 = "sha256-cyuDXMmVrVx3kluumR6WleMzuoV+261f47rpkVYHzZA=";
nativeBuildInputs = [ installShellFiles ];

4
pkgs/applications/networking/ftp/filezilla/default.nix
View file

@ -18,11 +18,11 @@
stdenv.mkDerivation rec {
pname = "filezilla";
version = "3.57.0";
version = "3.58.0";
src = fetchurl {
url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2";
sha256 = "sha256-gr9scHfKEwElSTVrRjlS8STuBIdvIeS6cgrMmBHImcc=";
sha256 = "sha256-0P5/cuAfd0K6oGRmgYsYbo6R//Ytbuey8OiEtrM4XYg=";
};
# https://www.linuxquestions.org/questions/slackware-14/trouble-building-filezilla-3-47-2-1-current-4175671182/#post6099769

2
pkgs/applications/virtualization/containerd/default.nix
View file

@ -48,7 +48,7 @@ buildGoModule rec {
homepage = "https://containerd.io/";
description = "A daemon to control runC";
license = licenses.asl20;
maintainers = with maintainers; [ offline vdemeester endocrimes ];
maintainers = with maintainers; [ offline vdemeester endocrimes zowoq ];
platforms = platforms.linux;
};
}

13
pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
View file

@ -47,18 +47,9 @@ stdenv.mkDerivation rec {
src = ./hardcode-fallback-background.patch;
default_wallpaper = "${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}";
})
# Revert "UserCard: use accent color for logged_in check (#566)"
# https://github.com/elementary/greeter/pull/566
# Fixes crash issue reported in:
# https://github.com/elementary/greeter/issues/578
# https://github.com/NixOS/nixpkgs/issues/151609
# Probably also fixes:
# https://github.com/elementary/greeter/issues/568
# https://github.com/elementary/greeter/issues/583
# https://github.com/NixOS/nixpkgs/issues/140513
# Revisit this when the greeter is ported to GTK 4:
# https://github.com/elementary/greeter/pull/591
./revert-pr566.patch
# https://github.com/elementary/greeter/issues/578#issuecomment-1030746697
./fix-crash.patch
# Fix build with meson 0.61
# https://github.com/elementary/greeter/pull/590
(fetchpatch {

21
pkgs/desktops/pantheon/desktop/elementary-greeter/fix-crash.patch Normal file
View file

@ -0,0 +1,21 @@
diff --git a/src/Cards/UserCard.vala b/src/Cards/UserCard.vala
index 83df22c..8cd917e 100644
--- a/src/Cards/UserCard.vala
+++ b/src/Cards/UserCard.vala
@@ -42,6 +42,7 @@ public class Greeter.UserCard : Greeter.BaseCard {
private Gtk.Stack login_stack;
private Greeter.PasswordEntry password_entry;
+ private SelectionCheck logged_in;
private unowned Gtk.StyleContext logged_in_context;
private weak Gtk.StyleContext main_grid_style_context;
private weak Gtk.StyleContext password_entry_context;
@@ -214,7 +215,7 @@ public class Greeter.UserCard : Greeter.BaseCard {
};
avatar_overlay.add (avatar);
- var logged_in = new SelectionCheck () {
+ logged_in = new SelectionCheck () {
halign = Gtk.Align.END,
valign = Gtk.Align.END
};

103
pkgs/desktops/pantheon/desktop/elementary-greeter/revert-pr566.patch
View file

@ -1,103 +0,0 @@
From 572a73cbc84dd9a0f5a7667a60c75ed5580d84a1 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 25 Jan 2022 10:03:31 +0800
Subject: [PATCH] Revert "UserCard: use accent color for logged_in check
(#566)"
This reverts commit 6f18c79c780582e43039032f6926816efa82e206.
---
data/Check.css | 11 -----------
data/greeter.gresource.xml | 1 -
src/Cards/UserCard.vala | 29 +++--------------------------
3 files changed, 3 insertions(+), 38 deletions(-)
delete mode 100644 data/Check.css
diff --git a/data/Check.css b/data/Check.css
deleted file mode 100644
index 947db6b..0000000
--- a/data/Check.css
+++ /dev/null
@@ -1,11 +0,0 @@
-check {
- background-color: @accent_color;
- border-radius: 99px;
- color: white;
- margin: 2px;
- min-height: 20px;
- min-width: 20px;
- -gtk-icon-shadow: 0 1px 1px shade(@accent_color, 0.7);
- -gtk-icon-source: -gtk-icontheme("check-active-symbolic");
- -gtk-icon-transform: scale(0.6);
-}
diff --git a/data/greeter.gresource.xml b/data/greeter.gresource.xml
index 604c89a..ce9be29 100644
--- a/data/greeter.gresource.xml
+++ b/data/greeter.gresource.xml
@@ -2,7 +2,6 @@
<gresources>
<gresource prefix="/io/elementary/greeter">
<file alias="Card.css" compressed="true">Card.css</file>
- <file alias="Check.css" compressed="true">Check.css</file>
<file alias="DateTime.css" compressed="true">DateTime.css</file>
<file alias="MainWindow.css" compressed="true">MainWindow.css</file>
</gresource>
diff --git a/src/Cards/UserCard.vala b/src/Cards/UserCard.vala
index 83df22c..02d2b0a 100644
--- a/src/Cards/UserCard.vala
+++ b/src/Cards/UserCard.vala
@@ -42,7 +42,6 @@ public class Greeter.UserCard : Greeter.BaseCard {
private Gtk.Stack login_stack;
private Greeter.PasswordEntry password_entry;
- private unowned Gtk.StyleContext logged_in_context;
private weak Gtk.StyleContext main_grid_style_context;
private weak Gtk.StyleContext password_entry_context;
@@ -214,14 +213,10 @@ public class Greeter.UserCard : Greeter.BaseCard {
};
avatar_overlay.add (avatar);
- var logged_in = new SelectionCheck () {
- halign = Gtk.Align.END,
- valign = Gtk.Align.END
- };
-
- logged_in_context = logged_in.get_style_context ();
-
if (lightdm_user.logged_in) {
+ var logged_in = new Gtk.Image.from_icon_name ("selection-checked", Gtk.IconSize.LARGE_TOOLBAR);
+ logged_in.halign = logged_in.valign = Gtk.Align.END;
+
avatar_overlay.add_overlay (logged_in);
session_button.sensitive = false;
@@ -304,7 +299,6 @@ public class Greeter.UserCard : Greeter.BaseCard {
gtksettings.gtk_theme_name = "io.elementary.stylesheet." + accent_to_string (prefers_accent_color);
var style_provider = Gtk.CssProvider.get_named (gtksettings.gtk_theme_name, null);
- logged_in_context.add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
password_entry_context.add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
}
@@ -451,21 +445,4 @@ public class Greeter.UserCard : Greeter.BaseCard {
return GLib.Source.REMOVE;
});
}
-
- private class SelectionCheck : Gtk.Spinner {
- private static Gtk.CssProvider check_provider;
-
- class construct {
- set_css_name (Gtk.STYLE_CLASS_CHECK);
- }
-
- static construct {
- check_provider = new Gtk.CssProvider ();
- check_provider.load_from_resource ("/io/elementary/greeter/Check.css");
- }
-
- construct {
- get_style_context ().add_provider (check_provider, Gtk.STYLE_PROVIDER_PRIORITY_USER);
- }
- }
}

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

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "rocksdb";
version = "6.28.2";
version = "6.29.3";
src = fetchFromGitHub {
owner = "facebook";
repo = pname;
rev = "v${version}";
sha256 = "sha256-0T/ANHTRzk0ymezRQbvJt6aL350Z004gcj4JapAyAnQ=";
sha256 = "sha256-O0nIPRKj0ZOEjynh7h9kM6V965hQKs+4GgIbN+Os0I4=";
};
nativeBuildInputs = [ cmake ninja ];

1
pkgs/development/nim-packages/build-nim-package/default.nix
View file

@ -38,6 +38,7 @@ stdenv.mkDerivation (attrs // {
installPhase;
meta = meta // {
platforms = meta.platforms or nim.meta.platforms;
maintainers = (meta.maintainers or [ ]) ++ [ lib.maintainers.ehmry ];
};
})

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

@ -17,14 +17,14 @@
}:
buildPythonPackage rec {
version = "2.3.4";
version = "2.3.5";
pname = "beancount";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "sha256-K/CM5qldmAAPTXM5WYXNHeuBwNUu1aduYQusd9gvhsA=";
sha256 = "sha256-FONWJaLpy9Q8rmF42gjLPxIk9iYeVBymcm3zXZjpw2o=";
};
# Tests require files not included in the PyPI archive.

9
pkgs/development/python-modules/imap-tools/default.nix
View file

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "imap-tools";
version = "0.50.2";
version = "0.51.0";
disabled = isPy27;
@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "ikvk";
repo = "imap_tools";
rev = "v${version}";
hash = "sha256-ki38Kr+eDEIQPRuoQePR7dCRDSgq2ZLXws1pq2gtQrI=";
hash = "sha256-ZJen+hpNpeZjScD7aqdaW796KRlJ8K1JBXPOagpceXk=";
};
checkInputs = [
@ -25,9 +25,10 @@ buildPythonPackage rec {
disabledTests = [
# tests require a network connection
"test_action"
"test_folders"
"test_connection"
"test_attributes"
"test_connection"
"test_folders"
"test_idle"
"test_live"
];

48
pkgs/development/python-modules/wxPython/4.1.nix
View file

@ -13,29 +13,59 @@
, wxGTK
, pillow
, numpy
, libXinerama
, libSM
, libXxf86vm
, libXtst
, libGLU
, libGL
, xorgproto
, gst_all_1
, libglvnd
, mesa
, webkitgtk
, autoPatchelfHook
}:
let
dynamic-linker = stdenv.cc.bintools.dynamicLinker;
in
buildPythonPackage rec {
pname = "wxPython";
version = "4.1.0";
version = "4.1.1";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "12x4ci5q7qni4rkfiq6lnpn1fk8b0sfc6dck5wyxkj2sfp5pa91f";
sha256 = "0a1mdhdkda64lnwm1dg0dlrf9rs4gkal3lra6hpqbwn718cf7r80";
};
# https://github.com/NixOS/nixpkgs/issues/75759
# https://github.com/wxWidgets/Phoenix/issues/1316
doCheck = false;
nativeBuildInputs = [ which doxygen wxGTK pkg-config ];
nativeBuildInputs = [
which
doxygen
wxGTK.gtk
pkg-config
autoPatchelfHook
];
buildInputs = [
wxGTK.gtk
ncurses
libXinerama
libSM
libXxf86vm
libXtst
xorgproto
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
libGLU
libGL
libglvnd
mesa
webkitgtk
];
propagatedBuildInputs = [ pillow numpy ];
@ -43,23 +73,17 @@ buildPythonPackage rec {
DOXYGEN = "${doxygen}/bin/doxygen";
preConfigure = lib.optionalString (!stdenv.isDarwin) ''
substituteInPlace wx/lib/wxcairo/wx_pycairo.py \
--replace 'cairoLib = None' 'cairoLib = ctypes.CDLL("${cairo}/lib/libcairo.so")'
substituteInPlace wx/lib/wxcairo/wx_pycairo.py \
--replace '_dlls = dict()' '_dlls = {k: ctypes.CDLL(v) for k, v in [
("gdk", "${wxGTK.gtk}/lib/libgtk-x11-3.0.so"),
("pangocairo", "${pango.out}/lib/libpangocairo-1.0.so"),
("cairoLib = None", "cairoLib = ctypes.CDLL('${cairo}/lib/libcairo.so')"),
("appsvc", None)
]}'
# https://github.com/wxWidgets/Phoenix/pull/1584
# It'll be not needed in next version because https://github.com/wxWidgets/Phoenix/pull/1699
substituteInPlace build.py --replace "os.environ['PYTHONPATH'] = phoenixDir()" \
"os.environ['PYTHONPATH'] = os.environ['PYTHONPATH'] + os.pathsep + phoenixDir()"
'';
buildPhase = ''
${python.interpreter} build.py -v --use_syswx dox etg --nodoc build_py
${python.interpreter} build.py -v build_wx dox etg --nodoc sip build_py
'';
installPhase = ''
@ -67,8 +91,6 @@ buildPythonPackage rec {
wrapPythonPrograms
'';
passthru = { inherit wxGTK; };
meta = with lib; {
description = "Cross platform GUI toolkit for Python, Phoenix version";
homepage = "http://wxpython.org/";

4
pkgs/development/tools/analysis/radare2/default.nix
View file

@ -44,13 +44,13 @@ let
in
stdenv.mkDerivation rec {
pname = "radare2";
version = "5.6.0";
version = "5.6.2";
src = fetchFromGitHub {
owner = "radare";
repo = "radare2";
rev = version;
sha256 = "sha256-AhO7Ev/4M9dtogNIMWOc03ARD5H2gdlRXR4Qpnkf7bw=";
sha256 = "sha256-R53S2+v0qCY5Q7Uf2gQ4veaOzYN2iE6F00+ERvknD2g=";
};
preBuild = ''

2
pkgs/development/tools/jless/default.nix
View file

@ -17,6 +17,6 @@ rustPlatform.buildRustPackage rec {
description = "A command-line pager for JSON data";
homepage = "https://github.com/PaulJuliusMartinez/jless";
license = licenses.mit;
maintainers = with maintainers; [ jfchevrette ];
maintainers = with maintainers; [ jfchevrette zowoq ];
};
}

6
pkgs/development/tools/just/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "just";
version = "0.11.0";
version = "0.11.2";
src = fetchFromGitHub {
owner = "casey";
repo = pname;
rev = version;
sha256 = "sha256-QQ0qRzbbH6lGjW50T67dXU7MLnEw3C9dcJ6ZlnSeh/U=";
sha256 = "sha256-9lC3vegfxEACoX25ebcLQU453IYy1zQf1K84YyLEnlU=";
};
cargoSha256 = "sha256-ZTfaRU1f0K/wprbDxba07cesgP70ZGR1xwwuyhdtTKw=";
cargoSha256 = "sha256-cTAbAnSqvrc6e9NtbiV7caj1JnQReWMUhCQoFXZ7Nbs=";
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];

14
pkgs/misc/arm-trusted-firmware/default.nix
View file

@ -1,4 +1,9 @@
{ lib, stdenv, fetchFromGitHub, openssl, pkgsCross, buildPackages }:
{ lib, stdenv, fetchFromGitHub, openssl, pkgsCross, buildPackages
# Warning: this blob runs on the main CPU (not the GPU) at privilege
# level EL3, which is above both the kernel and the hypervisor.
, unfreeIncludeHDCPBlob ? true
}:
let
buildArmTrustedFirmware = { filesToInstall
@ -20,6 +25,11 @@ let
sha256 = "sha256-qT9DdTvMcUrvRzgmVf2qmKB+Rb1WOB4p1rM+fsewGcg=";
};
patches = lib.optionals (!unfreeIncludeHDCPBlob) [
# this is a rebased version of https://gitlab.com/vicencb/kevinboot/-/blob/master/atf.patch
./remove-hdcp-blob.patch
];
depsBuildBuild = [ buildPackages.stdenv.cc ];
# For Cortex-M0 firmware in RK3399
@ -50,7 +60,7 @@ let
meta = with lib; {
homepage = "https://github.com/ARM-software/arm-trusted-firmware";
description = "A reference implementation of secure world software for ARMv8-A";
license = licenses.bsd3;
license = (if unfreeIncludeHDCPBlob then [ licenses.unfreeRedistributable ] else []) ++ [ licenses.bsd3 ];
maintainers = with maintainers; [ lopsided98 ];
} // extraMeta;
} // builtins.removeAttrs args [ "extraMeta" ]);

47
pkgs/misc/arm-trusted-firmware/remove-hdcp-blob.patch Normal file
View file

@ -0,0 +1,47 @@
diff --git a/plat/rockchip/rk3399/drivers/dp/cdn_dp.c b/plat/rockchip/rk3399/drivers/dp/cdn_dp.c
index a8773f4f6..8e28c4830 100644
--- a/plat/rockchip/rk3399/drivers/dp/cdn_dp.c
+++ b/plat/rockchip/rk3399/drivers/dp/cdn_dp.c
@@ -13,17 +13,6 @@
#include <cdn_dp.h>
-__asm__(
- ".pushsection .text.hdcp_handler, \"ax\", %progbits\n"
- ".global hdcp_handler\n"
- ".balign 4\n"
- "hdcp_handler:\n"
- ".incbin \"" HDCPFW "\"\n"
- ".type hdcp_handler, %function\n"
- ".size hdcp_handler, .- hdcp_handler\n"
- ".popsection\n"
-);
-
static uint64_t *hdcp_key_pdata;
static struct cdn_dp_hdcp_key_1x key;
@@ -38,7 +27,7 @@ uint64_t dp_hdcp_ctrl(uint64_t type)
return 0;
case HDCP_KEY_DATA_START_DECRYPT:
if (hdcp_key_pdata == (uint64_t *)(&key + 1))
- return hdcp_handler(&key);
+ return PSCI_E_DISABLED;
else
return PSCI_E_INVALID_PARAMS;
assert(0); /* Unreachable */
diff --git a/plat/rockchip/rk3399/platform.mk b/plat/rockchip/rk3399/platform.mk
index a658fb286..5edb6a25b 100644
--- a/plat/rockchip/rk3399/platform.mk
+++ b/plat/rockchip/rk3399/platform.mk
@@ -88,11 +88,6 @@ $(eval $(call add_define_val,RK3399M0PMUFW,\"$(RK3399M0PMUFW)\"))
ifdef PLAT_RK_DP_HDCP
BL31_SOURCES += ${RK_PLAT_SOC}/drivers/dp/cdn_dp.c
-HDCPFW=${RK_PLAT_SOC}/drivers/dp/hdcp.bin
-$(eval $(call add_define_val,HDCPFW,\"$(HDCPFW)\"))
-
-${BUILD_PLAT}/bl31/cdn_dp.o: CCACHE_EXTRAFILES=$(HDCPFW)
-${RK_PLAT_SOC}/drivers/dp/cdn_dp.c: $(HDCPFW)
endif
# CCACHE_EXTRAFILES is needed because ccache doesn't handle .incbin

80
pkgs/tools/networking/xrootd/default.nix Normal file
View file

@ -0,0 +1,80 @@
{ lib
, stdenv
, callPackage
, fetchFromGitHub
, cmake
, cppunit
, curl
, fuse
, libkrb5
, libuuid
, libxml2
, openssl
, pkg-config
, readline
, systemd
, zlib
, enableTests ? true
}:
stdenv.mkDerivation rec {
pname = "xrootd";
version = "5.4.0";
src = fetchFromGitHub {
owner = "xrootd";
repo = "xrootd";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "A2yUz2KhuRBoo5lMpZwPLNCJlYQXqsZSBR+Knj+gWAk=";
};
outputs = [ "bin" "out" "dev" "man" ];
passthru.tests = lib.optionalAttrs enableTests {
test-runner = callPackage ./test-runner.nix { };
};
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
curl
libkrb5
libuuid
libxml2
openssl
readline
zlib
]
++ lib.optionals stdenv.isLinux [
fuse
systemd
]
++ lib.optionals enableTests [
cppunit
];
preConfigure = ''
patchShebangs genversion.sh
# Manually apply part of
# https://github.com/xrootd/xrootd/pull/1619
# Remove after the above PR is merged.
sed -i 's/set\((\s*CMAKE_INSTALL_[A-Z_]\+DIR\s\+"[^"]\+"\s*)\)/define_default\1/g' cmake/XRootDOSDefs.cmake
'';
cmakeFlags = lib.optionals enableTests [
"-DENABLE_TESTS=TRUE"
];
meta = with lib; {
description = "High performance, scalable fault tolerant data access";
homepage = "https://xrootd.slac.stanford.edu";
license = licenses.lgpl3Plus;
platforms = platforms.all;
maintainers = with maintainers; [ ShamrockLee ];
};
}

27
pkgs/tools/networking/xrootd/test-runner.nix Normal file
View file

@ -0,0 +1,27 @@
{ lib
, runCommand
, xrootd
}:
# These tests are specified in the test procedure of the upstream CD:
# https://github.com/xrootd/xrootd/blob/master/.github/workflows/build.yml#L90-L98
runCommand "${xrootd.pname}-run-tests-${xrootd.version}" {
testRunnerPath = "${xrootd}/bin/test-runner";
testLibraries = [ "XrdClTests" ];
XrdClTestsSuites = [ "UtilsTest" "SocketTest" "PollerTest" ];
pname = "${xrootd.pname}-run-tests";
inherit (xrootd) version;
meta.mainProgram = "test-runner";
} ''
for testLibrary in $testLibraries; do
echo "Testing $testLibrary"
testLibraryPath="${xrootd.out}/lib/lib''${testLibrary}.so"
testsuiteVarname="''${testLibrary}Suites"
for testsuite in ''${!testsuiteVarname}; do
echo "Doing test $testsuite"
"$testRunnerPath" "$testLibraryPath" "All Tests/$testsuite/"
done
done
mkdir -p "$out/bin"
ln -s "$testRunnerPath" "$out/bin/test-runner"
''

14
pkgs/tools/package-management/packagekit/default.nix
View file

@ -11,6 +11,7 @@
, vala
, gtk-doc
, nix
, nlohmann_json ? null
, boost
, meson
, ninja
@ -26,18 +27,24 @@
, enableSystemd ? stdenv.isLinux
, systemd
}:
let
nix_version = lib.removeSuffix nix.VERSION_SUFFIX nix.version;
useNlohmann = lib.versionAtLeast "2.7" nix_version;
in
assert useNlohmann -> nlohmann_json != null;
stdenv.mkDerivation rec {
pname = "packagekit";
version = "1.2.5pre";
version = "1.2.5.1pre";
outputs = [ "out" "dev" "devdoc" ];
src = fetchFromGitHub {
owner = "PackageKit";
repo = "PackageKit";
rev = "9c2ef9cddf39ebde587907561f8e7ac99ed6be1a";
sha256 = "05z1ds240kcmigygkbgjasr4spn7vd7cbpsbfrghhgnmszx9bjgl";
rev = "33b847c49b4a42499e3c0f10fef62830c874e086";
sha256 = "UDpMswf0EBwcoHTqoWiztXnIAwM69nM+S9MPsR24amw=";
};
buildInputs = [
@ -52,6 +59,7 @@ stdenv.mkDerivation rec {
nix
boost
] ++ lib.optional enableSystemd systemd
++ lib.optional useNlohmann nlohmann_json
++ lib.optional enableBashCompletion bash-completion;
nativeBuildInputs = [
vala

6
pkgs/tools/security/gpg-tui/default.nix
View file

@ -16,16 +16,16 @@
rustPlatform.buildRustPackage rec {
pname = "gpg-tui";
version = "0.8.2";
version = "0.8.3";
src = fetchFromGitHub {
owner = "orhun";
repo = "gpg-tui";
rev = "v${version}";
hash = "sha256-jddkws4TXuW0AdLBEpS5RPk1a/mEkwYWMbYiLjt22LU=";
hash = "sha256-lqV09FEZAw1ir2cJr8ABhbgSoZoWnxhbxyA1HAufLQA=";
};
cargoHash = "sha256-bj77fMmpXeOqb1MzOPsEPQUh5AnZxBrapzt864V+IUU=";
cargoHash = "sha256-RMF4/WJRcpHuXKMvDYAGaJxUazcpkQCpv//u5XOd9Dg=";
nativeBuildInputs = [
gpgme # for gpgme-config

2
pkgs/tools/system/gdu/default.nix
View file

@ -45,7 +45,7 @@ buildGoModule rec {
'';
homepage = "https://github.com/dundee/gdu";
license = with licenses; [ mit ];
maintainers = [ maintainers.fab ];
maintainers = [ maintainers.fab maintainers.zowoq ];
platforms = platforms.unix;
};
}

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

@ -1094,6 +1094,8 @@ with pkgs;
xcd = callPackage ../tools/misc/xcd { };
xrootd = callPackage ../tools/networking/xrootd { };
xtrt = callPackage ../tools/archivers/xtrt { };
yabridge = callPackage ../tools/audio/yabridge {