Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
8e4dd5face
|
|
@ -5912,6 +5912,15 @@
|
|||
githubId = 41522204;
|
||||
name = "hexchen";
|
||||
};
|
||||
heyimnova = {
|
||||
email = "git@heyimnova.dev";
|
||||
github = "heyimnova";
|
||||
githubId = 115728866;
|
||||
name = "Nova Witterick";
|
||||
keys = [{
|
||||
fingerprint = "4304 6B43 8D83 078E 3DF7 10D6 DEB0 E15C 6D2A 5A7C";
|
||||
}];
|
||||
};
|
||||
hh = {
|
||||
email = "hh@m-labs.hk";
|
||||
github = "HarryMakes";
|
||||
|
|
|
|||
|
|
@ -65,8 +65,6 @@ in {
|
|||
] ++ optional pkgs.stdenv.hostPlatform.isAarch raspberrypiWirelessFirmware
|
||||
++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [
|
||||
rtl8723bs-firmware
|
||||
] ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "5.16") [
|
||||
rtw89-firmware
|
||||
];
|
||||
hardware.wirelessRegulatoryDatabase = true;
|
||||
})
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ in {
|
|||
wantedBy = [ "multi-user.target" ];
|
||||
wants = [ "network-online.target" ] ++ cfg.serviceDependencies;
|
||||
after = [ "network-online.target" ] ++ cfg.serviceDependencies;
|
||||
path = [ pkgs.lottieconverter ];
|
||||
path = [ pkgs.lottieconverter pkgs.ffmpeg-full ];
|
||||
|
||||
# mautrix-telegram tries to generate a dotfile in the home directory of
|
||||
# the running user if using a postgresql database:
|
||||
|
|
|
|||
|
|
@ -5,21 +5,22 @@
|
|||
, patchelf
|
||||
, makeWrapper
|
||||
, openssl
|
||||
, libxcrypt
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "snowsql";
|
||||
majorVersion = "1.2";
|
||||
version = "${majorVersion}.21";
|
||||
version = "${majorVersion}.23";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://sfc-repo.snowflakecomputing.com/snowsql/bootstrap/${majorVersion}/linux_x86_64/snowflake-snowsql-${version}-1.x86_64.rpm";
|
||||
sha256 = "10pzxqk71amvaz951jl666ia6v0z22bgpvr108l3q62950hhhwmn";
|
||||
sha256 = "16zx30l3g5i5ndgxsqlkmkrfzswbczpb3jcya3psq5170i8cfm8f";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ rpmextract makeWrapper ];
|
||||
|
||||
libPath = lib.makeLibraryPath [ openssl ];
|
||||
libPath = lib.makeLibraryPath [ openssl libxcrypt ];
|
||||
|
||||
buildCommand = ''
|
||||
mkdir -p $out/bin/
|
||||
|
|
|
|||
|
|
@ -21,11 +21,11 @@ let
|
|||
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "vivaldi";
|
||||
version = "5.6.2867.62";
|
||||
version = "5.7.2921.53";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_amd64.deb";
|
||||
sha256 = "sha256-p5okCdvEBurL1UgqLMBhCd4caPbiOA1WZrI9TC5j6og=";
|
||||
sha256 = "sha256-qkKCoHJCRji3XfXk71n4BfjFyQpXZ+BariHmbYPAuv8=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
|
|
|||
|
|
@ -37,6 +37,11 @@ stdenv.mkDerivation {
|
|||
url = "https://github.com/desktop-app/tg_owt/pull/101/commits/86d2bcd7afb8706663d29e30f65863de5a626142.patch";
|
||||
hash = "sha256-iWS0mB8R0vqPU/0qf6Ax54UCAKYDVCPac2mi/VHbFm0=";
|
||||
})
|
||||
# additional fix for GCC 12 + musl
|
||||
(fetchpatch {
|
||||
url = "https://git.alpinelinux.org/aports/plain/community/tg_owt/gcc12.patch?id=8120df03fa3b6db5b8ff92c7a52b680290ad6e20";
|
||||
hash = "sha256-ikgxUH1e7pz0n0pKUemrPXXa4UkECX+w467M9gU68zs=";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
|
|
@ -67,6 +67,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
# Testing of the CLI part and output
|
||||
"test_color_due_dates"
|
||||
"test_color_flag"
|
||||
"test_datetime_serialization" # Will be fixed in versions after 4.1.0
|
||||
"test_default_command"
|
||||
"test_main"
|
||||
"test_missing_cache_dir"
|
||||
|
|
@ -74,8 +75,6 @@ python3.pkgs.buildPythonApplication rec {
|
|||
"test_xdg_existant"
|
||||
# Tests are sensitive to performance
|
||||
"test_sorting_fields"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"test_sorting_fields"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "glitter";
|
||||
version = "1.6.3";
|
||||
version = "1.6.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "milo123459";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xrQqeRJfBEcjX0tkULg+94R7+mWWn6QeKIfZiDp+Vt8=";
|
||||
sha256 = "sha256-sMAHVXpgAhZYUpl75JRtKhTqt/sQkSkoEzk7aGV1vcQ=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-GQ7Bns+FPj4jl2dBXnMrmcKIYcZTLZc1WvaHgKGj/gU=";
|
||||
cargoSha256 = "sha256-CaWpGNP7Jsv/3dks0LVbZXoD/9HqJmOzaD0ejT5xSqA=";
|
||||
|
||||
nativeCheckInputs = [
|
||||
git
|
||||
|
|
|
|||
48
pkgs/applications/virtualization/quickgui/default.nix
Normal file
48
pkgs/applications/virtualization/quickgui/default.nix
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, autoPatchelfHook
|
||||
, dpkg
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "quickgui";
|
||||
version = "1.2.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/quickemu-project/quickgui/releases/download/v${version}/quickgui_${version}-1_lunar1.0_amd64.deb";
|
||||
sha256 = "sha256-crnV7OWH5UbkMM/TxTIOlXmvqBgjFmQG7RxameMOjH0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
dpkg
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
unpackCmd = "dpkg-deb -x $curSrc source";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mv usr $out
|
||||
substituteInPlace $out/share/applications/quickgui.desktop \
|
||||
--replace "/usr" $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A Flutter frontend for quickemu";
|
||||
homepage = "https://github.com/quickemu-project/quickgui";
|
||||
changelog = "https://github.com/quickemu-project/quickgui/releases/tag/v${version}";
|
||||
maintainers = [ lib.maintainers.heyimnova ];
|
||||
platforms = lib.platforms.linux;
|
||||
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
|
||||
mainProgram = "quickgui";
|
||||
};
|
||||
}
|
||||
61
pkgs/desktops/deepin/core/dde-polkit-agent/default.nix
Normal file
61
pkgs/desktops/deepin/core/dde-polkit-agent/default.nix
Normal file
|
|
@ -0,0 +1,61 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, dtkwidget
|
||||
, qt5integration
|
||||
, qt5platform-plugins
|
||||
, dde-qt-dbus-factory
|
||||
, pkg-config
|
||||
, cmake
|
||||
, qttools
|
||||
, wrapQtAppsHook
|
||||
, polkit-qt
|
||||
, qtbase
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dde-polkit-agent";
|
||||
version = "5.5.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-4wAqMymLPxKXbfAx2PtkEGfwenphPxBZn+qCdcyqNc0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace AuthDialog.cpp \
|
||||
--replace "/usr/share/dde-session-shell/dde-session-shell.conf" "/etc/dde-session-shell/dde-session-shell.conf"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
qttools
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
dtkwidget
|
||||
qt5platform-plugins
|
||||
dde-qt-dbus-factory
|
||||
polkit-qt
|
||||
];
|
||||
|
||||
# qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
|
||||
qtWrapperArgs = [
|
||||
"--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
wrapQtApp $out/lib/polkit-1-dde/dde-polkit-agent
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "PolicyKit agent for Deepin Desktop Environment";
|
||||
homepage = "https://github.com/linuxdeepin/dde-polkit-agent";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
51
pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix
Normal file
51
pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, qttools
|
||||
, wrapQtAppsHook
|
||||
, dtkwidget
|
||||
, dde-polkit-agent
|
||||
, libsecret
|
||||
, libgnome-keyring
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dpa-ext-gnomekeyring";
|
||||
version = "5.0.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-mXaGwbtEwaqfOT0izK64zX4s3VFmsRpUGOVm6oSEhn8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace gnomekeyringextention.cpp \
|
||||
--replace "/usr/share/dpa-ext-gnomekeyring" "$out/share/dpa-ext-gnomekeyring"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
qttools
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
dtkwidget
|
||||
dde-polkit-agent
|
||||
libgnome-keyring
|
||||
libsecret
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "GNOME keyring extension for dde-polkit-agent";
|
||||
homepage = "https://github.com/linuxdeepin/dpa-ext-gnomekeyring";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
|
|
@ -29,6 +29,10 @@ let
|
|||
image-editor = callPackage ./library/image-editor { };
|
||||
udisks2-qt5 = callPackage ./library/udisks2-qt5 { };
|
||||
|
||||
#### CORE
|
||||
dde-polkit-agent = callPackage ./core/dde-polkit-agent { };
|
||||
dpa-ext-gnomekeyring = callPackage ./core/dpa-ext-gnomekeyring { };
|
||||
|
||||
#### Dtk Application
|
||||
deepin-album = callPackage ./apps/deepin-album { };
|
||||
deepin-calculator = callPackage ./apps/deepin-calculator { };
|
||||
|
|
|
|||
|
|
@ -133,7 +133,8 @@ rec {
|
|||
# Use -fPIC for compilation, and link with -pie if no -shared flag used in ldflags
|
||||
echo "-target ${targetInfo.triple} -fPIC" >> $out/nix-support/cc-cflags
|
||||
echo "-z,noexecstack -z,relro -z,now -z,muldefs" >> $out/nix-support/cc-ldflags
|
||||
echo 'if [[ ! " $@ " =~ " -shared " ]]; then NIX_LDFLAGS_${suffixSalt}+=" -pie"; fi' >> $out/nix-support/add-flags.sh
|
||||
echo 'expandResponseParams "$@"' >> $out/nix-support/add-flags.sh
|
||||
echo 'if [[ ! (" ''${params[@]} " =~ " -shared ") && ! (" ''${params[@]} " =~ " -no-pie ") ]]; then NIX_LDFLAGS_${suffixSalt}+=" -pie"; fi' >> $out/nix-support/add-flags.sh
|
||||
echo "-Xclang -mnoexecstack" >> $out/nix-support/cc-cxxflags
|
||||
if [ ${targetInfo.triple} == arm-linux-androideabi ]; then
|
||||
# https://android.googlesource.com/platform/external/android-cmake/+/refs/heads/cmake-master-dev/android.toolchain.cmake
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mautrix";
|
||||
version = "0.19.3";
|
||||
version = "0.19.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
|||
owner = "mautrix";
|
||||
repo = "python";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7nvy2/DUS2BkcyQUUG8+aT/JHcPu141e5YWOiccS6cU=";
|
||||
hash = "sha256-zPcqM+Ge7K4pJD4K0MkkGdSiYvXxe0K1qbfHzVYmGx0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymicrobot";
|
||||
version = "0.0.8";
|
||||
version = "0.0.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "PyMicroBot";
|
||||
inherit version;
|
||||
hash = "sha256-I4EkiG39v0yJXOAR7lmaqedLf9zHQCcxLXQ0nTfYq70=";
|
||||
hash = "sha256-dhhRHXdck7hJGkXQpkiMulLsnMluZ5ADZ9L8cNm6dFs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -34,6 +34,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Library to communicate with MicroBot";
|
||||
homepage = "https://github.com/spycle/pyMicroBot/";
|
||||
changelog = "https://github.com/spycle/pyMicroBot/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -20,14 +20,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-glanceclient";
|
||||
version = "4.2.0";
|
||||
version = "4.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-+CmOh9Dr6Gx8MLkR1u/YNpScOxIO7OUIbJAio+omOpg=";
|
||||
hash = "sha256-5nwCPOc9GBxk9BItiaScfy1eljl+e0okFCEOVsHoXDQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytibber";
|
||||
version = "0.27.0";
|
||||
version = "0.27.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "Danielhiversen";
|
||||
repo = "pyTibber";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-m4y65UiuiWRS7EBv6AFnX9Ia2eTy8H1vgfx+fQrcXz4=";
|
||||
hash = "sha256-KmUzXlINRbtyzZCoG4d2Xc57g07d+x7bdoq/DtMmtqM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "bingo";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bwplotka";
|
||||
repo = "bingo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-s+vdtMzeHUtUlmMlvgnK83RYoMqS3GqrTnu7LssIK6A=";
|
||||
hash = "sha256-YvBRI1i7ICnacYQv7rNDuUnqhuLXJ4eAZhT0ce3vFuU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-28p1g+p+guJ0x4/5QDGsGN6gDnZkE4AKF/2cFgNjPDM=";
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "inferno";
|
||||
version = "0.11.14";
|
||||
version = "0.11.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jonhoo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0H+h4BM4x3vlI6EMeXNzcCQpW2S4czJR2GaviZ0nhEM=";
|
||||
hash = "sha256-fyTsB+1ftol3prNLydT/coLchip1vijmfLLt3/DnBbc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoHash = "sha256-5VQNgZUgakQUczKs7T+c305c3I1DDSaVMO3tFXqIdIc=";
|
||||
cargoHash = "sha256-XBah55xfbWjQrkupebZE2uiveFhh/R0BF1KEKkY5Hx8=";
|
||||
|
||||
# skip flaky tests
|
||||
checkFlags = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# This file is autogenerated! Run ./update.sh to regenerate.
|
||||
{
|
||||
version = "20221214";
|
||||
sourceHash = "sha256-vljUwXekmCYAH932wfbJe/hC4TDPRQOgEiPTUMeUKLE=";
|
||||
outputHash = "sha256-h0cCqnl6XvSoeyq54JHvl45z7qe/7ZKrcMNJJeqVLMk=";
|
||||
version = "20230210";
|
||||
sourceHash = "sha256-sjUO+DTjAMszfCkNSYjLS+AbceIVPVVH0OEho5VOIFA=";
|
||||
outputHash = "sha256-ZcmMLenblgQngdYui0wNANXhB5a/z635nNXo/MO83R8=";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
{ stdenvNoCC, lib, fetchFromGitHub }:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "rtw89-firmware";
|
||||
|
||||
# TODO: probably remove after updating linux firmware
|
||||
# https://github.com/lwfinger/rtw89/commit/a2c113501a5a988683f236df1aa79ce40f29e1be
|
||||
version = "unstable-2021-10-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lwfinger";
|
||||
repo = "rtw89";
|
||||
rev = "0684157cba90e36bff5bc61a59e7e87c359b5e5c";
|
||||
sha256 = "0cvawyi1ksw9xkr8pzwipsl7b8hnmrb17w5cblyicwih8fqaw632";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/lib/firmware/rtw89
|
||||
cp *.bin $out/lib/firmware/rtw89
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Driver for Realtek 8852AE, an 802.11ax device";
|
||||
homepage = "https://github.com/lwfinger/rtw89";
|
||||
license = licenses.unfreeRedistributableFirmware;
|
||||
maintainers = with maintainers; [ tvorog ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,34 +2,33 @@
|
|||
, python3
|
||||
, fetchFromGitHub
|
||||
, withE2BE ? true
|
||||
, withHQthumbnails ? false
|
||||
}:
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.27.0a7";
|
||||
version = "1.28.0a1";
|
||||
pname = "tulir-telethon";
|
||||
src = super.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-w4WILvLvJBKf3Nlj0omTCDDD4z+b0XFlCplQ/IHwIPs=";
|
||||
hash = "sha256-Kf7S5nSvedhA5RYt5rbTxBiQq6DGwHJ5uEYxd9AsYIc=";
|
||||
};
|
||||
doCheck = false;
|
||||
});
|
||||
};
|
||||
};
|
||||
in
|
||||
python.pkgs.buildPythonPackage rec {
|
||||
python.pkgs.buildPythonPackage {
|
||||
pname = "mautrix-telegram";
|
||||
version = "unstable-2023-01-28";
|
||||
version = "unstable-2023-02-16";
|
||||
disabled = python.pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mautrix";
|
||||
repo = "telegram";
|
||||
rev = "f12abbe03846fd5897d58572ab24b70a58b337d2";
|
||||
sha256 = "sha256-5ZZ85FOmTO26q2zhAIsF7mTlN4BLNLW2dQF+0culkUM=";
|
||||
rev = "354b49d9e5f91f913b5fdf9288bc631a9a34d142";
|
||||
hash = "sha256-zdK/0jgw++YwSzP8qs1BqInQlFOoM63TeI1jF1AqDnk=";
|
||||
};
|
||||
|
||||
format = "setuptools";
|
||||
|
|
@ -59,9 +58,6 @@ python.pkgs.buildPythonPackage rec {
|
|||
prometheus-client
|
||||
# sqlite
|
||||
aiosqlite
|
||||
] ++ lib.optionals withHQthumbnails [
|
||||
# hq_thumbnails
|
||||
moviepy
|
||||
] ++ lib.optionals withE2BE [
|
||||
# e2be
|
||||
python-olm
|
||||
|
|
|
|||
|
|
@ -1,20 +1,21 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub }:
|
||||
{ lib, rustPlatform, fetchFromGitea }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "evscript";
|
||||
version = "unstable-2021-06-16";
|
||||
version = "unstable-2022-11-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "unrelentingtech";
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "valpackett";
|
||||
repo = pname;
|
||||
rev = "25912c0b6446f31b0f64485af3fa4aa8a93b33df";
|
||||
sha256 = "sha256-apq3kHipEX6zOTNwqpIQR46JqmeE7EKVSOGrNNSkyu8=";
|
||||
rev = "ba997c9723a91717c683f08e9957d0ecea3da6cd";
|
||||
sha256 = "sha256-wuTPcBUuPK1D4VO8BXexx9AdiPM+X0TkJ3G7b7ofER8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-1aR9/fhJQ+keRIxSG2cpY1HTalE6nM+MTb1Za3Tot28=";
|
||||
cargoSha256 = "sha256-5jcb/MajXV9bp0T9Og8d5TEzTwQyiyPTPHeWh8Ewr8Q=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/unrelentingtech/evscript";
|
||||
homepage = "https://codeberg.org/valpackett/evscript";
|
||||
description = "A tiny sandboxed Dyon scripting environment for evdev input devices";
|
||||
license = licenses.unlicense;
|
||||
maintainers = with maintainers; [ milesbreslin ];
|
||||
|
|
|
|||
|
|
@ -2,23 +2,27 @@
|
|||
, lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, CoreServices
|
||||
, Security
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "MozWire";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NilsIrl";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vC8HmwJCHMKQUsYBwRmr88tmZxPKNvI6hxlcjG2AV3Q=";
|
||||
hash = "sha256-2i8C1XgfI3MXnwXZzY6n8tIcw45G9h3vZqRlFaVoLH0=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
CoreServices
|
||||
Security
|
||||
];
|
||||
|
||||
cargoHash = "sha256-9qXoMugmL6B9vC/yrMJxZ5p792ZJmrTzk/khRVTkHf4=";
|
||||
cargoHash = "sha256-YXVH7kx5CiurTeXiphjDgcYxxovKtTF3Q9y/XOyVPUA=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "MozillaVPN configuration manager giving Linux, macOS users (among others), access to MozillaVPN";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "q";
|
||||
version = "0.8.4";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "natesales";
|
||||
repo = "q";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-M2TgDha+F4hY7f9sabzZEdsxdp8rdXDZB4ktmpDF5D8=";
|
||||
sha256 = "sha256-WPVHMAau3+0jcIrRhRL5dy6h+J13LKj5GwQMJi7hGvo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-216NwRlU7mmr+ebiBwq9DVtFb2SpPgkGUrVZMUAY9rI=";
|
||||
vendorHash = "sha256-0Yd8y1SkxmfIFZuSheMGQnurlFv3sxkSDgGrQJLR3iU=";
|
||||
|
||||
doCheck = false; # tries to resolve DNS
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
|
|||
buildInputs = lib.optionals stdenv.isLinux [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ Security CoreServices ];
|
||||
|
||||
cargoBuildFeatures = [
|
||||
buildFeatures = [
|
||||
"trust-dns"
|
||||
"local-http-native-tls"
|
||||
"local-tunnel"
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "traceroute";
|
||||
version = "2.1.1";
|
||||
version = "2.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/traceroute/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-j8jVBG6FXXWIYHuzGfW4LjuhPpHV1GNoYyYuY4a7r3Y=";
|
||||
sha256 = "sha256-UHwmjyl3tOIYznPn6+1Fug2XCoykmV3Zy7H/6OmbWx8=";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "openpgp-card-tools";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Mvnj8AEhREP+nGrioC9IHYX3k6sKGKzOh00V8nslyhw=";
|
||||
sha256 = "sha256-Wgj6YZSQj8+BcyPboUTadUOg6Gq6VxV4GRW8TWbnRfc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-0KRq8GsrQaLJ6fopZpdzgxIWHIse9QWDo24IQj1eAhc=";
|
||||
cargoHash = "sha256-u6xzKDCtv5FzaYgn5wab6ZPICJ/DaqUxiRS80xaEa1A=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];
|
||||
buildInputs = [ pcsclite nettle ] ++ lib.optionals stdenv.isDarwin [ PCSC ];
|
||||
|
|
|
|||
|
|
@ -21,5 +21,6 @@ rustPlatform.buildRustPackage rec {
|
|||
homepage = "https://github.com/solidiquis/erdtree";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ zendo ];
|
||||
mainProgram = "et";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, rust
|
||||
, rustPlatform
|
||||
, pkg-config
|
||||
, ronn
|
||||
|
|
@ -9,7 +10,7 @@
|
|||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zram-generator";
|
||||
version = "1.1.2";
|
||||
|
||||
|
|
@ -20,23 +21,20 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-n+ZOWU+sPq9DcHgzQWTxxfMmiz239qdetXypqdy33cM=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
};
|
||||
|
||||
# RFE: Include Cargo.lock in sources
|
||||
# https://github.com/systemd/zram-generator/issues/65
|
||||
cargoLock.lockFile = ./Cargo.lock;
|
||||
|
||||
postPatch = ''
|
||||
cp ${./Cargo.lock} Cargo.lock
|
||||
substituteInPlace Makefile \
|
||||
--replace 'target/$(BUILDTYPE)' 'target/${rust.toRustTargetSpec stdenv.hostPlatform}/$(BUILDTYPE)'
|
||||
substituteInPlace src/generator.rs \
|
||||
--replace 'Command::new("systemd-detect-virt")' 'Command::new("${systemd}/bin/systemd-detect-virt")' \
|
||||
--replace 'Command::new("modprobe")' 'Command::new("${kmod}/bin/modprobe")'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = with rustPlatform; [
|
||||
cargoSetupHook
|
||||
rust.cargo
|
||||
rust.rustc
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
ronn
|
||||
];
|
||||
|
|
@ -45,7 +43,16 @@ stdenv.mkDerivation rec {
|
|||
systemd
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
preBuild = ''
|
||||
# embedded into the binary at build time
|
||||
# https://github.com/systemd/zram-generator/blob/v1.1.2/Makefile#LL11-L11C56
|
||||
export SYSTEMD_UTIL_DIR=$($PKG_CONFIG --variable=systemdutildir systemd)
|
||||
'';
|
||||
|
||||
dontCargoInstall = true;
|
||||
|
||||
installFlags = [
|
||||
"-o program" # already built by cargoBuildHook
|
||||
"PREFIX=$(out)"
|
||||
"SYSTEMD_SYSTEM_UNIT_DIR=$(out)/lib/systemd/system"
|
||||
"SYSTEMD_SYSTEM_GENERATOR_DIR=$(out)/lib/systemd/system-generators"
|
||||
|
|
|
|||
|
|
@ -1373,6 +1373,7 @@ mapAliases ({
|
|||
# The alias for linuxPackages*.rtlwifi_new is defined in ./all-packages.nix,
|
||||
# due to it being inside the linuxPackagesFor function.
|
||||
rtlwifi_new-firmware = rtw88-firmware; # Added 2021-03-14
|
||||
rtw89-firmware = throw "rtw89-firmware has been removed because linux-firmware now contains it."; # Added 2023-02-19
|
||||
|
||||
### S ###
|
||||
|
||||
|
|
|
|||
|
|
@ -226,6 +226,8 @@ with pkgs;
|
|||
|
||||
quickemu = callPackage ../development/quickemu { };
|
||||
|
||||
quickgui = callPackage ../applications/virtualization/quickgui { };
|
||||
|
||||
adcli = callPackage ../os-specific/linux/adcli { };
|
||||
|
||||
aether = callPackage ../applications/networking/aether { };
|
||||
|
|
@ -6818,7 +6820,7 @@ with pkgs;
|
|||
mozillavpn = qt6Packages.callPackage ../tools/networking/mozillavpn { };
|
||||
|
||||
mozwire = callPackage ../tools/networking/mozwire {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
|
||||
};
|
||||
|
||||
pax = callPackage ../tools/archivers/pax {
|
||||
|
|
@ -26599,8 +26601,6 @@ with pkgs;
|
|||
|
||||
rtw88-firmware = callPackage ../os-specific/linux/firmware/rtw88-firmware { };
|
||||
|
||||
rtw89-firmware = callPackage ../os-specific/linux/firmware/rtw89-firmware { };
|
||||
|
||||
rvvm = callPackage ../applications/virtualization/rvvm { };
|
||||
|
||||
s3ql = callPackage ../tools/backup/s3ql { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue