Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-06-09 00:09:07 +00:00 committed by GitHub
commit b61efd9db1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
41 changed files with 422 additions and 203 deletions

View file

@ -29,6 +29,28 @@ in
xlink:href="http://pam-mount.sourceforge.net/pam_mount.conf.5.html" />. xlink:href="http://pam-mount.sourceforge.net/pam_mount.conf.5.html" />.
''; '';
}; };
additionalSearchPaths = mkOption {
type = types.listOf types.package;
default = [];
example = literalExample "[ pkgs.bindfs ]";
description = ''
Additional programs to include in the search path of pam_mount.
Useful for example if you want to use some FUSE filesystems like bindfs.
'';
};
fuseMountOptions = mkOption {
type = types.listOf types.str;
default = [];
example = literalExample ''
[ "nodev" "nosuid" "force-user=%(USER)" "gid=%(USERGID)" "perms=0700" "chmod-deny" "chown-deny" "chgrp-deny" ]
'';
description = ''
Global mount options that apply to every FUSE volume.
You can define volume-specific options in the volume definitions.
'';
};
}; };
}; };
@ -60,11 +82,12 @@ in
<!-- if activated, requires ofl from hxtools to be present --> <!-- if activated, requires ofl from hxtools to be present -->
<logout wait="0" hup="no" term="no" kill="no" /> <logout wait="0" hup="no" term="no" kill="no" />
<!-- set PATH variable for pam_mount module --> <!-- set PATH variable for pam_mount module -->
<path>${pkgs.util-linux}/bin</path> <path>${makeBinPath ([ pkgs.util-linux ] ++ cfg.additionalSearchPaths)}</path>
<!-- create mount point if not present --> <!-- create mount point if not present -->
<mkmountpoint enable="1" remove="true" /> <mkmountpoint enable="1" remove="true" />
<!-- specify the binaries to be called --> <!-- specify the binaries to be called -->
<fusemount>${pkgs.fuse}/bin/mount.fuse %(VOLUME) %(MNTPT) -o ${concatStringsSep "," (cfg.fuseMountOptions ++ [ "%(OPTIONS)" ])}</fusemount>
<cryptmount>${pkgs.pam_mount}/bin/mount.crypt %(VOLUME) %(MNTPT)</cryptmount> <cryptmount>${pkgs.pam_mount}/bin/mount.crypt %(VOLUME) %(MNTPT)</cryptmount>
<cryptumount>${pkgs.pam_mount}/bin/umount.crypt %(MNTPT)</cryptumount> <cryptumount>${pkgs.pam_mount}/bin/umount.crypt %(MNTPT)</cryptumount>
<pmvarrun>${pkgs.pam_mount}/bin/pmvarrun -u %(USER) -o %(OPERATION)</pmvarrun> <pmvarrun>${pkgs.pam_mount}/bin/pmvarrun -u %(USER) -o %(OPERATION)</pmvarrun>

View file

@ -31,9 +31,9 @@
} }
}, },
"dev": { "dev": {
"version": "93.0.4530.5", "version": "93.0.4535.3",
"sha256": "0xxnn9fbwgmfk0zz5an35na1zprhas487pbg2qpgg76g50zxnsx5", "sha256": "19iy4p59n0pg9s39g614y4yxh5f6h86bcp471qdnm6fvzmzcxd18",
"sha256bin64": "14fzmfhaiish91byg7knr9nf2cigklfvy145vc7qhg17b6gzba25", "sha256bin64": "16q9s8l20bmr2n0y3pi505l5hbhbmpi8kh47aylj5gzk1nr30a8r",
"deps": { "deps": {
"gn": { "gn": {
"version": "2021-05-07", "version": "2021-05-07",

View file

@ -171,6 +171,14 @@ in rec {
passthru = { inherit plugins; }; passthru = { inherit plugins; };
}); });
terraform_1_0_0 = pluggable (generic {
version = "1.0.0";
sha256 = "sha256-ddcT/I2Qn1pKFyhXgh+CcD3fSv2steSNmjyyiS2SE/o=";
vendorSha256 = "sha256-oFvoEsDunJR4IULdGwS6nHBKWEgUehgT+nNM41W/GYo=";
patches = [ ./provider-path-0_15.patch ];
passthru = { inherit plugins; };
});
# Tests that the plugins are being used. Terraform looks at the specific # Tests that the plugins are being used. Terraform looks at the specific
# file pattern and if the plugin is not found it will try to download it # file pattern and if the plugin is not found it will try to download it
# from the Internet. With sandboxing enable this test will fail if that is # from the Internet. With sandboxing enable this test will fail if that is

View file

@ -1,5 +1,5 @@
{ lib, stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune_2 { lib, callPackage, stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune_2
, fix, menhir, menhirLib, menhirSdk, merlin-extend, ppx_tools_versioned, utop, cppo , fix, menhir, menhirLib, menhirSdk, merlin-extend, ppxlib, utop, cppo, ppx_derivers
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,11 +13,28 @@ stdenv.mkDerivation rec {
sha256 = "0m6ldrci1a4j0qv1cbwh770zni3al8qxsphl353rv19f6rblplhs"; sha256 = "0m6ldrci1a4j0qv1cbwh770zni3al8qxsphl353rv19f6rblplhs";
}; };
nativeBuildInputs = [ makeWrapper menhir ]; nativeBuildInputs = [
makeWrapper
menhir
];
propagatedBuildInputs = [ menhirLib merlin-extend ppx_tools_versioned ]; buildInputs = [
cppo
dune_2
findlib
fix
menhir
menhirSdk
ocaml
ppxlib
utop
];
buildInputs = [ ocaml findlib dune_2 cppo fix utop menhir menhirSdk ]; propagatedBuildInputs = [
menhirLib
merlin-extend
ppx_derivers
];
buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed
@ -29,11 +46,16 @@ stdenv.mkDerivation rec {
--prefix OCAMLPATH : "$OCAMLPATH:$OCAMLFIND_DESTDIR" --prefix OCAMLPATH : "$OCAMLPATH:$OCAMLFIND_DESTDIR"
''; '';
passthru.tests = {
hello = callPackage ./tests/hello { };
};
meta = with lib; { meta = with lib; {
homepage = "https://reasonml.github.io/"; homepage = "https://reasonml.github.io/";
downloadPage = "https://github.com/reasonml/reason";
description = "Facebook's friendly syntax to OCaml"; description = "Facebook's friendly syntax to OCaml";
license = licenses.mit; license = licenses.mit;
inherit (ocaml.meta) platforms; inherit (ocaml.meta) platforms;
maintainers = [ maintainers.volth ]; maintainers = with maintainers; [ superherointj ];
}; };
} }

View file

@ -0,0 +1,23 @@
{ lib, buildDunePackage, reason }:
buildDunePackage rec {
pname = "helloreason";
version = "0.0.1";
src = ./.;
useDune2 = true;
buildInputs = [
reason
];
doCheck = true;
doInstallCheck = true;
postInstallCheck = ''
$out/bin/${pname} | grep -q "Hello From Reason" > /dev/null
'';
meta.timeout = 60;
}

View file

@ -0,0 +1,4 @@
(executable
(name helloreason)
(public_name helloreason)
(libraries reason))

View file

@ -0,0 +1,6 @@
let sayHello = () => {
let fromWhom = "From Reason";
print_endline("Hello " ++ fromWhom);
};
sayHello();

View file

@ -25,15 +25,21 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake curl ]; nativeBuildInputs = [ cmake curl ];
buildInputs = [ buildInputs = [
curl openssl s2n-tls zlib curl openssl zlib
aws-c-common aws-c-event-stream aws-checksums
] ++ lib.optionals (stdenv.isDarwin && ] ++ lib.optionals (stdenv.isDarwin &&
((builtins.elem "text-to-speech" apis) || ((builtins.elem "text-to-speech" apis) ||
(builtins.elem "*" apis))) (builtins.elem "*" apis)))
[ CoreAudio AudioToolbox ]; [ CoreAudio AudioToolbox ];
# propagation is needed for Security.framework to be available when linking # propagation is needed for Security.framework to be available when linking
propagatedBuildInputs = [ aws-c-cal aws-c-io ]; propagatedBuildInputs = [
aws-c-cal
aws-c-event-stream
aws-c-io
aws-c-common
aws-checksums
s2n-tls
];
cmakeFlags = [ cmakeFlags = [
"-DBUILD_DEPS=OFF" "-DBUILD_DEPS=OFF"

View file

@ -18,21 +18,21 @@ let
url = "https://download.fcitx-im.org/data/lm_sc.3gm.arpa-${arpaVer}.tar.bz2"; url = "https://download.fcitx-im.org/data/lm_sc.3gm.arpa-${arpaVer}.tar.bz2";
sha256 = "0bqy3l7mif0yygjrcm65qallszgn17mvgyxhvz7a54zaamyan6vm"; sha256 = "0bqy3l7mif0yygjrcm65qallszgn17mvgyxhvz7a54zaamyan6vm";
}; };
dictVer = "20200715"; dictVer = "20210402";
dict = fetchurl { dict = fetchurl {
url = "https://download.fcitx-im.org/data/dict.utf8-${dictVer}.tar.xz"; url = "https://download.fcitx-im.org/data/dict.utf8-${dictVer}.tar.xz";
sha256 = "1ln7r64j8mc7wz4j0q4v8wd68wy7qqz4bz1dpxk7zqbdvza6rhr3"; sha256 = "sha256-gYz7tama5bQMJwe2FYc09KEBlkRIU0AMvWsUUFWS2A0=";
}; };
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libime"; pname = "libime";
version = "1.0.3"; version = "1.0.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fcitx"; owner = "fcitx";
repo = "libime"; repo = "libime";
rev = version; rev = version;
sha256 = "sha256-Ykj4/3yKUqK0BRqW1E2zFYNgeUOXQ1DsotmKU6c8vEg="; sha256 = "sha256-q/SXS6pT4vBkCkCTarPVHrZPXijYnc2t51YGRvzQ0FY=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xcb-imdkit"; pname = "xcb-imdkit";
version = "1.0.2"; version = "1.0.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fcitx"; owner = "fcitx";
repo = "xcb-imdkit"; repo = "xcb-imdkit";
rev = version; rev = version;
sha256 = "sha256-ISaVsMtDsyfhbhsAwDSWkQ7ZcpNtvC7M9NFQsWA5ju8="; sha256 = "sha256-IPuTRSgmrnCJRgGWcE4JRaxd0sGCcHrKRnn2B1OdDMU=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -1,33 +1,44 @@
{ lib { lib
, stdenv
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, pythonOlder , pythonOlder
, pytestCheckHook , pytestCheckHook
, numpy , numpy
, stdenv
, aiohttp , aiohttp
, pytest-vcr , pytest-vcr
, requests , requests
, paramiko
, smbprotocol
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "fsspec"; pname = "fsspec";
version = "2021.04.0"; version = "2021.05.0";
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "intake"; owner = "intake";
repo = "filesystem_spec"; repo = "filesystem_spec";
rev = version; rev = version;
sha256 = "sha256-9072kb1VEQ0xg9hB8yEzJMD2Ttd3UGjBmTuhE+Uya1k="; sha256 = "sha256-MQjUBLmx3Lb3nZNU/AgBKUQ/qNOd+XH+2YI51wV8AO0=";
}; };
checkInputs = [ pytestCheckHook numpy pytest-vcr ]; propagatedBuildInputs = [
aiohttp
paramiko
requests
smbprotocol
];
checkInputs = [
numpy
pytest-vcr
pytestCheckHook
];
__darwinAllowLocalNetworking = true; __darwinAllowLocalNetworking = true;
propagatedBuildInputs = [ aiohttp requests ];
disabledTests = [ disabledTests = [
# Test assumes user name is part of $HOME # Test assumes user name is part of $HOME
# AssertionError: assert 'nixbld' in '/homeless-shelter/foo/bar' # AssertionError: assert 'nixbld' in '/homeless-shelter/foo/bar'
@ -43,8 +54,10 @@ buildPythonPackage rec {
"test_touch" "test_touch"
]; ];
pythonImportsCheck = [ "fsspec" ];
meta = with lib; { meta = with lib; {
description = "A specification that python filesystems should adhere to"; description = "A specification that Python filesystems should adhere to";
homepage = "https://github.com/intake/filesystem_spec"; homepage = "https://github.com/intake/filesystem_spec";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = [ maintainers.costrouc ]; maintainers = [ maintainers.costrouc ];

View file

@ -1,31 +1,54 @@
{ buildPythonPackage, fetchFromGitHub, lib, pytestCheckHook, google-auth { lib
, google-auth-oauthlib, requests, decorator, fsspec, ujson, aiohttp, crcmod , buildPythonPackage
, pytest-vcr, vcrpy }: , fetchFromGitHub
, pytestCheckHook
, pythonOlder
, google-auth
, google-auth-oauthlib
, requests
, decorator
, fsspec
, ujson
, aiohttp
, crcmod
, pytest-vcr
, vcrpy
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "gcsfs"; pname = "gcsfs";
version = "2021.04.0"; version = "2021.05.0";
disabled = pythonOlder "3.6";
# github sources needed for test data
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dask"; owner = "dask";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-OA43DaQue7R5d6SzfKThEQFEwJndjLfznu1LMubs5fs="; sha256 = "sha256-I17eWaijxn0+8CzfzvzXVc0t9gQ03vx29a/i+QCQ0/U=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
aiohttp
crcmod
decorator
fsspec
google-auth google-auth
google-auth-oauthlib google-auth-oauthlib
requests requests
decorator
fsspec
aiohttp
ujson ujson
crcmod
]; ];
checkInputs = [ pytestCheckHook pytest-vcr vcrpy ]; checkInputs = [
pytest-vcr
pytestCheckHook
vcrpy
];
disabledTests = [
# Tests wants to communicate with the Link-local address
"test_GoogleCredentials_None"
];
pythonImportsCheck = [ "gcsfs" ]; pythonImportsCheck = [ "gcsfs" ];
meta = with lib; { meta = with lib; {

View file

@ -2,7 +2,6 @@
, astral , astral
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, poetry-core , poetry-core
, pytestCheckHook , pytestCheckHook
, pythonOlder , pythonOlder
@ -11,7 +10,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "hdate"; pname = "hdate";
version = "0.10.2"; version = "0.10.3";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
format = "pyproject"; format = "pyproject";
@ -19,7 +18,7 @@ buildPythonPackage rec {
owner = "py-libhdate"; owner = "py-libhdate";
repo = "py-libhdate"; repo = "py-libhdate";
rev = "v${version}"; rev = "v${version}";
sha256 = "07b0c7q8w6flj4q72v58d3wymsxfp5qz8z97qhhc2977mjx5fsxd"; sha256 = "sha256-6rOsG6qgq4woBhj25SNWvKshvFLBL/6MJiBZb+NPvdk=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -35,15 +34,6 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
patches = [
# Version was not updated for the release
(fetchpatch {
name = "update-version.patch";
url = "https://github.com/py-libhdate/py-libhdate/commit/b8186a891b29fed99def5ce0985ee0ae1e0dd77e.patch";
sha256 = "1pmhgh57x9390ff5gyisng0l6b79sd6dxmf172hpk1gr03c3hv98";
})
];
postPatch = '' postPatch = ''
substituteInPlace pyproject.toml --replace "^2020.5" ">=2020.5" substituteInPlace pyproject.toml --replace "^2020.5" ">=2020.5"
''; '';

View file

@ -3,25 +3,35 @@
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, pytestCheckHook , pytestCheckHook
, pytest-cov
, watchdog , watchdog
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "hupper"; pname = "hupper";
version = "1.10.2"; version = "1.10.3";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "3818f53dabc24da66f65cf4878c1c7a9b5df0c46b813e014abdd7c569eb9a02a"; sha256 = "sha256-zW9Rtyx1h7ybzopl7NAloelfGwMoRRm/6RKE0BAxbNk=";
}; };
# FIXME: watchdog dependency is disabled on Darwin because of #31865, which causes very silent # FIXME: watchdog dependency is disabled on Darwin because of #31865, which causes very silent
# segfaults in the testsuite that end up failing the tests in a background thread (in myapp) # segfaults in the testsuite that end up failing the tests in a background thread (in myapp)
checkInputs = [ pytestCheckHook pytest-cov ] ++ lib.optional (!stdenv.isDarwin) watchdog; checkInputs = [
pytestCheckHook
] ++ lib.optional (!stdenv.isDarwin) [
watchdog
];
disabledTestPaths = [
# Doesn't work with an exported home, RuntimeError: timeout waiting for change to file=/build/tmpgfn145cx
"tests/test_it.py"
];
pythonImportsCheck = [ "hupper" ];
meta = with lib; { meta = with lib; {
description = "in-process file monitor / reloader for reloading your code automatically during development"; description = "In-process file monitor/reloader for reloading your code automatically during development";
homepage = "https://github.com/Pylons/hupper"; homepage = "https://github.com/Pylons/hupper";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ ];

View file

@ -4,7 +4,7 @@
, imagecorruptions , imagecorruptions
, numpy , numpy
, opencv3 , opencv3
, pytest , pytestCheckHook
, scikitimage , scikitimage
, scipy , scipy
, shapely , shapely
@ -43,11 +43,30 @@ buildPythonPackage rec {
six six
]; ];
checkPhase = '' checkInputs = [
pytest ./test opencv3
''; pytestCheckHook
];
checkInputs = [ opencv3 pytest ]; disabledTests = [
# Tests are outdated
"test_quokka_segmentation_map"
"test_pool"
"test_avg_pool"
"test_max_pool"
"test_min_pool"
"est_median_pool"
"test_alpha_is_080"
"test_face_and_lines_at_half_visibility"
"test_polygon_fully_inside_image__no_rectangular_shape"
];
disabledTestPaths = [
# TypeError: int() argument must be a string, a bytes-like object or a number, not 'NoneType'
"test/augmenters/test_pooling.py"
];
pythonImportsCheck = [ "imgaug" ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/aleju/imgaug"; homepage = "https://github.com/aleju/imgaug";

View file

@ -0,0 +1,43 @@
{ lib
, buildPythonPackage
, cryptography
, fetchFromGitHub
, pytest-mock
, pytestCheckHook
, pythonOlder
, glibcLocales
}:
buildPythonPackage rec {
pname = "pyspnego";
version = "0.1.6";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "jborean93";
repo = pname;
rev = "v${version}";
sha256 = "0pfh2x0539f0k2qi2pbjm64b2fqp64c63xxpinvg1yfaw915kgpb";
};
propagatedBuildInputs = [
cryptography
];
checkInputs = [
glibcLocales
pytest-mock
pytestCheckHook
];
LC_ALL = "en_US.UTF-8";
pythonImportsCheck = [ "spnego" ];
meta = with lib; {
description = "Python SPNEGO authentication library";
homepage = "Python SPNEGO authentication library";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -1,24 +1,38 @@
{ lib, buildPythonPackage, fetchPypi, docutils, aiobotocore, fsspec }: { lib
, buildPythonPackage
, fetchPypi
, docutils
, aiobotocore
, fsspec
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "s3fs"; pname = "s3fs";
version = "0.5.2"; version = "2021.5.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "87e5210415db17b9de18c77bcfc4a301570cc9030ee112b77dc47ab82426bae1"; sha256 = "sha256-cEJVMIFMaC3E9829ofKTCtgy2/G+40G1yQURxUzBJpA=";
}; };
buildInputs = [ docutils ]; buildInputs = [
propagatedBuildInputs = [ aiobotocore fsspec ]; docutils
];
propagatedBuildInputs = [
aiobotocore
fsspec
];
# Depends on `moto` which has a long dependency chain with exact # Depends on `moto` which has a long dependency chain with exact
# version requirements that can't be made to work with current # version requirements that can't be made to work with current
# pythonPackages. # pythonPackages.
doCheck = false; doCheck = false;
pythonImportsCheck = [ "s3fs" ];
meta = with lib; { meta = with lib; {
description = "S3FS builds on boto3 to provide a convenient Python filesystem interface for S3."; description = "S3FS builds on boto3 to provide a convenient Python filesystem interface for S3";
homepage = "https://github.com/dask/s3fs/"; homepage = "https://github.com/dask/s3fs/";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ teh ]; maintainers = with maintainers; [ teh ];

View file

@ -0,0 +1,43 @@
{ lib
, buildPythonPackage
, cryptography
, fetchFromGitHub
, pyspnego
, pytest-mock
, pytestCheckHook
, pythonOlder
, six
}:
buildPythonPackage rec {
pname = "smbprotocol";
version = "1.5.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "jborean93";
repo = pname;
rev = "v${version}";
sha256 = "1ym0fvljbwgl1h7f63m3psbsvqm64fipsrrmbqb97hrhfdzxqxpa";
};
propagatedBuildInputs = [
cryptography
pyspnego
six
];
checkInputs = [
pytest-mock
pytestCheckHook
];
pythonImportsCheck = [ "smbprotocol" ];
meta = with lib; {
description = "Python SMBv2 and v3 Client";
homepage = "https://github.com/jborean93/smbprotocol";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -16,11 +16,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "xmlsec"; pname = "xmlsec";
version = "1.3.9"; version = "1.3.11";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1c4k42zv3plm6v65p7z6l5rxyf50h40d02nhc16vq7cjrfvdf4rx"; sha256 = "sha256-zS6q/38xeEoH3ZnOgfp2cxPfO6GDT6pBQ+4sBwAMrHo=";
}; };
# https://github.com/mehcode/python-xmlsec/issues/84#issuecomment-632930116 # https://github.com/mehcode/python-xmlsec/issues/84#issuecomment-632930116
@ -38,6 +38,8 @@ buildPythonPackage rec {
checkInputs = [ pytestCheckHook hypothesis ]; checkInputs = [ pytestCheckHook hypothesis ];
disabledTestPaths = [ "tests/test_doc_examples.py" ]; disabledTestPaths = [ "tests/test_doc_examples.py" ];
pythonImportsCheck = [ "xmlsec" ];
meta = with lib; { meta = with lib; {
description = "Python bindings for the XML Security Library"; description = "Python bindings for the XML Security Library";
homepage = "https://github.com/mehcode/python-xmlsec"; homepage = "https://github.com/mehcode/python-xmlsec";

View file

@ -1,85 +1,85 @@
{ fetchPypi { lib
, lib , aiohttp
, fetchpatch , aioresponses
, buildPythonPackage
, isPy3k
, appdirs , appdirs
, attrs , attrs
, buildPythonPackage
, cached-property , cached-property
, defusedxml , defusedxml
, fetchFromGitHub
, freezegun
, httpx
, isodate , isodate
, lxml , lxml
, requests
, requests_toolbelt
, six
, pytz
, tornado
, aiohttp
# test dependencies
, freezegun
, mock , mock
, pretend , pretend
, pytest , pytest-asyncio
, pytestcov , pytest-httpx
, pytestCheckHook
, pythonOlder
, pytz
, requests
, requests_toolbelt
, requests-file
, requests-mock , requests-mock
, aioresponses , xmlsec
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "zeep"; pname = "zeep";
version = "3.4.0"; version = "4.0.0";
disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchFromGitHub {
inherit pname version; owner = "mvantellingen";
sha256 = "0e98669cfeb60756231ae185498f9ae21b30b2681786b8de58ed34c3b93e41dd"; repo = "python-zeep";
rev = version;
sha256 = "1rwmwk47fxs8dxwv5dr6gbnbiyilznifb47fhbxgzj231w0y82cm";
}; };
patches = [
( fetchpatch {
url = "https://github.com/mvantellingen/python-zeep/pull/1006/commits/ba7edd6bf2b31023b31e8f17c161e1d6d5af3d29.patch";
sha256 = "1j0jd5hmh457im9sbawaqf6pnfy36fhr9wqdim8wk5da9ixr0ajs";
})
];
propagatedBuildInputs = [ propagatedBuildInputs = [
appdirs appdirs
attrs attrs
cached-property cached-property
defusedxml defusedxml
httpx
isodate isodate
lxml lxml
pytz
requests requests
requests_toolbelt requests_toolbelt
six requests-file
pytz xmlsec
];
# optional requirements
tornado
] ++ lib.optional isPy3k aiohttp;
checkInputs = [ checkInputs = [
aiohttp
aioresponses
freezegun freezegun
mock mock
pretend pretend
pytestcov pytest-asyncio
pytest pytest-httpx
pytestCheckHook
requests-mock requests-mock
] ++ lib.optional isPy3k aioresponses; xmlsec
];
checkPhase = '' preCheck = ''
runHook preCheck export HOME=$(mktemp -d);
# fix compatibility with pytest 4
substituteInPlace tests/conftest.py \
--replace 'request.node.get_marker("requests")' 'request.node.get_closest_marker("requests")'
# ignored tests requires xmlsec python module
HOME=$(mktemp -d) pytest tests --ignore tests/test_wsse_signature.py
runHook postCheck
''; '';
disabledTests = [
# lxml.etree.XMLSyntaxError: Extra content at the end of the document, line 2, column 64
"test_mime_content_serialize_text_xml"
];
pythonImportsCheck = [ "zeep" ];
meta = with lib; { meta = with lib; {
description = "Python SOAP client";
homepage = "http://docs.python-zeep.org"; homepage = "http://docs.python-zeep.org";
license = licenses.mit; license = licenses.mit;
description = "A modern/fast Python SOAP client based on lxml / requests";
maintainers = with maintainers; [ rvl ]; maintainers = with maintainers; [ rvl ];
}; };
} }

View file

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, nixosTests, jre_headless }: { lib, stdenv, fetchurl, nixosTests, jre_headless }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "minecraft-server"; pname = "minecraft-server";
version = "1.16.5"; version = "1.17";
src = fetchurl { src = fetchurl {
url = "https://launcher.mojang.com/v1/objects/1b557e7b033b583cd9f66746b7a9ab1ec1673ced/server.jar"; url = "https://launcher.mojang.com/v1/objects/0a269b5f2c5b93b1712d0f5dc43b6182b9ab254e/server.jar";
# sha1 because that comes from mojang via api # sha1 because that comes from mojang via api
sha1 = "1b557e7b033b583cd9f66746b7a9ab1ec1673ced"; sha1 = "0a269b5f2c5b93b1712d0f5dc43b6182b9ab254e";
}; };
preferLocalBuild = true; preferLocalBuild = true;

View file

@ -1,38 +1,32 @@
{ {
"4.14": { "4.14": {
"extra": "-hardened1", "extra": "-hardened1",
"name": "linux-hardened-4.14.234-hardened1.patch", "name": "linux-hardened-4.14.235-hardened1.patch",
"sha256": "1vdr3j62whc2xdy1l4imkp6axpwh7r3cjp0sgsld7l5331x19qh7", "sha256": "0m49pg27pnp6kwkbawg0fw3lzm5nchqjhqkfgprckwgb9v5bgbcc",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.234-hardened1/linux-hardened-4.14.234-hardened1.patch" "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.235-hardened1/linux-hardened-4.14.235-hardened1.patch"
}, },
"4.19": { "4.19": {
"extra": "-hardened1", "extra": "-hardened1",
"name": "linux-hardened-4.19.192-hardened1.patch", "name": "linux-hardened-4.19.193-hardened1.patch",
"sha256": "0gy4h73ygiqr6c9zbmfz4as18ldcnnzgc4qd2nss08m2x1cb1n76", "sha256": "0r2rxl08x2l1yimaqksrc79s36rnp77xm5in9cvp7ff24y9r9g0j",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.192-hardened1/linux-hardened-4.19.192-hardened1.patch" "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.193-hardened1/linux-hardened-4.19.193-hardened1.patch"
}, },
"5.10": { "5.10": {
"extra": "-hardened1", "extra": "-hardened1",
"name": "linux-hardened-5.10.40-hardened1.patch", "name": "linux-hardened-5.10.42-hardened1.patch",
"sha256": "15nprqyw9whqghpnr39wpn54snxz49wdr4dq41dbmmqmrrlfyxnr", "sha256": "1hignnqy0d7nrfnh5j8h1xkj15kvx80h55qzzq1wlmyjxpr6c0ix",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.40-hardened1/linux-hardened-5.10.40-hardened1.patch" "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.42-hardened1/linux-hardened-5.10.42-hardened1.patch"
},
"5.11": {
"extra": "-hardened1",
"name": "linux-hardened-5.11.22-hardened1.patch",
"sha256": "1lwf56pxyzqzjqw4k1qd93vi44abmbz6hqbalamz6ancxkb800hh",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.22-hardened1/linux-hardened-5.11.22-hardened1.patch"
}, },
"5.12": { "5.12": {
"extra": "-hardened1", "extra": "-hardened1",
"name": "linux-hardened-5.12.7-hardened1.patch", "name": "linux-hardened-5.12.9-hardened1.patch",
"sha256": "1r8bf8hrxpzyxqcy3zf1m86bfi0lr4aijbrq12sqb7n2g1wc1j87", "sha256": "08ijifhl8sl858ik32ny47h7pq0r160sv55a07igkbhrh60arfqa",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.7-hardened1/linux-hardened-5.12.7-hardened1.patch" "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.9-hardened1/linux-hardened-5.12.9-hardened1.patch"
}, },
"5.4": { "5.4": {
"extra": "-hardened1", "extra": "-hardened1",
"name": "linux-hardened-5.4.122-hardened1.patch", "name": "linux-hardened-5.4.124-hardened1.patch",
"sha256": "1wa3h18gwgn4blkidf8mlw3r0nb2asya5rbwylghq3qnaa2hc0k7", "sha256": "1bn7fa09kzgv6v9d3gl66l8wg6z23chjhk6g219cqb7mfd4m5ykl",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.122-hardened1/linux-hardened-5.4.122-hardened1.patch" "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.124-hardened1/linux-hardened-5.4.124-hardened1.patch"
} }
} }

View file

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "4.14.234"; version = "4.14.235";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1mwqb9sq6qd9angl3xysdsrfpgppf46g3kiwg1svqgpgrx7cqn1b"; sha256 = "03k793hj294zf7jncs1h8zh5dh6xagkfvnydd9jadxvq2z8vvl8f";
}; };
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ]; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ];

View file

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "4.19.192"; version = "4.19.193";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1680dz4wjg721a8lqwh6ijd90zcr2f3wzcvhwgn3shbwgjkwsk87"; sha256 = "17ci49ak5iw01kfkn3fcgncg9hm4j188417bxi3bnsq9il5ymhl4";
}; };
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ]; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ];

View file

@ -1,13 +1,13 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec { buildLinux (args // rec {
version = "4.4.270"; version = "4.4.271";
extraMeta.branch = "4.4"; extraMeta.branch = "4.4";
extraMeta.broken = stdenv.isAarch64; extraMeta.broken = stdenv.isAarch64;
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1lz48gv1v3wvw9xvd3y9q4py7ii1g9fj4dwyvvjdzbipyw7s21pq"; sha256 = "0n5h2lv1p542a45pas3pi0vkhgrk096vwrps79a7v3a6c1q2dxx6";
}; };
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ]; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ];

View file

@ -1,13 +1,13 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec { buildLinux (args // rec {
version = "4.9.270"; version = "4.9.271";
extraMeta.branch = "4.9"; extraMeta.branch = "4.9";
extraMeta.broken = stdenv.isAarch64; extraMeta.broken = stdenv.isAarch64;
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0ck5abzpla291gcxrxjindj5szgcvmb2fwfilvdnzc6pnqk00ay3"; sha256 = "1480miixphkf0b8w00m753ar7yp1rnl3zyr9wp4inngi2f90553r";
}; };
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ]; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ];

View file

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "5.10.40"; version = "5.10.42";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "091g9g29m4vh66bxihiylyprb3cxr8cy4m494klb2lkirlx8103l"; sha256 = "1r86v6q7ml7zv001f25w3h667nqqy39439s94vnqsyyn7g3jg84b";
}; };
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ];

View file

@ -1,20 +0,0 @@
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:
with lib;
buildLinux (args // rec {
version = "5.11.22";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
# branchVersion needs to be x.y
extraMeta.branch = versions.majorMinor version;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "003nlphkqish6l4xblhi369v4qv2zck7529prkdnx4gb2ihpq0hi";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_11 ];
} // (args.argsOverride or {}))

View file

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "5.12.7"; version = "5.12.9";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0ircrclggrbmm80vz7irhg73qvhjddsmf7zclw5cqnnmm3qfj8jk"; sha256 = "0vg71h8r90fl01a8khyf1776y76rgqisxafky89cswa2fpsvxyn7";
}; };
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ]; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ];

View file

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "5.4.122"; version = "5.4.124";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "00g6s3ymriwddshy5sd458b1wfvw2ynxv6dr63ziykwfq50jlr9p"; sha256 = "10kxa1ng9w9xd2d5xh48fbhp1kri650p90nihrcpnb845gd9vwpp";
}; };
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ];

View file

@ -1,8 +1,8 @@
{ stdenv, lib, fetchsvn, linux { stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn { , scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
rev = "18096"; rev = "18115";
sha256 = "08m7afj0h9bcgg8rx8ksp85hmaqjl4k4p4q4zy6x51788xn4mycg"; sha256 = "00wsxlhz7lc4qk7jcgshb05hvv3mm4m8r3zalc9wvp4r1r6xbbjp";
} }
, ... , ...
}: }:

View file

@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:
let let
version = "5.11.21"; version = "5.12.9";
suffix = "lqx1"; suffix = "lqx1";
in in
@ -14,13 +14,13 @@ buildLinux (args // {
owner = "zen-kernel"; owner = "zen-kernel";
repo = "zen-kernel"; repo = "zen-kernel";
rev = "v${version}-${suffix}"; rev = "v${version}-${suffix}";
sha256 = "1klvik8nrqsqi5ijnga1li4gacsknmap75g2zp8f3hd3hz18d5n1"; sha256 = "sha256-qmX66nz+gVOt1RGsUT9fA3wPUT7I9Z4jhxpybP0I8Cw=";
}; };
extraMeta = { extraMeta = {
branch = "5.10/master"; branch = "5.12/master";
maintainers = with lib.maintainers; [ atemu ]; maintainers = with lib.maintainers; [ atemu ];
description = linux_zen.meta.description + " (Same as linux_zen but less aggressive release schedule)"; description = linux_zen.meta.description + " (Same as linux_zen but less aggressive release schedule)";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or { }))

View file

@ -6,7 +6,7 @@
, ... } @ args: , ... } @ args:
let let
version = "5.10.35-rt39"; # updated by ./update-rt.sh version = "5.10.41-rt42"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version; branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0; kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // { in buildLinux (args // {
@ -18,14 +18,14 @@ in buildLinux (args // {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "1zcqsjzqgcvlhkjwhzs6sxgbhzkfg898pbisivjqfymp8nfs2dxc"; sha256 = "0wb739q7dha8nxkd72x42k4in5nw633yw065ppwc8rq7x2fpa17n";
}; };
kernelPatches = let rt-patch = { kernelPatches = let rt-patch = {
name = "rt"; name = "rt";
patch = fetchurl { patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "03gq9y111k4js4cc87yc9y7hyg1wxwbc1bjyjdvb4nrx2wqka79y"; sha256 = "1z8jgsq5fkg486xxawg4c4wk1l9xra7x1cfqaf4grhw0csbbx883";
}; };
}; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;

View file

@ -6,7 +6,7 @@
, ... } @ args: , ... } @ args:
let let
version = "5.4.115-rt57"; # updated by ./update-rt.sh version = "5.4.123-rt59"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version; branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0; kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // { in buildLinux (args // {
@ -14,14 +14,14 @@ in buildLinux (args // {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "1llxk04vlpi7a4ca2f5vlcxfn68n8yhmsar3hsl259i7hms28isv"; sha256 = "1pi223dls52piw65s3v4ml23wdyy73xpbdvp511187b6zgzk7zlf";
}; };
kernelPatches = let rt-patch = { kernelPatches = let rt-patch = {
name = "rt"; name = "rt";
patch = fetchurl { patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "1xh7xi27q58njhfayi2lnk4id7hnlklkgh2zx012gxv4ari76g0k"; sha256 = "1m1mnmk7h35p7dv6mg3pla6pw3b645hbbccjmp1jc3fyn6qiy6fq";
}; };
}; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;

View file

@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, buildLinux, ... } @ args: { lib, fetchFromGitHub, buildLinux, ... } @ args:
let let
version = "5.11.16"; version = "5.12.9";
suffix = "zen1"; suffix = "zen1";
in in
@ -14,13 +14,13 @@ buildLinux (args // {
owner = "zen-kernel"; owner = "zen-kernel";
repo = "zen-kernel"; repo = "zen-kernel";
rev = "v${version}-${suffix}"; rev = "v${version}-${suffix}";
sha256 = "0jyicnpqccn194jrm1mc4zq0cil7ls9l57ws3nv783vlk7b0k3gv"; sha256 = "sha256-Sbe7pY/htLRRx5Qs78BpEzNCSIEsnZMj1+bkAftZdbQ=";
}; };
extraMeta = { extraMeta = {
branch = "5.10/master"; branch = "5.12/master";
maintainers = with lib.maintainers; [ atemu andresilva ]; maintainers = with lib.maintainers; [ atemu andresilva ];
description = "Built using the best configuration and kernel sources for desktop, multimedia, and gaming workloads."; description = "Built using the best configuration and kernel sources for desktop, multimedia, and gaming workloads.";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or { }))

View file

@ -52,7 +52,7 @@ in rec {
}; };
unifi6 = generic { unifi6 = generic {
version = "6.1.71"; version = "6.2.25";
sha256 = "1lvsq0xpfgwpbzs25khy7bnrhv8i1jgzi8ij75bsh65hfa3rplc2"; sha256 = "14pfy9cxjyaczdp9lk56by8s5485sjsz2414x7wshf1x76yfjh27";
}; };
} }

View file

@ -31,13 +31,13 @@ in
mkDerivation rec { mkDerivation rec {
pname = "fcitx5-chinese-addons"; pname = "fcitx5-chinese-addons";
version = "5.0.3"; version = "5.0.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fcitx"; owner = "fcitx";
repo = "fcitx5-chinese-addons"; repo = "fcitx5-chinese-addons";
rev = version; rev = version;
sha256 = "sha256-kCihpRUtUXrqqf7FPQp8ZRexiygOuDVOdQwVx7tSn+c="; sha256 = "sha256-+DhXFqUxECGZYHAmEw5cZJQnRHHgvT0nVVqY9DXgWBU=";
}; };
cmakeFlags = [ cmakeFlags = [

View file

@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell #!/usr/bin/env nix-shell
#!nix-shell -i python3 -p nix-prefetch-github python3Packages.requests #!nix-shell -i python3 -p nix-update nix-prefetch-github python3Packages.requests
from nix_prefetch_github import * from nix_prefetch_github import *
import json import json
@ -12,8 +12,7 @@ REPOS = [ "libime", "xcb-imdkit", "fcitx5", "fcitx5-gtk", "fcitx5-qt", "fcitx5-c
OWNER = "fcitx" OWNER = "fcitx"
def get_latest_tag(repo, owner=OWNER): def get_latest_tag(repo, owner=OWNER):
r = requests.get( 'https://api.github.com/repos/{}/{}/tags'.format(owner,repo) r = requests.get('https://api.github.com/repos/{}/{}/tags'.format(owner,repo))
, auth=('poscat', 'db5e6fd16d0eb8c36385d3d944e058a1178b4265'))
return r.json()[0].get("name") return r.json()[0].get("name")
def main(): def main():

View file

@ -20555,13 +20555,6 @@ in
]; ];
}; };
linux_5_11 = callPackage ../os-specific/linux/kernel/linux-5.11.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
];
};
linux_5_12 = callPackage ../os-specific/linux/kernel/linux-5.12.nix { linux_5_12 = callPackage ../os-specific/linux/kernel/linux-5.12.nix {
kernelPatches = [ kernelPatches = [
kernelPatches.bridge_stp_helper kernelPatches.bridge_stp_helper
@ -20873,7 +20866,6 @@ in
linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19);
linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4);
linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10); linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10);
linuxPackages_5_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_11);
linuxPackages_5_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_12); linuxPackages_5_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_12);
# When adding to the list above: # When adding to the list above:
@ -20907,7 +20899,7 @@ in
# Hardened Linux # Hardened Linux
hardenedLinuxPackagesFor = kernel': overrides: hardenedLinuxPackagesFor = kernel': overrides:
let # Note: We use this hack since the hardened patches can lag behind and we don't want to delay updates: let # Note: We use this hack since the hardened patches can lag behind and we don't want to delay updates:
linux_latest_for_hardened = pkgs.linux_5_11; linux_latest_for_hardened = pkgs.linux_5_12;
kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides; kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides;
in linuxPackagesFor (kernel.override { in linuxPackagesFor (kernel.override {
structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix {
@ -31177,6 +31169,7 @@ in
terraform_0_13 terraform_0_13
terraform_0_14 terraform_0_14
terraform_0_15 terraform_0_15
terraform_1_0_0
terraform_plugins_test terraform_plugins_test
; ;

View file

@ -6400,6 +6400,8 @@ in {
pyspinel = callPackage ../development/python-modules/pyspinel { }; pyspinel = callPackage ../development/python-modules/pyspinel { };
pyspnego = callPackage ../development/python-modules/pyspnego { };
pyspotify = callPackage ../development/python-modules/pyspotify { }; pyspotify = callPackage ../development/python-modules/pyspotify { };
pysptk = callPackage ../development/python-modules/pysptk { }; pysptk = callPackage ../development/python-modules/pysptk { };
@ -7790,6 +7792,8 @@ in {
smartypants = callPackage ../development/python-modules/smartypants { }; smartypants = callPackage ../development/python-modules/smartypants { };
smbprotocol = callPackage ../development/python-modules/smbprotocol { };
smbus-cffi = callPackage ../development/python-modules/smbus-cffi { }; smbus-cffi = callPackage ../development/python-modules/smbus-cffi { };
smdebug-rulesconfig = callPackage ../development/python-modules/smdebug-rulesconfig { }; smdebug-rulesconfig = callPackage ../development/python-modules/smdebug-rulesconfig { };