Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
7045ea4c43
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, fetchurl, buildPythonApplication, libjack2, pydbus, pyliblo, pyqt5, qttools, which }:
|
||||
{ lib, fetchurl, buildPythonApplication, libjack2, pydbus, pyliblo, pyqt5, qttools, which, bash }:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "raysession";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonApplication rec {
|
|||
qttools # lrelease to build translations.
|
||||
which # which to find lrelease.
|
||||
];
|
||||
buildInputs = [ libjack2 ];
|
||||
buildInputs = [ libjack2 bash ];
|
||||
propagatedBuildInputs = [ pydbus pyliblo pyqt5 ];
|
||||
|
||||
dontWrapQtApps = true; # The program is a python script.
|
||||
|
|
|
|||
|
|
@ -160,6 +160,9 @@ in stdenv.mkDerivation rec {
|
|||
++ lib.optional tclSupport tcl
|
||||
++ lib.optional rubySupport ruby;
|
||||
|
||||
# error: '__declspec' attributes are not enabled; use '-fdeclspec' or '-fms-extensions' to enable support for __declspec attributes
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fdeclspec";
|
||||
|
||||
preConfigure = "" + lib.optionalString ftNixSupport ''
|
||||
cp ${vimPlugins.vim-nix.src}/ftplugin/nix.vim runtime/ftplugin/nix.vim
|
||||
cp ${vimPlugins.vim-nix.src}/indent/nix.vim runtime/indent/nix.vim
|
||||
|
|
|
|||
|
|
@ -8317,6 +8317,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/darfink/starsearch.vim/";
|
||||
};
|
||||
|
||||
statuscol-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "statuscol.nvim";
|
||||
version = "2023-04-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "luukvbaal";
|
||||
repo = "statuscol.nvim";
|
||||
rev = "b115b5d7a4ea5d4b152d61d89457cc874e08a7d1";
|
||||
sha256 = "026j7m8la14pfz9xqmw13gr1x8c9yx9ykqq4wa8x7cyf3a1s8z13";
|
||||
};
|
||||
meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/";
|
||||
};
|
||||
|
||||
stylish-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "stylish.nvim";
|
||||
version = "2022-02-01";
|
||||
|
|
|
|||
|
|
@ -698,6 +698,7 @@ https://github.com/cshuaimin/ssr.nvim/,HEAD,
|
|||
https://github.com/luukvbaal/stabilize.nvim/,,
|
||||
https://github.com/eigenfoo/stan-vim/,,
|
||||
https://github.com/darfink/starsearch.vim/,,
|
||||
https://github.com/luukvbaal/statuscol.nvim/,,
|
||||
https://github.com/teto/stylish.nvim/,HEAD,
|
||||
https://github.com/kvrohit/substrata.nvim/,HEAD,
|
||||
https://github.com/lambdalisue/suda.vim/,,
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "klayout";
|
||||
version = "0.28.6";
|
||||
version = "0.28.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KLayout";
|
||||
repo = "klayout";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Errpn2GHxVncum+6zriM9OrhrCDK8EtD2ZYVYPoyabk=";
|
||||
hash = "sha256-CA6PNoQtg59Mo7dKIgSVeC4owVuAirJ3mFds1J9IQtI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, fetchFromGitHub
|
||||
, gobject-introspection
|
||||
, gtk3
|
||||
, gtksourceview3
|
||||
, gtksourceview4
|
||||
, webkitgtk
|
||||
, wrapGAppsHook
|
||||
, python3Packages
|
||||
|
|
@ -10,19 +10,19 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "skytemple";
|
||||
version = "1.3.10";
|
||||
version = "1.4.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SkyTemple";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-CyYGTXdQsGpDR/gpqViEQO1xUPHaXTES592nRJixa1o=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-NK0yLxs7/pVpl9LCz6ggYsaUDuEAj6edBEPC+4yCxNM=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
gobject-introspection
|
||||
gtk3
|
||||
gtksourceview3
|
||||
gtksourceview4
|
||||
# webkitgkt is used for rendering interactive statistics graph which
|
||||
# can be seen by opening a ROM, entering Pokemon section, selecting
|
||||
# any Pokemon, and clicking Stats and Moves tab.
|
||||
|
|
@ -52,7 +52,7 @@ python3Packages.buildPythonApplication rec {
|
|||
skytemple-icons
|
||||
skytemple-ssb-debugger
|
||||
tilequant
|
||||
];
|
||||
] ++ skytemple-files.optional-dependencies.spritecollab;
|
||||
|
||||
doCheck = false; # there are no tests
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "temporal";
|
||||
version = "1.20.0";
|
||||
version = "1.20.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "temporalio";
|
||||
repo = "temporal";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-YZzGAOPCljTMmyt1t0gjbgn+IelntCo/275+SjOJiJE=";
|
||||
hash = "sha256-2xer6W8pSZttjn5m5GgTOpHyXx2rE4qRZsBZzxwWh4o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-UMqkgQsnOxFcXgbm+oi3JGjqmbwaKEh6s5bzivGVAM8=";
|
||||
vendorHash = "sha256-Fo/xePou96KdFlUNIqhDZX4TJoYXqlMyuLDvmR/XreY=";
|
||||
|
||||
excludedPackages = [ "./build" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rssguard";
|
||||
version = "4.3.3";
|
||||
version = "4.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "martinrotter";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-dSnPQbCPXREMOeqyn17BEi29soeVfrThnDBqdti5BiA=";
|
||||
sha256 = "sha256-1xoMymsx5Z8oZzZtPzLWaOs0zy/E0pIsLpHgZlVdgSw=";
|
||||
};
|
||||
|
||||
buildInputs = [ qtwebengine qttools ];
|
||||
|
|
|
|||
|
|
@ -1,68 +0,0 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, alacritty
|
||||
, cage
|
||||
, cairo
|
||||
, libxkbcommon
|
||||
, makeWrapper
|
||||
, mesa
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, udev
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, wlroots
|
||||
, xwayland
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wio";
|
||||
version = "0.pre+unstable=2021-06-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "museoa";
|
||||
repo = pname;
|
||||
rev = "e0b258777995055d69e61a0246a6a64985743f42";
|
||||
sha256 = "sha256-8H9fOnZsNjjq9XvOv68F4RRglGNluxs5/jp/h4ROLiI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
cairo
|
||||
libxkbcommon
|
||||
mesa # for libEGL
|
||||
udev
|
||||
wayland
|
||||
wayland-protocols
|
||||
wlroots
|
||||
xwayland
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/wio \
|
||||
--prefix PATH ":" "${lib.makeBinPath [ alacritty cage ]}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wio-project.org/";
|
||||
description = "That Plan 9 feel, for Wayland";
|
||||
longDescription = ''
|
||||
Wio is a Wayland compositor for Linux and FreeBSD which has a similar look
|
||||
and feel to plan9's rio.
|
||||
'';
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
inherit (wayland.meta) platforms;
|
||||
};
|
||||
|
||||
passthru.providedSessions = [ "wio" ];
|
||||
}
|
||||
# TODO: factor Linux-specific options
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-pop-shell";
|
||||
version = "unstable-2023-04-05";
|
||||
version = "unstable-2023-04-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "shell";
|
||||
rev = "a3a1b7bb832838fec2ea875954d33443fc680912";
|
||||
hash = "sha256-B82UKtJRDDejBX1UBBIjPRO8rzHNapJRi8wv6dT7oJ8=";
|
||||
rev = "b5acccefcaa653791d25f70a22c0e04f1858d96e";
|
||||
hash = "sha256-w6EBHKWJ4L3ZRVmFqZhCqHGumbElQXk9udYSnwjIl6c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ glib nodePackages.typescript gjs ];
|
||||
|
|
|
|||
|
|
@ -108,6 +108,59 @@ let
|
|||
|
||||
name_ = name;
|
||||
|
||||
validatePythonMatches = attrName: let
|
||||
isPythonModule = drv:
|
||||
# all pythonModules have the pythonModule attribute
|
||||
(drv ? "pythonModule")
|
||||
# Some pythonModules are turned in to a pythonApplication by setting the field to false
|
||||
&& (!builtins.isBool drv.pythonModule);
|
||||
isMismatchedPython = drv: drv.pythonModule != python;
|
||||
|
||||
optionalLocation = let
|
||||
pos = builtins.unsafeGetAttrPos (if attrs ? "pname" then "pname" else "name") attrs;
|
||||
in if pos == null then "" else " at ${pos.file}:${toString pos.line}:${toString pos.column}";
|
||||
|
||||
leftPadName = name: against: let
|
||||
len = lib.max (lib.stringLength name) (lib.stringLength against);
|
||||
in lib.strings.fixedWidthString len " " name;
|
||||
|
||||
throwMismatch = drv: let
|
||||
myName = "'${namePrefix}${name}'";
|
||||
theirName = "'${drv.name}'";
|
||||
in throw ''
|
||||
Python version mismatch in ${myName}:
|
||||
|
||||
The Python derivation ${myName} depends on a Python derivation
|
||||
named ${theirName}, but the two derivations use different versions
|
||||
of Python:
|
||||
|
||||
${leftPadName myName theirName} uses ${python}
|
||||
${leftPadName theirName myName} uses ${toString drv.pythonModule}
|
||||
|
||||
Possible solutions:
|
||||
|
||||
* If ${theirName} is a Python library, change the reference to ${theirName}
|
||||
in the ${attrName} of ${myName} to use a ${theirName} built from the same
|
||||
version of Python
|
||||
|
||||
* If ${theirName} is used as a tool during the build, move the reference to
|
||||
${theirName} in ${myName} from ${attrName} to nativeBuildInputs
|
||||
|
||||
* If ${theirName} provides executables that are called at run time, pass its
|
||||
bin path to makeWrapperArgs:
|
||||
|
||||
makeWrapperArgs = [ "--prefix PATH : ''${lib.makeBinPath [ ${lib.getName drv } ] }" ];
|
||||
|
||||
${optionalLocation}
|
||||
'';
|
||||
|
||||
checkDrv = drv:
|
||||
if (isPythonModule drv) && (isMismatchedPython drv)
|
||||
then throwMismatch drv
|
||||
else drv;
|
||||
|
||||
in inputs: builtins.map (checkDrv) inputs;
|
||||
|
||||
# Keep extra attributes from `attrs`, e.g., `patchPhase', etc.
|
||||
self = toPythonModule (stdenv.mkDerivation ((builtins.removeAttrs attrs [
|
||||
"disabled" "checkPhase" "checkInputs" "nativeCheckInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "format"
|
||||
|
|
@ -149,14 +202,14 @@ let
|
|||
pythonOutputDistHook
|
||||
] ++ nativeBuildInputs;
|
||||
|
||||
buildInputs = buildInputs ++ pythonPath;
|
||||
buildInputs = validatePythonMatches "buildInputs" (buildInputs ++ pythonPath);
|
||||
|
||||
propagatedBuildInputs = propagatedBuildInputs ++ [
|
||||
propagatedBuildInputs = validatePythonMatches "propagatedBuildInputs" (propagatedBuildInputs ++ [
|
||||
# we propagate python even for packages transformed with 'toPythonApplication'
|
||||
# this pollutes the PATH but avoids rebuilds
|
||||
# see https://github.com/NixOS/nixpkgs/issues/170887 for more context
|
||||
python
|
||||
];
|
||||
]);
|
||||
|
||||
inherit strictDeps;
|
||||
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncsleepiq";
|
||||
version = "1.2.3";
|
||||
version = "1.3.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-X+bJyzQxWJaS1/KNOE/3zQKSbwUpm9XN35HYf6s+BPs=";
|
||||
hash = "sha256-eW6iSGuaZ/cQZKN55b6tHsBPdYglxGYt7OoxV7czB8w=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -31,6 +31,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Async interface to SleepIQ API";
|
||||
homepage = "https://github.com/kbickar/asyncsleepiq";
|
||||
changelog = "https://github.com/kbickar/asyncsleepiq/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,21 +1,47 @@
|
|||
{ buildPythonPackage, fetchPypi, lib
|
||||
, authres, dnspython, dkimpy, publicsuffix2
|
||||
{ lib
|
||||
, authres
|
||||
, buildPythonPackage
|
||||
, dkimpy
|
||||
, dnspython
|
||||
, fetchFromGitHub
|
||||
, publicsuffix2
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "authheaders";
|
||||
version = "0.15.1";
|
||||
version = "0.15.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-90rOvu+CbHtammrMDZpPx7rIboIT2X/jL1GtfjpmuOk=";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ValiMail";
|
||||
repo = "authentication-headers";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-vtLt7JUdLF0gBWgMzP65UAR6A9BnTech5n0alFErcSQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ authres dnspython dkimpy publicsuffix2 ];
|
||||
propagatedBuildInputs = [
|
||||
authres
|
||||
dnspython
|
||||
dkimpy
|
||||
publicsuffix2
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"authheaders"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for the generation of email authentication headers";
|
||||
homepage = "https://github.com/ValiMail/authentication-headers";
|
||||
changelog = "https://github.com/ValiMail/authentication-headers/blob${version}/CHANGES";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bashlex";
|
||||
version = "0.16";
|
||||
version = "0.18";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
|
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
|||
owner = "idank";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-vpcru/ax872WK3XuRQWTmTD9zRdObn2Bit6kY9ZIQaI=";
|
||||
hash = "sha256-ddZN91H95RiTLXx4lpES1Dmz7nNsSVUeuFuOEpJ7LQI=";
|
||||
};
|
||||
|
||||
# workaround https://github.com/idank/bashlex/issues/51
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bellows";
|
||||
version = "0.35.1";
|
||||
version = "0.35.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "zigpy";
|
||||
repo = "bellows";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-o2806cXjtt+yMeSdpEq4KOlIlDsvf7qCUO2TBzkt5uY=";
|
||||
hash = "sha256-I9PXFdRXHQ7OnzCdB631nlfnkpConl+j5Z3iiH7RcA4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bumps";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-BY9kg0ksKfrpQgsl1aDDJJ+zKJmURqwTtKxlITxse+o=";
|
||||
hash = "sha256-J8NeV9FCUC5dLkosBzVrovxiJJbeuj8Xc50NGEI9Bms=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -31,6 +31,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Data fitting with bayesian uncertainty analysis";
|
||||
homepage = "https://bumps.readthedocs.io/";
|
||||
changelog = "https://github.com/bumps/bumps/releases/tag/v${version}";
|
||||
license = licenses.publicDomain;
|
||||
maintainers = with maintainers; [ rprospero ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "can";
|
||||
version = "4.1.0";
|
||||
version = "4.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
|||
owner = "hardbyte";
|
||||
repo = "python-can";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-jNy47SapujTF3ReJtIbwUY53IftIH4cXZjkzHrnZMFQ=";
|
||||
hash = "sha256-KY+WViWcKbrO6SO6cIo5dWylyBDEdmAR6wYwJogeCjs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "censys";
|
||||
version = "2.1.9";
|
||||
version = "2.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
owner = "censys";
|
||||
repo = "censys-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-BB/pLpPK2qh5902bZp9QM3Wiu/l48pzq7HcjaAtM4D0=";
|
||||
hash = "sha256-CtW6EN9oH/OIZ4XaoSuKlMYK9Mh/ewRs6y34xbfY234=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, antlr4
|
||||
, antlr4-python3-runtime
|
||||
, igraph
|
||||
|
|
@ -11,27 +10,19 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "explorerscript";
|
||||
version = "0.1.1";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SkyTemple";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1vzyliiyrxx8l9sfbqcyr4xn5swd7znkxy69kn0vb5rban8hm9c1";
|
||||
sha256 = "sha256-REQYyxB2sb/gG54+OkMw+M4Agg9SWfAyqAhiSNnd3tE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
antlr4
|
||||
];
|
||||
|
||||
patches = [
|
||||
# https://github.com/SkyTemple/ExplorerScript/pull/17
|
||||
(fetchpatch {
|
||||
url = "https://github.com/SkyTemple/ExplorerScript/commit/47d8b3d246881d675a82b4049b87ed7d9a0e1b15.patch";
|
||||
sha256 = "0sadw9l2nypl2s8lw526lvbdj4rzqdvrjncx4zxxgyp3x47csb48";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i "s/antlr4-python3-runtime.*/antlr4-python3-runtime',/" setup.py
|
||||
antlr -Dlanguage=Python3 -visitor explorerscript/antlr/{ExplorerScript,SsbScript}.g4
|
||||
|
|
|
|||
|
|
@ -27,14 +27,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-auth";
|
||||
version = "2.17.1";
|
||||
version = "2.17.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-jzebRrrTga0qC5id+wwTrSjTwqefJzSCE/iUah0V1Vo=";
|
||||
hash = "sha256-zjEeK8WLEw/d8xbfV8mzlDwqe09uwx3pZjqTM+QGTvw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-dlp";
|
||||
version = "3.12.0";
|
||||
version = "3.12.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-v874eaWthn7DD9Sxg+hrXr/93k7u591h0GL68wwmeP4=";
|
||||
hash = "sha256-KBqnGp56U2lGLo/2MWu5kfHr7pfIJJDT857+xnrK+iU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-pubsub";
|
||||
version = "2.15.0";
|
||||
version = "2.16.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-PKVX/A1AT3EqHahBLnGlXNY7aiZZdbCmvsQ/+KNV7UA=";
|
||||
hash = "sha256-WH2n1TXKhYzu7XA2IFNV5abdPkTqSryW9OUNGr/YhDs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -17,14 +17,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-spanner";
|
||||
version = "3.31.0";
|
||||
version = "3.32.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-gVQL0boXV/4vaYBpSM8Qli8do3YC7X5ULJeepE2LDUo=";
|
||||
hash = "sha256-/2ktwVBV6CmEKrX8cngxmeOz4Hwhpw2ThOX1rA/yYeQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-resumable-media";
|
||||
version = "2.4.1";
|
||||
version = "2.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Fbii5130LcZQLRMG2wvOJke6YBP5zQO24XNowIhu6Qo=";
|
||||
hash = "sha256-IYkx6OKypzpY6zVKKI4DoP1fscRYMmGsbkwHhmZGjJM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "graphene";
|
||||
version = "3.2.1";
|
||||
version = "3.2.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "graphql-python";
|
||||
repo = "graphene";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-XnrzgPkkFsTgNE9J+eSkD8f5MokKjtZhbbE/dxNZryk=";
|
||||
hash = "sha256-kwF6oXp06w7r1PbPoJTCQ9teTExYMoqvIZDhtv5QNn8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "gvm-tools";
|
||||
version = "23.3.0";
|
||||
version = "23.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "greenbone";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-sv34PwOEWGsIgSNpUcqvwjJ+6FSrmpXNB5gc47EjFU0=";
|
||||
hash = "sha256-L7GR50nlcm2EQ6YxLAfieQJ+vPUrCrj72KNSY73LFko=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "2023.4.2";
|
||||
version = "2023.4.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-cMrp0IewFezXpuXDnXDoDmEge/2NWRlhqkBmIwBjlrE=";
|
||||
hash = "sha256-5wUx0S3Wg30Kn6RAkybAOMQqRvVDt9HeIJyTPCVHqRc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "isbnlib";
|
||||
version = "3.10.13";
|
||||
version = "3.10.14";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Rnk0H1ag35HGNeg4oiLOfxB1XLW8yVSOP3qK/1Z009Q=";
|
||||
hash = "sha256-lvkIZMd7AfVfoR5b/Kn9kJUB2YQvO8cQ1Oq4UZXZBTk=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
@ -37,6 +37,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Extract, clean, transform, hyphenate and metadata for ISBNs";
|
||||
homepage = "https://github.com/xlcnd/isbnlib";
|
||||
changelog = "https://github.com/xlcnd/isbnlib/blob/v${version}/CHANGES.txt";
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "msal";
|
||||
version = "1.21.0";
|
||||
version = "1.22.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-lrXIZ4MP0Rbl99DsjvGyOLTNpNGuqG2P7PUYJg4Tb78=";
|
||||
hash = "sha256-ioL1N1ZCwWJciQWAGEMClMEJRA3OQupmfUZsLKtSCs0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pex";
|
||||
version = "2.1.131";
|
||||
version = "2.1.134";
|
||||
format = "flit";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-eG1giXUuQfxROe0H8ZhU0qde8LZwRXy6YCiT54mZ6q4=";
|
||||
hash = "sha256-hVh8N/eTJL5HpxIUkLsnD985zm1pGnD5YDgwJ/3N6dU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
33
pkgs/development/python-modules/pmdsky-debug-py/default.nix
Normal file
33
pkgs/development/python-modules/pmdsky-debug-py/default.nix
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
#This package is auto-generated. It could totally be possible to generate it from upstream, but seems unecessary
|
||||
buildPythonPackage rec {
|
||||
pname = "pmdsky-debug-py";
|
||||
version = "4.0.0";
|
||||
# SkyTemple specifically require this version. This is used when patching the binary,
|
||||
# and risk to be a bit problematic if using the latest version, given it doesn’t follow semver.
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SkyTemple";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-iRiUZoyWAkFGPvRyQRWvI0210Vk2jPS0PSCCCns5yJI=";
|
||||
};
|
||||
|
||||
prePatch = "cd src";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Autogenerated and statically check-able pmdsky-debug symbol definitions for Python";
|
||||
homepage = "https://github.com/SkyTemple/pmdsky-debug-py";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ marius851000 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pontos";
|
||||
version = "23.4.7";
|
||||
version = "23.4.9";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
owner = "greenbone";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-8EZzxVluFl/EnnJZpu3Mo1KtZVIC36/UvgBeUaPLouo=";
|
||||
hash = "sha256-rShSVoDL5jY1xCZ6O9jUdGpErMMmq91Ypb0rBoTApIQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "py-desmume";
|
||||
version = "0.0.4.post2";
|
||||
version = "0.0.5.post0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
owner = "SkyTemple";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-a819+K/Ovnz53ViDKpUGGjeblWvrAO5ozt/tizdLKCY=";
|
||||
hash = "sha256-q6E7J7e0yXt+jo1KNqqAw2cG/Us+Tw0dLfTqAKWfAlc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -64,6 +64,6 @@ buildPythonPackage rec {
|
|||
description = "Python library to interface with DeSmuME, the Nintendo DS emulator";
|
||||
homepage = "https://github.com/SkyTemple/py-desmume";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ xfix ];
|
||||
maintainers = with maintainers; [ marius851000 xfix ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,17 +8,18 @@
|
|||
, pytest-asyncio
|
||||
, pytest-cases
|
||||
, pytestCheckHook
|
||||
, pytz
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysiaalarm";
|
||||
version = "3.0.2";
|
||||
version = "3.1.1";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-hS0OaafYjRdPVSCOHfb2zKp0tEOl1LyMJpwnpvsvALs=";
|
||||
hash = "sha256-q42bsBeAwU9lt7wtYGFJv23UBND+aMXZJlSWyTfZDQE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -35,6 +36,7 @@ buildPythonPackage rec {
|
|||
propagatedBuildInputs = [
|
||||
dataclasses-json
|
||||
pycryptodome
|
||||
pytz
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
@ -51,6 +53,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python package for creating a client that talks with SIA-based alarm systems";
|
||||
homepage = "https://github.com/eavanvalkenburg/pysiaalarm";
|
||||
changelog = "https://github.com/eavanvalkenburg/pysiaalarm/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-engineio";
|
||||
version = "4.4.0";
|
||||
version = "4.4.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "miguelgrinberg";
|
||||
repo = "python-engineio";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-pixLk9Q7mIw1ReFemDu039lJtCwqi73tvhXl0KhKvgw=";
|
||||
hash = "sha256-sE6AlT01Rou427i9w+xwUTMflKxUr0Heqt2l+Y2AMmU=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvizio";
|
||||
version = "0.1.60";
|
||||
version = "0.1.61";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-RwwZDb4mQJZw8w1sTFJ0eM3az4pDQbVLGtA+anyKEJM=";
|
||||
sha256 = "sha256-AtqMWe2zgRqOp5S9oKq7keHNHM8pnTmV1mfGiVzygTc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,34 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "range-typed-integers";
|
||||
version = "1.0.1";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "theCapypara";
|
||||
repo = "range-typed-integers";
|
||||
rev = version;
|
||||
sha256 = "sha256-4+XdalHq6Q2cBbuYi4x7kmCNQh1MwYf+XlLP9FzzzgE=";
|
||||
};
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A package provides integer types that have a specific range of valid values";
|
||||
homepage = "https://github.com/theCapypara/range-typed-integers";
|
||||
license = [ licenses.mit ];
|
||||
maintainers = with maintainers; [ marius851000 ];
|
||||
};
|
||||
}
|
||||
40
pkgs/development/python-modules/sectools/default.nix
Normal file
40
pkgs/development/python-modules/sectools/default.nix
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, ldap3
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sectools";
|
||||
version = "1.3.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "p0dalirius";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-F9mmPSlfSSS7UDNuX9OPrqDsEpqq0bD3eROG8D9CC78=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ldap3
|
||||
];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"sectools"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "library containing functions to write security tools";
|
||||
homepage = "https://github.com/p0dalirius/sectools";
|
||||
changelog = "https://github.com/p0dalirius/sectools/releases/tag/${version}";
|
||||
license = with licenses; [ gpl3Only ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,16 +1,40 @@
|
|||
{ stdenv, lib, buildPythonPackage, fetchFromGitHub, appdirs, dungeon-eos, explorerscript
|
||||
, ndspy, pillow, setuptools, skytemple-rust, tilequant, armips
|
||||
{ stdenv
|
||||
, lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, appdirs
|
||||
, dungeon-eos
|
||||
, explorerscript
|
||||
, ndspy
|
||||
, pillow
|
||||
, setuptools
|
||||
, skytemple-rust
|
||||
, tilequant
|
||||
, pyyaml
|
||||
, pmdsky-debug-py
|
||||
, typing-extensions
|
||||
, pythonOlder
|
||||
, # optional dependancies for SpriteCollab
|
||||
aiohttp
|
||||
, lru-dict
|
||||
, graphql-core
|
||||
, gql
|
||||
, armips
|
||||
# tests
|
||||
, pytestCheckHook
|
||||
, parameterized
|
||||
, xmldiff
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "skytemple-files";
|
||||
version = "1.3.9";
|
||||
version = "1.4.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SkyTemple";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-Z/jbr9o0WKPjkAsfZzxuwAKKdwYV3rLGkUMlMgyC5s0=";
|
||||
hash = "sha256-SLRZ9ThrH2UWqfr5BbjJKDM/SRkCfMNK70XZT4+Ks7w=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -21,9 +45,37 @@ buildPythonPackage rec {
|
|||
|
||||
buildInputs = [ armips ];
|
||||
|
||||
propagatedBuildInputs = [ appdirs dungeon-eos explorerscript ndspy pillow setuptools skytemple-rust tilequant ];
|
||||
propagatedBuildInputs = [
|
||||
appdirs
|
||||
dungeon-eos
|
||||
explorerscript
|
||||
ndspy
|
||||
pillow
|
||||
setuptools
|
||||
skytemple-rust
|
||||
tilequant
|
||||
pyyaml
|
||||
pmdsky-debug-py
|
||||
] ++ lib.optionals (pythonOlder "3.9") [
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
spritecollab = [
|
||||
aiohttp
|
||||
gql
|
||||
graphql-core
|
||||
lru-dict
|
||||
] ++ gql.optional-dependencies.aiohttp;
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook parameterized xmldiff ] ++ passthru.optional-dependencies.spritecollab;
|
||||
pytestFlagsArray = "test/";
|
||||
disabledTestPaths = [
|
||||
"test/skytemple_files_test/common/spritecollab/sc_online_test.py"
|
||||
"test/skytemple_files_test/compression_container/atupx/atupx_test.py" # Particularly long test
|
||||
];
|
||||
|
||||
doCheck = false; # requires Pokémon Mystery Dungeon ROM
|
||||
pythonImportsCheck = [ "skytemple_files" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -5,27 +5,30 @@
|
|||
, libiconv
|
||||
, Foundation
|
||||
, rustPlatform
|
||||
, setuptools-rust }:
|
||||
, setuptools-rust
|
||||
, range-typed-integers
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "skytemple-rust";
|
||||
version = "1.3.7";
|
||||
version = "1.4.0.post0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SkyTemple";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-rC7KA79va8gZpMKJQ7s3xYdbopNqmWdRYDCbaWaxsR0=";
|
||||
hash = "sha256-aw57B15sDbMcdNPD8MW+O7AdqSSqjlOcuXNSm10GdPM=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-lXPCxRbaqUC5EfyeBPtJDuGADYOA+DWMaOZRwXppP8E=";
|
||||
hash = "sha256-SvHrMr5k4afVdU5nvg+bcoHVmzHYyoOYqv7nOSVxRCE=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ];
|
||||
nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]);
|
||||
propagatedBuildInputs = [ range-typed-integers ];
|
||||
|
||||
GETTEXT_SYSTEM = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,20 +1,31 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, gobject-introspection, gtk3, gtksourceview3
|
||||
, wrapGAppsHook, nest-asyncio, pycairo, py-desmume, pygtkspellcheck, setuptools
|
||||
, skytemple-files, skytemple-icons
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, gobject-introspection
|
||||
, gtk3
|
||||
, gtksourceview4
|
||||
, wrapGAppsHook
|
||||
, nest-asyncio
|
||||
, pycairo
|
||||
, py-desmume
|
||||
, pygtkspellcheck
|
||||
, setuptools
|
||||
, skytemple-files
|
||||
, skytemple-icons
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "skytemple-ssb-debugger";
|
||||
version = "1.3.8.post2";
|
||||
version = "1.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SkyTemple";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-dd0qsSNBwxuSopjz2PLqEFddZpvMgeJIjBXY5P6OAow=";
|
||||
hash = "sha256-/LBz0PCQI3QOAmOZk6Jynqi/+NN0w8gbY/S3YckRZ68=";
|
||||
};
|
||||
|
||||
buildInputs = [ gobject-introspection gtk3 gtksourceview3 ];
|
||||
buildInputs = [ gobject-introspection gtk3 gtksourceview4 ];
|
||||
nativeBuildInputs = [ gobject-introspection wrapGAppsHook ];
|
||||
propagatedBuildInputs = [
|
||||
nest-asyncio
|
||||
|
|
|
|||
|
|
@ -9,17 +9,9 @@
|
|||
, sortedcollections
|
||||
}:
|
||||
|
||||
let
|
||||
aikku93-tilequant = fetchFromGitHub {
|
||||
owner = "SkyTemple";
|
||||
repo = "aikku93-tilequant";
|
||||
rev = "6604e0906edff384b6c8d4cde03e6601731f66fd";
|
||||
sha256 = "0w19h3n2i0xriqsy0b0rifjgbv4hqd7gl78fw0cappkrdykij5r1";
|
||||
};
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "tilequant";
|
||||
version = "0.4.0.post0";
|
||||
version = "0.4.1.post0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -28,13 +20,10 @@ buildPythonPackage rec {
|
|||
owner = "SkyTemple";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "189af203iay3inj1bbgm3hh1fshn879bcm28ypbvfp27fy7j5b25";
|
||||
hash = "sha256-7vU/AYnX7deOH3PjrseRIj9BUJMWzDlwR3UcMpBRyfc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
cp -R --no-preserve=mode ${aikku93-tilequant} __aikku93_tilequant
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
gitpython
|
||||
];
|
||||
|
|
@ -56,6 +45,6 @@ buildPythonPackage rec {
|
|||
description = "Tool for quantizing image colors using tile-based palette restrictions";
|
||||
homepage = "https://github.com/SkyTemple/tilequant";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ xfix ];
|
||||
maintainers = with maintainers; [ marius851000 xfix ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-public-api";
|
||||
version = "0.28.0";
|
||||
version = "0.29.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-lItbWIY9CytvcLmASkbbF5wLYKWrXn2Gl9mgccg9J0M=";
|
||||
hash = "sha256-Tf2nAisZlKPalWa0T5XDAWy+d/ERJYtzJVb3gEdcGSo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-6Eula3fex0KhWhBR53K0Kl0nlbqpfZfD/Y3zrEURPmc=";
|
||||
cargoHash = "sha256-X+4C/ExKAVvAX11dBcJHhV7WW/EUI1zk3UR8mBQkSY4=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, lib, fetchFromGitHub, runCommand, unzip, meson, ninja, pkg-config, qtbase, qttools, wrapQtAppsHook, luajit }:
|
||||
let
|
||||
dataVersion = "2.28.0";
|
||||
dataVersion = "2.29.0";
|
||||
frontendVersion = "unstable-2023-04-09";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation {
|
|||
owner = "PathOfBuildingCommunity";
|
||||
repo = "PathOfBuilding";
|
||||
rev = "v${dataVersion}";
|
||||
hash = "sha256-IO6qUE6OcjNibljNzcJQlwji3DZqrBm7cvHedKuAwpM=";
|
||||
hash = "sha256-uG+Qb50+oG5yd67w2WgnatKpq+/0UA8IfJeJXRKnQXU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
version = "2.8.0";
|
||||
version = "2.8.1";
|
||||
pname = "grafana-loki";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "loki";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RPa3G1zrWzunyQOdNUQ/dZGJ/7sh2OGvoEqeYaT7Qv0=";
|
||||
hash = "sha256-kMVbswnq8hnPv/QmvPXmOL4QOTHyuKvgQ6+CNX0DunQ=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "zfs_exporter";
|
||||
version = "2.2.7";
|
||||
version = "2.2.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pdf";
|
||||
repo = pname;
|
||||
rev = "v" + version;
|
||||
hash = "sha256-bc9bmGrRGhm58JzrVLLJBUc1zaGXqz2fqx+ZphidFbc=";
|
||||
hash = "sha256-NTlYMznUfDfLftvuR5YWOW4Zu0rWfLkKPHPTrD/62+Q=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-jQiw3HlqWcsjdadDdovCsDMBB3rnWtacfbtzDb5rc9c=";
|
||||
vendorHash = "sha256-ZJRxH9RhNSnVmcsonaakbvvjQ+3ovnyMny1Pe/vyQxE=";
|
||||
|
||||
postInstall = ''
|
||||
install -Dm444 -t $out/share/doc/${pname} *.md
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mysql-connector-java";
|
||||
version = "8.0.31";
|
||||
version = "8.0.33";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-${version}.zip";
|
||||
sha256 = "sha256-Wo86n/4mono7YAagI/5Efm/X+2jjpOPaFSCMNAB6btI=";
|
||||
sha256 = "sha256-k3jft7sM2xrc88mdhltxtm+SZcRAn6B4EvglMyJyX4Y=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "qovery-cli";
|
||||
version = "0.58.7";
|
||||
version = "0.58.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Qovery";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-96tbVlFvKe8ExgOhTeiDiq51NHTrh1BzBVp6omcydXg=";
|
||||
hash = "sha256-MwBj1rrj23SBOKDV60EI/WqXy+zqT+43IWnjFdrDT+Q=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-w40zewXGB76kMgP0GzUtyncBBnCDgxcGJ7EO107WWN0=";
|
||||
vendorHash = "sha256-WeHcB1yETbnTVxtccPf3q0JNwLDbTJyKKme02Xnfy60=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
karchive, kcoreaddons, kcrash, kiconthemes, kwidgetsaddons, solid, qgpgme }:
|
||||
mkDerivation rec {
|
||||
pname = "isoimagewriter";
|
||||
version = "0.9.2";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/unstable/${pname}/${version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-c6cHnGVKPOw/cGXlKWsc40/1ZbiUJH/H+XmffE0MQcU=";
|
||||
url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-ppAiMD7Bvra3tPDWjlnkGZ08mGh2fLnrI8bdGZngal0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ];
|
||||
|
|
|
|||
38
pkgs/tools/security/apachetomcatscanner/default.nix
Normal file
38
pkgs/tools/security/apachetomcatscanner/default.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "apachetomcatscanner";
|
||||
version = "3.5";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "p0dalirius";
|
||||
repo = "ApacheTomcatScanner";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ChVVXUjm6y71iRs64Kv63oiOG1GSqmx6J0YiGtEI0ao=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
requests
|
||||
sectools
|
||||
xlsxwriter
|
||||
];
|
||||
|
||||
# Project has no test
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"apachetomcatscanner"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to scan for Apache Tomcat server vulnerabilities";
|
||||
homepage = "https://github.com/p0dalirius/ApacheTomcatScanner";
|
||||
changelog = "https://github.com/p0dalirius/ApacheTomcatScanner/releases/tag/${version}";
|
||||
license = with licenses; [ gpl2Only ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1721,6 +1721,7 @@ mapAliases ({
|
|||
weechat-matrix-bridge = throw "'weechat-matrix-bridge' has been renamed to/replaced by 'weechatScripts.weechat-matrix-bridge'"; # Converted to throw 2022-02-22
|
||||
weighttp = throw "weighttp has been removed: abandoned by upstream"; # Added 2022-04-20
|
||||
whirlpool-gui = throw "whirlpool-gui has been removed as it depended on an insecure version of Electron"; # added 2022-02-08
|
||||
wio = throw "wio has been removed from nixpkgs, it was unmaintained and required wlroots_0_14 at the time of removal"; # Added 2023-04-28
|
||||
wicd = throw "wicd has been removed as it is abandoned"; # Added 2021-09-11
|
||||
wineFull = throw "'wineFull' has been renamed to/replaced by 'winePackages.full'"; # Converted to throw 2022-02-22
|
||||
wineMinimal = throw "'wineMinimal' has been renamed to/replaced by 'winePackages.minimal'"; # Converted to throw 2022-02-22
|
||||
|
|
|
|||
|
|
@ -1407,6 +1407,8 @@ with pkgs;
|
|||
|
||||
apache-airflow = with python3.pkgs; toPythonApplication apache-airflow;
|
||||
|
||||
apachetomcatscanner = callPackage ../tools/security/apachetomcatscanner { };
|
||||
|
||||
airsonic = callPackage ../servers/misc/airsonic { };
|
||||
|
||||
airspy = callPackage ../applications/radio/airspy { };
|
||||
|
|
@ -34837,10 +34839,6 @@ with pkgs;
|
|||
electron = electron_19;
|
||||
};
|
||||
|
||||
wio = callPackage ../applications/window-managers/wio {
|
||||
wlroots = wlroots_0_14;
|
||||
};
|
||||
|
||||
windowlab = callPackage ../applications/window-managers/windowlab { };
|
||||
|
||||
windowmaker = callPackage ../applications/window-managers/windowmaker { };
|
||||
|
|
@ -35434,6 +35432,15 @@ with pkgs;
|
|||
boost = boost175;
|
||||
inherit (darwin) autoSignDarwinBinariesHook;
|
||||
};
|
||||
elementsd-simplicity = elementsd.overrideAttrs (_: rec {
|
||||
version = "unstable-2023-04-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ElementsProject";
|
||||
repo = "elements";
|
||||
rev = "ea318a45094ab3d31dd017d7781a6f28f1ffaa33"; # simplicity branch latest
|
||||
sha256 = "ooe+If3HWaJWpr2ux7DpiCTqB9Hv+aXjquEjplDjvhM=";
|
||||
};
|
||||
});
|
||||
|
||||
ergo = callPackage ../applications/blockchains/ergo { };
|
||||
|
||||
|
|
|
|||
|
|
@ -7665,6 +7665,8 @@ self: super: with self; {
|
|||
|
||||
pmw = callPackage ../development/python-modules/pmw { };
|
||||
|
||||
pmdsky-debug-py = callPackage ../development/python-modules/pmdsky-debug-py { };
|
||||
|
||||
pnglatex = callPackage ../development/python-modules/pnglatex { };
|
||||
|
||||
pocket = callPackage ../development/python-modules/pocket { };
|
||||
|
|
@ -10124,6 +10126,8 @@ self: super: with self; {
|
|||
|
||||
random2 = callPackage ../development/python-modules/random2 { };
|
||||
|
||||
range-typed-integers = callPackage ../development/python-modules/range-typed-integers { };
|
||||
|
||||
rangehttpserver = callPackage ../development/python-modules/rangehttpserver { };
|
||||
|
||||
rapidfuzz = callPackage ../development/python-modules/rapidfuzz { };
|
||||
|
|
@ -10712,6 +10716,8 @@ self: super: with self; {
|
|||
|
||||
securetar = callPackage ../development/python-modules/securetar { };
|
||||
|
||||
sectools = callPackage ../development/python-modules/sectools { };
|
||||
|
||||
seedir = callPackage ../development/python-modules/seedir { };
|
||||
|
||||
seekpath = callPackage ../development/python-modules/seekpath { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue