Merge staging-next into staging

This commit is contained in:
nixpkgs-ci[bot]
2025-06-23 06:07:17 +00:00
committed by GitHub
18 changed files with 258 additions and 101 deletions
+6
View File
@@ -21820,6 +21820,12 @@
keys = [ { fingerprint = "6AE2 A847 23D5 6D98 5B34 0BC0 8E5F A470 9F69 E911"; } ];
name = "Ralph Seichter";
};
rskew = {
name = "Rowan Skewes";
email = "rowan.skewes@gmail.com";
github = "rskew";
githubId = 16100155;
};
rski = {
name = "rski";
email = "rom.skiad+nix@gmail.com";
@@ -134,7 +134,7 @@ in
enable = true;
virtualHosts."${cfg.domain}".locations = {
"/" = {
root = "${cfg.package}/share/engelsystem/public";
root = "${cfg.package}/share/php/engelsystem/public";
extraConfig = ''
index index.php;
try_files $uri $uri/ /index.php?$args;
@@ -142,7 +142,7 @@ in
'';
};
"~ \\.php$" = {
root = "${cfg.package}/share/engelsystem/public";
root = "${cfg.package}/share/php/engelsystem/public";
extraConfig = ''
fastcgi_pass unix:${config.services.phpfpm.pools.engelsystem.socket};
fastcgi_index index.php;
@@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension {
sources = {
"x86_64-linux" = {
arch = "linux-x64";
hash = "sha256-3JEqkFY1vuI11HdM+X1rZkbVOrFpykAy7CdYxtyfu+0=";
hash = "sha256-/6V4hjwp3Vy4WEwTtcYvJk6Rt3AIeKqXWJ09Zsp9CZg=";
};
"x86_64-darwin" = {
arch = "darwin-x64";
hash = "sha256-yqb0PdhSpCecUxEO2ZUpFzn1wZcaDcfvFPXJW0gYgh4=";
hash = "sha256-bMwiMIhsvF6Q12vCgt9Os109acqW8Ovpt3o9Y8Sf+gk=";
};
"aarch64-linux" = {
arch = "linux-arm64";
hash = "sha256-CUpfezfvhVSROFBV8ZI9W+DpwxyH6QLvhOOO8O5PYag=";
hash = "sha256-SwBHNKqif3mGqNSF6Y100HCDaLmARe0jApPol7AzsOQ=";
};
"aarch64-darwin" = {
arch = "darwin-arm64";
hash = "sha256-AGc6wI15C7tZJAJ8yfx1xlQ8wQj/f8S3xHKwp+C/5x4=";
hash = "sha256-SGTQdjvrXkEaCuHv9dfJfCBUgkfOtf+kLPiHYAqJ7+8=";
};
};
in
{
name = "visualjj";
publisher = "visualjj";
version = "0.15.1";
version = "0.15.4";
}
// sources.${stdenvNoCC.hostPlatform.system}
or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");
@@ -189,13 +189,13 @@
"vendorHash": "sha256-AcHndbTWMMsE7CSnLtUdnfyIfkKVfmOobNOhvtrTh4I="
},
"bitwarden": {
"hash": "sha256-pEvTdaXuxsfrmJmgYo9mC3OSzU7q0DHEj2esXiumpMk=",
"hash": "sha256-eqWyKPzSINSZcO8Ho0WHTeVDOxbUynOzupXu6vzTtuU=",
"homepage": "https://registry.terraform.io/providers/maxlaverse/bitwarden",
"owner": "maxlaverse",
"repo": "terraform-provider-bitwarden",
"rev": "v0.13.6",
"rev": "v0.14.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-nL0kii/BGihXiNp/69Kk/2J5o4lmYPHx6IqTF/IyWaU="
"vendorHash": "sha256-TmlnrCsIM9k2ApPFcSpFUoggIIDrT9S/BeD3kKI2Klc="
},
"brightbox": {
"hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=",
@@ -261,13 +261,13 @@
"vendorHash": "sha256-shRiTPn4A1rmwBnoSlRDfdYuHqSFvL4o6o8vAJutu3Q="
},
"cloudflare": {
"hash": "sha256-REHAEG7Ux+Twv0kA13NQpthBdb+LulYm0McquE6gL14=",
"hash": "sha256-RChYMs2i4E+7RqRnYfeQftETUyHMWh/UeUd4/6kNmag=",
"homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare",
"owner": "cloudflare",
"repo": "terraform-provider-cloudflare",
"rev": "v5.5.0",
"rev": "v5.6.0",
"spdx": "Apache-2.0",
"vendorHash": "sha256-PRzjEL+6XIacWmO4jmCOMsbPF+R3l1VMeUKUR7vPMmQ="
"vendorHash": "sha256-BecQ41WKBb+w3eWGH3U/h6GjIKceCB+xDSzQSqrqJ2k="
},
"cloudfoundry": {
"hash": "sha256-1nYncJLVU/f9WD6Quh9IieIXgixPzbPk4zbtI1zmf9g=",
@@ -759,13 +759,13 @@
"vendorHash": "sha256-fP6brpY/wRI1Yjgapzi+FfOci65gxWeOZulXbGdilrE="
},
"linode": {
"hash": "sha256-DNH+q9FSRlT/SoyW9+n+FLzy/Zi5l82sRigBZIaKabc=",
"hash": "sha256-3EBaRDf1ChC92iaYowJEpCIn/br/MxeQGqd47/xuEHo=",
"homepage": "https://registry.terraform.io/providers/linode/linode",
"owner": "linode",
"repo": "terraform-provider-linode",
"rev": "v2.41.0",
"rev": "v3.0.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-j/YgQ4w89XRZPYMCGAT72ervryIeutvk0ivFPR8E1yI="
"vendorHash": "sha256-o4C58i+/IhMQSziF6Ldb8P+3ojTYyXx9CS65/9ExLpE="
},
"linuxbox": {
"hash": "sha256-svQRz1/PdVLpHoxOam1sfRTwHqgqs4ohJQs3IPMMAM4=",
@@ -840,13 +840,13 @@
"vendorHash": "sha256-QWBzQXx/dzWZr9dn3LHy8RIvZL1EA9xYqi7Ppzvju7g="
},
"mongodbatlas": {
"hash": "sha256-+JYvL6xGA2zIOg2fl8Bl7CYU4x9N4aVJpIl/6PYdyPU=",
"hash": "sha256-bLz/tYvOXe2MPa1WY4CZmm8Pcjv9C67oEHl/7TIuBRE=",
"homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas",
"owner": "mongodb",
"repo": "terraform-provider-mongodbatlas",
"rev": "v1.35.1",
"rev": "v1.36.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-fz6e/QEcWQY7ZrWyUbk8M/+RPB8dwN3NHPLmNLyGVhQ="
"vendorHash": "sha256-0te8WmbzRbuU3t2YmgEd4Emhu4nUhI78V9F/QLKMXzk="
},
"namecheap": {
"hash": "sha256-fHH9sHI1mqQ9q9nX9DHJ0qfEfmDB4/2uzyVvUuIAF18=",
@@ -1300,13 +1300,13 @@
"vendorHash": "sha256-L+XwC7c4ph4lM0+BhHB9oi1R/Av8jlDcqHewOmtPU1s="
},
"tailscale": {
"hash": "sha256-0QBQv3KbCjQsHDiPYRVaskzhBt6MsrpFvXSYM83AFKY=",
"hash": "sha256-p96Jv4sIxWHWcpxcAWXASf2m06M7lsIvCCygM9KEALY=",
"homepage": "https://registry.terraform.io/providers/tailscale/tailscale",
"owner": "tailscale",
"repo": "terraform-provider-tailscale",
"rev": "v0.20.0",
"rev": "v0.21.1",
"spdx": "MIT",
"vendorHash": "sha256-f+2SYxdPVXDpwFY6ra9Abe/aXil6zzXk8wQTr49QkC8="
"vendorHash": "sha256-nTKqpoJKabvtMDdI++Luq41vB0X2NWS6gufJbru2ZPI="
},
"talos": {
"hash": "sha256-O5S0XYdTyNGihPx4hQhYN5+ApnMuCaIcWlHA9D9/3nM=",
@@ -1327,11 +1327,11 @@
"vendorHash": "sha256-Sqi4MLQTF5n3AZyEkaI03KhFvgy34ROqbd8Rx1N6/oY="
},
"tencentcloud": {
"hash": "sha256-3r3DCZ1bmoBieF0BQ37ai3UxzxWbf5orJ4mvh8aeUhQ=",
"hash": "sha256-VoXdT/ZZp3CGxYg9xjyvnt2TLLWUwCkCzI9i6NWlTQg=",
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
"owner": "tencentcloudstack",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.81.199",
"rev": "v1.82.2",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -1499,12 +1499,12 @@
"vendorHash": "sha256-GRnVhGpVgFI83Lg34Zv1xgV5Kp8ioKTFV5uaqS80ATg="
},
"yandex": {
"hash": "sha256-zwwFvbQWsreZ/4QFmqIk8xXMUaLqfUFnTZig3lGW//w=",
"hash": "sha256-VPmAwHQnpQTEW+hKoInsuFiLXMi2rZY7lFfmDZ5BAW8=",
"homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
"owner": "yandex-cloud",
"repo": "terraform-provider-yandex",
"rev": "v0.142.0",
"rev": "v0.144.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-RrtTtQdiAWxLEefIH/pcpeAlCjqY7PYy9ZCDd+gIEEk="
"vendorHash": "sha256-Gks/EvJ2SvXry5UC34gzxXZRcSrSIxv2SHQ7ZDILM3s="
}
}
@@ -7,12 +7,12 @@
}:
stdenv.mkDerivation rec {
pname = "vdr-markad";
version = "4.2.12";
version = "4.2.14";
src = fetchFromGitHub {
repo = "vdr-plugin-markad";
owner = "kfb77";
hash = "sha256-b2DSHbjMnRSY4pf5gSizU3Jbq8gEGC5xFYHCdIaYMfs=";
hash = "sha256-ro7bva0eDik6GbA70aXnBy6UgdzSLx/N4oGjCbzmw8Q=";
tag = "V${version}";
};
+20 -20
View File
@@ -1,56 +1,56 @@
{
"stable": {
"linux": {
"version": "8.10.78",
"version": "8.10.80",
"sources": {
"x86_64": {
"url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.10.78.x64.tar.gz",
"hash": "sha256-COmXSjbCetPsbm40OrWGVtULPheEgnHEO0ZcIgWaG1w="
"url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.10.80.x64.tar.gz",
"hash": "sha256-fxhLeeJzzbIhRZcrLnkBvrwAA+jzGeOhnmiH3ErlDTE="
},
"aarch64": {
"url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.10.78.arm64.tar.gz",
"hash": "sha256-diy7VhKRluSnVSR35Ogamf9RDHdqxSJifLOOYmMrJHE="
"url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.10.80.arm64.tar.gz",
"hash": "sha256-Ffr7Xow6ZMGE4Spf3QfDoSydR3OXasMpM3ttiiPup+Q="
}
}
},
"darwin": {
"version": "8.10.78",
"version": "8.10.80",
"sources": {
"x86_64": {
"url": "https://downloads.1password.com/mac/1Password-8.10.78-x86_64.zip",
"hash": "sha256-8fbjEc/Z0xCdXq/uHp4bQE5Js5hNLbVCRZxnepUdLUs="
"url": "https://downloads.1password.com/mac/1Password-8.10.80-x86_64.zip",
"hash": "sha256-4b7mocNt/H9xiai9E9pqT5LWNsRi6Skr+F1vctfmU3k="
},
"aarch64": {
"url": "https://downloads.1password.com/mac/1Password-8.10.78-aarch64.zip",
"hash": "sha256-x03dZ/eVrvFcbese1cBAvyJKwtWe6rOcgytn0OsEFDQ="
"url": "https://downloads.1password.com/mac/1Password-8.10.80-aarch64.zip",
"hash": "sha256-8PJq6VVTAMQWLP9rLwOhtK02KZckn7ps4evDPL6EvYs="
}
}
}
},
"beta": {
"linux": {
"version": "8.10.80-18.BETA",
"version": "8.10.82-27.BETA",
"sources": {
"x86_64": {
"url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.10.80-18.BETA.x64.tar.gz",
"hash": "sha256-X2Wu/dQQ7fv+tTAU2/70S38wL6WdJuc/DXWoiHZvSP4="
"url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.10.82-27.BETA.x64.tar.gz",
"hash": "sha256-6ncTm+rgEPGRwMquOCWH8sXin9CrjiHsUDLKo3CrLIM="
},
"aarch64": {
"url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.10.80-18.BETA.arm64.tar.gz",
"hash": "sha256-52aRg6QD/fKOzOHoG88q8VNJIizxnISFnpxek7bJ05w="
"url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.10.82-27.BETA.arm64.tar.gz",
"hash": "sha256-fRgTfZjQRrPbYUKIub+y9iYSBvsElN90ag0maPKTM2g="
}
}
},
"darwin": {
"version": "8.10.80-18.BETA",
"version": "8.10.82-27.BETA",
"sources": {
"x86_64": {
"url": "https://downloads.1password.com/mac/1Password-8.10.80-18.BETA-x86_64.zip",
"hash": "sha256-kUU+nm19DmdY8ZG6d+EJFQXcCy/BOauXh83suQLSvz0="
"url": "https://downloads.1password.com/mac/1Password-8.10.82-27.BETA-x86_64.zip",
"hash": "sha256-jCxzPxRvb7gjhDeZVcTcuED4N436aJsivpfgae9dVc0="
},
"aarch64": {
"url": "https://downloads.1password.com/mac/1Password-8.10.80-18.BETA-aarch64.zip",
"hash": "sha256-eZG0QaB5NRwRCYcmlfZA/HTceLq7eUzR+AvzDeOrzAY="
"url": "https://downloads.1password.com/mac/1Password-8.10.82-27.BETA-aarch64.zip",
"hash": "sha256-PibtIpKpyp0+jkzZ9odNow6Gew/fjWy9EvdIgeewpA4="
}
}
}
+2 -2
View File
@@ -6,11 +6,11 @@
}:
let
pname = "chatbox";
version = "1.13.4";
version = "1.14.1";
src = fetchurl {
url = "https://download.chatboxai.app/releases/Chatbox-${version}-x86_64.AppImage";
hash = "sha256-pNRHDP3xbOix0wqSGaBAksGbzDXnq6I00t/A7cDkPzQ=";
hash = "sha256-2k2G6VMO83ztuknr4FRE0eUtsweV0eu9JSNgKaVuatQ=";
};
appimageContents = appimageTools.extract { inherit pname version src; };
+6 -2
View File
@@ -80,12 +80,12 @@
}:
stdenv.mkDerivation rec {
version = "5.0.1";
version = "5.2.0";
pname = "darktable";
src = fetchurl {
url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
hash = "sha256-SpGNCU67qYPvZ6EMxxXD1+jKc4AJkgqf9l0zQXtt2YQ=";
hash = "sha256-U6Rs1G73EYSFxKv0q0B8GBY5u4Y0JD7A7R98HoKZvsY=";
};
nativeBuildInputs = [
@@ -193,6 +193,10 @@ stdenv.mkDerivation rec {
)
'';
postPatch = ''
patchShebangs ./tools/generate_styles_string.sh
'';
nativeInstallCheckInputs = [
versionCheckHook
];
+45 -25
View File
@@ -1,48 +1,68 @@
{
lib,
fetchzip,
fetchFromGitHub,
fetchYarnDeps,
nodejs,
yarn,
yarnBuildHook,
yarnConfigHook,
nixosTests,
php,
stdenv,
writeText,
}:
stdenv.mkDerivation rec {
php.buildComposerProject2 (finalAttrs: {
pname = "engelsystem";
version = "3.6.0";
src = fetchzip {
url = "https://github.com/engelsystem/engelsystem/releases/download/v${version}/engelsystem-v${version}.zip";
hash = "sha256-AZVW04bcSlESSRmtfvP2oz15xvZLlGEz/X9rX7PuRGg=";
src = fetchFromGitHub {
owner = "engelsystem";
repo = "engelsystem";
tag = "v${finalAttrs.version}";
hash = "sha256-Pi+nowImUvENx2c4gsku1KkFb3pLM84oT8WevI6ImQg=";
};
buildInputs = [ php ];
inherit php;
installPhase = ''
runHook preInstall
vendorHash = "sha256-0Mv48mB/pTQtYd2do6wTdhD/c2zwbU1gTYsdU7rELPY=";
composoerNoDev = true;
composerStrictValidation = false;
# prepare
rm -r ./storage/
yarnOfflineCache = fetchYarnDeps {
pname = "${finalAttrs.pname}-yarn-deps";
yarnLock = "${finalAttrs.src}/yarn.lock";
hash = "sha256-nyCLM9OF2qwlW+VK38kiRMo6jMlupNFG+91N3Fb/WLY=";
};
strictDeps = true;
nativeBuildInputs = [
nodejs
yarn
yarnConfigHook
];
preBuild = ''
yarn build
'';
preInstall = ''
rm -rf node_modules
# link config and storage into FHS locations
ln -sf /etc/engelsystem/config.php ./config/config.php
ln -sf /var/lib/engelsystem/storage/ ./storage
rm -rf storage
ln -snf /var/lib/engelsystem/storage/ ./storage
'';
mkdir -p $out/share/engelsystem
mkdir -p $out/bin
cp -r . $out/share/engelsystem
echo $(command -v php)
# The patchShebangAuto function always used the php without extensions, so path the shebang manually
sed -i -e "1 s|.*|#\!${lib.getExe php}|" "$out/share/engelsystem/bin/migrate"
ln -s "$out/share/engelsystem/bin/migrate" "$out/bin/migrate"
runHook postInstall
postInstall = ''
mkdir $out/bin
ln -s $out/share/php/engelsystem/bin/migrate $out/bin/migrate
'';
passthru.tests = nixosTests.engelsystem;
meta = {
changelog = "https://github.com/engelsystem/engelsystem/releases/tag/v${version}";
changelog = "https://github.com/engelsystem/engelsystem/releases/tag/v${finalAttrs.version}";
description = "Coordinate your volunteers in teams, assign them to work shifts or let them decide for themselves when and where they want to help with what";
homepage = "https://engelsystem.de";
license = lib.licenses.gpl2Only;
@@ -50,4 +70,4 @@ stdenv.mkDerivation rec {
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.all;
};
}
})
+1 -1
View File
@@ -245,7 +245,7 @@ stdenv.mkDerivation (finalAttrs: {
];
postPatch = ''
substituteInPlace completions/fastfetch.fish --replace-fail python3 '${python3.interpreter}'
substituteInPlace completions/fastfetch.{bash,fish,zsh} --replace-fail python3 '${python3.interpreter}'
'';
postInstall =
+3 -3
View File
@@ -8,17 +8,17 @@
rustPlatform.buildRustPackage rec {
pname = "mpd-discord-rpc";
version = "1.8.0";
version = "1.8.1";
src = fetchFromGitHub {
owner = "JakeStanger";
repo = "mpd-discord-rpc";
rev = "v${version}";
hash = "sha256-RuXH0RaR0VVN7tja0pcc8QH826/JzH4tyVVCbrK7ldI=";
hash = "sha256-6PSwfvmGdcxQvmnbloTBWEiz5vbN/RxK4Afq1PgUX94=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-ewmg5t0JljnvxjrGDJzokRwndv7UNw9NMQ7Cx6oDWjg=";
cargoHash = "sha256-ecGhzcaqvTDAvbeWkr/3uXu5GD3NqlgHAiywzHfmsaA=";
nativeBuildInputs = [
pkg-config
+43
View File
@@ -0,0 +1,43 @@
{
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
openssl,
libgit2,
nix-update-script,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "pullomatic";
version = "0.2.2";
src = fetchFromGitHub {
owner = "fooker";
repo = "pullomatic";
tag = "v${finalAttrs.version}";
hash = "sha256-qPuJ2mqbqQQxncsz5DexOYyNctIInX0Of5mdAGu/t/M=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-+B/DzDaF3qQlPzjh97CBMAseyeUClgsgzE0EJ8kTlqg=";
nativeBuildInputs = [
pkg-config
];
buildInputs = [
openssl
libgit2
];
passthru.updateScript = nix-update-script { };
meta = {
description = "Automates Git repository syncing through pure configuration";
homepage = "https://github.com/fooker/pullomatic";
license = lib.licenses.mit;
mainProgram = "pullomatic";
maintainers = with lib.maintainers; [ fooker ];
};
})
+41
View File
@@ -0,0 +1,41 @@
{
lib,
rustPlatform,
fetchFromGitHub,
versionCheckHook,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "tombi";
version = "0.4.9";
src = fetchFromGitHub {
owner = "tombi-toml";
repo = "tombi";
tag = "v${finalAttrs.version}";
hash = "sha256-2516aT6zaI5bntjjJ/p/yk0gWW6fzixQx5ESs29aS6Q=";
};
# Tests relies on the presence of network
doCheck = false;
cargoBuildFlags = [ "--package tombi-cli" ];
cargoHash = "sha256-cVj0dL9vGVm3WPQ5IA2LDxDLHia5T+pLi6rTQxAqoC4=";
postPatch = ''
substituteInPlace Cargo.toml \
--replace-fail 'version = "0.0.0-dev"' 'version = "${finalAttrs.version}"'
'';
nativeInstallCheckInputs = [
versionCheckHook
];
doInstallCheck = true;
meta = {
description = "TOML Formatter / Linter / Language Server";
homepage = "https://github.com/tombi-toml/tombi";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ psibi ];
mainProgram = "tombi";
};
})
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "wideriver";
version = "1.2.0";
version = "1.2.1";
src = fetchFromGitHub {
owner = "alex-courtis";
repo = "wideriver";
tag = finalAttrs.version;
hash = "sha256-D1JHfMnq6u057FrBqgZ4UlfeOlkTWKkKzFYM29+vIJo=";
hash = "sha256-nDjK6BjRH4G+9ySTE4uV7SxaV8P3XKTgsFyDsx8Ld1U=";
};
nativeBuildInputs = [
+22 -10
View File
@@ -1,28 +1,40 @@
{
lib,
stdenv,
fetchurl,
fetchFromGitHub,
nix-update-script,
versionCheckHook,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "xmake";
version = "2.9.9";
src = fetchurl {
url = "https://github.com/xmake-io/xmake/releases/download/v${version}/xmake-v${version}.tar.gz";
hash = "sha256-6SUFuDvJd2KG6ucZ1YvOp/8ld6/hLLXMsnnIHn28cC0=";
version = "3.0.0";
src = fetchFromGitHub {
owner = "xmake-io";
repo = "xmake";
tag = "v${finalAttrs.version}";
hash = "sha256-JY94DaSZ12pRrcCPxoPaECRA8rMK6/fNNyr/F8Htu8A=";
fetchSubmodules = true;
};
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "--version";
passthru = {
updateScript = nix-update-script { };
};
meta = with lib; {
meta = {
changelog = "https://github.com/xmake-io/xmake/releases/tag/v${finalAttrs.version}";
description = "Cross-platform build utility based on Lua";
homepage = "https://xmake.io";
license = licenses.asl20;
maintainers = with maintainers; [
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
rewine
rennsax
];
mainProgram = "xmake";
};
}
})
@@ -11,6 +11,7 @@
buildPythonPackage rec {
pname = "djoser";
version = "2.3.1";
pyproject = true;
src = fetchFromGitHub {
owner = "sunscrapers";
@@ -19,18 +20,14 @@ buildPythonPackage rec {
hash = "sha256-xPhf7FiJSq5bHfAU5RKbobgnsRh/6cLcXP6vfrLdzJA=";
};
buildInputs = [
build-system = [ poetry-core ];
dependencies = [
django
djangorestframework-simplejwt
social-auth-app-django
];
pyproject = true;
build-system = [
poetry-core
];
# djet isn't packaged yet
# nativeCheckInputs = [ pytestCheckHook ];
@@ -0,0 +1,32 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
unittestCheckHook,
}:
buildPythonPackage rec {
pname = "logging-tree";
version = "1.10";
src = fetchFromGitHub {
owner = "brandon-rhodes";
repo = "logging_tree";
tag = version;
hash = "sha256-9MeCx708EUe5dmFkol+HISzdBX+yar1HjKIAwmg1msA=";
};
build-system = [ setuptools ];
nativeCheckInputs = [ unittestCheckHook ];
pythonImportsCheck = [ "logging_tree" ];
meta = {
description = "Debug Python logging problems by printing out the tree of handlers you have defined";
homepage = "https://github.com/brandon-rhodes/logging_tree";
license = [ lib.licenses.bsd2 ];
maintainers = [ lib.maintainers.rskew ];
};
}
+2
View File
@@ -8494,6 +8494,8 @@ self: super: with self; {
logging-journald = callPackage ../development/python-modules/logging-journald { };
logging-tree = callPackage ../development/python-modules/logging-tree { };
logical-unification = callPackage ../development/python-modules/logical-unification { };
logilab-common = callPackage ../development/python-modules/logilab/common.nix {