Merge remote-tracking branch 'origin/master' into haskell-updates

This commit is contained in:
sternenseemann 2022-08-04 14:31:47 +02:00
commit 17746af0c5
88 changed files with 609 additions and 879 deletions

View file

@ -453,7 +453,7 @@ In the file `pkgs/top-level/all-packages.nix` you can find fetch helpers, these
}
```
Find the value to put as `sha256` by running `nix run -f '<nixpkgs>' nix-prefetch-github -c nix-prefetch-github --rev 1f795f9f44607cc5bec70d1300150bfefcef2aae NixOS nix` or `nix-prefetch-url --unpack https://github.com/NixOS/nix/archive/1f795f9f44607cc5bec70d1300150bfefcef2aae.tar.gz`.
Find the value to put as `sha256` by running `nix-shell -p nix-prefetch-github --run "nix-prefetch-github --rev 1f795f9f44607cc5bec70d1300150bfefcef2aae NixOS nix"`.
## Obtaining source hash {#sec-source-hashes}

View file

@ -16,9 +16,6 @@ rec {
*/
flakeExposed = import ./flake-systems.nix { };
# TODO(@sternenseemann): remove before 21.11
supported = throw "2022-05-23: Use lib.systems.flakeExposed instead of lib.systems.supported.hydra, as lib.systems.supported has been removed";
# Elaborate a `localSystem` or `crossSystem` so that it contains everything
# necessary.
#

View file

@ -109,6 +109,9 @@ in
# USB drivers
"xhci-pci-renesas"
# Reset controllers
"reset-raspberrypi" # Triggers USB chip firmware load.
# Misc "weak" dependencies
"analogix-dp"
"analogix-anx6345" # For DP or eDP (e.g. integrated display)

View file

@ -320,7 +320,7 @@ in
${optionalString haveLocalDB ''
if ! [ -e ${baseDir}/.db-created ]; then
runuser -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createuser hydra
runuser -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createdb -O hydra hydra
runuser -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createdb -- -O hydra hydra
touch ${baseDir}/.db-created
fi
echo "create extension if not exists pg_trgm" | runuser -u ${config.services.postgresql.superUser} -- ${config.services.postgresql.package}/bin/psql hydra

View file

@ -689,14 +689,14 @@ in
''
if [ ! -d _darcs ]
then
${pkgs.darcs}/bin/darcs initialize
darcs initialize
echo "${gm}" > _darcs/prefs/email
''
else if repositoryType == "mercurial" then
''
if [ ! -d .hg ]
then
${pkgs.mercurial}/bin/hg init
hg init
cat >> .hg/hgrc <<NAMED
[ui]
username = gitit ${gm}
@ -706,9 +706,9 @@ NAMED
''
if [ ! -d .git ]
then
${pkgs.git}/bin/git init
${pkgs.git}/bin/git config user.email "${gm}"
${pkgs.git}/bin/git config user.name "gitit"
git init
git config user.email "${gm}"
git config user.name "gitit"
''}
chown ${uid}:${gid} -R ${repositoryPath}
fi

View file

@ -30,7 +30,7 @@ let
install -D ${xmonadEnv}/share/man/man1/xmonad.1.gz $out/share/man/man1/xmonad.1.gz
makeWrapper ${configured}/bin/xmonad $out/bin/xmonad \
'' + optionalString cfg.enableConfiguredRecompile ''
--set NIX_GHC "${xmonadEnv}/bin/ghc" \
--set XMONAD_GHC "${xmonadEnv}/bin/ghc" \
'' + ''
--set XMONAD_XMESSAGE "${pkgs.xorg.xmessage}/bin/xmessage"
'');
@ -46,7 +46,7 @@ in {
haskellPackages = mkOption {
default = pkgs.haskellPackages;
defaultText = literalExpression "pkgs.haskellPackages";
example = literalExpression "pkgs.haskell.packages.ghc784";
example = literalExpression "pkgs.haskell.packages.ghc8107";
type = types.attrs;
description = ''
haskellPackages used to build Xmonad and other packages.

View file

@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
] ++ lib.optionals documentationSupport [
help2man
python3.pkgs.sphinx
python3.pkgs.sphinx_rtd_theme
python3.pkgs.sphinx-rtd-theme
] ++ lib.optional translationSupport gettext;
buildInputs = [

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ergo";
version = "4.0.35";
version = "4.0.36";
src = fetchurl {
url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
sha256 = "sha256-DrDBGb3/trIqHuitj6YVRmXT1/sz9sWQcW4OHj4vhLo=";
sha256 = "sha256-Cnh6XRurdrQvT2PROJll8k2C6sieqWle8ba53XI+s8g=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "notepad-next";
version = "0.5.3";
version = "0.5.4";
src = fetchFromGitHub {
owner = "dail8859";
repo = "NotepadNext";
rev = "v${version}";
sha256 = "sha256-9VbtSpWiSVNRydqpTJ0Zd2/9mXy18Drl6q61BHZ0zrs=";
sha256 = "sha256-kEqoL4S/eHsbFoYxNlrv+Wq6acrHQm/qMfrARzl+BYA=";
# External dependencies - https://github.com/dail8859/NotepadNext/issues/135
fetchSubmodules = true;
};

View file

@ -13,12 +13,12 @@
let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; };
in stdenv.mkDerivation rec {
pname = "koreader";
version = "2022.05.1";
version = "2022.07";
src = fetchurl {
url =
"https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb";
sha256 = "sha256-Uz8fzF/SdKNRywoIb8B/iHRuXDwRyw7wH7bL9vRzPfY=";
sha256 = "sha256-8WQFfmKgu6XPqWQsma656RWpNwNkSXmHOHs2cyVVqJU=";
};
sourceRoot = ".";

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tut";
version = "1.0.15";
version = "1.0.16";
src = fetchFromGitHub {
owner = "RasmusLindroth";
repo = pname;
rev = version;
sha256 = "sha256-gRvX+UvekYDOVcX0ztLmM3OzHwl+FG2i6ATtRYMkQSE=";
sha256 = "sha256-sJX9qpWkNe/v9PSAJ5iY8RKEJXs84Gf0Imce4VIFp2Q=";
};
vendorSha256 = "sha256-ddo9b4AXa/6tcbsKZ2e7IXnU47TIIyhBZFk4tbmIdnY=";
vendorSha256 = "sha256-LAVvaZqZzMYCGtVWmeYXI7L4f2tStkaWG4QlLSrSjfk=";
meta = with lib; {
description = "A TUI for Mastodon with vim inspired keys";

View file

@ -5,13 +5,13 @@
python3Packages.buildPythonApplication rec {
pname = "urlscan";
version = "0.9.9";
version = "0.9.10";
src = fetchFromGitHub {
owner = "firecat53";
repo = pname;
rev = version;
sha256 = "sha256-ZJdmsb+2ElgLFWsicc0S8EQAZhF+gnn+ARgdAyaFDgc=";
hash = "sha256-lCOOVAdsr5LajBGY7XUi4J5pJqm5rOH5IMKhA6fju5w=";
};
propagatedBuildInputs = [

View file

@ -1,21 +1,21 @@
{
"stable": {
"version": "103.0.5060.134",
"sha256": "0wdmy15602qxrb403p8yyx69k7py85fbawdsgap1l6z4h4j2g2p4",
"sha256bin64": "143jc70cyns2bh5cizy32fdsfl6hq22rphx216vywhncdsd96cnw",
"version": "104.0.5112.79",
"sha256": "1wxb3nl080wgg1g61g3pgzz3gaawg442iv8pxqhnayacm3qn5ilw",
"sha256bin64": "1m09bbh6a4sm5i0n8z2wy0hb8s7w0c2d335mpyrmndzs45py5ggx",
"deps": {
"gn": {
"version": "2022-05-11",
"version": "2022-06-08",
"url": "https://gn.googlesource.com/gn",
"rev": "578a7fe4c3c6b0bc2ae1fd2e37f14857d09895bf",
"sha256": "03dqfrdpf5xxl64dby3qmbwpzdq2gsa8g7xl438py3a629rgxg63"
"rev": "2ecd43a10266bd091c98e6dcde507c64f6a0dad3",
"sha256": "1q06vsz9b4bb764wy1wy8n177z2pgpm97kq3rl1hmq185mz5fhra"
}
},
"chromedriver": {
"version": "103.0.5060.134",
"sha256_linux": "13ld47n16b9adb6gh9bc7gr0vi3afyz5pn15rq1w983yqab49vwb",
"sha256_darwin": "0rpnny902h8il8wvxh4ccrvviqfpds28zgqv1v0vhlbgzgykcw3z",
"sha256_darwin_aarch64": "19v7q2wnvp5yfhh8x73p9shayar5yddf22rzqnlvy59saygcc7wa"
"version": "104.0.5112.79",
"sha256_linux": "1naxi6pa5l9ciwzlqimcwqfjsqzyqndg1i0hp6zwh20wfvcfms3w",
"sha256_darwin": "0lgls8vsv31apgxjvksqaaiqj78q5v3bs0mnrxhfbw7cbhf6wxk5",
"sha256_darwin_aarch64": "11rjqdd65zibhb1gvdwy0slcdpvwh77mkhcj5hdg4hdlysd1a3a2"
}
},
"beta": {

View file

@ -202,7 +202,7 @@ let
in
buildStdenv.mkDerivation ({
name = "${pname}-unwrapped-${version}";
pname = "${pname}-unwrapped";
inherit version;
inherit src unpackPhase meta;

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kubergrunt";
version = "0.9.1";
version = "0.9.2";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = "kubergrunt";
rev = "v${version}";
sha256 = "sha256-PY3qWIK1Q5vW9CgX1F41wf1FbThY0Y/gU9R5XkRDHfA=";
sha256 = "sha256-2uMPj4/jluBW0N2+AyDb7QmuVwlCavfQZ3i2fg32m8o=";
};
vendorSha256 = "sha256-HupAsDuBLQnuMpG3gvpnhVZhQ6oSxAm9UNdJ8UHzNBU=";
vendorSha256 = "sha256-9hWX6INN5HWXyeFQRjkqr+BsGv56lInVYacvT6Imahw=";
# Disable tests since it requires network access and relies on the
# presence of certain AWS infrastructure

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "node-problem-detector";
version = "0.8.10";
version = "0.8.11";
src = fetchFromGitHub {
owner = "kubernetes";
repo = pname;
rev = "v${version}";
sha256 = "sha256-phuXsioSLO/jl1l5dwV/emoirJfgGXQSmeQHSImxm2U=";
sha256 = "sha256-dkOkHsQ1ZfB5rSFuFRlrKf605EIo/7IkyyYz3ZhMggQ=";
};
vendorSha256 = null;

View file

@ -9,7 +9,7 @@
stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "5.52.0"; # Please backport all updates to the stable channel.
version = "5.53.0"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "sha256-KFldVpKICRX2n/ccvqxpt1Dz6QwH2g+wqXRHAXI/iyY=";
sha256 = "sha256-31IIjeaziXyH+RFEDTutghj8iq8ogANbxvssJUj9HpM=";
};
nativeBuildInputs = [

View file

@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ makeWrapper removeReferencesTo pkg-config flex bison meson ninja perl python3 python3Packages.sphinx python3Packages.sphinx_rtd_theme ]
nativeBuildInputs = [ makeWrapper removeReferencesTo pkg-config flex bison meson ninja perl python3 python3Packages.sphinx python3Packages.sphinx-rtd-theme ]
++ lib.optionals gtkSupport [ wrapGAppsHook ]
++ lib.optionals stdenv.isDarwin [ sigtool ];

View file

@ -11,7 +11,7 @@ in stdenv.mkDerivation {
buildCommand = ''
install -D ${xmonadEnv}/share/man/man1/xmonad.1.gz $out/share/man/man1/xmonad.1.gz
makeWrapper ${xmonadEnv}/bin/xmonad $out/bin/xmonad \
--set NIX_GHC "${xmonadEnv}/bin/ghc" \
--set XMONAD_GHC "${xmonadEnv}/bin/ghc" \
--set XMONAD_XMESSAGE "${xmessage}/bin/xmessage"
'';

View file

@ -9,7 +9,7 @@
, recommonmark
, semantic-version
, sphinx
, sphinx_rtd_theme
, sphinx-rtd-theme
, pytest-runner
, setuptools-scm
, git
@ -57,7 +57,7 @@ buildPythonPackage rec {
# docs
recommonmark
sphinx
sphinx_rtd_theme
sphinx-rtd-theme
];
checkPhase = ''

View file

@ -27,7 +27,7 @@ index 46a0939..92af53d 100644
- CompileGhc ->
- run "ghc" ghcArgs
+ CompileGhc -> do
+ ghc <- fromMaybe "ghc" <$> (lookupEnv "NIX_GHC")
+ ghc <- fromMaybe "ghc" <$> (lookupEnv "XMONAD_GHC")
+ run ghc ghcArgs
CompileStackGhc stackYaml ->
run "stack" ["build", "--silent", "--stack-yaml", stackYaml] .&&.

View file

@ -32,7 +32,7 @@ let
env = python3.withPackages (pp: with pp; [
sphinx
recommonmark
sphinx_rtd_theme
sphinx-rtd-theme
]);
in
# Expose only the sphinx-build binary to avoid contaminating

View file

@ -12,11 +12,11 @@
stdenv.mkDerivation rec {
pname = "libnbd";
version = "1.12.2";
version = "1.14.0";
src = fetchurl {
url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz";
hash = "sha256-57veJapt72LkP02wO4c1nDdHmnodqfT+rKPNDeTGQPM=";
hash = "sha256-fwVAMqZGX1HZMA/81qb67K5gwSqtcT1HnLBLdqDr4Cc=";
};
nativeBuildInputs = [

View file

@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
] ++ lib.optionals (enableDocs || enableGI) [
doxygen
(python3.withPackages (ps: with ps;
lib.optionals enableDocs [ sphinx sphinx_rtd_theme breathe ] ++
lib.optionals enableDocs [ sphinx sphinx-rtd-theme breathe ] ++
lib.optionals enableGI [ lxml ]
))
];

View file

@ -2,10 +2,12 @@
, buildPythonPackage
, aiocoap
, bleak
, bleak-retry-connector
, chacha20poly1305-reuseable
, commentjson
, cryptography
, fetchFromGitHub
, orjson
, poetry-core
, pytest-aiohttp
, pytestCheckHook
@ -15,7 +17,7 @@
buildPythonPackage rec {
pname = "aiohomekit";
version = "1.1.0";
version = "1.2.3";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -24,7 +26,7 @@ buildPythonPackage rec {
owner = "Jc2k";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-tHCkWNWcEsxoznaB8nysEMSx8g6cceNFP+gVB2jqG9g=";
hash = "sha256-cO+XHdHyz6W6PAoLNgazA4CifBfpLqCQoz1KtpcEAmg=";
};
nativeBuildInputs = [
@ -34,9 +36,11 @@ buildPythonPackage rec {
propagatedBuildInputs = [
aiocoap
bleak
bleak-retry-connector
chacha20poly1305-reuseable
commentjson
cryptography
orjson
zeroconf
];

View file

@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "bellows";
version = "0.31.1";
version = "0.31.2";
format = "setuptools";
src = fetchFromGitHub {
owner = "zigpy";
repo = "bellows";
rev = "refs/tags/${version}";
sha256 = "sha256-kjZL6N1VF3Rc26eB5fU1UEs9BEr4sfV4Hto6QdwqeqY=";
sha256 = "sha256-CAah1Yu3gbHcqHbTM1nXAVFqGKatdUNYt881sjsCD2o=";
};
propagatedBuildInputs = [

View file

@ -1,7 +1,9 @@
{ lib
, async-timeout
, bleak
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, pytestCheckHook
, pythonOlder
, pytest-asyncio
@ -9,8 +11,8 @@
buildPythonPackage rec {
pname = "bleak-retry-connector";
version = "1.1.0";
format = "setuptools";
version = "1.2.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -18,10 +20,15 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "v${version}";
hash = "sha256-3d66Kp4bz+ZhiC4ZVJscI5nE+qJdsIaefrC4SM0wGP4=";
hash = "sha256-nFlh+/6aDHNntHDxdkE2413ZLM7Z84lcn7xFKWdJ/U8=";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
async-timeout
bleak
];

View file

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "bleak";
version = "0.14.3";
version = "0.15.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-dg5bsegECH92JXa5uVY9Y7R9UhsWUpiOKMPLXmS2GZA=";
hash = "sha256-qth0iBPbY7tgSCD/0rU3CgbJwCckoN7Fb7g1EAdPzjk=";
};
propagatedBuildInputs = [

View file

@ -0,0 +1,65 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, poetry-core
, async-timeout
, dbus-next
, myst-parser
, pytestCheckHook
, sphinxHook
, sphinx-rtd-theme
}:
buildPythonPackage rec {
pname = "bluetooth-adapters";
version = "0.1.3";
format = "pyproject";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "Bluetooth-Devices";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-c96HgcmyiDwvcq8OsZ5s65VmAihz6KtCviP2h6Iu1Fo=";
};
postPatch = ''
# Drop pytest arguments (coverage, ...)
sed -i '/addopts/d' pyproject.toml
'';
outputs = [
"out"
"doc"
];
nativeBuildInputs = [
myst-parser
poetry-core
sphinx-rtd-theme
sphinxHook
];
propagatedBuildInputs = [
async-timeout
dbus-next
];
pythonImportsCheck = [
"bluetooth_adapters"
];
checkInputs = [
pytestCheckHook
];
meta = with lib; {
changelog = "https://github.com/bluetooth-devices/bluetooth-adapters/blob/main/CHANGELOG.md";
description = "Tools to enumerate and find Bluetooth Adapters";
homepage = "https://bluetooth-adapters.readthedocs.io/";
license = licenses.asl20;
maintainers = teams.home-assistant.members;
};
}

View file

@ -2,6 +2,7 @@
, attrs
, buildPythonPackage
, fetchFromGitHub
, exceptiongroup
, hypothesis
, immutables
, motor
@ -37,6 +38,8 @@ buildPythonPackage rec {
propagatedBuildInputs = [
attrs
] ++ lib.optionals (pythonOlder "3.11") [
exceptiongroup
] ++ lib.optionals (pythonOlder "3.7") [
typing-extensions
];

View file

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "geventhttpclient";
version = "1.5.5";
version = "2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-H0+XP7n2r+TO7BOdXV2BmbVzM3Gm0uzAZeJXyBAgU5s=";
hash = "sha256-SegzLaon80HeCNk4h4KJs7dzaVzblvIpZRjC1uPr7JI=";
};
propagatedBuildInputs = [

View file

@ -0,0 +1,51 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, poetry-core
, bleak
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "home-assistant-bluetooth";
version = "1.4.0";
format = "pyproject";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "home-assistant-libs";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-viJOrmvrooHh47yyJJomOGBhQvcoWM3jKMRwZ+6/UJ8=";
};
postPatch = ''
# drop pytest parametrization (coverage, etc.)
sed -i '/addopts/d' pyproject.toml
'';
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
bleak
];
pythonImportsCheck = [
"home_assistant_bluetooth"
];
checkInputs = [
pytestCheckHook
];
meta = with lib; {
description = "Basic bluetooth models used by Home Assistant";
changelog = "https://github.com/home-assistant-libs/home-assistant-bluetooth/blob/main/CHANGELOG.md";
homepage = "https://github.com/home-assistant-libs/home-assistant-bluetooth";
license = licenses.asl20;
maintainers = teams.home-assistant.members;
};
}

View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "idasen";
version = "0.8.3";
version = "0.9.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "newAM";
repo = "idasen";
rev = "v${version}";
hash = "sha256-tjA7qgU3JYvwSdDH+aWrmKBX1Q9J5/UT7KjiTBxvKAE=";
hash = "sha256-7Tg+/3BXRmzG39jIC281MKxyJyf9e9/1uOqUji08B3U=";
};
nativeBuildInputs = [

View file

@ -3,7 +3,7 @@
, lib
, numpy
, opencv3
, sphinx_rtd_theme
, sphinx-rtd-theme
, lxml
, xmljson
}:
@ -22,7 +22,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
numpy
opencv3
sphinx_rtd_theme
sphinx-rtd-theme
lxml
xmljson
];

View file

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "meteoalertapi";
version = "0.2.0";
version = "0.3.0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "rolfberkenbosch";
repo = "meteoalert-api";
rev = "v${version}";
sha256 = "sha256-EdHqWEkE/uUtz/xjV4k4NvNvtPPU4sJjHGwUM7J+HWs=";
sha256 = "sha256-uB2nza9fj7vOWixL4WEQX1N3i2Y80zQPM3x1+gRtg+w=";
};
propagatedBuildInputs = [

View file

@ -6,7 +6,7 @@
# docs
, python
, sphinx
, sphinx_rtd_theme
, sphinx-rtd-theme
# tests
, hypothesis
@ -29,7 +29,7 @@ buildPythonPackage rec {
nativeBuildInputs = [
sphinx
sphinx_rtd_theme
sphinx-rtd-theme
];
postInstall = ''

View file

@ -30,6 +30,11 @@ buildPythonPackage rec {
sha256 = "sha256-GEtrC7o5YnkuvBfQQfhG5P74QMiHz63Fdh1cC/r5CF0=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace "docutils>=0.15,<0.19" "docutils>=0.15"
'';
format = "flit";
nativeBuildInputs = [ flit-core ];
@ -60,6 +65,8 @@ buildPythonPackage rec {
"test_footnotes"
"test_gettext_html"
"test_fieldlist_extension"
# docutils 0.19 expectation mismatches
"test_docutils_roles"
];
meta = with lib; {

View file

@ -1,7 +1,6 @@
{ lib, stdenv
, buildPythonPackage
, fetchPypi
, isPy3k
, cli-helpers
, click
, configobj
@ -29,6 +28,11 @@ buildPythonPackage rec {
sha256 = "sha256-8DkwGH4n1g32WMqKBPtgHsXXR2xzXysVQsat7Fysj+I=";
};
postPatch = ''
substituteInPlace setup.py \
--replace "pgspecial>=1.13.1,<2.0.0" "pgspecial>=1.13.1"
'';
propagatedBuildInputs = [
cli-helpers
click
@ -57,6 +61,6 @@ buildPythonPackage rec {
homepage = "https://pgcli.com";
changelog = "https://github.com/dbcli/pgcli/raw/v${version}/changelog.rst";
license = licenses.bsd3;
maintainers = with maintainers; [ dywedir ];
maintainers = with maintainers; [ dywedir SuperSandro2000 ];
};
}

View file

@ -0,0 +1,30 @@
{ lib
, fetchPypi
, buildPythonPackage
, types-requests
, requests
}:
buildPythonPackage rec {
pname = "pyarr";
version = "4.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-3DX02V3Srpx6hqimWbesxfkDqslVH4+8uXY7XYDmjX0=";
};
propagatedBuildInputs = [
requests
types-requests
];
pythonImportsCheck = [ "pyarr" ];
meta = with lib; {
description = "Python client for Servarr API's (Sonarr, Radarr, Readarr, Lidarr)";
homepage = "https://github.com/totaldebug/pyarr";
license = licenses.mit;
maintainers = with maintainers; [ onny ];
};
}

View file

@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "pyatv";
version = "0.10.2";
version = "0.10.3";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "postlund";
repo = pname;
rev = "v${version}";
sha256 = "sha256-70bimFWsby2x8wBRH5CZgg9Xjw8n+xfhW07rOG9Pk0s=";
sha256 = "sha256-ng5KfW93p2/N2a6lnGbRJC6aWOQgTl0imBLdUIUlDic=";
};
postPatch = ''

View file

@ -6,7 +6,7 @@
, mock
, pytestCheckHook
, pythonOlder
, sphinx_rtd_theme
, sphinx-rtd-theme
}:
buildPythonPackage rec {
@ -26,7 +26,7 @@ buildPythonPackage rec {
checkInputs = [
invoke
mock
sphinx_rtd_theme
sphinx-rtd-theme
pytestCheckHook
];

View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pydeconz";
version = "100";
version = "101";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Kane610";
repo = "deconz";
rev = "refs/tags/v${version}";
hash = "sha256-8wgvwYSGijxHB+CABHr+jnW87EnJE/67wrJqZgJk0mA=";
hash = "sha256-U9jdKKT6RtvdJlWTwuUby0q7Qxa3mWUds8HQvsME9R4=";
};
propagatedBuildInputs = [

View file

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "pyrisco";
version = "0.3.1";
version = "0.5.1";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "OnFreund";
repo = pname;
rev = "v${version}";
sha256 = "1im29h4rxnp98aqzgzjj5i8jv2h5zw9c5yx8xxzl4cmr3yila9zw";
sha256 = "sha256-2v5fkawGy20vmKu/Fz29jnxmcpMl4HGNTNE9r2p6zDc=";
};
propagatedBuildInputs = [ aiohttp ];

View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "pyswitchbot";
version = "0.15.2";
version = "0.17.3";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "pySwitchbot";
rev = "refs/tags/${version}";
hash = "sha256-JoHFDFJcltgNrP3faFfyTV7D15h8YTyojWEUcrREeGU=";
hash = "sha256-vyfIt9Tkl6jpO//xizraqBwwwGmuJjkFGU3TzN3dqhQ=";
};
propagatedBuildInputs = [

View file

@ -10,6 +10,7 @@
, defusedxml
, fetchPypi
, importlib-metadata
, micloud
, netifaces
, poetry-core
, pytest-mock
@ -24,14 +25,14 @@
buildPythonPackage rec {
pname = "python-miio";
version = "0.5.11";
version = "0.5.12";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-1hC7yE/hGLx9g3NXqU45yC/6dcW6/0oZwgYW5bj/37c=";
hash = "sha256-BJw1Gg3FO2R6WWKjkrpxDN4fTMTug5AIj0SNq1gEbBY=";
};
nativeBuildInputs = [
@ -47,6 +48,7 @@ buildPythonPackage rec {
croniter
cryptography
defusedxml
micloud
netifaces
pytz
pyyaml

View file

@ -3,6 +3,8 @@
, aresponses
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, pydantic
, pytestCheckHook
, pytest-asyncio
, pythonOlder
@ -10,8 +12,8 @@
buildPythonPackage rec {
pname = "pytraccar";
version = "0.10.1";
format = "setuptools";
version = "1.0.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -19,11 +21,16 @@ buildPythonPackage rec {
owner = "ludeeus";
repo = pname;
rev = version;
sha256 = "sha256-fqf7sckvq5GebgpDVVSgwHISu4/wntjc/WF9LFlXN2w=";
sha256 = "sha256-ngyLe6sbTTQ7n4WdV06OlQnn/vqkD+JUruyMYS1Ym+Q=";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aiohttp
pydantic
];
checkInputs = [
@ -32,10 +39,14 @@ buildPythonPackage rec {
pytest-asyncio
];
pytestFlagsArray = [
"--asyncio-mode=legacy"
];
postPatch = ''
# Upstream doesn't set version in the repo
substituteInPlace setup.py \
--replace 'version="master",' 'version="${version}",'
substituteInPlace pyproject.toml \
--replace 'version = "0"' 'version = "${version}"'
'';
pythonImportsCheck = [

View file

@ -8,11 +8,12 @@
}:
buildPythonPackage rec {
pname = "sphinx_rtd_theme";
pname = "sphinx-rtd-theme";
version = "1.0.0";
src = fetchPypi {
inherit pname version;
pname = "sphinx_rtd_theme";
inherit version;
sha256 = "0p3abj91c3l72ajj5jwblscsdf1jflrnn0djx2h5y6f2wjbx9ipf";
};

View file

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "stripe";
version = "3.5.0";
version = "4.0.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-CPdMrmYZ1KfXj4Fi/3K8PpyRP1PsluzV3cfYI8Lnnd0=";
hash = "sha256-eRwaQZwqlw+U6QnJqCypeihfrZuSwdETt8aNyICfdck=";
};
propagatedBuildInputs = [

View file

@ -50,12 +50,13 @@ buildPythonPackage rec {
# likely related to https://github.com/sarugaku/shellingham/issues/35
"test_show_completion"
"test_install_completion"
] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [
"test_install_completion"
];
pythonImportsCheck = [ "typer" ];
meta = with lib; {
broken = (stdenv.isLinux && stdenv.isAarch64);
description = "Python library for building CLI applications";
homepage = "https://typer.tiangolo.com/";
license = licenses.mit;

View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "xknx";
version = "0.21.5";
version = "0.22.1";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "XKNX";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-rtR77b4/cgDA6rf/Q+ecuKI5bl7N4YMim8TeQ7ovKhI=";
sha256 = "sha256-CQX6dd/taVyqLKMzhFJxmYjbpZQIHYD+Nps1WyGqqnw=";
};
propagatedBuildInputs = [

View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "zha-quirks";
version = "0.0.77";
version = "0.0.78";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = "zha-device-handlers";
rev = "refs/tags/${version}";
hash = "sha256-z/DLMTN0VsKore4crzbyvMhyG7O4bicC9XPbeGNf74M=";
hash = "sha256-S54reJhzvDMOC5+N/WZ8bz8XNXH/91jAAy8gCq90MvQ=";
};
propagatedBuildInputs = [

View file

@ -0,0 +1,23 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "lurk";
version = "0.2.9";
src = fetchFromGitHub {
owner = "jakwai01";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Vvz1CWNpMbVpICL42VQHLM7AWSONGSXP5kfZ8rZlw8M=";
};
cargoSha256 = "sha256-AoFkgm13vj/18GOuSIgzs+xk82lSQ6zGpq4QVWcClv8=";
meta = with lib; {
description = "A simple and pretty alternative to strace";
homepage = "https://github.com/jakwai01/lurk";
license = licenses.agpl3Only;
maintainers = with maintainers; [ figsoda ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
}

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "act";
version = "0.2.29";
version = "0.2.30";
src = fetchFromGitHub {
owner = "nektos";
repo = pname;
rev = "v${version}";
sha256 = "sha256-n5IUhx5nZ6+bbYc3Z0d3stBSvr2Ht2XUwtDorQTcOhs=";
sha256 = "sha256-QNuCXBVSERNjn4ehqpOepAmLLqZAA2FvMBmMwceh4kI=";
};
vendorSha256 = "sha256-rMM1BcL4FGFXs0DHoLV9kt+BxnreVTL7kwCd9li1i6g=";
vendorSha256 = "sha256-T5HWT0h9ZSVQBbQbwIL1wu8BXvOkFIXtimz7QMUkWtQ=";
doCheck = false;

View file

@ -17,8 +17,7 @@ buildGoModule {
sha256 = "0n9pf0i5y59kiiv6dq8h8w1plaz9w6s67rqr2acqgxa45iq36mkh";
};
vendorSha256 = "1xgl4avq0rblzqqpaxl4dwg4ysrhacwhfd21vb0v9ffr3zcpdw9n";
proxyVendor = true;
vendorSha256 = "sha256-e5n0QhgffzC1igZX1zS18IX5oF5F0Zy/s8jWyNOD8NM=";
subPackages = [ "." ];
@ -36,8 +35,5 @@ buildGoModule {
license = licenses.mit;
maintainers = with maintainers; [ adisbladis ];
mainProgram = "vgo2nix";
# vendoring fails with cryptic error:
# reading file:///nix/store/..../github.com/orivej/e/@v/v0.0.0-20180728214217-ac3492690fda.zip: no such file or directory
broken = true;
};
}

View file

@ -25,8 +25,8 @@ stdenvNoCC.mkDerivation (finalAttrs:
darwin = { inherit (default) rev hash version; };
default = {
rev = "v${finalAttrs.version}";
hash = "sha256-+6PkrkamSvhCaGj2tq+RXri/yQ7vs0cAqgdRAFtU8UA=";
version = "1.10.1";
hash = "sha256-T93ZylxzJGprrP+j6axZwl2d3hJowMCUOKNjIyNzkmE=";
version = "1.10.3";
};
};
in

View file

@ -6,6 +6,7 @@
, gmp ? null
, libmpc ? null
, mpfr ? null
, pahole
, lib
, stdenv
@ -124,7 +125,8 @@ let
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ perl gmp libmpc mpfr ]
++ lib.optionals (lib.versionAtLeast version "4.16") [ bison flex ];
++ lib.optionals (lib.versionAtLeast version "4.16") [ bison flex ]
++ lib.optional (lib.versionAtLeast version "5.2") pahole;
platformName = stdenv.hostPlatform.linux-kernel.name;
# e.g. "defconfig"

View file

@ -2,61 +2,61 @@
"4.14": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-4.14.288-hardened1.patch",
"sha256": "0d592ppnd1bw375zyrfj92kg0k60knbq6g1lpawx7xhflklrlcfw",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.288-hardened1/linux-hardened-4.14.288-hardened1.patch"
"name": "linux-hardened-4.14.290-hardened1.patch",
"sha256": "14bnps4y5k2aa0fd2g4bdbiir1w7xfrvgsqd3cfzni8zhf4xrw0l",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.290-hardened1/linux-hardened-4.14.290-hardened1.patch"
},
"sha256": "0yyzxyz66mfngx3ll3pl43413xb67iyxddzh3lpzqcfg7d0rxfwz",
"version": "4.14.288"
"sha256": "0zyxb99a7fa2l85vnzmvg2nry99clj20d4j38piqm921iqxak2j4",
"version": "4.14.290"
},
"4.19": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-4.19.252-hardened1.patch",
"sha256": "04jrv10z1kjqlnb58wmc3765xdpp8lm59vyhi94kbra3krzq7yax",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.252-hardened1/linux-hardened-4.19.252-hardened1.patch"
"name": "linux-hardened-4.19.254-hardened1.patch",
"sha256": "0c8mlpykk3j3zmh2fszyc0xnyqdfqf02nna5fq018179pmsglbnk",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.254-hardened1/linux-hardened-4.19.254-hardened1.patch"
},
"sha256": "0ac7k6x9h8gqi37n8d4fyi52h4cmzyy8f5vfv1aiihww4kvzca7v",
"version": "4.19.252"
"sha256": "1rd40wmdaymbly2zvf60mjqsflkd4n1y232qz0ixn1rfl28yz62i",
"version": "4.19.254"
},
"5.10": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.10.131-hardened1.patch",
"sha256": "00px04xyr8hz73rm0adc0x9fifwcyh2bh0rg0vqc1yjva4kl639d",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.131-hardened1/linux-hardened-5.10.131-hardened1.patch"
"name": "linux-hardened-5.10.134-hardened1.patch",
"sha256": "0d6ygrsssbww9aqy55q1zxq2b1y9lwnz0j8xfqpya3c3hll1951a",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.134-hardened1/linux-hardened-5.10.134-hardened1.patch"
},
"sha256": "1ki11mvl3dky7iih90znr47vr66dxnlwrqwg2jkk1hqn5i243i4b",
"version": "5.10.131"
"sha256": "0s9j4zzck9880kvyb18i2ng6dc16p0dwsi95mkwdhg83vyn16dgc",
"version": "5.10.134"
},
"5.15": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.15.55-hardened1.patch",
"sha256": "1nqf97la1sryis600pac0hnivahbhzq1k5q73wg9nmzrc0qjz5w0",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.55-hardened1/linux-hardened-5.15.55-hardened1.patch"
"name": "linux-hardened-5.15.58-hardened1.patch",
"sha256": "1c2friimfzi5i0x76z66wdgkfafly1rhpy8zzs7li3s79d22138k",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.58-hardened1/linux-hardened-5.15.58-hardened1.patch"
},
"sha256": "1k7x7fp675wglfd357n7hjidnm3j8zj3gcymyazg6fkcid8bvxhy",
"version": "5.15.55"
"sha256": "1a2gzjfymfafvk8cvibr1zdfydzxg0c5j772c9hqwcabkibxjnyp",
"version": "5.15.58"
},
"5.18": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.18.12-hardened1.patch",
"sha256": "07wap8qjjn21pxd04ll88kw6cq681ila46ji7i4jbad2dp3p5pcl",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.18.12-hardened1/linux-hardened-5.18.12-hardened1.patch"
"name": "linux-hardened-5.18.15-hardened1.patch",
"sha256": "0ir6k4d9mx4skyhxjin2hn237kl3qh6cl0kmjqkqyxkm83k12kln",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.18.15-hardened1/linux-hardened-5.18.15-hardened1.patch"
},
"sha256": "09wmgfrnv1df6jg9v3svwhvnxl0j6h4f240p903xlmgj884lvds0",
"version": "5.18.12"
"sha256": "0g5yvhq7rmkzvfl4w50l7bg56a20insvg4s4nvgnk2iqvkmlz039",
"version": "5.18.15"
},
"5.4": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.4.206-hardened1.patch",
"sha256": "0m4jcyvjqfki0asxapn4q9qgyfxw8k6yqcyw899zss8584zqa6i2",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.206-hardened1/linux-hardened-5.4.206-hardened1.patch"
"name": "linux-hardened-5.4.208-hardened1.patch",
"sha256": "0pknl9ac0qn8yig1hfm3hmlmvf5pxswymyilv0w3kcsacgg22xyi",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.208-hardened1/linux-hardened-5.4.208-hardened1.patch"
},
"sha256": "1asvc7y1f938icspxx39n6y6r0w9mp0k9vik84rsx1hzzv0db41c",
"version": "5.4.206"
"sha256": "0i0fxv04r6g5ha84chih5cqsy59cv67pjxp8zfrdk1qapwddyvgh",
"version": "5.4.208"
}
}

View file

@ -31,7 +31,7 @@ let
doCheck = false;
};
sphinx_rtd_theme = prev.sphinx_rtd_theme.override {
sphinx-rtd-theme = prev.sphinx-rtd-theme.override {
inherit sphinx;
docutils = docutils_old;
};
@ -59,7 +59,7 @@ stdenv.mkDerivation {
imagemagick
perl
py.pkgs.sphinx
py.pkgs.sphinx_rtd_theme
py.pkgs.sphinx-rtd-theme
which
];

View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.10.134";
version = "5.10.135";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0s9j4zzck9880kvyb18i2ng6dc16p0dwsi95mkwdhg83vyn16dgc";
sha256 = "0i1kahv739qpyyml7d7sx306nv7gp55i5d97vlb0fryfx4dsd6g4";
};
} // (args.argsOverride or {}))

View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.15.58";
version = "5.15.59";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1a2gzjfymfafvk8cvibr1zdfydzxg0c5j772c9hqwcabkibxjnyp";
sha256 = "1jxw6fnc7yaw7r6193wy6l8wdlpy3frw48drnc3dnh3k0m1cdpg6";
};
} // (args.argsOverride or { }))

View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.18.15";
version = "5.18.16";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0g5yvhq7rmkzvfl4w50l7bg56a20insvg4s4nvgnk2iqvkmlz039";
sha256 = "1khi1npn8d8jimwdy8bf3r7l780mxdmvk5azdv419pk33qjqdxgi";
};
} // (args.argsOverride or { }))

View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.4.208";
version = "5.4.209";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0i0fxv04r6g5ha84chih5cqsy59cv67pjxp8zfrdk1qapwddyvgh";
sha256 = "1kdnz99k7zspzaxqaxahbf6hncigy4cvjlb79jsy7a95qxxr31qf";
};
} // (args.argsOverride or {}))

View file

@ -1,8 +1,8 @@
{ stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
rev = "18825";
sha256 = "0gqmdlcxq3ws3mafbf47j40vrrfr5966nily6l7gj8hq2j0016cj";
rev = "18837";
sha256 = "0645lkbh5bi9a8nhdyh21h7rrw8x8pmb7la08zn7gpkmwvk3wnwx";
}
, ...
}:

View file

@ -4,16 +4,16 @@ let
# comments with variant added for update script
# ./update-zen.py zen
zenVariant = {
version = "5.18.15"; #zen
version = "5.18.16"; #zen
suffix = "zen1"; #zen
sha256 = "0pn62l2ajas427ddbx92q5ad0rkqz6vvg6mc6dirs32a4j6nzajx"; #zen
sha256 = "016pkwjg6la2xkqrqyw6ragmpk4z6x4rqw8dbykx2l4fzb57w56g"; #zen
isLqx = false;
};
# ./update-zen.py lqx
lqxVariant = {
version = "5.18.15"; #lqx
suffix = "lqx2"; #lqx
sha256 = "0mhl82h6fiay2d4b7x0n68j22ay81wr0ik6k0vx8vl4qqpf2anc0"; #lqx
version = "5.18.16"; #lqx
suffix = "lqx1"; #lqx
sha256 = "11xcbpf8c5j0gjymbwyq40rnwzjahwh81v26vaz5kavkzw2nma9r"; #lqx
isLqx = true;
};
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {

View file

@ -1,14 +1,41 @@
{ lib, stdenv, fetchurl, kernel }:
{ lib, stdenv, fetchgit, fetchpatch, kernel }:
stdenv.mkDerivation rec {
pname = "lttng-modules-${kernel.version}";
version = "2.13.2";
version = "2.13.4";
src = fetchurl {
url = "https://lttng.org/files/lttng-modules/lttng-modules-${version}.tar.bz2";
sha256 = "sha256-39VH2QQcjFRa5be/7z8O8tnyUg1qtEGIyeqN5W1dKYo=";
src = fetchgit {
url = "https://git.lttng.org/lttng-modules.git";
rev = "v${version}";
hash = "sha256-J2Tr1vOiCAilmnf3attF3bz8Irn9IQ2QbapdXJ4MUSg=";
};
patches = [
# fix: mm/page_alloc: fix tracepoint mm_page_alloc_zone_locked() (v5.19)
(fetchpatch {
url = "https://git.lttng.org/?p=lttng-modules.git;a=patch;h=6229bbaa423832f6b7c7a658ad11e1d4242752ff";
hash = "sha256-pqbKxBzjfN20wfsqSeBLXNQ+/U+3qk9RfTiT32OwSIc=";
})
# fix: fs: Remove flags parameter from aops->write_begin (v5.19)
(fetchpatch {
url = "https://git.lttng.org/?p=lttng-modules.git;a=patch;h=5e2f832d59d51589ab69479c7db43c7581fb9346";
hash = "sha256-auoCbvFEVR76sOCLjIe+q/Q+vunQlR3G3gVcjqAGGPk=";
})
# fix: workqueue: Fix type of cpu in trace event (v5.19)
(fetchpatch {
url = "https://git.lttng.org/?p=lttng-modules.git;a=patch;h=c6da9604b1666780ea4725b3b3d1bfa1548f9c89";
hash = "sha256-qoTwy+P32qg1L+JctqM1+70OkeTbnbL3QJ9LwaBq/bw=";
})
# fix: net: skb: introduce kfree_skb_reason() (v5.15.58..v5.16)
(fetchpatch {
url = "https://git.lttng.org/?p=lttng-modules.git;a=patch;h=96c477dabaaf6cd1734bebe0972fef877e5a463b";
hash = "sha256-b7BhrYZ5SZqeRVGEu0Eo9GfbcZdDPrgEnOl2XU3z+ds=";
})
];
nativeBuildInputs = kernel.moduleBuildDependencies;
hardeningDisable = [ "pic" ];
@ -30,6 +57,5 @@ stdenv.mkDerivation rec {
license = with licenses; [ lgpl21Only gpl2Only mit ];
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
broken = kernel.kernelAtLeast "5.18";
};
}

View file

@ -17,11 +17,11 @@ rec {
# Policy: use the highest stable version as the default (on our master).
stable = if stdenv.hostPlatform.system == "x86_64-linux"
then generic {
version = "515.57";
sha256_64bit = "sha256-hB1p/hQmiDZHESuwcP4vKaH4ScZKyAqNYccJcNjT1SI=";
openSha256 = "sha256-D8fXlmuGEHkFAT2aSAj7hXpndi2bfOd6vQAcKfsQx4U=";
settingsSha256 = "sha256-M9AVeMsHSQv+zhIdBtXm+QRXf7NcZpLfCDmKMUjBl1U=";
persistencedSha256 = "sha256-joKUuP4PgQxu4kOxy8SkHORPkEmuYfk3b+7svAyMQ1Q=";
version = "515.65.01";
sha256_64bit = "sha256-BJLdxbXmWqAMvHYujWaAIFyNCOEDtxMQh6FRJq7klek=";
openSha256 = "sha256-GCCDnaDsbXTmbCYZBCM3fpHmOSWti/DkBJwYrRGAMPI=";
settingsSha256 = "sha256-kBELMJCIWD9peZba14wfCoxsi3UXO3ehFYcVh4nvzVg=";
persistencedSha256 = "sha256-P8oT7g944HvNk2Ot/0T0sJM7dZs+e0d+KwbwRrmsuDY=";
}
else legacy_390;
@ -55,19 +55,22 @@ rec {
# Last one supporting Kepler architecture
legacy_470 = generic {
version = "470.129.06";
sha256_64bit = "sha256-QQkQtwBuFzBjMnaDKfS1PW+ekcxVXCiJkXWOKo8IqZg=";
settingsSha256 = "sha256-vUS4O/c4IrbC8offzUFGLlMdP/Tlz1GwQIV2geRfj/o=";
persistencedSha256 = "sha256-jCcYUsbhQ77IOQquXqbTZfh1N0IvKQOWrIMU9rEwSW0=";
version = "470.141.03";
sha256_64bit = "sha256-vpjSR6Q9dJGmW/3Jl/tlMeFZQ0brEqD6qgRGcs21cJ8=";
settingsSha256 = "sha256-OWSUmUBqAxsR3e6EPzcIotpd6nm4Le8hIj4pzJ5WnhE=";
persistencedSha256 = "sha256-XsGYGgucDhvPpqtM9IBLfo3tbn7sIobpo5JW/XqOkTo=";
};
# Last one supporting x86
legacy_390 = generic {
version = "390.151";
sha256_32bit = "sha256-lOOZtFllnBKxNE6Mj09e7h7VkV/0WfyLuDHJ4dRGd9s=";
sha256_64bit = "sha256-UibkhCBEz/2Qlt6tr2iTTBM9p04FuAzNISNlhLOvsfw=";
settingsSha256 = "sha256-teXQa0pQctQl1dvddVJtI7U/vVuMu6ER1Xd99Jprpvw=";
persistencedSha256 = "sha256-FxiTXYABplKFcBXr4orhYWiJq4zVePpplMbg2kvEuXk=";
version = "390.154";
sha256_32bit = "sha256-XuhxuEvZ8o4iW3o+Xxvh+eLQBn83uNa40MJRcC8G0+c=";
sha256_64bit = "sha256-9EICgMVSEJZMAI1bck8mFYRdR61MnAXY7SamL8YzH3w=";
settingsSha256 = "sha256-iNT6//EvtasivDfXPY6j6OrpymbslO/q45uKd5smFUw=";
persistencedSha256 = "sha256-y+MkudjQBkuVzHrY/rh7IGRN8VjLsJQ3a+fYDXdrzzk=";
broken = kernel.kernelAtLeast "5.18";
patches =
let patch390 = o:
(lib.optional ((lib.versions.majorMinor kernel.modDirVersion) == o.version) (fetchpatch {

View file

@ -1,28 +1,36 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib
, buildGoModule
, fetchFromGitHub
, makeWrapper
}:
buildGoModule {
pname = "echoip";
version = "unstable-2019-07-12";
version = "unstable-2021-08-03";
src = fetchFromGitHub {
owner = "mpolden";
repo = "echoip";
rev = "fb5fac92d2173c2a5b07ed4ecc7b5fefe8484ed2";
sha256 = "17gkh1qfxasvxy25lmjdwk5fsjkcp7lmw9si3xzf01m7qnj5zi4b";
rev = "ffa6674637a5bf906d78ae6675f9a4680a78ab7b";
sha256 = "sha256-yN7PIwoIi2SPwwFWnHDoXnwvKohkPPf4kVsNxHLpqCE=";
};
vendorSha256 = "0vvs717pl5gzggxpbn2vkyxmpiw5zjdfnpbh8i81xidbqvlnm22h";
vendorSha256 = "sha256-lXYpkeGpBK+WGHqyLxJz7kS3t7a55q55QQLTqtxzroc=";
outputs = [ "out" "index" ];
nativeBuildInputs = [ makeWrapper ];
postInstall = ''
mkdir -p $index
cp $src/index.html $index/index.html
install -D html/* -t $out/share/echoip/html
wrapProgram $out/bin/echoip \
--add-flags "-t $out/share/echoip/html"
'';
doCheck = false;
meta = with lib; {
description = "IP address lookup service";
homepage = "https://github.com/mpolden/echoip";
license = licenses.bsd3;
maintainers = with maintainers; [ rvolosatovs ];
maintainers = with maintainers; [ rvolosatovs SuperSandro2000 ];
};
}

View file

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2022.7.7";
version = "2022.8.0";
components = {
"abode" = ps: with ps; [
abodepy
@ -85,6 +85,7 @@
boto3
];
"ambee" = ps: with ps; [
aiohttp-cors
ambee
];
"amberelectric" = ps: with ps; [
@ -107,7 +108,6 @@
"analytics" = ps: with ps; [
aiohttp-cors
fnvhash
lru-dict
sqlalchemy
];
"android_ip_webcam" = ps: with ps; [
@ -124,6 +124,7 @@
"anel_pwrctrl" = ps: with ps; [
]; # missing inputs: anel_pwrctrl-homeassistant
"anthemav" = ps: with ps; [
aiohttp-cors
]; # missing inputs: anthemav
"apache_kafka" = ps: with ps; [
aiokafka
@ -281,10 +282,16 @@
"bluesound" = ps: with ps; [
xmltodict
];
"bluetooth" = ps: with ps; [
aiohttp-cors
bleak
bluetooth-adapters
];
"bluetooth_le_tracker" = ps: with ps; [
pygatt
]
++ pygatt.optional-dependencies.GATTTOOL;
aiohttp-cors
bleak
bluetooth-adapters
];
"bluetooth_tracker" = ps: with ps; [
bt-proximity
pybluez
@ -489,11 +496,12 @@
aiodiscover
aiohttp-cors
async-upnp-client
bleak
bluetooth-adapters
fnvhash
hass-nabucasa
home-assistant-frontend
ifaddr
lru-dict
pillow
pyserial
pyudev
@ -510,7 +518,6 @@
"demo" = ps: with ps; [
aiohttp-cors
fnvhash
lru-dict
sqlalchemy
];
"denon" = ps: with ps; [
@ -711,7 +718,6 @@
"energy" = ps: with ps; [
aiohttp-cors
fnvhash
lru-dict
sqlalchemy
];
"enigma2" = ps: with ps; [
@ -741,6 +747,9 @@
"epsonworkforce" = ps: with ps; [
]; # missing inputs: epsonprinter
"eq3btsmart" = ps: with ps; [
aiohttp-cors
bleak
bluetooth-adapters
construct
]; # missing inputs: python-eq3bt
"esphome" = ps: with ps; [
@ -807,7 +816,6 @@
];
"filter" = ps: with ps; [
fnvhash
lru-dict
sqlalchemy
];
"fints" = ps: with ps; [
@ -830,6 +838,9 @@
fixerio
];
"fjaraskupan" = ps: with ps; [
aiohttp-cors
bleak
bluetooth-adapters
fjaraskupan
];
"fleetgo" = ps: with ps; [
@ -916,7 +927,6 @@
aiohttp-cors
fnvhash
home-assistant-frontend
lru-dict
pillow
sqlalchemy
];
@ -944,7 +954,6 @@
];
"generic_thermostat" = ps: with ps; [
fnvhash
lru-dict
sqlalchemy
];
"geniushub" = ps: with ps; [
@ -1024,6 +1033,11 @@
];
"google_wifi" = ps: with ps; [
];
"govee_ble" = ps: with ps; [
aiohttp-cors
bleak
bluetooth-adapters
]; # missing inputs: govee-ble
"gpsd" = ps: with ps; [
gps3
];
@ -1063,7 +1077,6 @@
aiohttp-cors
fnvhash
home-assistant-frontend
lru-dict
pillow
sqlalchemy
];
@ -1079,7 +1092,6 @@
aiohttp-cors
fnvhash
home-assistant-frontend
lru-dict
pillow
sqlalchemy
];
@ -1109,12 +1121,10 @@
"history" = ps: with ps; [
aiohttp-cors
fnvhash
lru-dict
sqlalchemy
];
"history_stats" = ps: with ps; [
fnvhash
lru-dict
sqlalchemy
];
"hitron_coda" = ps: with ps; [
@ -1135,11 +1145,13 @@
];
"homeassistant" = ps: with ps; [
];
"homeassistant_alerts" = ps: with ps; [
aiohttp-cors
];
"homeassistant_yellow" = ps: with ps; [
aiohttp-cors
fnvhash
home-assistant-frontend
lru-dict
pillow
sqlalchemy
];
@ -1157,6 +1169,8 @@
"homekit_controller" = ps: with ps; [
aiohomekit
aiohttp-cors
bleak
bluetooth-adapters
ifaddr
zeroconf
];
@ -1257,6 +1271,11 @@
influxdb-client
influxdb
];
"inkbird" = ps: with ps; [
aiohttp-cors
bleak
bluetooth-adapters
]; # missing inputs: inkbird-ble
"input_boolean" = ps: with ps; [
];
"input_button" = ps: with ps; [
@ -1274,7 +1293,6 @@
fnvhash
home-assistant-frontend
insteon-frontend-home-assistant
lru-dict
pillow
pyinsteon
pyserial
@ -1428,7 +1446,7 @@
aiolifx
aiolifx-effects
ifaddr
];
]; # missing inputs: aiolifx-connection
"lifx_cloud" = ps: with ps; [
];
"light" = ps: with ps; [
@ -1471,7 +1489,6 @@
aiohttp-cors
fnvhash
home-assistant-frontend
lru-dict
pillow
sqlalchemy
];
@ -1533,7 +1550,6 @@
aiohttp-cors
fnvhash
home-assistant-frontend
lru-dict
pillow
sqlalchemy
];
@ -1613,8 +1629,8 @@
aiohttp-cors
];
"miflora" = ps: with ps; [
bluepy
]; # missing inputs: miflora
aiohttp-cors
];
"mikrotik" = ps: with ps; [
librouteros
];
@ -1633,9 +1649,15 @@
minio
];
"mitemp_bt" = ps: with ps; [
]; # missing inputs: mitemp_bt
aiohttp-cors
];
"mjpeg" = ps: with ps; [
];
"moat" = ps: with ps; [
aiohttp-cors
bleak
bluetooth-adapters
]; # missing inputs: moat-ble
"mobile_app" = ps: with ps; [
pynacl
pyturbojpeg
@ -1713,7 +1735,6 @@
aiohttp-cors
fnvhash
home-assistant-frontend
lru-dict
pillow
sqlalchemy
];
@ -1795,6 +1816,8 @@
"nextcloud" = ps: with ps; [
nextcloudmonitor
];
"nextdns" = ps: with ps; [
]; # missing inputs: nextdns
"nfandroidtv" = ps: with ps; [
]; # missing inputs: notifications-android-tv
"nightscout" = ps: with ps; [
@ -1885,7 +1908,6 @@
aiohttp-cors
fnvhash
home-assistant-frontend
lru-dict
pillow
sqlalchemy
];
@ -1913,6 +1935,7 @@
"openalpr_cloud" = ps: with ps; [
];
"openalpr_local" = ps: with ps; [
aiohttp-cors
];
"opencv" = ps: with ps; [
numpy
@ -1992,7 +2015,6 @@
aiohttp-cors
fnvhash
home-assistant-frontend
lru-dict
pillow
sqlalchemy
];
@ -2000,7 +2022,6 @@
aiohttp-cors
fnvhash
home-assistant-frontend
lru-dict
pillow
sqlalchemy
];
@ -2044,7 +2065,6 @@
];
"plant" = ps: with ps; [
fnvhash
lru-dict
sqlalchemy
];
"plex" = ps: with ps; [
@ -2162,6 +2182,7 @@
radios
];
"radiotherm" = ps: with ps; [
aiohttp-cors
radiotherm
];
"rainbird" = ps: with ps; [
@ -2183,7 +2204,6 @@
aiohttp-cors
fnvhash
home-assistant-frontend
lru-dict
pillow
sqlalchemy
];
@ -2197,7 +2217,6 @@
];
"recorder" = ps: with ps; [
fnvhash
lru-dict
sqlalchemy
];
"recswitch" = ps: with ps; [
@ -2218,6 +2237,9 @@
"renault" = ps: with ps; [
renault-api
];
"repairs" = ps: with ps; [
aiohttp-cors
];
"repetier" = ps: with ps; [
]; # missing inputs: pyrepetierng
"rest" = ps: with ps; [
@ -2232,6 +2254,9 @@
"rfxtrx" = ps: with ps; [
pyrfxtrx
];
"rhasspy" = ps: with ps; [
aiohttp-cors
];
"ridwell" = ps: with ps; [
aioridwell
];
@ -2298,7 +2323,6 @@
fnvhash
hass-nabucasa
home-assistant-frontend
lru-dict
pillow
sqlalchemy
];
@ -2359,9 +2383,13 @@
];
"sensor" = ps: with ps; [
fnvhash
lru-dict
sqlalchemy
];
"sensorpush" = ps: with ps; [
aiohttp-cors
bleak
bluetooth-adapters
]; # missing inputs: sensorpush-ble
"sentry" = ps: with ps; [
sentry-sdk
];
@ -2413,6 +2441,7 @@
pysignalclirestapi
];
"simplepush" = ps: with ps; [
aiohttp-cors
]; # missing inputs: simplepush
"simplisafe" = ps: with ps; [
simplisafe-python
@ -2528,9 +2557,7 @@
];
"soundtouch" = ps: with ps; [
aiohttp-cors
ifaddr
libsoundtouch
zeroconf
];
"spaceapi" = ps: with ps; [
aiohttp-cors
@ -2575,13 +2602,13 @@
];
"statistics" = ps: with ps; [
fnvhash
lru-dict
sqlalchemy
];
"statsd" = ps: with ps; [
statsd
];
"steam_online" = ps: with ps; [
aiohttp-cors
steamodd
];
"steamist" = ps: with ps; [
@ -2635,6 +2662,9 @@
];
"switchbot" = ps: with ps; [
pyswitchbot
aiohttp-cors
bleak
bluetooth-adapters
];
"switcher_kis" = ps: with ps; [
aioswitcher
@ -2745,7 +2775,6 @@
];
"tibber" = ps: with ps; [
fnvhash
lru-dict
pytibber
sqlalchemy
];
@ -2916,6 +2945,7 @@
pyudev
];
"uscis" = ps: with ps; [
aiohttp-cors
]; # missing inputs: uscisstatus
"usgs_earthquakes_feed" = ps: with ps; [
aio-geojson-usgs-earthquakes
@ -3101,6 +3131,11 @@
netdisco
zeroconf
];
"xiaomi_ble" = ps: with ps; [
aiohttp-cors
bleak
bluetooth-adapters
]; # missing inputs: xiaomi-ble
"xiaomi_miio" = ps: with ps; [
construct
micloud
@ -3177,7 +3212,6 @@
fnvhash
home-assistant-frontend
ifaddr
lru-dict
pillow
pyserial-asyncio
pyserial
@ -3274,6 +3308,7 @@
"blebox"
"blink"
"blueprint"
"bluetooth"
"bluetooth_le_tracker"
"bmw_connected_drive"
"bond"
@ -3448,6 +3483,7 @@
"home_connect"
"home_plus_control"
"homeassistant"
"homeassistant_alerts"
"homeassistant_yellow"
"homekit"
"homekit_controller"
@ -3601,7 +3637,6 @@
"onvif"
"open_meteo"
"openalpr_cloud"
"openalpr_local"
"openerz"
"opengarage"
"openhardwaremonitor"
@ -3656,10 +3691,12 @@
"reddit"
"remote"
"renault"
"repairs"
"rest"
"rest_command"
"rflink"
"rfxtrx"
"rhasspy"
"ridwell"
"ring"
"risco"

View file

@ -41,18 +41,6 @@ let
});
})
(self: super: {
aiohomekit = super.aiohomekit.overridePythonAttrs (oldAttrs: rec {
version = "0.7.20";
src = fetchFromGitHub {
owner = "Jc2k";
repo = "aiohomekit";
rev = "refs/tags/${version}";
hash = "sha256-g7N+CIBJCMnW4FjN502SahhSpPS1p7AXZvduteHu+Z4=";
};
});
})
(self: super: {
backoff = super.backoff.overridePythonAttrs (oldAttrs: rec {
version = "1.11.1";
@ -144,6 +132,18 @@ let
});
})
(self: super: {
plugwise = super.plugwise.overridePythonAttrs (oldAttrs: rec {
version = "0.20.1";
src = fetchFromGitHub {
owner = "plugwise";
repo = "python-plugwise";
rev = "refs/tags/v${version}";
hash = "sha256-Sk7L0JPwn7IXVl5GeERxrG/vrHXeNwUjW1mgm4g40Ng=";
};
});
})
# Pinned due to API changes in 0.1.0
(mkOverride "poolsense" "0.0.8" "sha256-17MHrYRmqkH+1QLtgq2d6zaRtqvb9ju9dvPt9gB2xCc=")
@ -173,18 +173,6 @@ let
});
})
(self: super: {
python-homewizard-energy = super.python-homewizard-energy.overridePythonAttrs (oldAttrs: rec {
version = "1.0.3";
src = fetchFromGitHub {
owner = "DCSBL";
repo = "python-homewizard-energy";
rev = "refs/tags/v${version}";
hash = "sha256-ioISqRFZZCojTJ/KYS8QUtoEpBNOPqY9lC9NFbZyh5A=";
};
});
})
# pyunifiprotect excludes pydantic==1.9.1
(self: super: {
pydantic = super.pydantic.overridePythonAttrs (oldAttrs: rec {
@ -198,18 +186,6 @@ let
});
})
(self: super: {
pydeconz = super.pydeconz.overridePythonAttrs (oldAttrs: rec {
version = "98";
src = fetchFromGitHub {
owner = "Kane610";
repo = "deconz";
rev = "refs/tags/v${version}";
hash = "sha256-hCJRoyDWDxrBrxs2g6mVh7MOe6UMd+S8+ftfWyzWgH8=";
};
});
})
(self: super: {
python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec {
pname = "python-slugify";
@ -281,18 +257,6 @@ let
});
})
(self: super: {
wled = super.wled.overridePythonAttrs (oldAttrs: rec {
version = "0.13.2";
src = fetchFromGitHub {
owner = "frenck";
repo = "python-wled";
rev = "refs/tags/v${version}";
hash = "sha256-Rv0jaKkN6jQ7oiv1cBYx4HAr7IqPm57jZFykXayp0T0=";
};
});
})
# home-assistant-frontend does not exist in python3.pkgs
(self: super: {
home-assistant-frontend = self.callPackage ./frontend.nix { };
@ -332,7 +296,7 @@ let
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
# Don't forget to run parse-requirements.py after updating
hassVersion = "2022.7.7";
hassVersion = "2022.8.0";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -350,7 +314,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
hash = "sha256-OU6tPTBC53ogkynH6NrYiQCerPo8Fu0ZLHhNsY0emGs=";
hash = "sha256-nxSOl4K8XZWesv6o6O+YuJFrza0sEz9atiw+ZP9A5ww=";
};
# leave this in, so users don't have to constantly update their downstream patch handling
@ -368,6 +332,7 @@ in python.pkgs.buildPythonApplication rec {
"awesomeversion"
"bcrypt"
"cryptography"
"home-assistant-bluetooth"
"httpx"
"ifaddr"
"orjson"
@ -396,6 +361,7 @@ in python.pkgs.buildPythonApplication rec {
ciso8601
cryptography
httpx
home-assistant-bluetooth
ifaddr
jinja2
lru-dict

View file

@ -4,7 +4,7 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
version = "20220707.1";
version = "20220802.0";
format = "wheel";
src = fetchPypi {
@ -12,7 +12,7 @@ buildPythonPackage rec {
pname = "home_assistant_frontend";
dist = "py3";
python = "py3";
sha256 = "sha256-nsQBMERX4DMm1s3jgDwUzWNnqP44S95AM3+RQ8MdCgI=";
sha256 = "sha256-vUK/apsaJLaR/i6I2EWPxyohps+EazOr9ZuBKoRcyCI=";
};
# there is nothing to strip in this package

View file

@ -1,30 +0,0 @@
diff -u openafs-1.8.0/src/bozo/bosserver.c /tmp/buffer-content-13110-gd
--- openafs-1.8.0/src/bozo/bosserver.c
+++ #<buffer bosserver.c>
@@ -244,24 +244,6 @@
static int
CreateDirs(const char *coredir)
{
- if ((!strncmp
- (AFSDIR_USR_DIRPATH, AFSDIR_CLIENT_ETC_DIRPATH,
- strlen(AFSDIR_USR_DIRPATH)))
- ||
- (!strncmp
- (AFSDIR_USR_DIRPATH, AFSDIR_SERVER_BIN_DIRPATH,
- strlen(AFSDIR_USR_DIRPATH)))) {
- if (MakeDir(AFSDIR_USR_DIRPATH))
- return errno;
- }
- if (!strncmp
- (AFSDIR_SERVER_AFS_DIRPATH, AFSDIR_SERVER_BIN_DIRPATH,
- strlen(AFSDIR_SERVER_AFS_DIRPATH))) {
- if (MakeDir(AFSDIR_SERVER_AFS_DIRPATH))
- return errno;
- }
- if (MakeDir(AFSDIR_SERVER_BIN_DIRPATH))
- return errno;
if (MakeDir(AFSDIR_SERVER_ETC_DIRPATH))
return errno;
if (MakeDir(AFSDIR_SERVER_LOCAL_DIRPATH))
Diff finished. Fri Jun 29 15:45:46 2018

View file

@ -1,223 +0,0 @@
diff -Nur --unidirectional-new-file openafs-1.8.2/configure.ac openafs-1.8.2.new/configure.ac
--- openafs-1.8.2/configure.ac 2018-09-11 17:52:48.000000000 +0200
+++ openafs-1.8.2.new/configure.ac 2018-10-16 15:56:36.512277860 +0200
@@ -23,6 +23,7 @@
AFS_LT_INIT
AC_PROG_CC
+AX_PROG_CC_FOR_BUILD
AC_PATH_PROGS([PATH_CPP], [cpp], [${CC-cc} -E], [$PATH:/lib:/usr/ccs/lib])
AC_SUBST([PATH_CPP])
diff -Nur --unidirectional-new-file openafs-1.8.2/src/cf/ax_prog_cc_for_build.m4 openafs-1.8.2.new/src/cf/ax_prog_cc_for_build.m4
--- openafs-1.8.2/src/cf/ax_prog_cc_for_build.m4 1970-01-01 01:00:00.000000000 +0100
+++ openafs-1.8.2.new/src/cf/ax_prog_cc_for_build.m4 2018-10-16 16:20:40.278641658 +0200
@@ -0,0 +1,125 @@
+# ===========================================================================
+# https://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_PROG_CC_FOR_BUILD
+#
+# DESCRIPTION
+#
+# This macro searches for a C compiler that generates native executables,
+# that is a C compiler that surely is not a cross-compiler. This can be
+# useful if you have to generate source code at compile-time like for
+# example GCC does.
+#
+# The macro sets the CC_FOR_BUILD and CPP_FOR_BUILD macros to anything
+# needed to compile or link (CC_FOR_BUILD) and preprocess (CPP_FOR_BUILD).
+# The value of these variables can be overridden by the user by specifying
+# a compiler with an environment variable (like you do for standard CC).
+#
+# It also sets BUILD_EXEEXT and BUILD_OBJEXT to the executable and object
+# file extensions for the build platform, and GCC_FOR_BUILD to `yes' if
+# the compiler we found is GCC. All these variables but GCC_FOR_BUILD are
+# substituted in the Makefile.
+#
+# LICENSE
+#
+# Copyright (c) 2008 Paolo Bonzini <bonzini@gnu.org>
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved. This file is offered as-is, without any
+# warranty.
+
+#serial 9
+
+AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD])
+AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_CPP])dnl
+AC_REQUIRE([AC_EXEEXT])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+
+dnl Use the standard macros, but make them use other variable names
+dnl
+pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl
+pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl
+pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl
+pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl
+pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl
+pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl
+pushdef([ac_cv_objext], ac_cv_build_objext)dnl
+pushdef([ac_exeext], ac_build_exeext)dnl
+pushdef([ac_objext], ac_build_objext)dnl
+pushdef([CC], CC_FOR_BUILD)dnl
+pushdef([CPP], CPP_FOR_BUILD)dnl
+pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl
+pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl
+pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl
+pushdef([host], build)dnl
+pushdef([host_alias], build_alias)dnl
+pushdef([host_cpu], build_cpu)dnl
+pushdef([host_vendor], build_vendor)dnl
+pushdef([host_os], build_os)dnl
+pushdef([ac_cv_host], ac_cv_build)dnl
+pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl
+pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl
+pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl
+pushdef([ac_cv_host_os], ac_cv_build_os)dnl
+pushdef([ac_cpp], ac_build_cpp)dnl
+pushdef([ac_compile], ac_build_compile)dnl
+pushdef([ac_link], ac_build_link)dnl
+
+save_cross_compiling=$cross_compiling
+save_ac_tool_prefix=$ac_tool_prefix
+cross_compiling=no
+ac_tool_prefix=
+
+AC_PROG_CC
+AC_PROG_CPP
+AC_EXEEXT
+
+ac_tool_prefix=$save_ac_tool_prefix
+cross_compiling=$save_cross_compiling
+
+dnl Restore the old definitions
+dnl
+popdef([ac_link])dnl
+popdef([ac_compile])dnl
+popdef([ac_cpp])dnl
+popdef([ac_cv_host_os])dnl
+popdef([ac_cv_host_vendor])dnl
+popdef([ac_cv_host_cpu])dnl
+popdef([ac_cv_host_alias])dnl
+popdef([ac_cv_host])dnl
+popdef([host_os])dnl
+popdef([host_vendor])dnl
+popdef([host_cpu])dnl
+popdef([host_alias])dnl
+popdef([host])dnl
+popdef([LDFLAGS])dnl
+popdef([CPPFLAGS])dnl
+popdef([CFLAGS])dnl
+popdef([CPP])dnl
+popdef([CC])dnl
+popdef([ac_objext])dnl
+popdef([ac_exeext])dnl
+popdef([ac_cv_objext])dnl
+popdef([ac_cv_exeext])dnl
+popdef([ac_cv_prog_cc_g])dnl
+popdef([ac_cv_prog_cc_cross])dnl
+popdef([ac_cv_prog_cc_works])dnl
+popdef([ac_cv_prog_gcc])dnl
+popdef([ac_cv_prog_CPP])dnl
+
+dnl Finally, set Makefile variables
+dnl
+BUILD_EXEEXT=$ac_build_exeext
+BUILD_OBJEXT=$ac_build_objext
+AC_SUBST(BUILD_EXEEXT)dnl
+AC_SUBST(BUILD_OBJEXT)dnl
+AC_SUBST([CFLAGS_FOR_BUILD])dnl
+AC_SUBST([CPPFLAGS_FOR_BUILD])dnl
+AC_SUBST([LDFLAGS_FOR_BUILD])dnl
+])
diff -Nur --unidirectional-new-file openafs-1.8.2/src/comerr/Makefile.in openafs-1.8.2.new/src/comerr/Makefile.in
--- openafs-1.8.2/src/comerr/Makefile.in 2018-09-11 17:52:48.000000000 +0200
+++ openafs-1.8.2.new/src/comerr/Makefile.in 2018-10-16 15:48:19.678898925 +0200
@@ -38,11 +38,14 @@
compile_et: compile_et.o error_table.o
$(Q)case $(SYS_NAME) in \
*_linux* | *_umlinux* | *_darwin* ) \
- $(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr $(buildtool_roken) $(MT_LIBS);; \
+ $(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr_build $(buildtool_roken) $(MT_LIBS);; \
* ) \
- $(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr -ll $(buildtool_roken) $(MT_LIBS);; \
+ $(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr_build -ll $(buildtool_roken) $(MT_LIBS);; \
esac
+compile_et compile_et.o error_table.o: CC=$(CC_FOR_BUILD)
+compile_et compile_et.o error_table.o: LD=$(CC_FOR_BUILD)
+
libafscom_err.a: $(LT_objs)
$(LT_LDLIB_lwp) $(LT_objs)
diff -Nur --unidirectional-new-file openafs-1.8.2/src/config/Makefile.in openafs-1.8.2.new/src/config/Makefile.in
--- openafs-1.8.2/src/config/Makefile.in 2018-09-11 17:52:48.000000000 +0200
+++ openafs-1.8.2.new/src/config/Makefile.in 2018-10-16 15:48:19.677898926 +0200
@@ -54,6 +54,8 @@
config.o: config.c AFS_component_version_number.c
+config mkvers config.o mc.o: CC=$(CC_FOR_BUILD)
+
#
# Include installation targets
#
diff -Nur --unidirectional-new-file openafs-1.8.2/src/opr/Makefile.in openafs-1.8.2.new/src/opr/Makefile.in
--- openafs-1.8.2/src/opr/Makefile.in 2018-09-11 17:52:48.000000000 +0200
+++ openafs-1.8.2.new/src/opr/Makefile.in 2018-10-16 15:48:19.678898925 +0200
@@ -21,7 +21,7 @@
$(TOP_INCDIR)/opr/time.h \
$(TOP_INCDIR)/opr/uuid.h
-all: $(HEADERS) liboafs_opr.la $(TOP_LIBDIR)/libopr_pic.a $(TOP_LIBDIR)/libopr.a
+all: $(HEADERS) liboafs_opr.la $(TOP_LIBDIR)/libopr_pic.a $(TOP_LIBDIR)/libopr.a $(TOP_LIBDIR)/libopr_build.a
liboafs_opr.la: liboafs_opr.la.sym $(LT_objs) $(LT_deps)
$(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs)
@@ -29,12 +29,26 @@
libopr.a: $(LT_objs)
$(LT_LDLIB_static) $(LT_objs)
+LT_objs_build = $(patsubst %.lo, %_build.lo, $(LT_objs))
+
+%_build.lo: %.c
+ $(LT_CCRULE) $<
+
+libopr_build.a: $(LT_objs_build)
+ $(LT_LDLIB_static) $(LT_objs_build)
+
+libopr_build.a $(LT_objs_build): CC=$(CC_FOR_BUILD)
+libopr_build.a $(LT_objs_build): LD=$(CC_FOR_BUILD)
+
libopr_pic.la: $(LT_objs)
$(LT_LDLIB_pic) $(LT_objs)
$(TOP_LIBDIR)/libopr.a: libopr.a
$(INSTALL_DATA) libopr.a $@
+$(TOP_LIBDIR)/libopr_build.a: libopr_build.a
+ $(INSTALL_DATA) libopr_build.a $@
+
$(TOP_LIBDIR)/libopr_pic.a: libopr_pic.la
$(INSTALL_DATA) .libs/libopr_pic.a $@
diff -Nur --unidirectional-new-file openafs-1.8.2/src/rxgen/Makefile.in openafs-1.8.2.new/src/rxgen/Makefile.in
--- openafs-1.8.2/src/rxgen/Makefile.in 2018-09-11 17:52:48.000000000 +0200
+++ openafs-1.8.2.new/src/rxgen/Makefile.in 2018-10-16 15:48:19.677898926 +0200
@@ -25,6 +25,8 @@
CFLAGS_rpc_main.o= -DPATH_CPP="\"$(PATH_CPP)\""
+rxgen $(OBJS): CC=$(CC_FOR_BUILD)
+
#
# Install targets
#

View file

@ -1,105 +0,0 @@
{ lib, stdenv, buildPackages, fetchurl, which, autoconf, automake, flex
, bison , glibc, perl, libkrb5, libxslt, docbook_xsl, file
, docbook_xml_dtd_43, libtool_2
, withDevdoc ? false, doxygen, dblatex # Extra developer documentation
, ncurses # Extra ncurses utilities. Needed for debugging and monitoring.
, tsmbac ? null # Tivoli Storage Manager Backup Client from IBM
}:
with (import ./srcs.nix { inherit fetchurl; });
let
inherit (lib) optional optionalString optionals;
in stdenv.mkDerivation {
pname = "openafs";
inherit version srcs;
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ autoconf automake flex libxslt libtool_2 perl
which bison ] ++ optionals withDevdoc [ doxygen dblatex ];
buildInputs = [ libkrb5 ncurses ];
patches = [ ./bosserver.patch ./cross-build.patch ] ++ optional (tsmbac != null) ./tsmbac.patch;
outputs = [ "out" "dev" "man" "doc" ] ++ optional withDevdoc "devdoc";
enableParallelBuilding = false;
setOutputFlags = false;
# Makefiles don't include install targets for all new shared libs, yet.
dontDisableStatic = true;
preConfigure = ''
patchShebangs .
for i in `grep -l -R '/usr/\(include\|src\)' .`; do
echo "Patch /usr/include and /usr/src in $i"
substituteInPlace $i \
--replace "/usr/include" "${glibc.dev}/include" \
--replace "/usr/src" "$TMP"
done
for i in ./doc/xml/{AdminGuide,QuickStartUnix,UserGuide}/*.xml; do
substituteInPlace "''${i}" --replace "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \
"${docbook_xml_dtd_43}/xml/dtd/docbook/docbookx.dtd"
done
./regen.sh
configureFlagsArray=(
"--with-gssapi"
"--sysconfdir=/etc"
"--localstatedir=/var"
"--disable-kernel-module"
"--disable-fuse-client"
"--with-docbook-stylesheets=${docbook_xsl}/share/xml/docbook-xsl"
${optionalString (tsmbac != null) "--enable-tivoli-tsm"}
${optionalString (ncurses == null) "--disable-gtx"}
"--disable-linux-d_splice-alias-extra-iput"
)
'' + optionalString (tsmbac != null) ''
export XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I${tsmbac}/lib64/sample -DXBSA_TSMLIB=\\\"${tsmbac}/lib64/libApiTSM64.so\\\""
export XBSA_XLIBS="-ldl"
'';
buildFlags = [ "all_nolibafs" ];
postBuild = ''
for d in doc/xml/{AdminGuide,QuickStartUnix,UserGuide}; do
make -C "''${d}" index.html
done
'' + optionalString withDevdoc ''
make dox
'';
postInstall = ''
mkdir -p $doc/share/doc/openafs/{AdminGuide,QuickStartUnix,UserGuide}
cp -r doc/txt README LICENSE $doc/share/doc/openafs
for d in AdminGuide QuickStartUnix UserGuide ; do
cp "doc/xml/''${d}"/*.html "$doc/share/doc/openafs/''${d}"
done
rm -r $out/lib/openafs
'' + optionalString withDevdoc ''
mkdir -p $devdoc/share/devhelp/openafs/doxygen
cp -r doc/{pdf,protocol} $devdoc/share/devhelp/openafs
cp -r doc/doxygen/output/html $devdoc/share/devhelp/openafs/doxygen
'';
# Avoid references to $TMPDIR by removing it and let patchelf cleanup the
# binaries.
preFixup = ''
rm -rf "$(pwd)" && mkdir "$(pwd)"
'';
meta = with lib; {
outputsToInstall = [ "out" "doc" "man" ];
description = "Open AFS client";
homepage = "https://www.openafs.org";
license = licenses.ipl10;
platforms = platforms.linux;
maintainers = [ maintainers.maggesi maintainers.spacefrogg ];
};
}

View file

@ -1,64 +0,0 @@
{ lib, stdenv, fetchurl, which, autoconf, automake, flex, bison
, kernel, glibc, perl, libtool_2, libkrb5, fetchpatch }:
with (import ./srcs.nix {
inherit fetchurl;
});
let
modDestDir = "$out/lib/modules/${kernel.modDirVersion}/extra/openafs";
kernelBuildDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
in stdenv.mkDerivation {
pname = "openafs";
version = "${version}-${kernel.modDirVersion}";
inherit src;
nativeBuildInputs = [ autoconf automake flex libtool_2 perl which bison ]
++ kernel.moduleBuildDependencies;
buildInputs = [ libkrb5 ];
patches = [];
hardeningDisable = [ "pic" ];
configureFlags = [
"--with-linux-kernel-build=${kernelBuildDir}"
"--sysconfdir=/etc"
"--localstatedir=/var"
"--with-gssapi"
"--disable-linux-d_splice-alias-extra-iput"
];
preConfigure = ''
patchShebangs .
for i in `grep -l -R '/usr/\(include\|src\)' .`; do
echo "Patch /usr/include and /usr/src in $i"
substituteInPlace $i \
--replace "/usr/include" "${glibc.dev}/include" \
--replace "/usr/src" "${kernelBuildDir}"
done
./regen.sh -q
'';
buildPhase = ''
make V=1 only_libafs
'';
installPhase = ''
mkdir -p ${modDestDir}
cp src/libafs/MODLOAD-*/libafs-${kernel.modDirVersion}.* ${modDestDir}/libafs.ko
xz -f ${modDestDir}/libafs.ko
'';
meta = with lib; {
description = "Open AFS client kernel module";
homepage = "https://www.openafs.org";
license = licenses.ipl10;
platforms = platforms.linux;
maintainers = [ maintainers.maggesi maintainers.spacefrogg ];
broken = kernel.kernelAtLeast "5.15" || kernel.isHardened;
};
}

View file

@ -1,14 +0,0 @@
{ fetchurl }:
rec {
version = "1.9.1";
src = fetchurl {
url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
sha256 = "sha256-7rHihVR4VobHAzt0ZALFOLJnlfd1Qwsa5ohpRFWBPbw=";
};
srcs = [ src
(fetchurl {
url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2";
sha256 = "sha256-pvF8CdTl+5DNuymNvhb3UrGW05LcXRv8cZp2QQlXF+E=";
})];
}

View file

@ -1,62 +0,0 @@
diff -ru openafs-1.8.0/src/butc/afsxbsa.c openafs-1.8.0.new/src/butc/afsxbsa.c
--- openafs-1.8.0/src/butc/afsxbsa.c 2018-04-06 03:21:12.000000000 +0200
+++ openafs-1.8.0.new/src/butc/afsxbsa.c 2018-06-12 16:26:26.272522305 +0200
@@ -651,7 +651,7 @@
#if defined(AFS_AIX_ENV)
dynlib = dlopen("/usr/lib/libApiDS.a(dsmapish.o)", RTLD_NOW | RTLD_LOCAL | RTLD_MEMBER);
#elif defined (AFS_AMD64_LINUX26_ENV)
- dynlib = dlopen("/usr/lib64/libApiTSM64.so", RTLD_NOW | RTLD_LOCAL);
+ dynlib = dlopen(XBSA_TSMLIB, RTLD_NOW | RTLD_LOCAL);
#elif defined(AFS_SUN5_ENV) || defined(AFS_LINUX26_ENV)
dynlib = dlopen("/usr/lib/libApiDS.so", RTLD_NOW | RTLD_LOCAL);
#else
diff -ru openafs-1.8.0/src/cf/tivoli.m4 openafs-1.8.0.new/src/cf/tivoli.m4
--- openafs-1.8.0/src/cf/tivoli.m4 2018-04-06 03:21:12.000000000 +0200
+++ openafs-1.8.0.new/src/cf/tivoli.m4 2018-06-12 16:26:26.072522485 +0200
@@ -1,45 +1,7 @@
AC_DEFUN([OPENAFS_TIVOLI_TESTS],[
dnl check for tivoli
AC_MSG_CHECKING(for tivoli tsm butc support)
-XBSA_CFLAGS=""
-if test "$enable_tivoli_tsm" = "yes"; then
- XBSADIR1=/usr/tivoli/tsm/client/api/bin/xopen
- XBSADIR2=/opt/tivoli/tsm/client/api/bin/xopen
- XBSADIR3=/usr/tivoli/tsm/client/api/bin/sample
- XBSADIR4=/opt/tivoli/tsm/client/api/bin/sample
- XBSADIR5=/usr/tivoli/tsm/client/api/bin64/sample
- XBSADIR6=/opt/tivoli/tsm/client/api/bin64/sample
-
- if test -r "$XBSADIR3/dsmapifp.h"; then
- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR3"
- XBSA_XLIBS="-ldl"
- AC_MSG_RESULT([yes, $XBSA_CFLAGS])
- elif test -r "$XBSADIR4/dsmapifp.h"; then
- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR4"
- XBSA_XLIBS="-ldl"
- AC_MSG_RESULT([yes, $XBSA_CFLAGS])
- elif test -r "$XBSADIR5/dsmapifp.h"; then
- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR5"
- XBSA_XLIBS="-ldl"
- AC_MSG_RESULT([yes, $XBSA_CFLAGS])
- elif test -r "$XBSADIR6/dsmapifp.h"; then
- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR6"
- XBSA_XLIBS="-ldl"
- AC_MSG_RESULT([yes, $XBSA_CFLAGS])
- elif test -r "$XBSADIR1/xbsa.h"; then
- XBSA_CFLAGS="-Dxbsa -I$XBSADIR1"
- XBSA_XLIBS=""
- AC_MSG_RESULT([yes, $XBSA_CFLAGS])
- elif test -r "$XBSADIR2/xbsa.h"; then
- XBSA_CFLAGS="-Dxbsa -I$XBSADIR2"
- XBSA_XLIBS=""
- AC_MSG_RESULT([yes, $XBSA_CFLAGS])
- else
- AC_MSG_RESULT([no, missing xbsa.h and dsmapifp.h header files])
- fi
-else
- AC_MSG_RESULT([no])
-fi
+AC_MSG_RESULT([yes])
AC_SUBST(XBSA_CFLAGS)
AC_SUBST(XBSA_XLIBS)
XLIBS="$XBSA_XLIBS $XLIBS"

View file

@ -46,6 +46,13 @@ in python.pkgs.buildPythonApplication rec {
url = "https://github.com/dschep/ntfy/commit/2346e7cfdca84c8f1afc7462a92145c1789deb3e.patch";
sha256 = "13k7jbsdx0jx7l5s8whirric76hml5bznkfcxab5xdp88q52kpk7";
})
# Add compatibility with emoji 2.0
# https://github.com/dschep/ntfy/pull/250
(fetchpatch {
name = "ntfy-Add-compatibility-with-emoji-2.0.patch";
url = "https://github.com/dschep/ntfy/commit/4128942bb7a706117e7154a50a73b88f531631fe.patch";
sha256 = "sha256-V8dIy/K957CPFQQS1trSI3gZOjOcVNQLgdWY7g17bRw=";
})
];
checkPhase = ''

View file

@ -12,17 +12,17 @@ let
in
buildGoModule rec {
pname = "opentelemetry-collector";
version = "0.51.0";
version = "0.56.0";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-collector";
rev = "v${version}";
sha256 = "sha256-XCOyvFWvgGxjuOdyFk4Rh+HO8GBdRfWcR73h+7lF+8E=";
sha256 = "sha256-iaGtAmbq/pj+xEfwmSIFJHGBOwt5yCsdsXLWxzKmEB4=";
};
# there is a nested go.mod
sourceRoot = "source/cmd/otelcorecol";
vendorSha256 = "sha256-BAcJpiO6jFKcjtbBA9LDad1ifDpb47nWOylH8dDBUN0=";
vendorSha256 = "sha256-cQuA7I+dRKDGhrM/52zGT5zdPYHHSewDDLvuGL4ISz0=";
preBuild = ''
# set the build version, can't be done via ldflags

View file

@ -4,13 +4,13 @@ let
in
stdenv.mkDerivation rec {
pname = "taoup";
version = "1.1.16";
version = "1.1.17";
src = fetchFromGitHub {
owner = "globalcitizen";
repo = pname;
rev = "v${version}";
hash = "sha256-LNS4m7Er4dQKYDuHMF/5mAi4yGcYzppxfqVKFOT6I/s=";
hash = "sha256-awVom/X9R//w8yYaIwjm5RFYsptySl+PkArF1wP/LAc=";
};
buildInputs = [ rubyEnv bash ncurses ];

View file

@ -1,13 +1,13 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGoModule rec {
pname = "kapp";
version = "0.50.0";
version = "0.51.0";
src = fetchFromGitHub {
owner = "vmware-tanzu";
repo = "carvel-kapp";
rev = "v${version}";
sha256 = "sha256-rNn3CgqOCHe8rTQGM6SscYhX9rR6MBWRs9xdoOWXPIo=";
sha256 = "sha256-TfTnq6cGlCm8Fv/pf6wAFrxbW2CJyZFze+woxy70OzA=";
};
vendorSha256 = null;

View file

@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec {
propagatedBuildInputs = with python3Packages; [
appdirs beautifulsoup4 characteristic distro eliot fixtures foolscap future
html5lib magic-wormhole netifaces pyasn1 pycrypto pyutil pyyaml recommonmark
service-identity simplejson sphinx_rtd_theme testtools treq twisted zfec
service-identity simplejson sphinx-rtd-theme testtools treq twisted zfec
zope_interface
] ++ twisted.optional-dependencies.tls
++ twisted.optional-dependencies.conch;

View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2022-08-02";
version = "2022-08-04";
src = fetchFromGitHub {
owner = "offensive-security";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-7wXM4xYuhxdjLvqVeXBnJEr1Pqj28p7YQ1jRbGbOAOA=";
hash = "sha256-WOlOIQSv0dGSbrzpvvzH30hKXVLCAM1R5U4L3zt53MQ=";
};
nativeBuildInputs = [

View file

@ -1,71 +0,0 @@
source $stdenv/setup
export PLAN9=$out/plan9
export PLAN9_TARGET=$PLAN9
plan9portLinkFlags()
{
eval set -- "$NIX_LDFLAGS"
local flag
for flag in "$@"; do
printf ' -Wl,%s' "$flag"
done
}
configurePhase()
{
(
echo CC9=\"$(command -v $CC)\"
echo CFLAGS=\"$NIX_CFLAGS_COMPILE\"
echo LDFLAGS=\"$(plan9portLinkFlags)\"
echo X11=\"${libXt_dev}/include\"
case "$system" in
x86_64-*) echo OBJTYPE=x86_64;;
i?86-*) echo OBJTYPE=386;;
*power*) echo OBJTYPE=power;;
*sparc*) echo OBJTYPE=sparc;;
esac
if [[ $system =~ .*linux.* ]]; then
echo SYSVERSION=2.6.x
fi
) >config
for f in `grep -l -r /usr/local/plan9`; do
sed "s,/usr/local/plan9,${PLAN9},g" -i $f
done
}
buildPhase()
{
mkdir -p $PLAN9
# Copy sources, some necessary bin scripts
cp -R * $PLAN9
local originalPath="$PATH"
export PATH="$PLAN9/bin:$PATH"
export NPROC=$NIX_BUILD_CORES
pushd src
../dist/buildmk
mk clean
mk libs-nuke
mk all
mk -k install
if [[ -f $PLAN9/bin/quote1 ]]; then
cp $PLAN9/bin/quote1 $PLAN9/bin/'"'
cp $PLAN9/bin/quote2 $PLAN9/bin/'""'
fi
popd
export PATH="$originalPath"
}
installPhase()
{
# Copy the `9' utility. This way you can use
# $ 9 awk
# to use the plan 9 awk
mkdir $out/bin
ln -s $PLAN9/bin/9 $out/bin
}
genericBuild

View file

@ -2,7 +2,7 @@
, fontconfig, freetype, libX11, libXext, libXt, xorgproto
, Carbon, Cocoa, IOKit, Metal, QuartzCore, DarwinTools
, perl # For building web manuals
, which
, which, ed
}:
stdenv.mkDerivation rec {
@ -19,26 +19,69 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace bin/9c \
--replace 'which uniq' '${which}/bin/which uniq'
ed -sE INSTALL <<EOF
# get /bin:/usr/bin out of PATH
/^PATH=[^ ]*/s,,PATH=\$PATH:\$PLAN9/bin,
# no xcbuild nonsense
/^if.* = Darwin/+;/^fi/-c
${"\t"}export NPROC=$NIX_BUILD_CORES
.
# remove absolute include paths from fontsrv test
/cc -o a.out -c -I.*freetype2/;/x11.c/j
s/(-Iinclude).*-I[^ ]*/\1/
wq
EOF
'';
buildInputs = [ perl ] ++ (if !stdenv.isDarwin then [
fontconfig
freetype # fontsrv wants ft2build.h
libX11
libXext
libXt
xorgproto
nativeBuildInputs = [ ed ];
buildInputs = [ perl which ] ++ (if !stdenv.isDarwin then [
fontconfig freetype # fontsrv uses these
libX11 libXext libXt xorgproto
] else [
Carbon
Cocoa
IOKit
Metal
QuartzCore
Carbon Cocoa IOKit Metal QuartzCore
DarwinTools
]);
builder = ./builder.sh;
libXt_dev = libXt.dev;
configurePhase = ''
runHook preConfigure
cat >LOCAL.config <<EOF
CC9='$(command -v $CC)'
CFLAGS='$NIX_CFLAGS_COMPILE'
LDFLAGS='$(for f in $NIX_LDFLAGS; do echo "-Wl,$f"; done | xargs echo)'
${lib.optionalString (!stdenv.isDarwin) "X11='${libXt.dev}/include'"}
EOF
# make '9' available in the path so there's some way to find out $PLAN9
cat >LOCAL.INSTALL <<EOF
#!$out/plan9/bin/rc
mkdir $out/bin
ln -s $out/plan9/bin/9 $out/bin/
EOF
chmod +x LOCAL.INSTALL
# now, not in fixupPhase, so ./INSTALL works
patchShebangs .
runHook postConfigure
'';
buildPhase = ''
runHook preBuild
./INSTALL -b
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir $out
cp -r . $out/plan9
cd $out/plan9
./INSTALL -c
runHook postInstall
'';
dontPatchShebangs = true;
doInstallCheck = true;
installCheckPhase = ''
@ -70,12 +113,7 @@ stdenv.mkDerivation rec {
'';
license = licenses.mit;
maintainers = with maintainers; [
AndersonTorres
bbarker
ehmry
ftrvxmtrx
kovirobi
ylh
AndersonTorres bbarker ehmry ftrvxmtrx kovirobi ylh
];
mainProgram = "9";
platforms = platforms.unix;

View file

@ -16289,6 +16289,8 @@ with pkgs;
stdenv = overrideCC stdenv llvmPackages_9.clang;
});
lurk = callPackage ../development/tools/lurk { };
malt = callPackage ../development/tools/profiling/malt {};
massif-visualizer = libsForQt5.callPackage ../development/tools/analysis/massif-visualizer { };
@ -22673,7 +22675,6 @@ with pkgs;
openbgpd = callPackage ../servers/openbgpd { };
openafs_1_8 = callPackage ../servers/openafs/1.8 { tsmbac = null; ncurses = null; };
openafs_1_9 = callPackage ../servers/openafs/1.9 { tsmbac = null; ncurses = null; };
# Current stable release; don't backport release updates!
openafs = openafs_1_8;

View file

@ -405,7 +405,6 @@ in {
rtw89 = if lib.versionOlder kernel.version "5.16" then callPackage ../os-specific/linux/rtw89 { } else null;
openafs_1_8 = callPackage ../servers/openafs/1.8/module.nix { };
openafs_1_9 = callPackage ../servers/openafs/1.9/module.nix { };
# Current stable release; don't backport release updates!
openafs = openafs_1_8;

View file

@ -175,6 +175,7 @@ mapAliases ({
smart_open = smart-open; # added 2021-03-14
smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14
SPARQLWrapper = sparqlwrapper;
sphinx_rtd_theme = sphinx-rtd-theme; # added 2022-08-03
sphinxcontrib_plantuml = sphinxcontrib-plantuml; # added 2021-08-02
sqlalchemy_migrate = sqlalchemy-migrate; # added 2021-10-28
SQLAlchemy-ImageAttach = throw "sqlalchemy-imageattach has been removed as it is incompatible with sqlalchemy 1.4 and unmaintained"; # added 2022-04-23

View file

@ -1347,6 +1347,8 @@ in {
bluepy-devices = callPackage ../development/python-modules/bluepy-devices { };
bluetooth-adapters = callPackage ../development/python-modules/bluetooth-adapters { };
blurhash = callPackage ../development/python-modules/blurhash { };
bme280spi = callPackage ../development/python-modules/bme280spi { };
@ -4056,6 +4058,8 @@ in {
holoviews = callPackage ../development/python-modules/holoviews { };
home-assistant-bluetooth = callPackage ../development/python-modules/home-assistant-bluetooth { };
homeassistant-pyozw = callPackage ../development/python-modules/homeassistant-pyozw { };
homeconnect = callPackage ../development/python-modules/homeconnect { };
@ -7151,6 +7155,8 @@ in {
pyarlo = callPackage ../development/python-modules/pyarlo { };
pyarr = callPackage ../development/python-modules/pyarr { };
pyarrow = callPackage ../development/python-modules/pyarrow {
inherit (pkgs) arrow-cpp cmake;
};
@ -10146,7 +10152,7 @@ in {
sphinx_pypi_upload = callPackage ../development/python-modules/sphinx_pypi_upload { };
sphinx_rtd_theme = callPackage ../development/python-modules/sphinx_rtd_theme { };
sphinx-rtd-theme = callPackage ../development/python-modules/sphinx-rtd-theme { };
sphinx-serve = callPackage ../development/python-modules/sphinx-serve { };