diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 2680a9a6a536..32c9dc79d671 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -19,16 +19,16 @@ let maintainers = with maintainers; [ fliegendewurst ]; }; - version = "0.46.6"; + version = "0.46.7"; desktopSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "0nxlph23gkxrn10gnm0ncsy54fzcmbqcrrk492ygfgw8a8pl4ah1"; + sha256 = "0saqj32jcb9ga418bpdxy93hf1z8nmwzf76rfgnnac7286ciyinr"; }; serverSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "0z9wg84sdbpk8zhljydm05z7cqqv2ly9s921cli7rs8hcpl175cz"; + sha256 = "0b9bbm1iyaa5wf758085m6kfbq4li1iimj11ryf9xv9fzrbc4gvs"; }; in { diff --git a/pkgs/applications/science/math/geogebra/geogebra6.nix b/pkgs/applications/science/math/geogebra/geogebra6.nix index dc952dc23295..20708004158b 100644 --- a/pkgs/applications/science/math/geogebra/geogebra6.nix +++ b/pkgs/applications/science/math/geogebra/geogebra6.nix @@ -1,7 +1,7 @@ { lib, stdenv, unzip, fetchurl, electron_6, makeWrapper, geogebra }: let pname = "geogebra"; - version = "6-0-620-0"; + version = "6-0-631-0"; srcIcon = geogebra.srcIcon; desktopItem = geogebra.desktopItem; @@ -18,9 +18,9 @@ let src = fetchurl { urls = [ "https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" - "https://web.archive.org/web/20210101214511/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" + "https://web.archive.org/web/20210406083122/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" ]; - sha256 = "0xxzmphbfvmhnxnc1pkjgdhccjndyzmlvvaa8xfdrvswwwk7zh43"; + sha256 = "1k4jxcvxxjxfrdghs4a29zpp4yid2vh1mfgp8xxr3qlzxnqv92ha"; }; dontConfigure = true; @@ -53,9 +53,9 @@ let src = fetchurl { urls = [ "https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip" - "https://web.archive.org/web/20210101214236/https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip" + "https://web.archive.org/web/20210406084052/https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip" ]; - sha256 = "13g05d45j6dn9zwxpxnln83j7w1cvcd7l8jnir30pxlmdi7h8r78"; + sha256 = "0fa680yyz4nry1xvb9v6qqh1mib6grff5d3p7d90nyjlv101p262"; }; dontUnpack = true; diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix index 98d9c3477e75..210542e0c981 100644 --- a/pkgs/development/libraries/libplacebo/default.nix +++ b/pkgs/development/libraries/libplacebo/default.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { pname = "libplacebo"; - version = "3.120.0"; + version = "3.120.1"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = "v${version}"; - sha256 = "1vjcp703h0a8z70bqkx1fawhpyv3zl11c7rczyky8v4cmcihscgg"; + sha256 = "0x7jyzsdf884jrky4yci151pk4nzsz1w88wz8sk0cqing7bpaq16"; }; nativeBuildInputs = [ @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dvulkan-registry=${vulkan-headers}/share/vulkan/registry/vk.xml" + "-Ddemos=false" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index bf5604e6d981..d1543c24b396 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.17.41"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.17.45"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-2FsOBdfelhabACS3aykr5isB729cqFOlElBjRrgtKrs="; + sha256 = "sha256-7dMELrpeIZFKfQmcuKJfAJwMQqlSnJrE9bhSrVs6ys8="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index a0555d7f1ca7..4aac44470e25 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.20.41"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.20.45"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-Y/ZQ/Ja84UHoGUp2HmiQ/qL7puASU676Ma5p8UUBXCE="; + sha256 = "sha256-s6WbIcb0BNLF3LGiFphISlrBu+Y5ypey4PDhnFLC6+E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 3ac51ac050fb..fe362fa86da8 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -1,32 +1,25 @@ { lib , buildPythonPackage -, fetchPypi , convertdate , dateutil +, fetchPypi , hijri-converter , korean-lunar-calendar +, pytestCheckHook +, pythonOlder , six -, python -, flake8 }: buildPythonPackage rec { pname = "holidays"; - version = "0.10.5.2"; + version = "0.11.1"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0g4hqbb94cwxlcwsjzrzxzlann1ks2r4mgnfzqz74a2rg1nih5zd"; + sha256 = "sha256-f6/YRvZ/Drfh+cGcOPSnlnvweu1d7S3XqKovk3sOoBs="; }; - postPatch = '' - # ignore too long line issues - # https://github.com/dr-prodigy/python-holidays/issues/423 - substituteInPlace tests.py \ - --replace "flake8.get_style_guide(ignore=[" "flake8.get_style_guide(ignore=['E501', " - ''; - - propagatedBuildInputs = [ convertdate dateutil @@ -36,13 +29,9 @@ buildPythonPackage rec { ]; checkInputs = [ - flake8 + pytestCheckHook ]; - checkPhase = '' - ${python.interpreter} -m unittest - ''; - pythonImportsCheck = [ "holidays" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 836407524365..fc675279a40a 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.32.0"; + version = "2.33.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gwymCOwmA++FCy0Zl+MxPMbPp+kmNFpx9Azuc34m+J0="; + sha256 = "sha256-0l8xwZ10zQb+LnV/hjYoSSgN/TGpVdzdXeSfnEyf0J0="; }; pythonImportsCheck = [ diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix new file mode 100644 index 000000000000..ab01a4bcc27d --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: + +let + version = "5.11.10"; + suffix = "xanmod1-cacule"; +in + buildLinux (args // rec { + modDirVersion = "${version}-${suffix}"; + inherit version; + + src = fetchFromGitHub { + owner = "xanmod"; + repo = "linux"; + rev = modDirVersion; + sha256 = "sha256-Pn1rX61mA8FEt5G1GppK/YyzXnB+hdm5pWh/4swQ4VE="; + extraPostFetch = '' + rm $out/.config + ''; + }; + + extraMeta = { + branch = "5.11"; + maintainers = with lib.maintainers; [ fortuneteller2k ]; + description = "Built with custom settings and new features built to provide a stable, responsive and smooth desktop experience"; + broken = stdenv.hostPlatform.isAarch64; + }; + } // (args.argsOverride or { })) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index f25e71476380..e8064c5b77fe 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2021-03-31"; + version = "2021-04-06"; pname = "oh-my-zsh"; - rev = "2b1d4122796fea12dcaa7545cfca59fb43e6393e"; + rev = "1670f1cafcc919f35a2a52eaceeca315d293b679"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "1c1hcmvfrfwds1zn165vpfh11a19s6kb20bxy2dzpby5cs15g6bc"; + sha256 = "1nphmg5sss860xhrc6iaiimzvfklb82kxwwivybh0ccyk2chb7i0"; }; installPhase = '' diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 943c69e76294..81e340f5bcf7 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -21,11 +21,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.19.41"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.19.45"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-DKKE2iMn6BHmcohHY6Uv7q9Om8FkbTbsk0CaxueBJHA="; + sha256 = "sha256-eYH8AbMYs9Pez+DfKS4OyhD39+vKQZ2uegMwi6qHr2w="; }; # https://github.com/aws/aws-cli/issues/4837 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 756e007677f8..ea9c968519a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19790,6 +19790,13 @@ in ]; }; + linux_xanmod = callPackage ../os-specific/linux/kernel/linux-xanmod.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a specific kernel, we have a function that builds those packages @@ -20110,6 +20117,9 @@ in linuxPackages_zen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_zen); linuxPackages_lqx = recurseIntoAttrs (linuxPackagesFor pkgs.linux_lqx); + # XanMod kernel + linuxPackages_xanmod = recurseIntoAttrs (linuxPackagesFor pkgs.linux_xanmod); + # A function to build a manually-configured kernel linuxManualConfig = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {});