Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
d4187810f9
|
|
@ -182,23 +182,12 @@ rec {
|
|||
(b == armv7l && isCompatible a armv7a)
|
||||
(b == armv7l && isCompatible a armv7r)
|
||||
(b == armv7l && isCompatible a armv7m)
|
||||
(b == armv7a && isCompatible a armv8a)
|
||||
(b == armv7r && isCompatible a armv8a)
|
||||
(b == armv7m && isCompatible a armv8a)
|
||||
(b == armv7a && isCompatible a armv8r)
|
||||
(b == armv7r && isCompatible a armv8r)
|
||||
(b == armv7m && isCompatible a armv8r)
|
||||
(b == armv7a && isCompatible a armv8m)
|
||||
(b == armv7r && isCompatible a armv8m)
|
||||
(b == armv7m && isCompatible a armv8m)
|
||||
|
||||
# ARMv8
|
||||
(b == armv8r && isCompatible a armv8a)
|
||||
(b == armv8m && isCompatible a armv8a)
|
||||
|
||||
# XXX: not always true! Some arm64 cpus don’t support arm32 mode.
|
||||
(b == aarch64 && a == armv8a)
|
||||
(b == armv8a && isCompatible a aarch64)
|
||||
(b == armv8r && isCompatible a armv8a)
|
||||
(b == armv8m && isCompatible a armv8a)
|
||||
|
||||
# PowerPC
|
||||
(b == powerpc && isCompatible a powerpc64)
|
||||
|
|
|
|||
|
|
@ -1096,6 +1096,12 @@
|
|||
githubId = 1078530;
|
||||
name = "Alexandre Peyroux";
|
||||
};
|
||||
apfelkuchen6 = {
|
||||
email = "apfelkuchen6@hrnz.li";
|
||||
github = "apfelkuchen6";
|
||||
githubId = 73002165;
|
||||
name = "apfelkuchen6";
|
||||
};
|
||||
applePrincess = {
|
||||
email = "appleprincess@appleprincess.io";
|
||||
github = "applePrincess";
|
||||
|
|
@ -2285,6 +2291,12 @@
|
|||
githubId = 15320726;
|
||||
name = "Car Cdr";
|
||||
};
|
||||
caarlos0 = {
|
||||
name = "Carlos A Becker";
|
||||
email = "carlos@becker.software";
|
||||
github = "caarlos0";
|
||||
githubId = 245435;
|
||||
};
|
||||
cab404 = {
|
||||
email = "cab404@mailbox.org";
|
||||
github = "cab404";
|
||||
|
|
@ -2992,6 +3004,13 @@
|
|||
githubId = 40290417;
|
||||
name = "Seb Blair";
|
||||
};
|
||||
connorbaker = {
|
||||
email = "connor.baker@tweag.io";
|
||||
matrix = "@connorbaker:matrix.org";
|
||||
github = "connorbaker";
|
||||
name = "Connor Baker";
|
||||
githubId = 3880346;
|
||||
};
|
||||
considerate = {
|
||||
email = "viktor.kronvall@gmail.com";
|
||||
github = "considerate";
|
||||
|
|
@ -7924,6 +7943,12 @@
|
|||
githubId = 804677;
|
||||
name = "Kirill Kazakov";
|
||||
};
|
||||
kirillrdy = {
|
||||
email = "kirillrdy@gmail.com";
|
||||
github = "kirillrdy";
|
||||
githubId = 12160;
|
||||
name = "Kirill Radzikhovskyy";
|
||||
};
|
||||
kisonecat = {
|
||||
email = "kisonecat@gmail.com";
|
||||
github = "kisonecat";
|
||||
|
|
@ -12074,6 +12099,15 @@
|
|||
githubId = 4633847;
|
||||
name = "Ben Hamlin";
|
||||
};
|
||||
prrlvr = {
|
||||
email = "po@prrlvr.fr";
|
||||
github = "prrlvr";
|
||||
githubId = 33699501;
|
||||
name = "Pierre-Olivier Rey";
|
||||
keys = [{
|
||||
fingerprint = "40A0 78FD 297B 0AC1 E6D8 A119 4D38 49D9 9555 1307";
|
||||
}];
|
||||
};
|
||||
prusnak = {
|
||||
email = "pavol@rusnak.io";
|
||||
github = "prusnak";
|
||||
|
|
@ -14809,6 +14843,15 @@
|
|||
fingerprint = "38A0 29B0 4A7E 4C13 A4BB 86C8 7D51 0786 6B1C 6752";
|
||||
}];
|
||||
};
|
||||
thekostins = {
|
||||
name = "Konstantin";
|
||||
email = "anisimovkosta19@gmail.com";
|
||||
github = "TheKostins";
|
||||
githubId = 39405421;
|
||||
keys = [{
|
||||
fingerprint = "B216 7B33 E248 097F D82A 991D C94D 589A 4D0D CDD2";
|
||||
}];
|
||||
};
|
||||
thelegy = {
|
||||
email = "mail+nixos@0jb.de";
|
||||
github = "thelegy";
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "somebar";
|
||||
version = "1.0.0";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~raphi";
|
||||
repo = "somebar";
|
||||
rev = "${version}";
|
||||
sha256 = "sha256-snCW7dC8JI/pg1+HLjX0JXsTzwa3akA6rLcSNgKLF0c=";
|
||||
sha256 = "sha256-PBxCy1dZrOL1nmhVDQozvF0XL79uKMhhERGNpPPzaRU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
{ newScope, config, stdenv, fetchurl, makeWrapper
|
||||
, llvmPackages_14, ed, gnugrep, coreutils, xdg-utils
|
||||
, llvmPackages_14
|
||||
, llvmPackages_15
|
||||
, ed, gnugrep, coreutils, xdg-utils
|
||||
, glib, gtk3, gtk4, gnome, gsettings-desktop-schemas, gn, fetchgit
|
||||
, libva, pipewire, wayland
|
||||
, gcc, nspr, nss, runCommand
|
||||
|
|
@ -52,6 +54,9 @@ let
|
|||
inherit (upstream-info.deps.gn) url rev sha256;
|
||||
};
|
||||
});
|
||||
} // lib.optionalAttrs (chromiumVersionAtLeast "111") rec {
|
||||
llvmPackages = llvmPackages_15;
|
||||
stdenv = llvmPackages_15.stdenv;
|
||||
});
|
||||
|
||||
browser = callPackage ./browser.nix {
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@
|
|||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "111.0.5563.50",
|
||||
"sha256": "1iygqlgr7qqac489kb0s4z5mwvchhi7wkibj84ziqcxlbqlfrmni",
|
||||
"sha256bin64": "0pgrqb18hbp1q54flg0c63v85bi11m4rc6f25f0h0x90lvl65d05",
|
||||
"version": "111.0.5563.64",
|
||||
"sha256": "0x20zqwq051a5j76q1c3m0ddf1hhcm6fgz3b7rqrfamjppia0p3x",
|
||||
"sha256bin64": "1cl7zbsl0ndp5x1g0p1q511mn72iy72sqxycmlrccs9j8jmaiqgw",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-12-12",
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tsung";
|
||||
version = "1.7.0";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://tsung.erlang-projects.org/dist/tsung-${version}.tar.gz";
|
||||
sha256 = "6394445860ef34faedf8c46da95a3cb206bc17301145bc920151107ffa2ce52a";
|
||||
hash = "sha256-kehkMCYBfj0AiKZxD7EcT2F0d+gm6+TF/lhqpjFH/JI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
homepage = "http://tsung.erlang-projects.org/";
|
||||
changelog = "https://github.com/processone/tsung/blob/v${version}/CHANGELOG.md";
|
||||
description = "A high-performance benchmark framework for various protocols including HTTP, XMPP, LDAP, etc";
|
||||
longDescription = ''
|
||||
Tsung is a distributed load testing tool. It is protocol-independent and
|
||||
|
|
|
|||
|
|
@ -20,14 +20,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wpsoffice";
|
||||
version = "11.1.0.11664";
|
||||
version = "11.1.0.11691";
|
||||
|
||||
src = if useChineseVersion then fetchurl {
|
||||
url = "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2019/${lib.last (lib.splitString "." version)}/wps-office_${version}_amd64.deb";
|
||||
sha256 = "sha256-D2LhxBMHmQjVExa/63DHdws0V+EmOSlJzGq91jbuJHs=";
|
||||
sha256 = "sha256-ubFYACnsMObde9TGp1tyHtG0n5NxYMFtEbY9KXj62No=";
|
||||
} else fetchurl {
|
||||
url = "http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${lib.last (lib.splitString "." version)}/wps-office_${version}.XA_amd64.deb";
|
||||
sha256 = "sha256-9qZGqs4nsB9mWCJTi2x+vWmMF0sEoUYgEzLI//hijfU=";
|
||||
url = "https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${lib.last (lib.splitString "." version)}/wps-office_${version}.XA_amd64.deb";
|
||||
sha256 = "sha256-F1foPaDd4YiAcCePleKsABjFzsb2Uv+Lkja+58pnquI=";
|
||||
};
|
||||
|
||||
unpackCmd = "dpkg -x $src .";
|
||||
|
|
|
|||
|
|
@ -17,11 +17,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fossil";
|
||||
version = "2.20";
|
||||
version = "2.21";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.fossil-scm.org/home/tarball/version-${version}/fossil-${version}.tar.gz";
|
||||
sha256 = "1knff50rr8f39myxj50fprb9ya87cslmwz7zzfya56l33r7i7jh3";
|
||||
hash = "sha256-wf7sp4ISTN52mSQHxw8s7//L4beLZtwkaJDYMVnvgIQ=";
|
||||
};
|
||||
|
||||
# required for build time tool `./tools/translate.c`
|
||||
|
|
|
|||
|
|
@ -341,7 +341,7 @@ rec {
|
|||
if checkPhase == null then ''
|
||||
runHook preCheck
|
||||
${stdenv.shellDryRun} "$target"
|
||||
${shellcheck.unwrapped}/bin/shellcheck "$target"
|
||||
${lib.getExe shellcheck} "$target"
|
||||
runHook postCheck
|
||||
''
|
||||
else checkPhase;
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ let
|
|||
|
||||
pkg = self: stdenv.mkDerivation rec {
|
||||
pname = "hex";
|
||||
version = "1.0.1";
|
||||
version = "2.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hexpm";
|
||||
repo = "hex";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5g2MDbStlUrAPQCv1xWp+oPyRIOqARmlsKo/ONLTLnY=";
|
||||
sha256 = "sha256-fSADQDrqh5U/TdhaHXsMiLMk1wtQ0gEiTqEclJ2w2nY=";
|
||||
};
|
||||
|
||||
setupHook = writeText "setupHook.sh" ''
|
||||
|
|
|
|||
|
|
@ -6,18 +6,18 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unison-code-manager";
|
||||
milestone_id = "M4c";
|
||||
milestone_id = "M4h";
|
||||
version = "1.0.${milestone_id}-alpha";
|
||||
|
||||
src = if (stdenv.isDarwin) then
|
||||
fetchurl {
|
||||
url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-macos.tar.gz";
|
||||
sha256 = "sha256-mkzIC/cPkpH0obEBqkvvKVh74LaV6jkfyEMLHmJn/nE=";
|
||||
hash = "sha256-7yphap7qZBkbTKiwhyCTLgbBO/aA0eUWtva+XjpaZDI=";
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-linux.tar.gz";
|
||||
sha256 = "sha256-LfT/pMOvfBAwew6NW0VNvuB5c1AC7b+qKraP25+kytg=";
|
||||
hash = "sha256-vrZpYFoQw1hxgZ7lAoejIqnjIOFFMahAI9SjFN/Cnms=";
|
||||
};
|
||||
|
||||
# The tarball is just the prebuilt binary, in the archive root.
|
||||
|
|
|
|||
|
|
@ -10,17 +10,18 @@
|
|||
, readline
|
||||
, SDL
|
||||
, SDL_gfx
|
||||
, openssl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jimtcl";
|
||||
version = "0.81";
|
||||
version = "0.82";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "msteveb";
|
||||
repo = "jimtcl";
|
||||
rev = version;
|
||||
sha256 = "sha256-OpM9y7fQ+18qxl3/5wUCrNA9qiCdA0vTHqLYSw2lvJs=";
|
||||
sha256 = "sha256-CDjjrxpoTbLESAbCiCjQ8+E/oJP87gDv9SedQOzH3QY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -29,7 +30,11 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
sqlite readline SDL SDL_gfx
|
||||
sqlite
|
||||
readline
|
||||
SDL
|
||||
SDL_gfx
|
||||
openssl
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
|
|
@ -51,15 +56,13 @@ stdenv.mkDerivation rec {
|
|||
preCheck = ''
|
||||
# test exec2-3.2 fails depending on platform or sandboxing (?)
|
||||
rm tests/exec2.test
|
||||
# requires internet access
|
||||
rm tests/ssl.test
|
||||
'';
|
||||
|
||||
# test posix-1.6 needs the "hostname" command
|
||||
nativeCheckInputs = [ inetutils ];
|
||||
|
||||
postInstall = ''
|
||||
ln -sr $out/lib/libjim.so.${version} $out/lib/libjim.so
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "An open source small-footprint implementation of the Tcl programming language";
|
||||
homepage = "http://jim.tcl.tk/";
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "maestro";
|
||||
version = "1.23.0";
|
||||
version = "1.24.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip";
|
||||
sha256 = "0g508x79vhn7phmk4vlr3c213k0vi6yk0mpfcz5jcg4mpdapfmri";
|
||||
sha256 = "19zzs2a8zrnbgjqvdh31naf2h9l2am4bankshh563gfgcfsl0af0";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
61
pkgs/development/python-modules/easyenergy/default.nix
Normal file
61
pkgs/development/python-modules/easyenergy/default.nix
Normal file
|
|
@ -0,0 +1,61 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, aresponses
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pytest-asyncio
|
||||
, pytest-freezer
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, yarl
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "easyenergy";
|
||||
version = "0.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "klaasnicolaas";
|
||||
repo = "python-easyenergy";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-EhpZKwoayT53lhyuM/DlyLQ/1OSGuiAaiBdjM0UTZ8E=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace '"0.0.0"' '"${version}"' \
|
||||
--replace 'addopts = "--cov"' ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
yarl
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
aresponses
|
||||
pytest-asyncio
|
||||
pytest-freezer
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"easyenergy"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module for getting energy/gas prices from easyEnergy";
|
||||
homepage = "https://github.com/klaasnicolaas/python-easyenergy";
|
||||
changelog = "https://github.com/klaasnicolaas/python-easyenergy/releases/tag/v${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
61
pkgs/development/python-modules/energyzero/default.nix
Normal file
61
pkgs/development/python-modules/energyzero/default.nix
Normal file
|
|
@ -0,0 +1,61 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, aresponses
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pytest-asyncio
|
||||
, pytest-freezer
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, yarl
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "energyzero";
|
||||
version = "0.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "klaasnicolaas";
|
||||
repo = "python-energyzero";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-QSxr4hfNlpIbLpeQ8tcdRP3dARB/OxTP9cVgf+P63Lw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace '"0.0.0"' '"${version}"' \
|
||||
--replace 'addopts = "--cov"' ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
yarl
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
aresponses
|
||||
pytest-asyncio
|
||||
pytest-freezer
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"energyzero"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module for getting the dynamic prices from EnergyZero";
|
||||
homepage = "https://github.com/klaasnicolaas/python-energyzero";
|
||||
changelog = "https://github.com/klaasnicolaas/python-energyzero/releases/tag/v${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,47 @@
|
|||
{ lib
|
||||
, bleak
|
||||
, bleak-retry-connector
|
||||
, buildPythonPackage
|
||||
, cryptography
|
||||
, fetchPypi
|
||||
, poetry-core
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "eufylife-ble-client";
|
||||
version = "0.1.7";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "eufylife_ble_client";
|
||||
inherit version;
|
||||
hash = "sha256-Vt9hHUVAM0d+BcotPUD9v8jXrcg7lEDVChLENUHd3rY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bleak
|
||||
bleak-retry-connector
|
||||
cryptography
|
||||
];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"eufylife_ble_client"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module for parsing data from Eufy smart scales";
|
||||
homepage = "https://github.com/bdr99/eufylife-ble-client";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "iminuit";
|
||||
version = "2.20.0";
|
||||
version = "2.21.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-pz/m4C814xgPwBvFwXlO32Yv8XJcO8Kk9DNWd5nadQQ=";
|
||||
hash = "sha256-ivRsweaIvkiBceTfAI457wN+tbntJ3t4HTynWf29vAI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
26
pkgs/development/python-modules/python-musicpd/default.nix
Normal file
26
pkgs/development/python-modules/python-musicpd/default.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-musicpd";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname;
|
||||
inherit version;
|
||||
sha256 = "sha256-5Br4rZO1c/pPmAZ/UecYjuVLttR8R+xeReKsc/xnaeI=";
|
||||
};
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "An MPD (Music Player Daemon) client library written in pure Python.";
|
||||
homepage = "https://gitlab.com/kaliko/python-musicpd";
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with lib.maintainers; [ apfelkuchen6 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "slack-sdk";
|
||||
version = "3.20.0";
|
||||
version = "3.20.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
|||
owner = "slackapi";
|
||||
repo = "python-slack-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-NlUmoOlRV7h7d553uX2tAWi2aWCAqpHflSUrdZxlaws=";
|
||||
hash = "sha256-etPNhGjLrXOwkM7m2Q1xGoGraBq/2tq58bWXqncHy+w=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "algolia-cli";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "algolia";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-j0d2HK4McWA2yP7pt+TUOEYVUOQP4NYOdMlK7IqaAcU=";
|
||||
hash = "sha256-lO+ysaXZcwRsuEdkMyPKqrChbW27eId466Eb8Mss2IQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-RG/aLlCve0XLj3ljBBSsloFUgNAG6faqjyMYXOo+CgI=";
|
||||
vendorHash = "sha256-t8SqCBuE/JmVR71MC9sHtQ6tEovO2UJo7FCDM+IBk+c=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
stdenv.mkDerivation (self: {
|
||||
pname = "byacc";
|
||||
version = "20221229";
|
||||
version = "20230219";
|
||||
|
||||
src = fetchurl {
|
||||
urls = let
|
||||
|
|
@ -14,7 +14,7 @@ stdenv.mkDerivation (self: {
|
|||
"https://invisible-mirror.net/archives/byacc/${pname}-${version}.tgz"
|
||||
"ftp://ftp.invisible-island.net/byacc/${pname}-${version}.tgz"
|
||||
];
|
||||
hash = "sha256-ExbG95D6+maIQn8f+RJnth2LeHO0Q8Yg7vaabv8FA7w=";
|
||||
hash = "sha256-NrlyptSul1hN0YaSX7vDl9JssgYyp2wvUqx2U80IG1g=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
|
|
|||
30
pkgs/development/tools/parsing/re-flex/default.nix
Normal file
30
pkgs/development/tools/parsing/re-flex/default.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, boost
|
||||
, autoconf
|
||||
, automake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "re-flex";
|
||||
version = "3.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Genivia";
|
||||
repo = "RE-flex";
|
||||
rev = "v${version}";
|
||||
sha256 = "w3ecuUa7lBtRv071acBIZGcpjBZD4UvVQdUzT7qWiMo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ boost autoconf automake ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Genivia/RE-flex";
|
||||
description = "The regex-centric, fast lexical analyzer generator for C++ with full Unicode support";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with lib.maintainers; [ prrlvr ];
|
||||
};
|
||||
}
|
||||
|
|
@ -34,20 +34,20 @@
|
|||
|
||||
let
|
||||
pname = "mindustry";
|
||||
version = "141.2";
|
||||
version = "142";
|
||||
buildVersion = makeBuildVersion version;
|
||||
|
||||
Mindustry = fetchFromGitHub {
|
||||
owner = "Anuken";
|
||||
repo = "Mindustry";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7olnyjkcT8OwokipDnLFW3rMOPljF6HvsU249SDvA3U=";
|
||||
hash = "sha256-xL1oy93ljAl1hdzsdEF9NHZL/yb11markUg271C++R4=";
|
||||
};
|
||||
Arc = fetchFromGitHub {
|
||||
owner = "Anuken";
|
||||
repo = "Arc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JYM2/dkrLFZz+oqOs8e+iTRG5Vv4oUcmpAavRQ7NMMM=";
|
||||
hash = "sha256-CKcAnYAuHQb6wPkDUpinU83MVxhdvhYpjjuS3sEb6cg=";
|
||||
};
|
||||
soloud = fetchFromGitHub {
|
||||
owner = "Anuken";
|
||||
|
|
@ -126,7 +126,7 @@ let
|
|||
| sh
|
||||
'';
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-Eb+LyO1d2XwhAp9awgMlxs7dfZav0ja9kH7PaUJQOCo=";
|
||||
outputHash = "sha256-Fy2GXdB+cmRfiQFKnnz+UTUxT+LBTZa69BNwC23XD84=";
|
||||
};
|
||||
|
||||
in
|
||||
|
|
@ -229,7 +229,7 @@ stdenv.mkDerivation rec {
|
|||
binaryBytecode # deps
|
||||
];
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ chkno fgaz ];
|
||||
maintainers = with maintainers; [ chkno fgaz thekostins ];
|
||||
platforms = platforms.x86_64;
|
||||
# Hash mismatch on darwin:
|
||||
# https://github.com/NixOS/nixpkgs/pull/105590#issuecomment-737120293
|
||||
|
|
|
|||
|
|
@ -24,11 +24,11 @@ let
|
|||
in
|
||||
mkDerivation rec {
|
||||
pname = "ffado";
|
||||
version = "2.4.3";
|
||||
version = "2.4.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.ffado.org/files/libffado-${version}.tgz";
|
||||
sha256 = "08bygzv1k6ai0572gv66h7gfir5zxd9klfy74z2pxqp6s5hms58r";
|
||||
sha256 = "0vsn3y52g6f77lqh9qfkd7dslmb7bbgy46cv5idynx4frqscc23s";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tuxedo-keyboard-${kernel.version}";
|
||||
version = "3.1.1";
|
||||
version = "3.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tuxedocomputers";
|
||||
repo = "tuxedo-keyboard";
|
||||
rev = "v${version}";
|
||||
sha256 = "+59/5vfwx9fys7Q63SahVPS/ckvwkr4w6T37UqAnwZ4=";
|
||||
sha256 = "h6+br+JPEItym83MaVt+xo6o/zMtTv8+wsBoTeYa2AM=";
|
||||
};
|
||||
|
||||
buildInputs = [ linuxHeaders ];
|
||||
|
|
|
|||
|
|
@ -240,10 +240,10 @@ in {
|
|||
# IMPORTANT: Always use a tagged release candidate or commits from the
|
||||
# zfs-<version>-staging branch, because this is tested by the OpenZFS
|
||||
# maintainers.
|
||||
version = "2.1.10-staging-2023-01-24";
|
||||
rev = "92e0d9d183ce6752cd52f7277c8321d81df9ffee";
|
||||
version = "2.1.10-staging-2023-03-02";
|
||||
rev = "9d2e5c14b2f94c91aa389799bd9e80e1098263e7";
|
||||
|
||||
sha256 = "RT2ijcXhdw5rbz1niDjrqg6G/uOjyrJiTlS4qijiWqc=";
|
||||
sha256 = "sha256-E+nLmmSSPtGDjqBQp2GXJsYR2zCEpcxU0/9BD5QHdnA=";
|
||||
|
||||
isUnstable = true;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -843,7 +843,8 @@
|
|||
aioeafm
|
||||
];
|
||||
"easyenergy" = ps: with ps; [
|
||||
]; # missing inputs: easyenergy
|
||||
easyenergy
|
||||
];
|
||||
"ebox" = ps: with ps; [
|
||||
]; # missing inputs: pyebox
|
||||
"ebusd" = ps: with ps; [
|
||||
|
|
@ -934,7 +935,8 @@
|
|||
sqlalchemy
|
||||
];
|
||||
"energyzero" = ps: with ps; [
|
||||
]; # missing inputs: energyzero
|
||||
energyzero
|
||||
];
|
||||
"enigma2" = ps: with ps; [
|
||||
openwebifpy
|
||||
];
|
||||
|
|
@ -1017,13 +1019,14 @@
|
|||
bluetooth-data-tools
|
||||
dbus-fast
|
||||
esphome-dashboard-api
|
||||
eufylife-ble-client
|
||||
fnvhash
|
||||
ifaddr
|
||||
pyserial
|
||||
pyudev
|
||||
sqlalchemy
|
||||
zeroconf
|
||||
]; # missing inputs: eufylife_ble_client
|
||||
];
|
||||
"everlights" = ps: with ps; [
|
||||
pyeverlights
|
||||
];
|
||||
|
|
@ -4462,6 +4465,7 @@
|
|||
"dunehd"
|
||||
"dynalite"
|
||||
"eafm"
|
||||
"easyenergy"
|
||||
"ecobee"
|
||||
"econet"
|
||||
"ecowitt"
|
||||
|
|
@ -4475,12 +4479,14 @@
|
|||
"emulated_kasa"
|
||||
"emulated_roku"
|
||||
"energy"
|
||||
"energyzero"
|
||||
"enocean"
|
||||
"enphase_envoy"
|
||||
"environment_canada"
|
||||
"epson"
|
||||
"escea"
|
||||
"esphome"
|
||||
"eufylife_ble"
|
||||
"everlights"
|
||||
"evil_genius_labs"
|
||||
"ezviz"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, stdenvNoCC
|
||||
, fetchurl
|
||||
, makeWrapper
|
||||
|
|
@ -13,11 +14,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "opensearch";
|
||||
version = "2.5.0";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://artifacts.opensearch.org/releases/bundle/opensearch/${version}/opensearch-${version}-linux-x64.tar.gz";
|
||||
hash = "sha256-WPD5StVBb/hK+kP/1wkQQBKRQma/uaP+8ULeIFUBL1U=";
|
||||
hash = "sha256-qJrgWF8JCR4jmnF239gaiRr4Y7Tin0TyYjzxd1Q4Wko";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
@ -35,6 +36,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
|
||||
wrapProgram $out/bin/opensearch \
|
||||
--prefix PATH : "${lib.makeBinPath [ util-linux gnugrep coreutils ]}" \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$out/plugins/opensearch-knn/lib/" \
|
||||
--set JAVA_HOME "${jre_headless}"
|
||||
|
||||
wrapProgram $out/bin/opensearch-plugin --set JAVA_HOME "${jre_headless}"
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "syft";
|
||||
version = "0.73.0";
|
||||
version = "0.74.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anchore";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-FJGdp1scqzyeCWKIyTVNkaGNb4rbFLWvHDVWV4V5iBw=";
|
||||
hash = "sha256-AJAm+sgB3fyKYfyVTJsZVx5n7cnWVX5bFm27b1q+6sQ=";
|
||||
# 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;
|
||||
|
|
@ -22,7 +22,7 @@ buildGoModule rec {
|
|||
};
|
||||
# hash mismatch with darwin
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-/OwLARY5skfBfr9eJpP6YJuZrtghSGp4fZ7GfzoOiq8=";
|
||||
vendorHash = "sha256-iKcz+HFcek07GuK7xTeAKS/QRBt56oDMHy/mzlR8xDo=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
38
pkgs/tools/audio/mpd-sima/default.nix
Normal file
38
pkgs/tools/audio/mpd-sima/default.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ lib
|
||||
, buildPythonApplication
|
||||
, fetchFromGitLab
|
||||
, python-musicpd
|
||||
, requests}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "mpd-sima";
|
||||
version = "0.18.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "kaliko";
|
||||
repo = "sima";
|
||||
rev = version;
|
||||
sha256 = "sha256-lMvM1EqS1govhv4B2hJzIg5DFQYgEr4yJJtgOQxnVlY=";
|
||||
};
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
python-musicpd
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
preCheck = ''
|
||||
export HOME="$(mktemp -d)"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "An autoqueuing mpd client";
|
||||
homepage = "https://kaliko.me/mpd-sima/";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with lib.maintainers; [ apfelkuchen6 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -26,7 +26,7 @@ buildGoModule rec {
|
|||
meta = with lib; {
|
||||
description = "Deliver Go binaries as fast and easily as possible";
|
||||
homepage = "https://goreleaser.com";
|
||||
maintainers = with maintainers; [ c0deaddict endocrimes sarcasticadmin techknowlogick ];
|
||||
maintainers = with maintainers; [ c0deaddict endocrimes sarcasticadmin techknowlogick developer-guy caarlos0 ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, installShellFiles
|
||||
, makeWrapper
|
||||
, libpcap
|
||||
|
|
@ -17,6 +18,15 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-mnGC/moQANloR5ODwRjzJzBa55OEZ9QU+9WpAHxQE/g=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Patches the missing "--resume" functionality
|
||||
(fetchpatch {
|
||||
name = "resume.patch";
|
||||
url = "https://github.com/robertdavidgraham/masscan/commit/90791550bbdfac8905917a109ed74024161f14b3.patch";
|
||||
sha256 = "sha256-A7Fk3MBNxaad69MrUYg7fdMG77wba5iESDTIRigYslw=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
# Fix broken install command
|
||||
substituteInPlace Makefile --replace "-pm755" "-pDm755"
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ with localPython.pkgs; buildPythonApplication rec {
|
|||
meta = with lib; {
|
||||
homepage = "https://aws.amazon.com/elasticbeanstalk/";
|
||||
description = "A command line interface for Elastic Beanstalk";
|
||||
maintainers = with maintainers; [ eqyiel ];
|
||||
maintainers = with maintainers; [ eqyiel kirillrdy ];
|
||||
license = licenses.asl20;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5295,6 +5295,8 @@ with pkgs;
|
|||
|
||||
mpd-mpris = callPackage ../tools/audio/mpd-mpris { };
|
||||
|
||||
mpd-sima = python3Packages.callPackage ../tools/audio/mpd-sima { };
|
||||
|
||||
mpris-scrobbler = callPackage ../tools/audio/mpris-scrobbler { };
|
||||
|
||||
mq-cli = callPackage ../tools/system/mq-cli { };
|
||||
|
|
@ -17995,6 +17997,8 @@ with pkgs;
|
|||
flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { };
|
||||
flex = callPackage ../development/tools/parsing/flex { };
|
||||
|
||||
re-flex = callPackage ../development/tools/parsing/re-flex { };
|
||||
|
||||
flexibee = callPackage ../applications/office/flexibee { };
|
||||
|
||||
flexcpp = callPackage ../development/tools/parsing/flexc++ { };
|
||||
|
|
|
|||
|
|
@ -2951,6 +2951,8 @@ self: super: with self; {
|
|||
|
||||
easydict = callPackage ../development/python-modules/easydict { };
|
||||
|
||||
easyenergy = callPackage ../development/python-modules/easyenergy { };
|
||||
|
||||
easygui = callPackage ../development/python-modules/easygui { };
|
||||
|
||||
easyocr = callPackage ../development/python-modules/easyocr { };
|
||||
|
|
@ -3066,6 +3068,8 @@ self: super: with self; {
|
|||
|
||||
energyflow = callPackage ../development/python-modules/energyflow { };
|
||||
|
||||
energyzero = callPackage ../development/python-modules/energyzero { };
|
||||
|
||||
enhancements = callPackage ../development/python-modules/enhancements { };
|
||||
|
||||
enlighten = callPackage ../development/python-modules/enlighten { };
|
||||
|
|
@ -3170,6 +3174,8 @@ self: super: with self; {
|
|||
|
||||
et_xmlfile = callPackage ../development/python-modules/et_xmlfile { };
|
||||
|
||||
eufylife-ble-client = callPackage ../development/python-modules/eufylife-ble-client { };
|
||||
|
||||
evaluate = callPackage ../development/python-modules/evaluate { };
|
||||
|
||||
ev3dev2 = callPackage ../development/python-modules/ev3dev2 { };
|
||||
|
|
@ -9472,6 +9478,8 @@ self: super: with self; {
|
|||
|
||||
python-multipart = callPackage ../development/python-modules/python-multipart { };
|
||||
|
||||
python-musicpd = callPackage ../development/python-modules/python-musicpd { };
|
||||
|
||||
python-mystrom = callPackage ../development/python-modules/python-mystrom { };
|
||||
|
||||
python-nest = callPackage ../development/python-modules/python-nest { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue