diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bf73b52643ef..441d2a634758 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3588,6 +3588,12 @@ github = "edlimerkaj"; githubId = 71988351; }; + elliottslaughter = { + name = "Elliott Slaughter"; + email = "elliottslaughter@gmail.com"; + github = "elliottslaughter"; + githubId = 3129; + }; emantor = { email = "rouven+nixos@czerwinskis.de"; github = "emantor"; diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index a07ca4e581de..842e44686a06 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -45,7 +45,7 @@ assert with lib.strings; ( stdenv.mkDerivation rec { pname = "palemoon"; - version = "31.0.0"; + version = "31.1.0"; src = fetchFromGitea { domain = "repo.palemoon.org"; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { repo = "Pale-Moon"; rev = "${version}_Release"; fetchSubmodules = true; - sha256 = "sha256-fIQAQCtjA/9Otft3e9Z4xWgE09sqsdArYQtZqmEgfTc="; + sha256 = "sha256-82OvD4q89D0rxMdzPEabMGLXXtEt4A7P6p2gKi7o+oA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix index 55abcbc64dd6..5747ce4b607b 100644 --- a/pkgs/development/compilers/squeak/default.nix +++ b/pkgs/development/compilers/squeak/default.nix @@ -136,6 +136,11 @@ in stdenv.mkDerivation { --replace '/bin/rm ' '${coreutils}/bin/rm ' ''; + # Workaround build failure on -fno-common toolchains: + # ld: vm/vm.a(cogit.o):spur64src/vm/cogitX64SysV.c:2552: multiple definition of + # `traceStores'; vm/vm.a(gcc3x-cointerp.o):spur64src/vm/cogit.h:140: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + preAutoreconf = '' pushd ./platforms/unix/config > /dev/null ./mkacinc > ./acplugins.m4 diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index c0b9d7f71447..56f5cea5f919 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -30,13 +30,13 @@ let in stdenv.mkDerivation rec { pname = "terra"; - version = "1.0.0-beta3_${builtins.substring 0 7 src.rev}"; + version = "1.0.0-beta5"; src = fetchFromGitHub { owner = "terralang"; repo = "terra"; - rev = "99ff93f8c60c89bbe2dc7c63eab9bfe2f4c4833e"; - sha256 = "0ww54xjvv6p8jwsh6hml3v527zgnv2gj58gpb818bbg4k1jwa5fl"; + rev = "bcc5a81649cb91aaaff33790b39c87feb5f7a4c2"; + sha256 = "0jb147vbvix3zvrq6ln321jdxjgr6z68pdrirjp4zqmx78yqlcx3"; }; nativeBuildInputs = [ cmake ]; @@ -84,7 +84,7 @@ in stdenv.mkDerivation rec { description = "A low-level counterpart to Lua"; homepage = "https://terralang.org/"; platforms = platforms.x86_64; - maintainers = with maintainers; [ jb55 seylerius thoughtpolice ]; + maintainers = with maintainers; [ jb55 seylerius thoughtpolice elliottslaughter ]; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/asf-search/default.nix b/pkgs/development/python-modules/asf-search/default.nix new file mode 100644 index 000000000000..b868b5f13628 --- /dev/null +++ b/pkgs/development/python-modules/asf-search/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pytz, shapely, importlib-metadata, requests, python-dateutil }: + +buildPythonPackage rec { + pname = "asf_search"; + version = "3.0.6"; + + src = fetchFromGitHub { + owner = "asfadmin"; + repo = "Discovery-asf_search"; + rev = "v${version}"; + sha256 = "1jzah2l1db1p2mv59w9qf0x3a9hk6s5rzy0jnp2smsddvyxfwcyn"; + }; + + propagatedBuildInputs = [ pytz shapely importlib-metadata requests python-dateutil ]; + + doCheck = false; + + pythonImportsCheck = [ "asf_search" ]; + + meta = with lib; { + description = "Python wrapper for the ASF SearchAPI"; + homepage = "https://github.com/asfadmin/Discovery-asf_search"; + license = licenses.bsd3; + maintainers = with maintainers; [ bzizou ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix index 7860e82a5152..7c9a0d4609f0 100644 --- a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "google-cloud-access-context-manager"; - version = "0.1.11"; + version = "0.1.12"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nvwb5q8ZzN8Uz69H4KH+XLInHlJtm84WFmEmJ3M14so="; + sha256 = "sha256-OHTuAh8JsKnK9sDkXZbx/P9ElrQRSCGBk83wuhL8qEg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index 3d07a80cce40..8dd27b463d98 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "3.1.1"; + version = "3.1.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-YjR2pdEWEWh84nixN/lDO4HssDlNN8CfhX1TOmBnsQs="; + hash = "sha256-PtAKi9IHb+56HcBTiA/LPJcxhIB+JA+MPAkp3XSOr38="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index 1da9972e77fc..5ce7bae7f6b8 100644 --- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "1.5.0"; + version = "1.5.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-U5OoT8Usm2XGB6ya14vzLnI2yO44tvtKSDP0D5xRM4I="; + hash = "sha256-3lJfwntd6JdaU3/5MY8ZZuGc8iTt0Vfk6tVP8oWMtxQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index 060847cc0f75..383780ec8a4c 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.7.0"; + version = "2.7.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ylzS63MoRkJ5JZpLBMX6B9EE99EwahWuC8rEYRg00B0="; + sha256 = "sha256-UqPwa3OogA2MLm0eCwl2fWSz5Pu6wc6SfiDIF/y8k9I="; }; propagatedBuildInputs = [ google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index b73baab08108..174b14522e25 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "2.7.2"; + version = "2.7.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-4NTWyf3rndw1zHINlBMtoEmdfSXGnU/jEhxab807Vg4="; + hash = "sha256-eS67OJ8VfmXYFMrhKBNP++Jt+Q1hxcWMWwymdd/P4vE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyrogram/default.nix b/pkgs/development/python-modules/pyrogram/default.nix index 70a5ad0aeeaf..055efe297556 100644 --- a/pkgs/development/python-modules/pyrogram/default.nix +++ b/pkgs/development/python-modules/pyrogram/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyrogram"; - version = "2.0.26"; + version = "2.0.27"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pyrogram"; repo = "pyrogram"; rev = "v${version}"; - hash = "sha256-R6EPraYusA3WVW9AGHpf6JkaX3dJ/ioL0lXgH0J3Kg8="; + hash = "sha256-QYNE6VfbhlZpxc3CGitOs0zMwYI6RKQG/GhyWSNoaDI="; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/misc/dotter/default.nix b/pkgs/tools/misc/dotter/default.nix index 67401b4d85b8..a160fb8b1c58 100644 --- a/pkgs/tools/misc/dotter/default.nix +++ b/pkgs/tools/misc/dotter/default.nix @@ -1,17 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, which }: +{ lib +, stdenv +, fetchpatch +, fetchFromGitHub +, rustPlatform +, CoreServices +, which +}: rustPlatform.buildRustPackage rec { pname = "dotter"; - version = "0.12.10"; + version = "0.12.11"; src = fetchFromGitHub { owner = "SuperCuber"; repo = "dotter"; rev = "v${version}"; - hash = "sha256-uSM7M//3LHzdLSOruTyu46sp1a6LeodT2cCEFsuoPW4="; + hash = "sha256-7K0p20FqaYFzOmUAeq1ousAPCeqE4AZoARF3UY4p4bY="; }; - cargoHash = "sha256-JpMEC2HjAQLQiXHSE6L0HBDc0vLhd465wDK2+35aBXA="; + cargoHash = "sha256-BN6cdRmhvMjYQlaEa840+syuVKKUQ59TPMKicm40MTk="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2e553cf8addf..6fd6fcae0409 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -667,6 +667,8 @@ in { ase = callPackage ../development/python-modules/ase { }; + asf-search = callPackage ../development/python-modules/asf-search { }; + asgi-csrf = callPackage ../development/python-modules/asgi-csrf { }; asgineer = callPackage ../development/python-modules/asgineer { };