colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2023-03-01 00:03:05 +00:00 committed by GitHub
commit 758a48fae4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
48 changed files with 11602 additions and 7835 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/ArchiSteamFarm/default.nix
View File

@ -13,13 +13,13 @@
buildDotnetModule rec {
pname = "archisteamfarm";
# nixpkgs-update: no auto update
version = "5.4.1.11";
version = "5.4.2.13";
src = fetchFromGitHub {
owner = "justarchinet";
repo = pname;
rev = version;
sha256 = "sha256-t4azVZVvAJmCCsg/2o+ZWroEmCLfdPYn2iWwVwdhIZw=";
sha256 = "sha256-4DaqIsHfijA0hkhlsC6qQ1n+HC0zwdMtXiswOPOVpM4=";
};
dotnet-runtime = dotnetCorePackages.aspnetcore_7_0;

16
pkgs/applications/misc/ArchiSteamFarm/deps.nix generated
View File

@ -58,8 +58,8 @@
(fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; })
(fetchNuGet { pname = "JetBrains.Annotations"; version = "2022.3.1"; sha256 = "0lkhyyz25q82ygnxy26lwy5cl8fvkdc13pcn433xpjj8akzbmgd6"; })
(fetchNuGet { pname = "Markdig.Signed"; version = "0.30.4"; sha256 = "1bzc2vqpsq4mx6rw2rnk4hr14gqd5w8rf2h026gh7rqkwqd3r2dj"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "6.0.0-rc.1.21452.15"; sha256 = "0c3vnaag8gxlxij77n18m3hawpjkjjamsnq5kfjz5cvc7sfg3fwh"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "6.0.0-rc.1.21452.15"; sha256 = "1xyx358w4fqzxr9cy358agnm86rjijbnvikiqlngz2msgmldxi2z"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "7.0.0"; sha256 = "1f13vsfs1rp9bmdp3khk4mk2fif932d72yxm2wszpsr239x4s2bf"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "7.0.0"; sha256 = "1w49rg0n5wb1m5wnays2mmym7qy7bsi2b1zxz97af2rkbw3s3hbd"; })
(fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; })
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.4.1"; sha256 = "0bf68gq6mc6kzri4zi8ydc0xrazqwqg38bhbpjpj90zmqc28kari"; })
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; })
@ -93,12 +93,12 @@
(fetchNuGet { pname = "protobuf-net"; version = "3.0.101"; sha256 = "0594qckbc0lh61sw74ihaq4qmvf1lf133vfa88n443mh7lxm2fwf"; })
(fetchNuGet { pname = "protobuf-net.Core"; version = "3.0.101"; sha256 = "1kvn9rnm6f0jxs0s9scyyx2f2p8rk03qzc1f6ijv1g6xgkpxkq1m"; })
(fetchNuGet { pname = "SteamKit2"; version = "2.4.1"; sha256 = "13f7jra2d0kjlvnk4dghzhx8nhkd001i4xrkf6m19gisjvpjhpdr"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.4.0"; sha256 = "1jkgjnkjcb6dif0lzn7whjwwdd4fi6mzkmkdx8sfmv5cffzq4fvk"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.4.0"; sha256 = "0d01dpl4bcnrxqxyxcx0jhh9v375fqhva9w0siadj5y6m15h1sl5"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.Newtonsoft"; version = "6.4.0"; sha256 = "0yyh74b8vlngg2mg728ds86467y9vkxys29yszl129g2n8fk5q0m"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.4.0"; sha256 = "1wccx8ig2xc6xcfh774m5z34w6jn0hjffiwc5sq9yl63zkv01vnn"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.4.0"; sha256 = "1k58j6lfqcgrl5f7dw0xnbq6w5bvr42a9fc44vwbzl52kzjdlnh2"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.4.0"; sha256 = "1rxgf0hbkkzywh8z7asky2rrh1gpnrr514v1aj5vnmh49sa31kiz"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.5.0"; sha256 = "0k61chpz5j59s1yax28vx0mppx20ff8vg8grwja112hfrzj1f45n"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.5.0"; sha256 = "00n8s45xwbayj3p6x3awvs87vqvmzypny21nqc61m7a38d1asijv"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.Newtonsoft"; version = "6.5.0"; sha256 = "1160r9splvmxrgk3b8yzgls0pxxwak3iqfr8v13ah5mwy8zkpx71"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.5.0"; sha256 = "1s6axf6fin8sss3bvzp0s039rxrx71vx4rl559miw12bz3lld8kc"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.5.0"; sha256 = "0hq93gy5vyrigpdk9lhqwxglxwkbxa8ydllwcqs4bwfcsspzrs83"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.5.0"; sha256 = "17hx7kc187higm0gk67dndng3n7932sn3fwyj48l45cvyr3025h7"; })
(fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; })
(fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; })
(fetchNuGet { pname = "System.Composition"; version = "7.0.0"; sha256 = "1aii681g7a4gv8fvgd6hbnbbwi6lpzfcnl3k0k8hqx4m7fxp2f32"; })

4
pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
View File

@ -11,8 +11,8 @@ let
repo = "ASF-ui";
# updated by the update script
# this is always the commit that should be used with asf-ui from the latest asf version
rev = "a4617d145756f6dcf1f5729e5a60689aa484403b";
sha256 = "178ip280bqyqd36rka9g2jx7b7wdf3zh56sahg53yxr55zwq5bcp";
rev = "22692a1f115e8ca86f83fa17be55d9b20985570f";
sha256 = "0k0msk1r7ih092cwjngy1824bxkbjwz0d5p3k2r2l67r2p9b3lab";
};
in

799
pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

12
pkgs/development/compilers/gleam/default.nix
View File

@ -1,22 +1,22 @@
{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security, libiconv }:
{ lib, stdenv, rustPlatform, fetchFromGitHub, git, pkg-config, openssl, Security, libiconv }:
rustPlatform.buildRustPackage rec {
pname = "gleam";
version = "0.25.3";
version = "0.26.2";
src = fetchFromGitHub {
owner = "gleam-lang";
repo = pname;
rev = "v${version}";
sha256 = "sha256-JT9NUca+DaqxT36heaNKijIuqdnSvrYCfY2uM7wTOGo=";
rev = "refs/tags/v${version}";
hash = "sha256-NLUAKNWbKPAf81ce1OWTy/pnDcF2LfF12825DfE8AWw=";
};
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ git pkg-config ];
buildInputs = [ openssl ] ++
lib.optionals stdenv.isDarwin [ Security libiconv ];
cargoSha256 = "sha256-YPyGCd4//yta3jy5tWB4C5yRgxNbfG+hGF5/QSch/6M=";
cargoSha256 = "sha256-IOZEdoQ5cqXjhgqNzOg4h5t8i3JDxfjamLFdesEy9Z8=";
meta = with lib; {
description = "A statically typed language for the Erlang VM";

16632
pkgs/development/node-packages/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

6
pkgs/development/ocaml-modules/ffmpeg/base.nix
View File

@ -1,15 +1,15 @@
{ lib, fetchFromGitHub }:
rec {
version = "1.1.6";
version = "1.1.7";
useDune2 = true;
duneVersion = "3";
src = fetchFromGitHub {
owner = "savonet";
repo = "ocaml-ffmpeg";
rev = "v${version}";
sha256 = "sha256-NlWmt98QwuGFNP8FHnAR3C0DIiSfJ1ZJXeVFFZiOSXs=";
sha256 = "sha256-0QDy0ZUAtojYIuNliiDV2uywBnWxtKUhZ/LPqkfSOZ4=";
};
meta = with lib; {

2
pkgs/development/ocaml-modules/ffmpeg/default.nix
View File

@ -14,7 +14,7 @@ buildDunePackage {
minimalOCamlVersion = "4.08";
inherit (ffmpeg-base) version src useDune2;
inherit (ffmpeg-base) version src duneVersion;
propagatedBuildInputs = [
ffmpeg-avutil

2
pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix
View File

@ -11,7 +11,7 @@ buildDunePackage {
minimalOCamlVersion = "4.08";
inherit (ffmpeg-base) version src useDune2;
inherit (ffmpeg-base) version src duneVersion;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ];

2
pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix
View File

@ -11,7 +11,7 @@ buildDunePackage {
minimalOCamlVersion = "4.08";
inherit (ffmpeg-base) version src useDune2;
inherit (ffmpeg-base) version src duneVersion;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ dune-configurator ]

2
pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix
View File

@ -16,7 +16,7 @@ buildDunePackage {
minimalOCamlVersion = "4.08";
inherit (ffmpeg-base) version src useDune2;
inherit (ffmpeg-base) version src duneVersion;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ dune-configurator ]

2
pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix
View File

@ -13,7 +13,7 @@ buildDunePackage {
minimalOCamlVersion = "4.08";
inherit (ffmpeg-base) version src useDune2;
inherit (ffmpeg-base) version src duneVersion;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ dune-configurator ]

2
pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix
View File

@ -9,7 +9,7 @@ buildDunePackage {
minimalOCamlVersion = "4.08";
inherit (ffmpeg-base) version src useDune2;
inherit (ffmpeg-base) version src duneVersion;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ];

2
pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix
View File

@ -10,7 +10,7 @@ buildDunePackage {
minimalOCamlVersion = "4.08";
inherit (ffmpeg-base) version src useDune2;
inherit (ffmpeg-base) version src duneVersion;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ];

2
pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix
View File

@ -10,7 +10,7 @@ buildDunePackage {
minimalOCamlVersion = "4.08";
inherit (ffmpeg-base) version src useDune2;
inherit (ffmpeg-base) version src duneVersion;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ];

6
pkgs/development/ocaml-modules/mm/default.nix
View File

@ -4,7 +4,9 @@
buildDunePackage rec {
pname = "mm";
version = "0.8.1";
version = "0.8.2";
duneVersion = "3";
minimalOCamlVersion = "4.12";
@ -12,7 +14,7 @@ buildDunePackage rec {
owner = "savonet";
repo = "ocaml-mm";
rev = "v${version}";
sha256 = "sha256-7ozt+OgKNxMnjl2R+/ce27ZyL+T6BShvnnFE5BasJC4=";
sha256 = "sha256-EifM96MWIDyr1EVUZYuISWGwbMshVQppzWLJchqzV2E=";
};
buildInputs = [ dune-configurator ];

8
pkgs/development/ocaml-modules/shine/default.nix
View File

@ -2,15 +2,15 @@
buildDunePackage rec {
pname = "shine";
version = "0.2.2";
version = "0.2.3";
useDune2 = true;
duneVersion = "2";
src = fetchFromGitHub {
owner = "savonet";
repo = "ocaml-shine";
rev = "2e1de686ea031f1056df389161ea2b721bfdb39e";
sha256 = "0v6i4ym5zijki6ffkp2qkp00lk4fysjhmg690xscj23gwz4zx8ir";
rev = "refs/tags/v${version}";
sha256 = "sha256-x/ubqPXT89GWYV9KIyzny0rJDB3TBurLX71i0DlvHLU=";
};
buildInputs = [ dune-configurator ];

4
pkgs/development/python-modules/ailment/default.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "ailment";
version = "9.2.39";
version = "9.2.40";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
hash = "sha256-JO46r+eNBmMzCaXvpcQU3pnn833ABeMYnFlxh7bTHB8=";
hash = "sha256-Ykm9LuhICsnJemcAMlS0ohZM7x1ndCjF6etX9ip2IsA=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/angr/default.nix
View File

@ -31,7 +31,7 @@
buildPythonPackage rec {
pname = "angr";
version = "9.2.39";
version = "9.2.40";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -40,7 +40,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha256-De8np0Q+/JeWYAVmT7DtMOTOsdSh8DddTeNTBOl1KXk=";
hash = "sha256-PA/88T7o+oEr/U33opGu1Tcvc0zT/WhChpJJV/AvCmw=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/archinfo/default.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "archinfo";
version = "9.2.39";
version = "9.2.40";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
hash = "sha256-vmavJwt8YPpG0xW15lzX1gvuOiViWazqHUDiImlZGPo=";
hash = "sha256-jJFOtvcsU1bmJQT7atE6DJLcAeoN+78yWP4OiM6euWI=";
};
nativeBuildInputs = [

24
pkgs/development/python-modules/ascii-magic/default.nix
View File

@ -3,12 +3,13 @@
, colorama
, fetchPypi
, pillow
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "ascii-magic";
version = "2.1.1";
version = "2.3.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -16,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "ascii_magic";
inherit version;
hash = "sha256-YfGa+3nuqAAo69TydxO6uKNMcqZAkOEi/PMP8Frasfw=";
hash = "sha256-PtQaHLFn3u1cz8YotmnzWjoD9nvdctzBi+X/2KJkPYU=";
};
propagatedBuildInputs = [
@ -24,14 +25,27 @@ buildPythonPackage rec {
pillow
];
# Project is not tagging releases and tests are not shipped with PyPI source
# https://github.com/LeandroBarone/python-ascii_magic/issues/10
doCheck = false;
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"ascii_magic"
];
preCheck = ''
cd tests
'';
disabledTests = [
# Test requires network access
"test_from_url"
"test_quick_test"
"test_wrong_url"
# No clipboard in the sandbox
"test_from_clipboard"
];
meta = with lib; {
description = "Python module to converts pictures into ASCII art";
homepage = "https://github.com/LeandroBarone/python-ascii_magic";

4
pkgs/development/python-modules/claripy/default.nix
View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "claripy";
version = "9.2.39";
version = "9.2.40";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-Qr/wyaa5vDWd/0TEn9utdeaq6SINtopd49LuQddECvw=";
hash = "sha256-J56UP/6LoC9Tqf4zZb0Tup8la2a++9LCBwav3CclOuM=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/cle/default.nix
View File

@ -16,7 +16,7 @@
let
# The binaries are following the argr projects release cycle
version = "9.2.39";
version = "9.2.40";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
@ -38,7 +38,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
hash = "sha256-RwcVh2lmY5l4mbd4GG0C0PH+u4NDuTkGJRgyAVgpFMM=";
hash = "sha256-xNVZzw5m8OZNoK2AcbaSOEbr7uTVcMI7HCgRqylayDo=";
};
nativeBuildInputs = [

49
pkgs/development/python-modules/pysparse/default.nix
View File

@ -1,49 +0,0 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, numpy
, blas
, lapack
, isPy27
, python
}:
buildPythonPackage {
pname = "pysparse";
version = "1.3-dev";
disabled = !isPy27;
src = fetchFromGitHub {
owner = "PythonOptimizers";
repo = "pysparse";
rev = "f8430bd99ac2a6209c462657c5792d10033888cc";
sha256 = "19xcq8214yndra1xjhna3qjm32wprsqck97dlnw3xcww7rfy6hqh";
};
hardeningDisable = [ "all" ];
propagatedBuildInputs = [
numpy
blas
lapack
];
# Include patches from working version of PySparse 1.3-dev in
# Conda-Forge,
# https://github.com/conda-forge/pysparse-feedstock/tree/b69266911a2/recipe
# Thanks to https://github.com/guyer
patches = [ ./dropPackageLoader.patch ];
checkPhase = ''
cd test
${python.interpreter} -c "import pysparse"
${python.interpreter} test_sparray.py
'';
meta = with lib; {
homepage = "https://github.com/PythonOptimizers/pysparse";
description = "A Sparse Matrix Library for Python";
license = licenses.bsd3;
maintainers = with maintainers; [ costrouc ];
};
}

88
pkgs/development/python-modules/pysparse/dropPackageLoader.patch
View File

@ -1,88 +0,0 @@
diff --git a/pysparse/__init__.py b/pysparse/__init__.py
index 6d09b00..ff39084 100644
--- a/pysparse/__init__.py
+++ b/pysparse/__init__.py
@@ -1,9 +1,42 @@
-"PySparse: A Fast Sparse Matrix Library for Python"
+"""
+PySparse: A Fast Sparse Matrix Library for Python
+=================================================
+
+Documentation is available in the docstrings and
+online at http://pysparse.sourceforge.net/.
+
+Contents
+--------
+Pysparse imports
+::
+ spmatrix --- sparse matrix types
+
+and, in addition, provides:
+
+Subpackages
+-----------
+Using any of these subpackages requires an explicit import. For example,
+``import pysparse.itsolvers``.
+
+::
+
+ itsolvers --- Iterative linear algebra solvers
+ precon --- Preconditioners
+ direct --- Direct solvers
+ direct.superlu --- Wrappers to SuperLU library
+ direct.umfpack --- Wrappers to UMFPACK library
+ eigen.jdsym --- Jacobi davidson eigenvalue solver for symmetric matrices
+
+Utility tools
+-------------
+::
+
+ __version__ --- pysparse version string
+"""
+
__docformat__ = 'restructuredtext'
-# Imports
-from numpy._import_tools import PackageLoader
try:
from version import version as __version__
except ImportError:
@@ -11,31 +44,6 @@ except ImportError:
__version__ = 'undefined'
from sparse import spmatrix
-#from sparse import *
-from misc import get_include
-
-pkgload = PackageLoader()
-pkgload(verbose=False,postpone=True)
-
-if __doc__:
- __doc__ += """
-
-Available subpackages
----------------------
-"""
-if __doc__:
- __doc__ += pkgload.get_pkgdocs()
-
-__all__ = filter(lambda s: not s.startswith('_'), dir())
-__all__ += '__version__'
-
-__doc__ += """
-
-Miscellaneous
--------------
-
- __version__ : pysparse version string
-"""
from pysparse.misc import Deprecated
@@ -47,3 +55,5 @@ class _superlu:
return self.factorizeFnc(*args, **kwargs)
superlu = _superlu()
+
+__all__ = ['spmatrix', 'superlu', '__version__']

4
pkgs/development/python-modules/pyvex/default.nix
View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "pyvex";
version = "9.2.39";
version = "9.2.40";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-IQCMvP4o/aV+/tkP9SS5tlSNAdI6yRxYPczdF9jm1aY=";
hash = "sha256-M4eo/ADLoisxl2VFbLN2/VUV8vpDOxP+T6r5STDtyaA=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/scmrepo/default.nix
View File

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "scmrepo";
version = "0.1.12";
version = "0.1.13";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-2FUSIDueEleGj7BvIlyMB1ma7TW9kA5RUDBuDCvKLN0=";
hash = "sha256-/KUPePiy3ROZY+orJYZQLiAaQ5kY5eAe4v1hOS5Zmck=";
};
postPatch = ''

34
pkgs/development/python-modules/systemd/default.nix
View File

@ -1,31 +1,24 @@
{ lib
, buildPythonPackage
, fetchpatch
, fetchFromGitHub
, libredirect
, systemd
, pkg-config
, pytest
, python
}:
buildPythonPackage rec {
pname = "systemd";
version = "234";
version = "235";
src = fetchFromGitHub {
owner = "systemd";
repo = "python-systemd";
rev = "v${version}";
sha256 = "1fakw7qln44mfd6pj4kqsgyrhkc6cyr653id34kv0rdnb1bvysrz";
sha256 = "sha256-8p4m4iM/z4o6PHRQIpuSXb64tPTWGlujEYCDVLiIt2o=";
};
patches = [
# Fix runtime issues on Python 3.10
# https://github.com/systemd/python-systemd/issues/107
(fetchpatch {
url = "https://github.com/systemd/python-systemd/commit/c71bbac357f0ac722e1bcb2edfa925b68cca23c9.patch";
sha256 = "22s72Wa/BCwNNvwbxEUh58jhHlbA00SNwNVchVDovcc=";
})
];
nativeBuildInputs = [
pkg-config
];
@ -34,8 +27,17 @@ buildPythonPackage rec {
systemd
];
# No module named 'systemd._journal
doCheck = false;
nativeCheckInputs = [
pytest
];
checkPhase = ''
echo "12345678901234567890123456789012" > machine-id
export NIX_REDIRECTS=/etc/machine-id=$(realpath machine-id) \
LD_PRELOAD=${libredirect}/lib/libredirect.so
pytest $out/${python.sitePackages}/systemd
'';
pythonImportsCheck = [
"systemd.journal"
@ -46,7 +48,9 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python module for native access to the systemd facilities";
homepage = "http://www.freedesktop.org/software/systemd/python-systemd/";
homepage = "https://www.freedesktop.org/software/systemd/python-systemd/";
changelog = "https://github.com/systemd/python-systemd/blob/v${version}/NEWS";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

16
pkgs/development/python-modules/weconnect-mqtt/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "weconnect-mqtt";
version = "0.42.1";
version = "0.42.2";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -19,15 +19,9 @@ buildPythonPackage rec {
owner = "tillsteinbach";
repo = "WeConnect-mqtt";
rev = "refs/tags/v${version}";
hash = "sha256-/YCrnDOJdKc687pRKj1gVTOTj7dEpplN49VuFJOlQIE=";
hash = "sha256-dPG714a/GPNPs7h/ubLA+KI2hB5gFf5UDNwhhMyqJlc=";
};
propagatedBuildInputs = [
paho-mqtt
python-dateutil
weconnect
] ++ weconnect.optional-dependencies.Images;
postPatch = ''
substituteInPlace weconnect_mqtt/__version.py \
--replace "develop" "${version}"
@ -36,6 +30,12 @@ buildPythonPackage rec {
--replace "pytest-cov" ""
'';
propagatedBuildInputs = [
paho-mqtt
python-dateutil
weconnect
] ++ weconnect.optional-dependencies.Images;
nativeCheckInputs = [
pytestCheckHook
];

3
pkgs/development/python-modules/weconnect/default.nix
View File

@ -48,7 +48,8 @@ buildPythonPackage rec {
--replace "setup_requires=SETUP_REQUIRED," "setup_requires=[]," \
--replace "tests_require=TEST_REQUIRED," "tests_require=[],"
substituteInPlace image_extra_requirements.txt \
--replace "pillow~=9.4.0" "pillow"
--replace "pillow~=" "pillow>=" \
--replace "ascii_magic~=" "ascii_magic>="
substituteInPlace pytest.ini \
--replace "--cov=weconnect --cov-config=.coveragerc --cov-report html" "" \
--replace "pytest-cov" ""

8
pkgs/games/frogatto/data.nix
View File

@ -2,18 +2,18 @@
stdenv.mkDerivation {
pname = "frogatto-data";
version = "unstable-2022-04-13";
version = "unstable-2023-02-27";
src = fetchFromGitHub {
owner = "frogatto";
repo = "frogatto";
rev = "655493961c4ad57ba9cccdc24d23a2ded294b5f2";
sha256 = "0irn7p61cs8nm7dxsx84b2c3wryf2h12k2kclywdhy6xmh53w8k1";
rev = "5ca339f4b97e5004dc07394407bf1da43fbd6204";
sha256 = "sha256-6wqCFc7DlDt0u0JnPg4amVemc9HOjsB/U4s9n7N84QA=";
};
installPhase = ''
mkdir -p $out/share/frogatto/modules
cp -ar . $out/share/frogatto/modules/frogatto
cp -ar . $out/share/frogatto/modules/frogatto4
'';
meta = with lib; {

2
pkgs/games/frogatto/default.nix
View File

@ -14,7 +14,7 @@ let
genericName = "frogatto";
categories = [ "Game" "ArcadeGame" ];
};
version = "unstable-2020-12-04";
inherit (data) version;
in buildEnv {
name = "frogatto-${version}";

17
pkgs/games/frogatto/engine.nix
View File

@ -1,25 +1,19 @@
{ lib, stdenv, fetchFromGitHub, fetchurl, which
, boost, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf
, glew, zlib, icu, pkg-config, cairo, libvpx }:
, glew, zlib, icu, pkg-config, cairo, libvpx, glm
}:
stdenv.mkDerivation {
pname = "anura-engine";
version = "unstable-2022-04-09";
version = "unstable-2023-02-27";
src = fetchFromGitHub {
owner = "anura-engine";
repo = "anura";
rev = "5ac7f6fe63114274f0da7dad4c1ed673651e6424";
sha256 = "1yrcbvzgxdvn893qk1qcpb53pjns366fdls5qjal7lhq71kkfc67";
rev = "65d85b6646099db1d5cd25d31321bb434a3f94f1";
sha256 = "sha256-hb4Sn7uI+eXLaGb4zkEy4w+ByQJ6FqkoMUYFsyiFCeE=";
fetchSubmodules = true;
};
patches = [
# https://github.com/anura-engine/anura/issues/321
(fetchurl {
url = "https://github.com/anura-engine/anura/commit/627d08fb5254b5c66d315f1706089905c2704059.patch";
sha256 = "052m58qb3lg0hnxacpnjz2sz89dk0x6b5qi2q9bkzkvg38f237rr";
})
];
nativeBuildInputs = [
which pkg-config
@ -36,6 +30,7 @@ stdenv.mkDerivation {
icu
cairo
libvpx
glm
];
enableParallelBuilding = true;

31
pkgs/misc/rich-cli/default.nix
View File

@ -3,7 +3,32 @@
, python3
}:
python3.pkgs.buildPythonApplication rec {
let
python = python3.override {
packageOverrides = self: super: {
rich = super.rich.overrideAttrs (old: rec {
version = "12.4.0";
src = fetchFromGitHub {
owner = "Textualize";
repo = "rich";
rev = "refs/tags/v${version}";
hash = "sha256-ryJTusUNpvNF2031ICJWK8ScxHIh+LrXYg7nd0ph4aQ=";
};
});
textual = super.textual.overrideAttrs (old: rec {
version = "0.1.18";
src = fetchFromGitHub {
owner = "Textualize";
repo = "textual";
rev = "refs/tags/v${version}";
hash = "sha256-XVmbt8r5HL8r64ISdJozmM+9HuyvqbpdejWICzFnfiw=";
};
});
};
};
in
python.pkgs.buildPythonApplication rec {
pname = "rich-cli";
version = "1.8.0";
format = "pyproject";
@ -15,11 +40,11 @@ python3.pkgs.buildPythonApplication rec {
sha256 = "sha256-mV5b/J9wX9niiYtlmAUouaAm9mY2zTtDmex7FNWcezQ=";
};
nativeBuildInputs = with python3.pkgs; [
nativeBuildInputs = with python.pkgs; [
poetry-core
];
propagatedBuildInputs = with python3.pkgs; [
propagatedBuildInputs = with python.pkgs; [
rich
click
requests

4
pkgs/os-specific/linux/pcm/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pcm";
version = "202211";
version = "202302";
src = fetchFromGitHub {
owner = "opcm";
repo = "pcm";
rev = version;
hash = "sha256-/OSBzJ81xqw5LfS61DS7M33oDmfxDEzcU0NTVVbwWyI=";
hash = "sha256-69wdA6/bRN5gYl02GgA8mXnXxVZlHIGkhtC8vFKZVcA=";
};
nativeBuildInputs = [ cmake ];

6
pkgs/servers/libreddit/default.nix
View File

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "libreddit";
version = "0.29.3";
version = "0.29.4";
src = fetchFromGitHub {
owner = "libreddit";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-0QWODM1YT11x/h7vMkgAjPSGkHrOOHyaF6CCvip1hMQ=";
hash = "sha256-xGjCki0fQWXLXqCvNj6GjQ7qbFBcaJBPuPb8Aj1whLk=";
};
cargoHash = "sha256-ri577SRLtx+5vazle8fqUL7Q75scAzvxUpAWl0Al6js=";
cargoHash = "sha256-+fEHD648za4tNEQiu1AYfFXf3Hbe9f0D3MFYJ0OCfqQ=";
buildInputs = lib.optionals stdenv.isDarwin [
Security

1
pkgs/servers/matrix-synapse/plugins/default.nix
View File

@ -1,6 +1,7 @@
{ callPackage }:
{
matrix-http-rendezvous-synapse = callPackage ./rendezvous.nix { };
matrix-synapse-ldap3 = callPackage ./ldap3.nix { };
matrix-synapse-mjolnir-antispam = callPackage ./mjolnir-antispam.nix { };
matrix-synapse-pam = callPackage ./pam.nix { };

7
pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix
View File

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchFromGitHub, matrix-synapse }:
{ lib, stdenv, buildPythonPackage, fetchFromGitHub, matrix-synapse }:
buildPythonPackage rec {
pname = "matrix-synapse-mjolnir-antispam";
@ -13,7 +13,7 @@ buildPythonPackage rec {
sourceRoot = "./source/synapse_antispam";
propagatedBuildInputs = [ matrix-synapse ];
buildInputs = [ matrix-synapse ];
doCheck = false; # no tests
pythonImportsCheck = [ "mjolnir" ];
@ -25,8 +25,9 @@ buildPythonPackage rec {
Mjolnir's Synapse module is a way to interpret ban lists and apply
them to your entire homeserver.
'';
homepage = "https://github.com/matrix-org/mjolnir#synapse-module";
homepage = "https://github.com/matrix-org/mjolnir/blob/main/docs/synapse_module.md";
license = licenses.asl20;
maintainers = with maintainers; [ jojosch ];
broken = stdenv.isDarwin;
};
}

14
pkgs/servers/matrix-synapse/plugins/pam.nix
View File

@ -1,4 +1,4 @@
{ buildPythonPackage, fetchFromGitHub, twisted, python-pam }:
{ lib, buildPythonPackage, fetchFromGitHub, twisted, python-pam }:
buildPythonPackage rec {
pname = "matrix-synapse-pam";
@ -12,4 +12,16 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [ twisted python-pam ];
# has no tests
doCheck = false;
pythonImportsCheck = [ "pam_auth_provider" ];
meta = with lib; {
description = "PAM auth provider for the Synapse Matrix server";
homepage = "https://github.com/14mRh4X0r/matrix-synapse-pam";
license = licenses.eupl12;
maintainers = with maintainers; [ ];
};
}

1463
pkgs/servers/matrix-synapse/plugins/rendezvous-Cargo.lock generated Normal file
View File

File diff suppressed because it is too large Load Diff

48
pkgs/servers/matrix-synapse/plugins/rendezvous.nix Normal file
View File

@ -0,0 +1,48 @@
{ lib, buildPythonPackage, fetchFromGitHub, fetchPypi, rustPlatform, setuptools-rust }:
buildPythonPackage rec {
pname = "matrix-http-rendezvous-synapse";
version = "0.1.12";
format = "pyproject";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "rust-http-rendezvous-server";
rev = "v${version}";
sha256 = "sha256-minwa+7HLTNSBtBtt5pnoHsFnNEh834nsVw80+FIQi8=";
};
postPatch = ''
cp ${./rendezvous-Cargo.lock} Cargo.lock
'';
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src postPatch;
name = "${pname}-${version}";
hash = "sha256-TyxDq6YxZUArRj5gpjB1afDQgtUlCVer3Uhq6YKvVYM=";
};
nativeBuildInputs = [
setuptools-rust
] ++ (with rustPlatform; [
cargoSetupHook
maturinBuildHook
]);
preBuild = ''
cd synapse
'';
postBuild = ''
cd ..
'';
pythonImportsCheck = [ "matrix_http_rendezvous_synapse" ];
meta = with lib; {
description = "Implementation of MSC3886: Simple rendezvous capability";
homepage = "https://github.com/matrix-org/rust-http-rendezvous-server";
license = licenses.asl20;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

6
pkgs/tools/networking/croc/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "croc";
version = "9.6.2";
version = "9.6.3";
src = fetchFromGitHub {
owner = "schollz";
repo = pname;
rev = "v${version}";
sha256 = "sha256-MaIvxO2bvLGrZmBLXZk2vgW1NtyoVKRxXEZALEwI/lY=";
sha256 = "sha256-nAziLnuLkkPl1/RskKEehvQBMG4sYTEv+uPOQemum9w=";
};
vendorSha256 = "sha256-X+DxN0DAyZ/z8YRRjuezegcPHa6SJ3/XXPYP+1Apmjw=";
vendorSha256 = "sha256-yZ7S/6I5xdrfmyPkZsUUavXum8RqEVrlgrkJMQZc6IQ=";
subPackages = [ "." ];

33
pkgs/tools/networking/croc/test-local-relay.nix
View File

@ -2,18 +2,27 @@
stdenv.mkDerivation {
name = "croc-test-local-relay";
meta.timeout = 300;
nativeBuildInputs = [ croc ];
buildCommand = ''
HOME=$(mktemp -d)
# start a local relay
${croc}/bin/croc relay --ports 11111,11112 &
# start sender in background
MSG="See you later, alligator!"
${croc}/bin/croc --relay localhost:11111 send --code correct-horse-battery-staple --text "$MSG" &
# wait for things to settle
sleep 1
MSG2=$(${croc}/bin/croc --relay localhost:11111 --yes correct-horse-battery-staple)
# compare
[ "$MSG" = "$MSG2" ] && touch $out
HOME=$(mktemp -d)
# start a local relay
croc relay --ports 11111,11112 &
# start sender in background
MSG="See you later, alligator!"
croc --relay localhost:11111 send --code correct-horse-battery-staple --text "$MSG" &
# wait for things to settle
sleep 1
MSG2=$(croc --relay localhost:11111 --yes correct-horse-battery-staple)
# compare
[ "$MSG" = "$MSG2" ] && touch $out
'';
__darwinAllowLocalNetworking = true;
meta = {
timeout = 300;
broken = stdenv.isDarwin;
};
}

32
pkgs/tools/networking/speedtest-rs/default.nix Normal file
View File

@ -0,0 +1,32 @@
{ lib
, rustPlatform
, fetchFromGitHub
, openssl
, pkg-config
}:
rustPlatform.buildRustPackage rec {
pname = "speedtest-rs";
version = "0.1.4";
src = fetchFromGitHub {
owner = "nelsonjchen";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-/d6A+Arlcc3SCKPSkYXwvqY2BRyAbA33Ah+GddHcc5M=";
};
buildInputs = [ openssl ];
nativeBuildInputs = [ pkg-config ];
cargoSha256 = "sha256-4TJEM+oMjx/aaZgY2Y679pYFTdEWWFpWDYrK/o2b5UM=";
meta = with lib; {
description = "Command line internet speedtest tool written in rust";
homepage = "https://github.com/nelsonjchen/speedtest-rs";
changelog = "https://github.com/nelsonjchen/speedtest-rs/blob/v${version}/CHANGELOG.md";
license = with licenses; [ mit asl20 ];
maintainers = with maintainers; [ GaetanLepage ];
};
}

15
pkgs/tools/text/scraper/default.nix
View File

@ -1,15 +1,17 @@
{ lib, rustPlatform, fetchCrate, installShellFiles }:
{ lib, rustPlatform, fetchFromGitHub, installShellFiles }:
rustPlatform.buildRustPackage rec {
pname = "scraper";
version = "0.14.0";
version = "0.15.0";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-ucArD3xElLpOukNYHiErCTKDSlW2aDn00D3gr5L8Sm0=";
src = fetchFromGitHub {
owner = "causal-agent";
repo = "scraper";
rev = "v${version}";
hash = "sha256-K0MeZeS60gxo0/kBCaffNVQrR5S1HDoq77hnC//LMQg=";
};
cargoSha256 = "sha256-62rJWpDi2vPHFnJnIrisyj0sEZTzRra+zoMb06zmxdE=";
cargoHash = "sha256-2IvfJaYyX7ZA1y3TETydb7wXRER4CfH69xEvnxKCFTc=";
nativeBuildInputs = [ installShellFiles ];
@ -20,6 +22,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "A tool to query HTML files with CSS selectors";
homepage = "https://github.com/causal-agent/scraper";
changelog = "https://github.com/causal-agent/scraper/releases/tag/v${version}";
license = licenses.isc;
maintainers = with maintainers; [ figsoda ];
};

2
pkgs/top-level/all-packages.nix
View File

@ -1585,6 +1585,8 @@ with pkgs;
spectre-cli = callPackage ../tools/security/spectre-cli { };
speedtest-rs = callPackage ../tools/networking/speedtest-rs { };
steamtinkerlaunch = callPackage ../tools/games/steamtinkerlaunch {};
supermin = callPackage ../tools/virtualization/supermin { };

1
pkgs/top-level/python-aliases.nix
View File

@ -206,6 +206,7 @@ mapAliases ({
Pyro5 = pyro5; # added 2023-02-19
PyRSS2Gen = pyrss2gen; # added 2023-02-19
pysmart-smartx = pysmart; # added 2021-10-22
pysparse = throw "pysparse has been abandoned upstream."; # added 2023-02-28
pyspotify = throw "pyspotify has been removed because Spotify stopped supporting libspotify"; # added 2022-05-29
PyStemmer = pystemmer; # added 2023-02-19
pytest_6 = pytest; # added 2022-02-10

2
pkgs/top-level/python-packages.nix
View File

@ -8933,8 +8933,6 @@ self: super: with self; {
pyspark = callPackage ../development/python-modules/pyspark { };
pysparse = callPackage ../development/python-modules/pysparse { };
pyspcwebgw = callPackage ../development/python-modules/pyspcwebgw { };
pyspellchecker = callPackage ../development/python-modules/pyspellchecker { };