mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 12:29:02 +02:00
Merge staging-next into staging
This commit is contained in:
commit
093948b0c8
|
@ -46,6 +46,18 @@ let
|
|||
echo 'runAsRoot has run.'
|
||||
'';
|
||||
};
|
||||
|
||||
chownTestImage =
|
||||
pkgs.dockerTools.streamLayeredImage {
|
||||
name = "chown-test";
|
||||
tag = "latest";
|
||||
enableFakechroot = true;
|
||||
fakeRootCommands = ''
|
||||
touch /testfile
|
||||
chown 12345:12345 /testfile
|
||||
'';
|
||||
config.Cmd = [ "${pkgs.coreutils}/bin/stat" "-c" "%u:%g" "/testfile" ];
|
||||
};
|
||||
in {
|
||||
name = "docker-tools";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
|
@ -565,5 +577,11 @@ in {
|
|||
"${examples.nix-shell-build-derivation} | docker load",
|
||||
"docker run --rm -it nix-shell-build-derivation"
|
||||
)
|
||||
|
||||
with subtest("streamLayeredImage: chown is persistent in fakeRootCommands"):
|
||||
docker.succeed(
|
||||
"${chownTestImage} | docker load",
|
||||
"docker run --rm ${chownTestImage.imageName} | diff /dev/stdin <(echo 12345:12345)"
|
||||
)
|
||||
'';
|
||||
})
|
||||
|
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "werf";
|
||||
version = "1.2.290";
|
||||
version = "1.2.292";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "werf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pXmFpXpab6YKgujMGqP6xt5iRt/7CrG3wbpBeQ9Ty6c=";
|
||||
hash = "sha256-jBGAd7He2ap7+IF5Og7J6iBoIoLG8KqxSLcPKogJwP8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-yz0H/016NR+CwVbVfXPAIayacPprcf+MKptbG5fHwVY=";
|
||||
vendorHash = "sha256-JaAiQC5QnamzUz1hPSldXtZqhTQIlGFGMYhLJd7t3j4=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dayon";
|
||||
version = "13.0.1";
|
||||
version = "13.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RetGal";
|
||||
repo = "dayon";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-nevDC4kfVSgfmJZiCj82mc+/yZcIgub3CP9qi9ISF3o=";
|
||||
hash = "sha256-sKA50D+VYjfKzdZAppIGfU5uJqrCrZPEsk9EEMBxu3I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clingo";
|
||||
version = "5.7.0";
|
||||
version = "5.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "potassco";
|
||||
repo = "clingo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mXexFRPC/+5mNRVZqzsLJKiRkKA009OQrEhOAg8M38k=";
|
||||
sha256 = "sha256-S0JAfMwg49aryKABbC/2oLCEkndVpMVcFE6X0vkbtNc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
@ -0,0 +1,48 @@
|
|||
From 9a0102fe1da038ebe08107ead991964df11b0271 Mon Sep 17 00:00:00 2001
|
||||
From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com>
|
||||
Date: Mon, 19 Feb 2024 03:31:20 +0000
|
||||
Subject: [PATCH] no qtgui darwin bundle
|
||||
|
||||
---
|
||||
qtgui/recoll.pro.in | 11 +++++++++--
|
||||
1 file changed, 9 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/qtgui/recoll.pro.in b/qtgui/recoll.pro.in
|
||||
index a0ef314..6dbc3b5 100644
|
||||
--- a/qtgui/recoll.pro.in
|
||||
+++ b/qtgui/recoll.pro.in
|
||||
@@ -180,7 +180,7 @@ windows {
|
||||
}
|
||||
}
|
||||
|
||||
-macx: {
|
||||
+if (false) {
|
||||
QCBUILDLOC=Qt_6_4_2_for_macOS
|
||||
|
||||
# QT += webkit webkitwidgets
|
||||
@@ -375,7 +375,7 @@ macx: {
|
||||
QMAKE_BUNDLE_DATA = APP_EXAMPLES APP_EXAMPLES_MAC APP_FILTERS APP_IMAGES APP_DOC
|
||||
}
|
||||
|
||||
-unix:!macx {
|
||||
+unix {
|
||||
|
||||
VPATH = @srcdir@
|
||||
|
||||
@@ -400,6 +400,13 @@ VPATH = @srcdir@
|
||||
SOURCES += crontool.cpp \
|
||||
rtitool.cpp
|
||||
|
||||
+ macx {
|
||||
+ SOURCES += ../utils/closefrom.cpp \
|
||||
+ ../utils/execmd.cpp \
|
||||
+ ../utils/netcon.cpp \
|
||||
+ ../utils/rclionice.cpp
|
||||
+ }
|
||||
+
|
||||
FORMS += crontool.ui \
|
||||
rtitool.ui
|
||||
|
||||
--
|
||||
2.43.0
|
||||
|
|
@ -105,6 +105,8 @@ mkDerivation rec {
|
|||
patches = [
|
||||
# fix "No/bad main configuration file" error
|
||||
./fix-datadir.patch
|
||||
# use the same configure based build for darwin as linux
|
||||
./0001-no-qtgui-darwin-bundle.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -135,6 +137,10 @@ mkDerivation rec {
|
|||
libiconv
|
||||
];
|
||||
|
||||
qtWrapperArgs = [
|
||||
"--prefix PATH : ${filterPath}"
|
||||
];
|
||||
|
||||
# the filters search through ${PATH} using a sh proc 'checkcmds' for the
|
||||
# filtering utils. Short circuit this by replacing the filtering command with
|
||||
# the absolute path to the filtering command.
|
||||
|
@ -150,8 +156,6 @@ mkDerivation rec {
|
|||
substituteInPlace $f --replace /usr/bin/perl ${lib.getBin (perl.passthru.withPackages (p: [ p.ImageExifTool ]))}/bin/perl
|
||||
fi
|
||||
done
|
||||
wrapProgram $out/bin/recoll --prefix PATH : "${filterPath}"
|
||||
wrapProgram $out/bin/recollindex --prefix PATH : "${filterPath}"
|
||||
wrapProgram $out/share/recoll/filters/rclaudio.py \
|
||||
--prefix PYTHONPATH : $PYTHONPATH
|
||||
wrapProgram $out/share/recoll/filters/rclimg \
|
||||
|
@ -163,6 +167,11 @@ mkDerivation rec {
|
|||
mv $out/bin/recoll.app $out/Applications
|
||||
'';
|
||||
|
||||
# create symlink after fixup to prevent double wrapping of recoll
|
||||
postFixup = lib.optionalString (stdenv.isDarwin && withGui) ''
|
||||
ln -s ../Applications/recoll.app/Contents/MacOS/recoll $out/bin/recoll
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -139,6 +139,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
postInstall = ''
|
||||
rm -f ${placeholder "out"}/lib/*.a
|
||||
''
|
||||
# For mingw, libs are located in $out/bin not $out/lib
|
||||
+ lib.optionalString stdenv.hostPlatform.isMinGW ''
|
||||
ln -s $out/bin/*.dll $out/lib
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, fetchurl, pkg-config, buildDunePackage, dune-configurator
|
||||
{ lib, fetchurl, fetchpatch, pkg-config, buildDunePackage, dune-configurator
|
||||
, gtk3, cairo2
|
||||
, camlp-streams
|
||||
}:
|
||||
|
@ -14,6 +14,13 @@ buildDunePackage rec {
|
|||
hash = "sha256-bxEVMzfnaH5yHVxAmifNYOy8GnSivLLgSE/9+1yxBI4=";
|
||||
};
|
||||
|
||||
# Fix build with clang 16
|
||||
# See: https://github.com/garrigue/lablgtk/pull/175
|
||||
patches = fetchpatch {
|
||||
url = "https://github.com/garrigue/lablgtk/commit/a9b64b9ed8a13855c672cde0a2d9f78687f4214b.patch";
|
||||
hash = "sha256-j/L+yYKLlj410jx2VG77hnn9SVHCcSzmr3wpOMZhX5w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ dune-configurator camlp-streams ];
|
||||
propagatedBuildInputs = [ gtk3 cairo2 ];
|
||||
|
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocaml${ocaml.version}-mlgmpidl";
|
||||
version = "1.2.15";
|
||||
version = "1.3.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nberth";
|
||||
repo = "mlgmpidl";
|
||||
rev = version;
|
||||
sha256 = "sha256-85wy5eVWb5qdaa2lLDcfqlUTIY7vnN3nGMdxoj5BslU=";
|
||||
hash = "sha256-ZmSDKZiHko8MCeIuZL53HjupfwO6PAm8QOCc9O3xJOk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ perl ocaml findlib camlidl ];
|
||||
|
@ -17,18 +17,11 @@ stdenv.mkDerivation rec {
|
|||
strictDeps = true;
|
||||
|
||||
prefixKey = "-prefix ";
|
||||
configureFlags = [
|
||||
"--gmp-prefix ${gmp.dev}"
|
||||
"--mpfr-prefix ${mpfr.dev}"
|
||||
"-disable-profiling"
|
||||
];
|
||||
|
||||
postConfigure = ''
|
||||
substituteInPlace Makefile --replace "/bin/rm" "rm"
|
||||
mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs
|
||||
'';
|
||||
|
||||
|
||||
meta = {
|
||||
description = "OCaml interface to the GMP library";
|
||||
homepage = "https://www.inrialpes.fr/pop-art/people/bjeannet/mlxxxidl-forge/mlgmpidl/";
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiodiscover";
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -24,14 +24,9 @@ buildPythonPackage rec {
|
|||
owner = "bdraco";
|
||||
repo = "aiodiscover";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-FbOqTUSqxSPSCn5zA4s47+M6OsVsqvUBZxTFvJ5PoHs=";
|
||||
hash = "sha256-M3tus0r58YVJyi/S7UWq+OvaKke3hqkHGuYkUxEpVxg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace '"pytest-runner>=5.2",' ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
|
|
@ -1,21 +1,37 @@
|
|||
{ lib, buildPythonPackage, fetchPypi }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, setuptools
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "deluge-client";
|
||||
version = "1.10.0";
|
||||
format = "setuptools";
|
||||
version = "1.10.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Em3dVWkSYI/iBaRUIiIRsc11pg30QAvJYwa1F/Zn9Ik=";
|
||||
hash = "sha256-OIGu48Tgyp3YpWtxAEe4N+HQh6g+QhY2oHR3H5Kp8bU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
# it will try to connect to a running instance
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"deluge_client"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Lightweight pure-python rpc client for deluge";
|
||||
homepage = "https://github.com/JohnDoee/deluge-client";
|
||||
changelog = "https://github.com/JohnDoee/deluge-client/blob/${version}/CHANGELOG.rst";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
};
|
||||
|
|
|
@ -5,24 +5,26 @@
|
|||
, packaging
|
||||
, poetry-core
|
||||
, pydantic
|
||||
, pythonRelaxDepsHook
|
||||
, redis
|
||||
, structlog
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "diffsync";
|
||||
version = "1.10.0";
|
||||
version = "2.0.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "networktocode";
|
||||
repo = "diffsync";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-p7aML6dTDkF4hx67bwI29nhEHi7LIEZ5RlHPgtyQMbo=";
|
||||
hash = "sha256-4LS18FPrnGE1tM0pFzAw0+ajDaw9g7MCgIwS2ptrX9c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -33,6 +35,10 @@ buildPythonPackage rec {
|
|||
structlog
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"structlog"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"diffsync"
|
||||
];
|
||||
|
|
|
@ -0,0 +1,55 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, buildPythonPackage
|
||||
, dnspython
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pythonOlder
|
||||
, tenacity
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "linear-garage-door";
|
||||
version = "0.2.9";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IceBotYT";
|
||||
repo = "linear-garage-door";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-hWWJgZnEItYaSxka7zBHPeVlTEiOqRnA2vg6/MvpJGE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i pyproject.toml \
|
||||
-e "/--cov/d" \
|
||||
-e "/--no-cov/d"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
dnspython
|
||||
tenacity
|
||||
];
|
||||
|
||||
# Module doesn't have tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"linear_garage_door"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Control Linear Garage Doors with Python";
|
||||
homepage = "https://github.com/IceBotYT/linear-garage-door";
|
||||
changelog = "https://github.com/IceBotYT/linear-garage-door/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mkdocs-git-revision-date-localized-plugin";
|
||||
version = "1.2.2";
|
||||
version = "1.2.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "timvink";
|
||||
repo = "mkdocs-git-revision-date-localized-plugin";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-6qLVmmJzMTrvuoeSVUjWqmI6f5MbAFWAj36v2l3ZeD8=";
|
||||
hash = "sha256-sN3cuRjB3zkwp0xYoH20IJ8edXqi5rw66e3N4DuNqVU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "myuplink";
|
||||
version = "0.2.1";
|
||||
version = "0.3.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "pajzo";
|
||||
repo = "myuplink";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-wFtFRoT8JKBik5rmdZfz5CQlK4loseOovHfa08uVBo4=";
|
||||
hash = "sha256-XDsQmgP3VvWpuZWGBVW5pBsxTRZT2cl3kp1i2sb+LnM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
, lib
|
||||
, rpm
|
||||
, urllib3
|
||||
, keyring
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -23,7 +24,7 @@ buildPythonPackage rec {
|
|||
|
||||
buildInputs = [ bashInteractive ]; # needed for bash-completion helper
|
||||
nativeCheckInputs = [ rpm diffstat ];
|
||||
propagatedBuildInputs = [ urllib3 cryptography ];
|
||||
propagatedBuildInputs = [ urllib3 cryptography keyring ];
|
||||
|
||||
postInstall = ''
|
||||
install -D -m444 contrib/osc.fish $out/etc/fish/completions/osc.fish
|
||||
|
|
|
@ -7,12 +7,13 @@
|
|||
, click
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "primer3";
|
||||
version = "2.0.2";
|
||||
format = "setuptools";
|
||||
version = "2.0.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
@ -20,11 +21,12 @@ buildPythonPackage rec {
|
|||
owner = "libnano";
|
||||
repo = "primer3-py";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-v3y9nJpWc9lBKcPX/qjuezjfK0nzKIMiE0QdoLgyNj8=";
|
||||
hash = "sha256-O8BFjkjG9SfknSrK34s9EJnqTrtCf4zW9A+N+/MHl2w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
setuptools
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
gcc
|
||||
];
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pykka";
|
||||
version = "4.0.1";
|
||||
version = "4.0.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "jodal";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-SYgT69/AZX/JDm89PwFqrUL9Ll1iHRKEy78BN4QKz9Y=";
|
||||
hash = "sha256-2baFwZPNuVU39Kt5B8QvGKu7jMbg+GZ3ROoTxzPOXac=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -1,37 +1,50 @@
|
|||
{ buildPythonPackage
|
||||
{ lib
|
||||
, astroid
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy3k
|
||||
, lib
|
||||
|
||||
# pythonPackages
|
||||
, pylint
|
||||
, pylint-plugin-utils
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylint-flask";
|
||||
version = "0.6";
|
||||
format = "setuptools";
|
||||
disabled = !isPy3k;
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "05qmwgkpvaa5k05abqjxfbrfk3wpdqb8ph690z7bzxvb47i7vngl";
|
||||
hash = "sha256-9Nl94iFr97/OB8nAixZul4/p8nJd4qUKmEWpfefjFRc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
pylint
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
astroid
|
||||
pylint-plugin-utils
|
||||
];
|
||||
|
||||
# Tests require a very old version of pylint
|
||||
# also tests are only available at GitHub, with an old release tag
|
||||
# also tests are only available at GitHub, with an old release tag
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pylint_flask"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Pylint plugin to analyze Flask applications";
|
||||
homepage = "https://github.com/jschaf/pylint-flask";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [
|
||||
kamadorueda
|
||||
];
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ kamadorueda ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -39,9 +39,6 @@ buildPythonPackage rec {
|
|||
"pylint_plugin_utils"
|
||||
];
|
||||
|
||||
# https://github.com/PyCQA/pylint-plugin-utils/issues/26
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Utilities and helpers for writing Pylint plugins";
|
||||
homepage = "https://github.com/PyCQA/pylint-plugin-utils";
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymicrobot";
|
||||
version = "0.0.15";
|
||||
version = "0.0.16";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "PyMicroBot";
|
||||
inherit version;
|
||||
hash = "sha256-1uJetSJ4P4PcuvzBQBfkQHVIvLU+rdyEZDV2T28GKhg=";
|
||||
hash = "sha256-W1i1kKDM6DimcerhS5L7yEa32+cB032DrCAfhMCso4A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyroute2";
|
||||
version = "0.7.11";
|
||||
version = "0.7.12";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "svinota";
|
||||
repo = "pyroute2";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-rX/aUmL9H4dSoRngxVVX1olfGtxK93g76E6Z0CYNr2M=";
|
||||
hash = "sha256-zB792ZwDWd74YBYvQ5au0t2RWTIAqrWvNtQ/e+ZEk50=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -11,14 +11,14 @@
|
|||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "python-youtube";
|
||||
version = "0.9.3";
|
||||
version = "0.9.4";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sns-sdks";
|
||||
repo = "python-youtube";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-vd+cbESypc/q7eSrERqkMvGhVMIfKMsoxPblPJwPiUg=";
|
||||
hash = "sha256-OesJfnXI1w2d5moJyqvrWU3sCxDaqnk1bAhtK6SPjFw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -7,25 +7,31 @@
|
|||
, semver
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, toml
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "requirements-detector";
|
||||
version = "1.2.2";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "landscapeio";
|
||||
repo = pname;
|
||||
repo = "requirements-detector";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-qmrHFQRypBJOI1N6W/Dtc5ss9JGqoPhFlbqrLHcb6vc=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"astroid"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sentry-sdk";
|
||||
version = "1.40.3";
|
||||
version = "1.40.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -47,7 +47,7 @@ buildPythonPackage rec {
|
|||
owner = "getsentry";
|
||||
repo = "sentry-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-durgUKpJ5H+xd4FBpNWVtfmMlreTbvQvUaTVPoJw5wQ=";
|
||||
hash = "sha256-WyjyV1oBaRPDyawPckkgoA6JB974CNJG1h5YmmA10uo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "stanio";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-i1hqwUs1zeGq0Yjb+FgkUVxoQtyVGitBHdE4+1w1/J8=";
|
||||
hash = "sha256-3uQpMU2WXzkBga+o/3/4FERG7rWMwlR8zBCLpz5nROI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -10,15 +10,15 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "tplink-omada-client";
|
||||
version = "1.3.8";
|
||||
format = "pyproject";
|
||||
version = "1.3.11";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "tplink_omada_client";
|
||||
inherit version;
|
||||
hash = "sha256-/hWlBuqj8RuoOfY2qmha3kkqXIixwWTPKi7TjciB6Rk=";
|
||||
hash = "sha256-/mH9VqdF1l89qtAhug+ii4PCRO0PxKDr7LzvevjuZgc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "esbuild";
|
||||
version = "0.20.0";
|
||||
version = "0.20.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CJUBjDQAXSUFe37zYGbX6geeEk9goZ/aOalWDHPIZis=";
|
||||
hash = "sha256-p8ScB1mFwcc+gqmVFV/17yExP6DYZxMbHDHEiWM7/Xs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
|
||||
|
|
|
@ -13,16 +13,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "deno";
|
||||
version = "1.40.2";
|
||||
version = "1.40.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "denoland";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ycQN4BKuvK4FRYbHUKFFMVFg0LAG64xFiXbAkmQ46Cs=";
|
||||
hash = "sha256-yCKmVoNVSSp04IcmaJlX7HRzx0ZsN9mfHZTVzYIWqes=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-5OnYtVsuf6q4nQGO1+qL+2WFaKW0k13fNFS29gKaWhk=";
|
||||
cargoHash = "sha256-/rSzZxsA8ZynSat3J5ROPhD2ttrbAZykDs4RG7ww8pY=";
|
||||
|
||||
postPatch = ''
|
||||
# upstream uses lld on aarch64-darwin for faster builds
|
||||
|
|
|
@ -10,11 +10,11 @@ let
|
|||
};
|
||||
in
|
||||
fetch_librusty_v8 {
|
||||
version = "0.83.1";
|
||||
version = "0.83.2";
|
||||
shas = {
|
||||
x86_64-linux = "sha256-0cCpFMPpFWTvoU3+HThYDDTQO7DdpdVDDer5k+3HQFY=";
|
||||
aarch64-linux = "sha256-fOyJiD0raHxl+5tDWSpH/MbdBUqNY+HCKmTulYLXEYI=";
|
||||
x86_64-darwin = "sha256-JwZ1FrU/MZeEnvSPDojvDdDxIF/bdZBPRCXrjbBb7WM=";
|
||||
aarch64-darwin = "sha256-ajmr+SGj3L8TT+17NPkNcwQFESpIZuUul12Pp1oJAkY=";
|
||||
x86_64-linux = "sha256-RJNdy5jRZK3dTgrHsWuZZAHUyy1EogyNNuBekZ3Arrk=";
|
||||
aarch64-linux = "sha256-mpOmuqtd7ob6xvrgH4P/6GLa/hXTS/ok0WOYo7+7ZhI=";
|
||||
x86_64-darwin = "sha256-2o8CvJ3r5+4PLNGTySqPPDTqbU0piX4D1UtZMscMdHU=";
|
||||
aarch64-darwin = "sha256-WHeITWSHjZxfQJndxcjsp4yIERKrKXSHFZ0UBc43p8o=";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"testing": {
|
||||
"version": "6.8-rc4",
|
||||
"hash": "sha256:0nn36b2cx04p2210xm0msa8c1jl96vp0nf0bq3w8xhrl95yzj99z"
|
||||
"version": "6.8-rc5",
|
||||
"hash": "sha256:0cfv90lf0vccpasqxilr62p23qy5in5b9pz2916iifqs9sngj469"
|
||||
},
|
||||
"6.5": {
|
||||
"version": "6.5.13",
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.15.145-rt73"; # updated by ./update-rt.sh
|
||||
version = "5.15.148-rt74"; # updated by ./update-rt.sh
|
||||
branch = lib.versions.majorMinor version;
|
||||
kversion = builtins.elemAt (lib.splitString "-" version) 0;
|
||||
in buildLinux (args // {
|
||||
|
@ -18,14 +18,14 @@ in buildLinux (args // {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
|
||||
sha256 = "086nssif66s86wkixz4yb7xilz1k49g32l0ib28r8fjzc23rv95j";
|
||||
sha256 = "1n75lrck581mppx84cds1a1l5vj05cdkp8ahpry7dx6rgz4pb1f4";
|
||||
};
|
||||
|
||||
kernelPatches = let rt-patch = {
|
||||
name = "rt";
|
||||
patch = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
|
||||
sha256 = "0ddcbc1szgbb06wnp8bis7cg8idawj279867qa9kldqcws76l87p";
|
||||
sha256 = "0vbwqrkzigjfwmyxfbhq5n1g1qvyis949r97zqxhnmanq7c4njdk";
|
||||
};
|
||||
}; in [ rt-patch ] ++ kernelPatches;
|
||||
|
||||
|
|
|
@ -38,12 +38,12 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rabbitmq-server";
|
||||
version = "3.12.12";
|
||||
version = "3.12.13";
|
||||
|
||||
# when updating, consider bumping elixir version in all-packages.nix
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-lR/qwEoEH8v6oTTz6oAMlk2Tl2QSCEWV9rnU+gXX2KY=";
|
||||
hash = "sha256-UjUkiS8ay66DDzeW9EXOJPQVHHxC1sXT8mCn+KVXSQ4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync python3 ];
|
||||
|
|
|
@ -2732,7 +2732,8 @@
|
|||
limitlessled
|
||||
];
|
||||
"linear_garage_door" = ps: with ps; [
|
||||
]; # missing inputs: linear-garage-door
|
||||
linear-garage-door
|
||||
];
|
||||
"linksys_smart" = ps: with ps; [
|
||||
];
|
||||
"linode" = ps: with ps; [
|
||||
|
@ -6188,6 +6189,7 @@
|
|||
"life360"
|
||||
"lifx"
|
||||
"light"
|
||||
"linear_garage_door"
|
||||
"litterrobot"
|
||||
"livisi"
|
||||
"local_calendar"
|
||||
|
|
|
@ -195,7 +195,7 @@ let
|
|||
hash = "sha256-gFfDTc2QWBWHBCycVH1dYlCsWQMVcRZfOBIau+njtDU=";
|
||||
};
|
||||
|
||||
patches = (old.patches or []) ++ [
|
||||
patches = [
|
||||
# Fix https://nvd.nist.gov/vuln/detail/CVE-2023-49083 which has no upstream backport.
|
||||
# See https://github.com/pyca/cryptography/commit/f09c261ca10a31fe41b1262306db7f8f1da0e48a#diff-f5134bf8f3cf0a5cc8601df55e50697acc866c603a38caff98802bd8e17976c5R1893
|
||||
./python-cryptography-Cherry-pick-fix-for-CVE-2023-49083-on-cryptography-40.patch
|
||||
|
|
|
@ -6588,6 +6588,8 @@ self: super: with self; {
|
|||
|
||||
limnoria = callPackage ../development/python-modules/limnoria { };
|
||||
|
||||
linear-garage-door = callPackage ../development/python-modules/linear-garage-door { };
|
||||
|
||||
linear-operator = callPackage ../development/python-modules/linear-operator { };
|
||||
|
||||
linecache2 = callPackage ../development/python-modules/linecache2 { };
|
||||
|
|
Loading…
Reference in a new issue