mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-22 20:14:37 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
aee984b6cf
@ -1154,6 +1154,9 @@
|
||||
githubId = 48802534;
|
||||
name = "Anselm Schüler";
|
||||
matrix = "@schuelermine:matrix.org";
|
||||
keys = [{
|
||||
fingerprint = "CDBF ECA8 36FE E340 1CEB 58FF BA34 EE1A BA3A 0955";
|
||||
}];
|
||||
};
|
||||
anthonyroussel = {
|
||||
email = "anthony@roussel.dev";
|
||||
@ -8457,6 +8460,12 @@
|
||||
githubId = 662666;
|
||||
name = "Justinas Stankevičius";
|
||||
};
|
||||
justinlime = {
|
||||
email = "justinlime1999@gmail.com";
|
||||
github = "justinlime";
|
||||
githubId = 119710965;
|
||||
name = "Justin Fields";
|
||||
};
|
||||
justinlovinger = {
|
||||
email = "git@justinlovinger.com";
|
||||
github = "JustinLovinger";
|
||||
@ -10691,12 +10700,6 @@
|
||||
githubId = 10420834;
|
||||
name = "Mihai-Drosi Caju";
|
||||
};
|
||||
mcbeth = {
|
||||
email = "mcbeth@broggs.org";
|
||||
github = "mcbeth";
|
||||
githubId = 683809;
|
||||
name = "Jeffrey Brent McBeth";
|
||||
};
|
||||
mccurdyc = {
|
||||
email = "mccurdyc22@gmail.com";
|
||||
github = "mccurdyc";
|
||||
|
||||
@ -37,7 +37,7 @@ let
|
||||
babelfishTranslate = path: name:
|
||||
pkgs.runCommandLocal "${name}.fish" {
|
||||
nativeBuildInputs = [ pkgs.babelfish ];
|
||||
} "${pkgs.babelfish}/bin/babelfish < ${path} > $out;";
|
||||
} "babelfish < ${path} > $out;";
|
||||
|
||||
in
|
||||
|
||||
|
||||
@ -61,7 +61,7 @@ in
|
||||
checkPhase = optionalString cfg.checkConfig ''
|
||||
ln -s $out bird2.conf
|
||||
${cfg.preCheckConfig}
|
||||
${pkgs.bird}/bin/bird -d -p -c bird2.conf
|
||||
${pkgs.buildPackages.bird}/bin/bird -d -p -c bird2.conf
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "unifi-protect-backup";
|
||||
version = "0.9.1";
|
||||
version = "0.9.4";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
owner = "ep1cman";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-L7uM5v2CYGFHYxzBUKlMF+ChtjBM24GZ8NuyoQaOU6U=";
|
||||
hash = "sha256-MFg518iodxdHbr7k5kpkTWI59Kk7pPwyIVswVcjasl8=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
@ -33,6 +33,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
aiorun
|
||||
aiosqlite
|
||||
apprise
|
||||
async-lru
|
||||
click
|
||||
expiring-dict
|
||||
python-dateutil
|
||||
|
||||
@ -2356,8 +2356,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "direnv";
|
||||
publisher = "mkhl";
|
||||
version = "0.13.0";
|
||||
sha256 = "sha256-KdLJ7QTi9jz+JbbQuhXqyE3WV9oF+wyC/9ZJ/XTFOYc=";
|
||||
version = "0.14.0";
|
||||
sha256 = "sha256-T+bt6ku+zkqzP1gXNLcpjtFAevDRiSKnZaE7sM4pUOs=";
|
||||
};
|
||||
meta = {
|
||||
description = "direnv support for Visual Studio Code";
|
||||
@ -3462,8 +3462,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "errorlens";
|
||||
publisher = "usernamehw";
|
||||
version = "3.8.0";
|
||||
sha256 = "sha256-T2YTEbeC22/B5BlBBrBATLv95HQC5xGab+KnCMzI1vc=";
|
||||
version = "3.12.0";
|
||||
sha256 = "sha256-G5+We49/f5UwYqoBovegRK+UOT6KPZo85cvoDjD1Mu4=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/usernamehw.errorlens/changelog";
|
||||
|
||||
@ -110,7 +110,7 @@ in stdenv.mkDerivation {
|
||||
# This changes `ir/opt` to `ir/var/empty` in `externals/dynarmic/src/dynarmic/CMakeLists.txt`
|
||||
# making the build fail, as that path does not exist
|
||||
dontFixCmake = true;
|
||||
|
||||
patches = [./vulkan_version.patch];
|
||||
cmakeFlags = [
|
||||
# actually has a noticeable performance impact
|
||||
"-DYUZU_ENABLE_LTO=ON"
|
||||
|
||||
@ -1,19 +1,19 @@
|
||||
# Generated by ./update.sh - do not update manually!
|
||||
# Last updated: 2023-06-22
|
||||
# Last updated: 2023-07-31
|
||||
{
|
||||
compatList = {
|
||||
rev = "2288f79cad3be4c2c3148435372958aebea33156";
|
||||
rev = "c40af830523cf820b6a391a3ef420bcc1b68b367";
|
||||
hash = "sha256:1hdsza3wf9a0yvj6h55gsl7xqvhafvbz1i8paz9kg7l49b0gnlh1";
|
||||
};
|
||||
|
||||
mainline = {
|
||||
version = "1475";
|
||||
hash = "sha256:1948lqk89k7b48skcikjx3i3f8nwb6n6sh2bf00qqbchr8i27gpm";
|
||||
version = "1513";
|
||||
hash = "sha256:0mqrdsl55aimm39rws7ap6rw9qq6m4pzp7zlyvp3dchh1x58zzgq";
|
||||
};
|
||||
|
||||
ea = {
|
||||
version = "3702";
|
||||
distHash = "sha256:178mfg7rxr1372favkkizdcjv1ckfkzmjqfpw6ja3c5kv0psv19j";
|
||||
fullHash = "sha256:00ls667l8zaj8597saw6drd28x4k02iqh3l7rxjjxkcqny6qv6p8";
|
||||
version = "3783";
|
||||
distHash = "sha256:01prkdximgypikgggq2y53hlpf7gmg1z7zfbc9yi18f6s5cncs18";
|
||||
fullHash = "sha256:0pggknr2sxlc3pdy3jh423318z8rr8f0iz43zw85qwhqnj1h9q19";
|
||||
};
|
||||
}
|
||||
|
||||
13
pkgs/applications/emulators/yuzu/vulkan_version.patch
Normal file
13
pkgs/applications/emulators/yuzu/vulkan_version.patch
Normal file
@ -0,0 +1,13 @@
|
||||
Yuzu requires a version of Vulkan that has not yet been released as a stable Vulkan SDK. In case this patch fails, check which version Yuzu is currently using and verify that it still works with the version shipped in Nixpkgs.
|
||||
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -314,7 +314,7 @@
|
||||
find_package(zstd 1.5 REQUIRED)
|
||||
|
||||
if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS)
|
||||
- find_package(Vulkan 1.3.256 REQUIRED)
|
||||
+ find_package(Vulkan 1.3.250 REQUIRED)
|
||||
endif()
|
||||
|
||||
if (ENABLE_LIBUSB)
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "AusweisApp2";
|
||||
version = "1.26.5";
|
||||
version = "1.26.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Governikus";
|
||||
repo = "AusweisApp2";
|
||||
rev = version;
|
||||
hash = "sha256-6/acpPMHsMj/8GkLGNE8yg/apt8ynhN3O35lkA95HYQ=";
|
||||
hash = "sha256-i9hfmMp0pEqtIeKc1mcyINXetzD/33aM0utL8nomVcg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
let
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
pname = "obsidian";
|
||||
version = "1.3.5";
|
||||
version = "1.3.7";
|
||||
appname = "Obsidian";
|
||||
meta = with lib; {
|
||||
description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files";
|
||||
@ -25,7 +25,7 @@ let
|
||||
filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
|
||||
sha256 = if stdenv.isDarwin then "sha256-bTIJwQqufzxq1/ZxR8rVYER82tl0pPMpKwDPr9Gz1Q4=" else "sha256-jhm6ziFaJnv4prPSfOnJ/EbIRTf9rnvzAJVxnVqmWE4=";
|
||||
sha256 = if stdenv.isDarwin then "sha256-jHsrSYBHJBMyChGsgXHxH/S7wdI1CMonzid8WenNSmI=" else "sha256-8Qi12d4oZ2R6INYZH/qNUBDexft53uy9Uug7UoArwYw=";
|
||||
};
|
||||
|
||||
icon = fetchurl {
|
||||
|
||||
@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config";
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "process-compose";
|
||||
version = "0.51.4";
|
||||
version = "0.60.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "F1bonacc1";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-eR8uYeScV6bxntc2bEwJC/VSH1bXendJ1FNJB0bC2i0=";
|
||||
hash = "sha256-BsDel6F09HP5Oz2p0DDXKuS7Id5XPhZZxEzwu76vVwk=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
@ -43,7 +43,7 @@ buildGoModule rec {
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
vendorHash = "sha256-dlTqBKyI2t3twxQ+mnn+LTWzM2+CnEa4X0K2yDAZsQA=";
|
||||
vendorHash = "sha256-Z5vCxzdpd2OmlZ/woHhlLN2QMgqa9mm873QGuqDToiM=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -46,11 +46,11 @@
|
||||
"vendorHash": "sha256-xZ0pS7XxfYGbG2kEw5FAjABDQZmektaI7OhToiFMXKk="
|
||||
},
|
||||
"alicloud": {
|
||||
"hash": "sha256-w5cdAqGF9E9yDdLnMmrrZfWcp2qcfCz9NqylRUAzKOI=",
|
||||
"hash": "sha256-0qPmUmQ+CGRyah2GXUADAt3HPietpAahQ9ze6Ip6yvE=",
|
||||
"homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
|
||||
"owner": "aliyun",
|
||||
"repo": "terraform-provider-alicloud",
|
||||
"rev": "v1.208.0",
|
||||
"rev": "v1.208.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@ -182,13 +182,13 @@
|
||||
"vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8="
|
||||
},
|
||||
"buildkite": {
|
||||
"hash": "sha256-2nJXniJfOHuHaEEue0rugq5RRnThcFMh7MWYGE/AzmA=",
|
||||
"hash": "sha256-3rGuE47CYbl1B+DAYUBiuGTC1sn85c5aeay+irdhTe0=",
|
||||
"homepage": "https://registry.terraform.io/providers/buildkite/buildkite",
|
||||
"owner": "buildkite",
|
||||
"repo": "terraform-provider-buildkite",
|
||||
"rev": "v0.21.2",
|
||||
"rev": "v0.22.0",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-xxuF4LVDkFkHT42plP+Mv8GFdBrrZZVUm6vErjpho3I="
|
||||
"vendorHash": "sha256-oVXrSI+DU6NgmVIPcS4He4mHVrkA2tMxFUpxMnv0bu4="
|
||||
},
|
||||
"checkly": {
|
||||
"hash": "sha256-UXIni594P85sgS8XVLoJ0+UTBeUS0XC+oj98KJUfghg=",
|
||||
@ -445,24 +445,24 @@
|
||||
"vendorHash": "sha256-AVTWTS16d8QsPLLAJeAfgcVDzUBMp+b2oAphaCBqhS0="
|
||||
},
|
||||
"google": {
|
||||
"hash": "sha256-kQF9ed2q5Wc/LTbFtzSKgcvJPZa18O6ybuT8dzLFdzc=",
|
||||
"hash": "sha256-6VLZW6RlBW7D4GS/JTvlpIcF3AhIEKbNFOqsQI58HyE=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
|
||||
"owner": "hashicorp",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-google",
|
||||
"rev": "v4.75.1",
|
||||
"rev": "v4.76.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-2znSaprsw+uroTmLwh5+NXdgnUlkFXu4KbNLHgnGt2s="
|
||||
"vendorHash": "sha256-rlNYh42Cw2wMF/9aI8QM0x8t2jdz+V9u4uJvS6A4zx8="
|
||||
},
|
||||
"google-beta": {
|
||||
"hash": "sha256-8Zt7q6OqtXGBk+wMBuBYZkfckFC3Gk/m+24Y8eelflw=",
|
||||
"hash": "sha256-ecmCr1AHpyYDmt1ofjFgJjirsNhpcdLggp9EXz3hT5E=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
|
||||
"owner": "hashicorp",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-google-beta",
|
||||
"rev": "v4.75.1",
|
||||
"rev": "v4.76.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-2znSaprsw+uroTmLwh5+NXdgnUlkFXu4KbNLHgnGt2s="
|
||||
"vendorHash": "sha256-rlNYh42Cw2wMF/9aI8QM0x8t2jdz+V9u4uJvS6A4zx8="
|
||||
},
|
||||
"googleworkspace": {
|
||||
"hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=",
|
||||
@ -547,11 +547,11 @@
|
||||
"vendorHash": "sha256-hxT9mpKifb63wlCUeUzgVo4UB2TnYZy9lXF4fmGYpc4="
|
||||
},
|
||||
"huaweicloud": {
|
||||
"hash": "sha256-1cXPpJgvNegfx/mziyZozmEyiSlGRVuGHFdLCWozjsc=",
|
||||
"hash": "sha256-Uon1nXtoILFOQp9DsOubi31v6WJqWBa3zDZKHJdboHY=",
|
||||
"homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud",
|
||||
"owner": "huaweicloud",
|
||||
"repo": "terraform-provider-huaweicloud",
|
||||
"rev": "v1.52.1",
|
||||
"rev": "v1.53.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@ -845,11 +845,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"opennebula": {
|
||||
"hash": "sha256-bWmSXlNgPOhzNFodYAzLE1theDntCks3ywtruRbCcYc=",
|
||||
"hash": "sha256-0XeGaHyN+u5QEU9RUr51FVi13HNmjBN6mnFwfilPw5s=",
|
||||
"homepage": "https://registry.terraform.io/providers/OpenNebula/opennebula",
|
||||
"owner": "OpenNebula",
|
||||
"repo": "terraform-provider-opennebula",
|
||||
"rev": "v1.2.2",
|
||||
"rev": "v1.3.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-W7UGOtyFsIMXPqFDnde2XlzU7klR7Fs00mSuJ9ID20A="
|
||||
},
|
||||
@ -1034,11 +1034,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"snowflake": {
|
||||
"hash": "sha256-YsLF1bPYzn5cZlCqaCRKpSIXx0ha4imxIpC1Cm48o7A=",
|
||||
"hash": "sha256-gz41dRmJQm4cH7VhrEznir7IRA9+hGMjYzsOyQtNuG0=",
|
||||
"homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake",
|
||||
"owner": "Snowflake-Labs",
|
||||
"repo": "terraform-provider-snowflake",
|
||||
"rev": "v0.68.2",
|
||||
"rev": "v0.69.0",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-ZNkZ2GMSBZHz+L626VqT7pTeb8fSYkaCi84O5ggd1FM="
|
||||
},
|
||||
@ -1106,11 +1106,11 @@
|
||||
"vendorHash": "sha256-GNSKSlaFBj2P+z40U+0uwPSOuQBy+9vOVFfPe8p0A24="
|
||||
},
|
||||
"tencentcloud": {
|
||||
"hash": "sha256-z2M3r3MNObSR2flqqldmZvTCiPJ6l+vr05a9Ks34t6U=",
|
||||
"hash": "sha256-Pk+x9/acer3YWBEMZYZWar8oDTFLPc0QydgAHrJZBNI=",
|
||||
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
|
||||
"owner": "tencentcloudstack",
|
||||
"repo": "terraform-provider-tencentcloud",
|
||||
"rev": "v1.81.17",
|
||||
"rev": "v1.81.18",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@ -1261,12 +1261,12 @@
|
||||
"vendorHash": "sha256-KrYtKeQsa2ApSt4QA2yxgWJHq8LpuAR+DYNB4tIsTZI="
|
||||
},
|
||||
"yandex": {
|
||||
"hash": "sha256-03lZMLD2Iq9o9ijvMD7JNnaGNdn5OpB/s3509YdYRfQ=",
|
||||
"hash": "sha256-bG8cBOkwsVew5qmaFXdq7yc2j8JNfY9qwnQ7IJGUZvM=",
|
||||
"homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
|
||||
"owner": "yandex-cloud",
|
||||
"repo": "terraform-provider-yandex",
|
||||
"rev": "v0.95.0",
|
||||
"rev": "v0.96.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-IdRgtPUAYYR55MiT/2wqGzYhuMfThUmhnGGYoPQlHW0="
|
||||
"vendorHash": "sha256-Ni422dybGvn5yzu85FbBdvG0zL7+rSpJWr8+HE1MSeg="
|
||||
}
|
||||
}
|
||||
|
||||
54
pkgs/applications/office/notes/default.nix
Normal file
54
pkgs/applications/office/notes/default.nix
Normal file
@ -0,0 +1,54 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, wrapQtAppsHook
|
||||
, qtbase
|
||||
, qtdeclarative
|
||||
, Cocoa
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "notes";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nuttyartist";
|
||||
repo = "notes";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-ZfAm77UHyjs2aYOYb+AhKViz6uteb7+KKSedonSiMkY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DUPDATE_CHECKER=OFF" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtdeclarative
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
Cocoa
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString stdenv.isLinux ''
|
||||
# temporary fix: https://github.com/nuttyartist/notes/issues/613
|
||||
substituteInPlace $out/share/applications/io.github.nuttyartist.notes.desktop \
|
||||
--replace 'Exec=notes' 'Exec=env QT_STYLE_OVERRIDE= notes'
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
mkdir $out/Applications
|
||||
mv $out/bin/Notes.app $out/Applications
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A fast and beautiful note-taking app";
|
||||
downloadPage = "https://github.com/nuttyartist/notes";
|
||||
homepage = "https://www.get-notes.com";
|
||||
license = lib.licenses.mpl20;
|
||||
maintainers = with lib.maintainers; [ zendo ];
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
})
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "assemblyscript";
|
||||
version = "0.27.5";
|
||||
version = "0.27.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AssemblyScript";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3dWIYkiAA61xbUXJGmb/amjHmyXYoy16lLIAZR4sD5k=";
|
||||
sha256 = "sha256-jN8P3EL3giDIZSExkjm5ZUwgkN3EIQhVpMqfx273yZU=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-9ILa1qY2GpP2RckcZYcCMmgCwdXIImOm+D8nldeoQL8=";
|
||||
|
||||
@ -29,13 +29,13 @@ assert enableViewer -> wrapGAppsHook != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aravis";
|
||||
version = "0.8.27";
|
||||
version = "0.8.28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AravisProject";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-QxI/+2mtX9d4UTkbFFVh5N4JqTMqygGUgz08XWxAQac=";
|
||||
sha256 = "sha256-EgKZcylg3Nx320BdeEz8PVadwo2pE6a3h0vt7YT4LVA=";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "dev" "out" "lib" ];
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
From 2cc80dc06ea42087788cf27b31821ffa99a22f89 Mon Sep 17 00:00:00 2001
|
||||
From: Johannes Lode <johannes.lode@dynainstruments.com>
|
||||
Date: Thu, 14 Nov 2019 10:44:00 +0100
|
||||
Subject: [PATCH] Drop AC_FUNC_MALLOC and _REALLOC and check for them as
|
||||
regular functions.
|
||||
|
||||
While cross-compiling there occurred "undefined reference to
|
||||
`rpl_malloc'", the suggested change fixes the problem.
|
||||
|
||||
Tested for native X86_64 and armv7a-unknown-linux-gnueabihf.
|
||||
---
|
||||
configure.ac | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 008499d..b492dc4 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -81,7 +81,8 @@ AC_DEFUN([HEADER_NOT_FOUND_CXX],
|
||||
|
||||
# This is always checked (library needs this)
|
||||
AC_HEADER_STDC
|
||||
-AC_FUNC_MALLOC
|
||||
+# AC_FUNC_MALLOC -- does not work while cross-compiling
|
||||
+AC_CHECK_FUNC([malloc realloc])
|
||||
AC_CHECK_FUNC([ioctl], [], [FUNC_NOT_FOUND_LIB([ioctl])])
|
||||
AC_CHECK_FUNC([asprintf], [], [FUNC_NOT_FOUND_LIB([asprintf])])
|
||||
AC_CHECK_FUNC([scandir], [], [FUNC_NOT_FOUND_LIB([scandir])])
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@ -8,15 +8,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz";
|
||||
sha256 = "sha256-M68o6YheNXZrDYu6u7pEvyPt2tXhTkVZD3Kv/AXYXA8=";
|
||||
hash = "sha256-tu2lU1YWCo5zkG49SOlZ74EpZ4fXZJdbEPJX6WYGaOk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# cross compiling fix
|
||||
# https://github.com/brgl/libgpiod/pull/45
|
||||
./0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch
|
||||
];
|
||||
|
||||
buildInputs = [ kmod ] ++ lib.optionals enablePython [ python3 ncurses ];
|
||||
nativeBuildInputs = [
|
||||
autoconf-archive
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pythia";
|
||||
version = "8.309";
|
||||
version = "8.310";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pythia.org/download/pythia83/pythia${builtins.replaceStrings ["."] [""] version}.tgz";
|
||||
sha256 = "sha256-W9r9nyxKHEf9ik6C+58Nj8+6TeEAO44Uvk4DR0NtbDM=";
|
||||
sha256 = "sha256-kMgRq+ej0v/b+bSuq1HPbgpai++04++oBvPVucMR4ic=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ rsync ]
|
||||
|
||||
@ -3,18 +3,20 @@
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qrcodegen";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nayuki";
|
||||
repo = "QR-Code-generator";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-aci5SFBRNRrSub4XVJ2luHNZ2pAUegjgQ6pD9kpkaTY=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-aci5SFBRNRrSub4XVJ2luHNZ2pAUegjgQ6pD9kpkaTY=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/c";
|
||||
preBuild = ''
|
||||
cd c
|
||||
'';
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.cc.isClang [
|
||||
stdenv.cc.cc.libllvm.out
|
||||
@ -22,23 +24,31 @@ stdenv.mkDerivation rec {
|
||||
|
||||
makeFlags = lib.optionals stdenv.cc.isClang [ "AR=llvm-ar" ];
|
||||
|
||||
doCheck = true;
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
./qrcodegen-test
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/lib $out/include/qrcodegen
|
||||
cp libqrcodegen.a $out/lib
|
||||
cp qrcodegen.h $out/include/qrcodegen/
|
||||
install -Dt $out/lib/ libqrcodegen.a
|
||||
install -Dt $out/include/qrcodegen/ qrcodegen.h
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://www.nayuki.io/page/qr-code-generator-library";
|
||||
description = "High-quality QR Code generator library in many languages";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ mcbeth AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
# TODO: build the other languages
|
||||
# TODO: multiple outputs
|
||||
|
||||
@ -11,12 +11,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-authorization";
|
||||
version = "3.0.0";
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
hash = "sha256-Cl1/aDvzNyI2uEHNvUZ39rCO185BuZnD5kTUKGJSBX0=";
|
||||
hash = "sha256-abhavAmuZPxyl1vUNDEXDYx+tdFmdUuYqsXzhF3lfcQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "23.1.0";
|
||||
version = "24.0.0";
|
||||
pname = "azure-mgmt-network";
|
||||
format = "setuptools";
|
||||
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
hash = "sha256-NxcmmRE4MdfOG7naNcY1AHxzz/xUmoWlj1VUK1SxK/M=";
|
||||
hash = "sha256-LtahQ2PnJC2jlD3pHp+IBLaUaNXTamZqdFdE/iJ4840=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-translate";
|
||||
version = "3.11.2";
|
||||
version = "3.11.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-CZluS7DfpcICMYWvhxkvHSwANmj4yfT6xDJCMQskQj4=";
|
||||
hash = "sha256-LnjfcMGAMfF4ceLZdeeZjj3vyiL4JsjBsLiMlvXKVps=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "graphene";
|
||||
version = "3.2.2";
|
||||
version = "3.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "graphql-python";
|
||||
repo = "graphene";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-kwF6oXp06w7r1PbPoJTCQ9teTExYMoqvIZDhtv5QNn8=";
|
||||
hash = "sha256-DGxicCXZp9kW/OFkr0lAWaQ+GaECx+HD8+X4aW63vgQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-roborock";
|
||||
version = "0.30.2";
|
||||
version = "0.30.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
||||
owner = "humbertogontijo";
|
||||
repo = "python-roborock";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-mjhHNnhYNMrn4aiPvcq6YM9XCyfzOeZ/yh3RIYiZeaY=";
|
||||
hash = "sha256-EHHyuiG/yRGY7/Z5TAq/83rIkyehg37eTFxSOWrVhR0=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pywemo";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-OROS5mLMDXxygzWvURZtt5MD+gey5GxfsvpkbshOzR0=";
|
||||
hash = "sha256-NTuL3wm3x+f7rSbtI4A/yra+WYezHAWLvdyZXmUvHlg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,17 +1,16 @@
|
||||
{ lib
|
||||
, aiohttp
|
||||
, aiounittest
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, ffmpeg-python
|
||||
, pytestCheckHook
|
||||
, orjson
|
||||
, pythonOlder
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "reolink-aio";
|
||||
version = "0.7.3";
|
||||
version = "0.7.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -20,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "starkillerOG";
|
||||
repo = "reolink_aio";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-QCs0tb0yS5el6kYIoWm71x14e0rsp3lOUntgrj0hvBo=";
|
||||
hash = "sha256-muxM9+3D8WL2muw5yxbYKmbkVc5lTcj9XQOr67hb/pU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -28,34 +27,16 @@ buildPythonPackage rec {
|
||||
substituteInPlace setup.py \
|
||||
--replace "ffmpeg" "ffmpeg-python"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
ffmpeg-python
|
||||
orjson
|
||||
requests
|
||||
];
|
||||
|
||||
doCheck = false; # all testse require a network device
|
||||
|
||||
nativeCheckInputs = [
|
||||
aiounittest
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"tests/test.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Tests require network access
|
||||
"test1_settings"
|
||||
"test2_states"
|
||||
"test3_images"
|
||||
"test4_properties"
|
||||
"test_succes"
|
||||
"test_wrong_host"
|
||||
"test_wrong_password"
|
||||
"test_wrong_user"
|
||||
];
|
||||
# All tests require a network device
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"reolink_aio"
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-tabulate";
|
||||
version = "0.9.0.2";
|
||||
version = "0.9.0.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-HdQyKjoUbpBzFpx0J4uPFKWOuZBcqdsNJYjfQI8nysk=";
|
||||
hash = "sha256-GXZR+dZGcZPNFm2FABFqbTom8qTrLbCTvJU17hwL5V4=";
|
||||
};
|
||||
|
||||
# Module doesn't have tests
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
pname = "allure";
|
||||
version = "2.23.0";
|
||||
version = "2.23.1";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname version;
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/allure-framework/allure2/releases/download/${version}/allure-${version}.tgz";
|
||||
sha256 = "sha256-RBe9S6eHnKhtar/rLoLs6gl2TJtCNfoGrYLDbE6CpRI=";
|
||||
sha256 = "sha256-B06QKq6X9epmRt1wbGORzh8fLUXRAHo1Tv2hWUXJ9Ds=";
|
||||
};
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "apkid";
|
||||
version = "2.1.4";
|
||||
version = "2.1.5";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rednaga";
|
||||
repo = "APKiD";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ASxly2dH+TnwvU3CYD52XbC79n2dku01j3+YHOZ745U=";
|
||||
hash = "sha256-yO3k2kT043/KkiCjDnNUlqxX86kQqMZ+CghD+yon3r4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "bacon";
|
||||
version = "2.12.0";
|
||||
version = "2.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Canop";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-4uvR+KATP1sYPNimU0qQRtVo7zX0xIfbn7nqynZwwfw=";
|
||||
hash = "sha256-oD60D98mPQV454uld+g6FVKAxpyjwrfMAVfQcVPp9Fg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-PFPym2XxQrqhxgV67qMKcblL8dW7poX85YxzR5Xf9qU=";
|
||||
cargoHash = "sha256-lX1IXVGVCe/7jbkjIu+ammWi0BgE+r1tpsZaqz4WLPY=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
CoreServices
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "bearer";
|
||||
version = "1.16.0";
|
||||
version = "1.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bearer";
|
||||
repo = "bearer";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-u6dekNeUkqpnDmO1T9p90B1MfugQlvkFXQXyBC3dLVc=";
|
||||
hash = "sha256-cN+YEdNtxt/DDn4ZbUnDg0rHgSJ3xL2LmmtZQ+eKNZs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-eusdAz70KtkcizOayT7R426ZlHjuhmpq0/ZnL+2MJlU=";
|
||||
vendorHash = "sha256-d2QMNxTM7Cbr5X2Y1J9VBleVjMy9wZeEItYkChaYBR0=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/bearer"
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "trino-cli";
|
||||
version = "418";
|
||||
version = "422";
|
||||
|
||||
jarfilename = "${pname}-${version}-executable.jar";
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://maven/io/trino/${pname}/${version}/${jarfilename}";
|
||||
sha256 = "sha256-IVLQG+y2Uvph+0WE+BE2beDSCGzfgkOdclESi+szcZM=";
|
||||
sha256 = "sha256-isOcZDbm4Ykkolmcn4lRMkknZkTYRvMOXVZlGKRnXU8=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ast-grep";
|
||||
version = "0.9.2";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ast-grep";
|
||||
repo = "ast-grep";
|
||||
rev = version;
|
||||
hash = "sha256-s3Z+QbE+Np9Rox0Syir7ag1gJGSxnwpu5kQRmpBOUoA=";
|
||||
hash = "sha256-Il7VJyp4iIo8KrFHRoE4QptgzlJGKr+Npp2IkjDx/vc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-VbMAPBCubst0HDI+pG59KPkwWXOeQNjVMb81ci96rBg=";
|
||||
cargoHash = "sha256-KReLBqdXtef20tULasw47wrm5k+qUBwo8tPiOTvD9cQ=";
|
||||
|
||||
# error: linker `aarch64-linux-gnu-gcc` not found
|
||||
postPatch = ''
|
||||
|
||||
@ -8,13 +8,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bazarr";
|
||||
version = "1.2.3";
|
||||
version = "1.2.4";
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip";
|
||||
sha256 = "sha256-6yLXsdw3wdxrCqNsNrbcjqfqgRR1Nuyyxw6osYQl8uY=";
|
||||
sha256 = "sha256-TdBazeY/w9vSEbs/OgRtdoi/riAUai1zrmM/A8ecaWA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip makeWrapper ];
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "matrix-appservice-slack",
|
||||
"version": "2.1.1",
|
||||
"version": "2.1.2",
|
||||
"description": "A Matrix <--> Slack bridge",
|
||||
"engines": {
|
||||
"node": ">=16 <=18"
|
||||
@ -42,12 +42,13 @@
|
||||
"axios": "^0.27.2",
|
||||
"classnames": "^2.3.2",
|
||||
"escape-string-regexp": "^4.0.0",
|
||||
"matrix-appservice-bridge": "^8.1.1",
|
||||
"https-proxy-agent": "^5.0.1",
|
||||
"matrix-appservice-bridge": "^8.1.2",
|
||||
"matrix-widget-api": "^1.1.1",
|
||||
"minimist": "^1.2.6",
|
||||
"nedb": "^1.8.0",
|
||||
"node-emoji": "^1.10.0",
|
||||
"nunjucks": "^3.2.3",
|
||||
"nunjucks": "^3.2.4",
|
||||
"p-queue": "^6.0.0",
|
||||
"pg-promise": "^10.11.1",
|
||||
"randomstring": "^1.2.1",
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"version": "2.1.1",
|
||||
"srcHash": "sha256-+NO/V3EyqdxavnSTBU7weJnueL6+aCH3UWkqclpsId0=",
|
||||
"yarnHash": "1pqv7g3xbfs4zhmyxy5p216kq2jwjfjzxw2dv2a7hl0qwk6igyki"
|
||||
"version": "2.1.2",
|
||||
"srcHash": "sha256-e9k+5xvgHkVt/fKAr0XhYjbEzHYwdGRdqiPWWbT0T5M=",
|
||||
"yarnHash": "0266rrfx0fnrhn64ivy4iygf6nl5vc5i08j6h72k2zrh3rg203kz"
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "matrix-hookshot",
|
||||
"version": "4.4.0",
|
||||
"version": "4.4.1",
|
||||
"description": "A bridge between Matrix and multiple project management services, such as GitHub, GitLab and JIRA.",
|
||||
"main": "lib/app.js",
|
||||
"repository": "https://github.com/matrix-org/matrix-hookshot",
|
||||
@ -56,7 +56,7 @@
|
||||
"ioredis": "^5.2.3",
|
||||
"jira-client": "^8.0.0",
|
||||
"markdown-it": "^12.3.2",
|
||||
"matrix-appservice-bridge": "^9.0.0",
|
||||
"matrix-appservice-bridge": "^9.0.1",
|
||||
"matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.6.6-element.1",
|
||||
"matrix-widget-api": "^1.0.0",
|
||||
"micromatch": "^4.0.4",
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"version": "4.4.0",
|
||||
"srcHash": "sha256-mPLDdAVIMb5d2LPGtIfm/ofRs42081S3+QTsvqkfp3s=",
|
||||
"yarnHash": "0qd3h870mk3a2lzm0r7kyh07ykw86h9xwai9h205gnv1w0d59z6i",
|
||||
"cargoHash": "sha256-NGcnRKasYE4dleQLq+E4cM6C04Rfu4AsenDznGyC2Nk="
|
||||
"version": "4.4.1",
|
||||
"srcHash": "sha256-pQSivF/90BvvqtBGTi8eSssPzJdkUNW9cXztG+V+Joo=",
|
||||
"yarnHash": "1adcl20d5nis8w3amwkcxddybikn5whgx9ixv78lm9h2mc45y6jw",
|
||||
"cargoHash": "sha256-c5hZroZ3A9dhviSuqVfNMSr5KL/FEXecuyMfZwMD9kc="
|
||||
}
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "sachet";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "messagebird";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-zcFViE1/B+wrkxZ3YIyfy2IBbxLvXOf8iK/6eqZb1ZQ=";
|
||||
hash = "sha256-zcFViE1/B+wrkxZ3YIyfy2IBbxLvXOf8iK/6eqZb1ZQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
meta = with lib; {
|
||||
description = "An SMS alerting tool for Prometheus's Alertmanager";
|
||||
|
||||
2497
pkgs/servers/polaris/Cargo.lock
generated
Normal file
2497
pkgs/servers/polaris/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,18 +1,21 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, nix-update-script
|
||||
, polaris-web
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "polaris";
|
||||
version = "0.13.5";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "agersant";
|
||||
repo = "polaris";
|
||||
rev = version;
|
||||
sha256 = "sp1KDTzKvcGtuqL37fFnVgcnkIsmj5ZQji72BeyiFQE=";
|
||||
hash = "sha256-mLugPi3Xp46Lh48JQVeyOEGiovSF26gUt25MGBPFfkM=";
|
||||
|
||||
# The polaris version upstream in Cargo.lock is "0.0.0".
|
||||
# We're unable to simply patch it in the patch phase due to
|
||||
@ -26,11 +29,22 @@ rustPlatform.buildRustPackage rec {
|
||||
'';
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-0VHrlUoyYu+UTUQUioftBDlQJfLd/axz6bGJs+YXSmE=";
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"id3-1.4.0" = "sha256-0j2iOd/GkMqLu18Eu8nttmqez0G6fu2m19gsHWMmLds=";
|
||||
};
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.Security
|
||||
];
|
||||
|
||||
# Compile-time environment variables for where to find assets needed at runtime
|
||||
POLARIS_WEB_DIR = "${polaris-web}/share/polaris-web";
|
||||
POLARIS_SWAGGER_DIR = "${placeholder "out"}/share/polaris-swagger";
|
||||
env = {
|
||||
POLARIS_WEB_DIR = "${polaris-web}/share/polaris-web";
|
||||
POLARIS_SWAGGER_DIR = "${placeholder "out"}/share/polaris-swagger";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share
|
||||
@ -42,7 +56,11 @@ rustPlatform.buildRustPackage rec {
|
||||
ulimit -n 4096
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Self-host your music collection, and access it from any computer and mobile device";
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p common-updater-scripts curl jq nix coreutils
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")"/../../..
|
||||
|
||||
# update github tag and hash
|
||||
|
||||
latestVersion="$(curl -s "https://api.github.com/repos/agersant/polaris/releases?per_page=1" | jq -r ".[0].tag_name")"
|
||||
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; polaris.version or (lib.getVersion polaris)" | tr -d '"')
|
||||
|
||||
if [[ "$currentVersion" == "$latestVersion" ]]; then
|
||||
echo "polaris is up-to-date: $currentVersion"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
update-source-version polaris "$latestVersion"
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "aliyun-cli";
|
||||
version = "3.0.169";
|
||||
version = "3.0.170";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "aliyun";
|
||||
repo = pname;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-ZQR4bVVcqUdQc35Az/eDjLiK8Mk3a9zRVeUPdwPJ9fE=";
|
||||
sha256 = "sha256-PHrut4w66v/TBFZqFoopNJTDhuIjaKdiqA6pHxMKEC0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XM/ATJVTyhv85KI2aUTufVDzYZMLTegtNuT3JEsU5vM=";
|
||||
|
||||
@ -1,8 +1,9 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, bash
|
||||
, makeBinaryWrapper
|
||||
, bc
|
||||
, libnotify
|
||||
, feh
|
||||
, grim
|
||||
, imagemagick
|
||||
@ -24,14 +25,24 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-vCMuFMGcI4D4EzbSsXeNGKNS6nBFkfTcAmSzb9UMArc=";
|
||||
};
|
||||
|
||||
buildInputs = [ bash bc feh imagemagick ]
|
||||
++ lib.optionals waylandSupport [ grim slurp wl-clipboard ]
|
||||
++ lib.optionals x11Support [ xcolor ];
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
|
||||
# Ensure the following programs are found within $PATH
|
||||
wrapperPath = lib.makeBinPath ([
|
||||
bc
|
||||
feh
|
||||
#Needed to fix convert: unable to read font `(null)' @ error/annotate.c/RenderFreetype issue
|
||||
(imagemagick.override { ghostscriptSupport = true;})
|
||||
libnotify #Needed for the notify-send function call from the script
|
||||
] ++ lib.optionals waylandSupport [ grim slurp wl-clipboard ]
|
||||
++ lib.optionals x11Support [ xcolor ]);
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
install -m755 farge $out/bin
|
||||
wrapProgram $out/bin/farge \
|
||||
--prefix PATH : "${finalAttrs.wrapperPath}"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@ -40,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/sdushantha/farge";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ jtbx ];
|
||||
maintainers = with maintainers; [ jtbx justinlime ];
|
||||
mainProgram = "farge";
|
||||
};
|
||||
})
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sagoin";
|
||||
version = "0.2.2";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "figsoda";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bhBC7Cblw8vmP4BalYv2DMRQWPK2AELb8Ia9PSeWcXE=";
|
||||
hash = "sha256-/WNUDlJxxUGAtykX44A9EqMdBNwVKsGkPnq9pATmLEQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-1XcI2LUo6xOs6bJDXKVDqMangH2dq2E6fNokuSDzpK0=";
|
||||
cargoHash = "sha256-YGQZR5n71srD/8QrBUOoEe72nPm0cwgk5zrzoXy2Hx0=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -11,19 +11,15 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "urn-timer";
|
||||
version = "unstable-2023-07-01";
|
||||
version = "unstable-2023-07-31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paoloose";
|
||||
repo = "urn";
|
||||
rev = "8efdabcdd806b3b8997b82925d26209e6da8311b";
|
||||
hash = "sha256-lQVdHD3IkITJ2P2zimhFLTxmOzZkdWOg/RhR2xlBLJU=";
|
||||
rev = "2dad51949aa21e0e66a3d34e916fb66689c6be2e";
|
||||
hash = "sha256-0pZjgKW4kyBgMGKEa8ZMhKtzbJX2MoXKID++iy16m2A=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile --replace 'rsync -a --exclude=".*"' 'cp -r'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
xxd
|
||||
pkg-config
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "grype";
|
||||
version = "0.64.2";
|
||||
version = "0.65.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anchore";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-jCGeSAG97RojLidxJK8yCN1ldStpG9b57rUR5JkQGuE=";
|
||||
hash = "sha256-Dqjdl0fco3t8/jVt9/7pwXzoKapctU3T+ixkKTQ6sAE=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
@ -28,7 +28,7 @@ buildGoModule rec {
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-X3AqiW8wHGBkl/xlh1pPiDfQkZ9lDRyv0FTxWy2hT8E=";
|
||||
vendorHash = "sha256-VxsXhNOFj7Iwq7Sa2J8ADcfLt9Bz+D0RHwEGawveryU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ lib }:
|
||||
|
||||
rec {
|
||||
version = "1.27.0";
|
||||
version = "1.34.1";
|
||||
|
||||
srcHash = "sha256-F6n3LQY4a5sO6c8SMQF9YjjgOS+v2SH+UQPwhg2EX7Q=";
|
||||
srcHash = "sha256-jbwG3Xyb/rEyz7aR51/pfc+bU/KY9k6BsByZg6KDY5s=";
|
||||
|
||||
# submodule dependencies
|
||||
# these are fetched so we:
|
||||
@ -13,8 +13,8 @@ rec {
|
||||
"cli/src/semgrep/semgrep_interfaces" = {
|
||||
owner = "returntocorp";
|
||||
repo = "semgrep-interfaces";
|
||||
rev = "213f67abea73546ca6111e1bbf0ef96aa917c940";
|
||||
hash = "sha256-HeNHJkTje9j16+dwsfyMhoqQn/J18q/7XvQPRwgTw/Y=";
|
||||
rev = "f7fed064dadb859f0b802b11fb60f7f77008c4d7";
|
||||
hash = "sha256-EXYRc6p94QxkOBMPOdr608JqLY6kN1AanlRfOFXxPm8=";
|
||||
};
|
||||
};
|
||||
|
||||
@ -25,15 +25,15 @@ rec {
|
||||
core = {
|
||||
x86_64-linux = {
|
||||
platform = "any";
|
||||
hash = "sha256-cRj81dXpAE6S0EXajsRikOIAPzlUf42FhiDCWjv+wZQ=";
|
||||
hash = "sha256-XogITZZtuNmWBrCfL5qpHJNm6jFxzraZMXWhUotXA4c=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
platform = "macosx_10_14_x86_64";
|
||||
hash = "sha256-jqfGVZGF/DFgXkr7kQg6QyqEELSr8AKE3Ga8kTftnIY=";
|
||||
hash = "sha256-YjV915SZ2L8t6huToErTHRd82m4I+evPyeuwpVzi26o=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
platform = "macosx_11_0_arm64";
|
||||
hash = "sha256-e/uCSRMdbVD0lvc0hukbiUzheqRNIIh1LgMq6Ae7JYI=";
|
||||
hash = "sha256-BAnYYeUWosAorcHpqUMpRXJFl4NQDPbWTsykDN3w5UQ=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -102,6 +102,10 @@ buildPythonApplication rec {
|
||||
makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ semgrep-core ]})
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
chmod +x $out/bin/{,py}semgrep
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit common;
|
||||
submodulesSubset = lib.mapAttrs (k: args: fetchFromGitHub args) common.submodules;
|
||||
|
||||
@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
inherit version;
|
||||
format = "wheel";
|
||||
dist = python;
|
||||
python = "cp37.cp38.cp39.py37.py38.py39";
|
||||
python = "cp37.cp38.cp39.cp310.cp311.py37.py38.py39.py310.py311";
|
||||
inherit (data) platform hash;
|
||||
};
|
||||
|
||||
|
||||
@ -15,7 +15,6 @@ fi
|
||||
|
||||
ROOT="$(dirname "$(readlink -f "$0")")"
|
||||
NIXPKGS_ROOT="$ROOT/../../../.."
|
||||
NIX_DRV="$ROOT/default.nix"
|
||||
|
||||
COMMON_FILE="$ROOT/common.nix"
|
||||
|
||||
@ -59,7 +58,7 @@ fetchPypi rec {
|
||||
version = \"$VERSION\";
|
||||
format = \"wheel\";
|
||||
dist = python;
|
||||
python = \"cp37.cp38.cp39.py37.py38.py39\";
|
||||
python = \"cp37.cp38.cp39.cp310.cp311.py37.py38.py39.py310.py311\";
|
||||
platform = \"$PLATFORM\";
|
||||
}
|
||||
"
|
||||
@ -131,8 +130,6 @@ nix-instantiate -E "with import $NIXPKGS_ROOT {}; builtins.attrNames semgrep.pas
|
||||
continue
|
||||
fi
|
||||
|
||||
NEW_URL=$(instantiateClean semgrep.passthru.submodulesSubset."$SUBMODULE".url | sed "s@$OLD_REV@$NEW_REV@g")
|
||||
|
||||
TMP_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
|
||||
replace "$OLD_REV" "$NEW_REV" "$COMMON_FILE"
|
||||
replace "$OLD_HASH" "$TMP_HASH" "$COMMON_FILE"
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "d2";
|
||||
version = "0.5.1";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "terrastruct";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Oq6bJ/cX+kDyVUVP/RpCIcNeWpT3HESUMmR6mEi9X4Q=";
|
||||
hash = "sha256-MF8RqwoMc48JYgNUJTQKHlGl59xyHOALnFL2BWQAl24=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-SocBC/1LrdSQNfcNVa9nnPaq/UvLVIghHlUSJB7ImBk=";
|
||||
|
||||
@ -11054,6 +11054,10 @@ with pkgs;
|
||||
|
||||
notify-osd = callPackage ../applications/misc/notify-osd { };
|
||||
|
||||
notes = qt6Packages.callPackage ../applications/office/notes {
|
||||
inherit (darwin.apple_sdk.frameworks) Cocoa;
|
||||
};
|
||||
|
||||
notes-up = callPackage ../applications/office/notes-up { };
|
||||
|
||||
notify-osd-customizable = callPackage ../applications/misc/notify-osd-customizable { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user