Merge master into staging-next

This commit is contained in:
github-actions[bot]
2023-04-24 18:01:06 +00:00
committed by GitHub
24 changed files with 1537 additions and 51 deletions
+1
View File
@@ -43,6 +43,7 @@ Below is a short excerpt of some points in there:
* Not start with the package name.
* More generally, it should not refer to the package name.
* Not end with a period (or any punctuation for that matter).
* Aim to inform while avoiding subjective language.
* `meta.license` must be set and fit the upstream license.
* If there is no upstream license, `meta.license` should default to `lib.licenses.unfree`.
* If in doubt, try to contact the upstream developers for clarification.
+18
View File
@@ -5592,6 +5592,12 @@
fingerprint = "D0CF 440A A703 E0F9 73CB A078 82BB 70D5 41AE 2DB4";
}];
};
geri1701 = {
email = "geri@sdf.org";
github = "geri1701";
githubId = 67984144;
name = "Gerhard Schwanzer";
};
gerschtli = {
email = "tobias.happ@gmx.de";
github = "Gerschtli";
@@ -6118,6 +6124,12 @@
githubId = 2405974;
name = "Sébastian Méric de Bellefon";
};
hellwolf = {
email = "zhicheng.miao@gmail.com";
github = "hellwolf";
githubId = 186660;
name = "Miao, ZhiCheng";
};
henkery = {
email = "jim@reupload.nl";
github = "henkery";
@@ -11983,6 +11995,12 @@
githubId = 920910;
name = "peelz";
};
pelme = {
email = "andreas@pelme.se";
github = "pelme";
githubId = 20529;
name = "Andreas Pelme";
};
penalty1083 = {
email = "penalty1083@outlook.com";
github = "penalty1083";
+20 -2
View File
@@ -574,12 +574,15 @@ in
virtualisation.writableStore =
mkOption {
type = types.bool;
default = true; # FIXME
default = cfg.mountHostNixStore;
defaultText = literalExpression "cfg.mountHostNixStore";
description =
lib.mdDoc ''
If enabled, the Nix store in the VM is made writable by
layering an overlay filesystem on top of the host's Nix
store.
By default, this is enabled if you mount a host Nix store.
'';
};
@@ -713,6 +716,21 @@ in
For applications which do a lot of reads from the store,
this can drastically improve performance, but at the cost of
disk space and image build time.
As an alternative, you can use a bootloader which will provide you
with a full NixOS system image containing a Nix store and
avoid mounting the host nix store through
{option}`virtualisation.mountHostNixStore`.
'';
};
virtualisation.mountHostNixStore =
mkOption {
type = types.bool;
default = !cfg.useNixStoreImage && !cfg.useBootLoader;
defaultText = literalExpression "!cfg.useNixStoreImage && !cfg.useBootLoader";
description = lib.mdDoc ''
Mount the host Nix store as a 9p mount.
'';
};
@@ -933,7 +951,7 @@ in
virtualisation.additionalPaths = [ config.system.build.toplevel ];
virtualisation.sharedDirectories = {
nix-store = mkIf (!cfg.useNixStoreImage) {
nix-store = mkIf cfg.mountHostNixStore {
source = builtins.storeDir;
target = "/nix/store";
};
+3 -5
View File
@@ -2,17 +2,15 @@
python3Packages.buildPythonApplication rec {
pname = "mopidy-somafm";
version = "2.0.0";
version = "2.0.2";
src = python3Packages.fetchPypi {
inherit version;
pname = "Mopidy-SomaFM";
sha256 = "1j88rrliys8hqvnb35k1xqw88bvrllcb4rb53lgh82byhscsxlf3";
sha256 = "DC0emxkoWfjGHih2C8nINBFByf521Xf+3Ks4JRxNPLM=";
};
propagatedBuildInputs = [
mopidy
];
propagatedBuildInputs = [ mopidy ];
doCheck = false;
@@ -2,23 +2,28 @@
rustPlatform.buildRustPackage rec {
pname = "xplr";
version = "0.20.2";
version = "0.21.1";
src = fetchFromGitHub {
owner = "sayanarijit";
repo = pname;
rev = "v${version}";
sha256 = "sha256-iPcxDNtwWnvFljZw052aw/ekCahyFBNt/zbUAdaWJA8=";
sha256 = "sha256-WUv0F7etmJFNRnHXkQ5G3p/5BWL30kfSYnxXYpAdo+I=";
};
buildInputs = lib.optional stdenv.isDarwin libiconv;
cargoSha256 = "sha256-Sn7ZcNdmMDQJHn99iTJX9c3uVhaGpRvEgdoJFmIUgeU=";
cargoSha256 = "sha256-0JJpGSOwayPB3cn7OpBjsOiK4WQNbil3gYrfkqG2cS8=";
checkFlags = [
# failure: path::tests::test_relative_to_parent
"--skip=path::tests::test_relative_to_parent"
];
meta = with lib; {
description = "A hackable, minimal, fast TUI file explorer";
homepage = "https://xplr.dev";
license = licenses.mit;
maintainers = with maintainers; [ sayanarijit suryasr007 thehedgeh0g ];
maintainers = with maintainers; [ sayanarijit suryasr007 thehedgeh0g mimame ];
};
}
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "snapmaker-luban";
version = "4.7.2";
version = "4.7.3";
src = fetchurl {
url = "https://github.com/Snapmaker/Luban/releases/download/v${version}/snapmaker-luban-${version}-linux-x64.tar.gz";
sha256 = "sha256-Orl3nKqkz1L1MTUEaxpnhD/nzQPDXxzgAP/GfC5tQ/o=";
sha256 = "sha256-CPeTTnwykaa58tpA7Aznrvrs0DqxOKjspZjHrT+e9tw=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "toot";
version = "0.34.1";
version = "0.36.0";
src = fetchFromGitHub {
owner = "ihabunek";
repo = "toot";
rev = "refs/tags/${version}";
sha256 = "sha256-5LTd3FPodYxMm4zZJsAfO0O1Y0AXUxaz+ZtEh6b5Etw=";
sha256 = "sha256-gEQA9PASSKAMqulOaK8ynBXX7BdptY1uwdS1tOf3/Jc=";
};
nativeCheckInputs = with python3Packages; [ pytest ];
@@ -1,16 +1,32 @@
{ lib, fetchurl, mkDerivation, cmake, extra-cmake-modules, pkg-config, qtbase, qtkeychain, sqlite, libsecret }:
{ lib
, fetchFromGitHub
, mkDerivation
, pkg-config
, cmake
, extra-cmake-modules
, callPackage
, qtbase
, qtkeychain
, qttools
, sqlite
, libsecret
}:
mkDerivation rec {
pname = "owncloud-client";
version = "2.11.0.8354";
version = "3.2.1";
src = fetchurl {
url = "https://download.owncloud.com/desktop/ownCloud/stable/${version}/source/ownCloud-${version}.tar.xz";
sha256 = "sha256-YraWvGgeF5b1+3i5Jlk+bwvAULr7KFOSX8y0ZoPpljI=";
libregraph = callPackage ./libre-graph-api-cpp-qt-client.nix { };
src = fetchFromGitHub {
owner = "owncloud";
repo = "client";
rev = "refs/tags/v${version}";
hash = "sha256-39tpvzlTy3KRxg8DzCQW2VnsaLqJ+dNQRur2TqRZytE=";
};
nativeBuildInputs = [ pkg-config cmake extra-cmake-modules ];
buildInputs = [ qtbase qtkeychain sqlite libsecret ];
buildInputs = [ qtbase qttools qtkeychain sqlite libsecret libregraph ];
qtWrapperArgs = [
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}"
@@ -19,13 +35,17 @@ mkDerivation rec {
cmakeFlags = [
"-UCMAKE_INSTALL_LIBDIR"
"-DNO_SHIBBOLETH=1"
# https://github.com/owncloud/client/issues/10537#issuecomment-1447965096
# NB! From 4.0 it may be turned off by default
"-DWITH_AUTO_UPDATER=OFF"
];
meta = with lib; {
description = "Synchronise your ownCloud with your computer using this desktop client";
homepage = "https://owncloud.org";
maintainers = [ maintainers.qknight ];
maintainers = with maintainers; [ qknight hellwolf ];
platforms = platforms.unix;
license = licenses.gpl2Plus;
changelog = "https://github.com/owncloud/client/releases/tag/v${version}";
};
}
@@ -0,0 +1,34 @@
{ lib
, fetchFromGitHub
, mkDerivation
, cmake
, qtbase
}:
mkDerivation rec {
pname = "libre-graph-api-cpp-qt-client";
version = "0.13.2";
src = fetchFromGitHub {
owner = "owncloud";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-gbrA8P+ukQAiF2czC2szw3fJv1qoPJyMQ72t7PqB5/s=";
};
sourceRoot = "source/client";
nativeBuildInputs = [ cmake ];
buildInputs = [ qtbase ];
cmakeFlags = [ ];
meta = with lib; {
description = "C++ Qt API for Libre Graph, a free API for cloud collaboration inspired by the MS Graph API";
homepage = "https://owncloud.org";
maintainers = with maintainers; [ qknight hellwolf ];
platforms = platforms.unix;
license = licenses.asl20;
changelog = "https://github.com/owncloud/libre-graph-api-cpp-qt-client/releases/tag/v${version}";
};
}
@@ -9,6 +9,8 @@
, libX11
, lib
, stdenv
, libgcrypt
, wrapGAppsHook
}:
stdenv.mkDerivation {
@@ -33,10 +35,12 @@ stdenv.mkDerivation {
stdenv.cc.cc.lib
libGL
libX11
libgcrypt
];
nativeBuildInputs = [
autoPatchelfHook
wrapGAppsHook
];
installPhase = ''
@@ -14,13 +14,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "terminator";
version = "2.1.2";
version = "2.1.3";
src = fetchFromGitHub {
owner = "gnome-terminator";
repo = "terminator";
rev = "v${version}";
hash = "sha256-dN9+6VGIdIyY52nm2BMONeb+WV7UGL68frjnHRxRzTU=";
hash = "sha256-Kx0z9oheA7Ihgsyg6zgPcGFMrqlXoIpQcL/dMqPB2qA=";
};
nativeBuildInputs = [
@@ -15,7 +15,7 @@ let
mkDerivation = if stdenv.isDarwin then stdenv.mkDerivation else gnustep.gsmakeDerivation;
in
mkDerivation {
pname = "owl";
pname = "owl-compositor";
version = "unstable-2021-11-10";
src = fetchFromGitHub {
@@ -25,13 +25,13 @@ let
in stdenv.mkDerivation rec {
pname = "amdvlk";
version = "2023.Q1.3";
version = "2023.Q2.1";
src = fetchRepoProject {
name = "${pname}-src";
manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
rev = "refs/tags/v-${version}";
sha256 = "JYGegQQCoKIpvBQYhNbG8j6CgtKb+c8MsK+cFtYUgtY=";
sha256 = "znjv50seqN2Rdzwnu/5ks6q1uiUacM/Z5fzMyCgv0b8=";
};
buildInputs = [
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "fakeredis";
version = "2.10.3";
version = "2.11.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "dsoftwareinc";
repo = "fakeredis-py";
rev = "refs/tags/v${version}";
hash = "sha256-qd8tofR5FdfV/A37gfNRYALf5rUMh7ldhS/hETUHo/k=";
hash = "sha256-R9fB8Y22HPFxMtFQJmmbxZWh6qUtbXrWFUetaOKRFlg=";
};
nativeBuildInputs = [
@@ -0,0 +1,29 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "looseversion";
version = "1.0.3";
format = "flit";
src = fetchPypi {
inherit version pname;
sha256 = "sha256-A1KIhg4a/mfWPqnHAN2dCVxyTi5XIqOQKd2RZS1DFu0";
};
nativeCheckInputs = [
pytestCheckHook
];
pytestFlagsArray = [ "tests.py" ];
pythonImportsCheck = [ "looseversion" ];
meta = with lib; {
description = "Version numbering for anarchists and software realists";
homepage = "https://github.com/effigies/looseversion";
license = licenses.psfl;
maintainers = with maintainers; [ pelme ];
};
}
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "niko-home-control";
version = "0.2.2";
version = "0.3.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "NoUseFreak";
repo = pname;
rev = version;
sha256 = "0ah02dfnnbk98grvd180fp9rak5gpi58xiql1yyzig5pcbjidvk3";
sha256 = "sha256-n/uQAX2LgxeGTRF56+G5vm5wbeTQQQODV4EKaPgKw1k=";
};
propagatedBuildInputs = [
+7 -7
View File
@@ -5,22 +5,22 @@
rustPlatform.buildRustPackage rec {
pname = "jql";
version = "5.2.0";
version = "6.0.5";
src = fetchFromGitHub {
owner = "yamafaktory";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-gFPN3aSukh0QMfGLn65icf5ZyYb8Y+r+GMdG2gm2InY=";
rev = "jql-v${version}";
hash = "sha256-MdIYU6/j+hpFBcaZ1IiW6ImeWD3mmYezGEpZBbWmRzs=";
};
cargoHash = "sha256-XJW0TDRJdLwgWDm5ZBSCUj5VS5ZowGCr6tHV0MpZuvI=";
cargoHash = "sha256-vb7HyumsLYN9rZTD8KxzV+1SN5F2rLhuullYDwRt7wM=";
meta = with lib; {
description = "A JSON Query Language CLI tool built with Rust";
homepage = "https://github.com/yamafaktory/jql";
changelog = "https://github.com/yamafaktory/jql/releases/tag/v${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ akshgpt7 ];
changelog = "https://github.com/yamafaktory/jql/releases/tag/${src.rev}";
license = with licenses; [ asl20 mit ];
maintainers = with maintainers; [ akshgpt7 figsoda ];
};
}
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "patchelf";
version = "unstable-2023-03-27";
version = "unstable-2023-04-23";
src = fetchFromGitHub {
owner = "NixOS";
repo = "patchelf";
rev = "99db062953e88c26e1b1ae5120b8f8bd9f8d9b90";
sha256 = "sha256-6UQR7pmaeIv4G/eymgrFXXfrh3ODfsqIIAu0A44N/6g=";
rev = "99c24238981b7b1084313aca8f5c493bb46f302c";
sha256 = "sha256-v8hMcFVtTknn1LMfRCDQa/bYgP/bpsPhSYp01TiCtew=";
};
# Drop test that fails on musl (?)
+1 -1
View File
@@ -1,7 +1,7 @@
{ lib, perlPackages, fetchurl }:
perlPackages.buildPerlPackage {
pname = "Graph-Easy";
pname = "graph-easy";
version = "0.76";
src = fetchurl {
url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Graph-Easy-0.76.tar.gz";
+9 -7
View File
@@ -4,7 +4,7 @@
, fetchFromGitHub
, curl
, installShellFiles
, makeWrapper
, makeBinaryWrapper
, pkg-config
, bzip2
, libgit2_1_5
@@ -26,21 +26,21 @@ in
rustPlatform.buildRustPackage rec {
pname = "nix-init";
version = "0.2.1";
version = "0.2.2";
src = fetchFromGitHub {
owner = "nix-community";
repo = "nix-init";
rev = "v${version}";
hash = "sha256-SvoKw0Ep8NGknu+6qd6xW6hfH261kFD6DjZhPXQpzs0=";
hash = "sha256-eiPUJj87PU4EgMQRJ4Yv5d/y94j5AklbP1sVNXNSNPs=";
};
cargoHash = "sha256-lm4Y/ZTRMiBp3ECKnHZBvwM8Qso+rilT3BDxzfcnpHQ=";
cargoHash = "sha256-OKHW5q8bvJiwJAAEr9AHEWoDCwDKr6ACxsFRtJOTNis=";
nativeBuildInputs = [
curl
installShellFiles
makeWrapper
makeBinaryWrapper
pkg-config
];
@@ -82,8 +82,10 @@ rustPlatform.buildRustPackage rec {
installShellCompletion artifacts/nix-init.{bash,fish} --zsh artifacts/_nix-init
'';
GEN_ARTIFACTS = "artifacts";
ZSTD_SYS_USE_PKG_CONFIG = true;
env = {
GEN_ARTIFACTS = "artifacts";
ZSTD_SYS_USE_PKG_CONFIG = true;
};
meta = with lib; {
description = "Command line tool to generate Nix packages from URLs";
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,35 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "typst-fmt";
version = "unstable-2023-04-16";
src = fetchFromGitHub {
owner = "astrale-sharp";
repo = pname;
rev = "9ed1fd1656f8e776b6c8d9d326c488f5ba1091eb";
hash = "sha256-yHR13n5yx5Yl2atteGQq+qqz21zsy37ZJfGllbvSZcQ=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"typst-0.2.0" = "sha256-+YHyxZTzMG9zpzLV9NgJsMtrXG+/ymPQo5b26HDYJaQ=";
};
};
postPatch = ''
cp ${./Cargo.lock} Cargo.lock
'';
checkFlags = [
# test_eof is ignored upstream
"--skip=rules::tests_typst_format::test_eof"
];
meta = with lib; {
description = "A formatter for the Typst language";
homepage = "https://github.com/astrale-sharp/typst-fmt";
license = licenses.mit;
maintainers = with maintainers; [ geri1701 ];
};
}
+4 -1
View File
@@ -2525,6 +2525,8 @@ with pkgs;
fox = fox_1_6;
};
xplr = callPackage ../applications/file-managers/xplr { };
ytree = callPackage ../applications/file-managers/ytree { };
### APPLICATIONS/TERMINAL-EMULATORS
@@ -13142,6 +13144,8 @@ with pkgs;
typst = callPackage ../tools/typesetting/typst { };
typst-fmt = callPackage ../tools/typesetting/typst-fmt { };
tz = callPackage ../tools/misc/tz { };
u9fs = callPackage ../servers/u9fs { };
@@ -13529,7 +13533,6 @@ with pkgs;
xe = callPackage ../tools/system/xe { };
xplr = callPackage ../applications/misc/xplr { };
xray = callPackage ../tools/networking/xray { };
+5 -1
View File
@@ -1242,7 +1242,9 @@ self: super: with self; {
beartype = callPackage ../development/python-modules/beartype { };
beautifulsoup4 = callPackage ../development/python-modules/beautifulsoup4 { };
beautifulsoup4 = callPackage ../development/python-modules/beautifulsoup4 {
inherit (python.pythonForBuild.pkgs) sphinxHook; # hook splicing broken since #194205
};
beautifultable = callPackage ../development/python-modules/beautifultable { };
@@ -5742,6 +5744,8 @@ self: super: with self; {
loopy = callPackage ../development/python-modules/loopy { };
looseversion = callPackage ../development/python-modules/looseversion { };
losant-rest = callPackage ../development/python-modules/losant-rest { };
lrcalc-python = callPackage ../development/python-modules/lrcalc-python { };