From 134a55abe1845e2be14decf6f99d2351d75ccac3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 00:28:35 +0000 Subject: [PATCH 01/12] python310Packages.google-cloud-logging: 3.1.1 -> 3.1.2 --- .../python-modules/google-cloud-logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From b51489a8300e8893c9e15c58b40accf7697416ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 02:46:27 +0000 Subject: [PATCH 02/12] python310Packages.google-cloud-vision: 2.7.2 -> 2.7.3 --- .../python-modules/google-cloud-vision/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From 4de7377e7e694ec76849caaafd347a7fee64f096 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 02:52:03 +0000 Subject: [PATCH 03/12] python310Packages.google-cloud-access-context-manager: 0.1.11 -> 0.1.12 --- .../google-cloud-access-context-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From e3a269446b7838fcc2cf55d5b18148e00a75793f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 03:00:08 +0000 Subject: [PATCH 04/12] python310Packages.google-cloud-videointelligence: 2.7.0 -> 2.7.1 --- .../python-modules/google-cloud-videointelligence/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From d56a35e1334132f0a4f19d5bb91b44cfa743394e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 03:11:46 +0000 Subject: [PATCH 05/12] python310Packages.google-cloud-resource-manager: 1.5.0 -> 1.5.1 --- .../python-modules/google-cloud-resource-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From 4d96447ebf3bf12ce18c9d1e6e0050cde080a0f8 Mon Sep 17 00:00:00 2001 From: Elliott Slaughter Date: Wed, 1 Jun 2022 10:16:09 -0700 Subject: [PATCH 06/12] terra: 1.0.0-beta3 -> 1.0.0-beta5 https://github.com/terralang/terra/releases/tag/release-1.0.0-beta5 https://github.com/terralang/terra/releases/tag/release-1.0.0-beta4 --- pkgs/development/compilers/terra/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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; }; } From 78c918ed868a4d3cf66f2a54ebf3b4bb7f4287a6 Mon Sep 17 00:00:00 2001 From: Elliott Slaughter Date: Wed, 1 Jun 2022 10:56:35 -0700 Subject: [PATCH 07/12] Add elliottslaughter to maintainers list. --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3c50a9c5b8d8..27ed5f4bbc04 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3571,6 +3571,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"; From 512038331168b8f15e16f371bc2d0e0a964c29b2 Mon Sep 17 00:00:00 2001 From: linsui Date: Wed, 8 Jun 2022 10:17:47 +0800 Subject: [PATCH 08/12] dotter: 0.12.10 -> 0.12.11 --- pkgs/tools/misc/dotter/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) 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 ]; From fc96793474dc17485480059ee8f5a7d27a8e90af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Jun 2022 07:36:14 +0000 Subject: [PATCH 09/12] palemoon: 31.0.0 -> 31.1.0 --- pkgs/applications/networking/browsers/palemoon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From 660ac5bf602ae820a3239842e292a8b168b952f9 Mon Sep 17 00:00:00 2001 From: Bruno Bzeznik Date: Fri, 10 Jun 2022 02:02:47 +0200 Subject: [PATCH 10/12] pythonPackages.asf_search: init at 3.0.6 (#157504) * pythonPackages.asf_search: init at 3.0.6 * Update pkgs/development/python-modules/asf-search/default.nix Co-authored-by: Sandro * Update pkgs/development/python-modules/asf-search/default.nix Co-authored-by: Sandro * Update pkgs/development/python-modules/asf-search/default.nix Co-authored-by: Sandro Co-authored-by: Sandro --- .../python-modules/asf-search/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/asf-search/default.nix 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/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 { }; From 8bc1f617dd3e1faa2d55d80d06895bb5a08aea0b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 9 Jun 2022 22:59:07 +0100 Subject: [PATCH 11/12] squeak: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: 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 --- pkgs/development/compilers/squeak/default.nix | 5 +++++ 1 file changed, 5 insertions(+) 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 From 19e8b063a968b4d8e25f2f9edaf78808f7503e19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 8 Jun 2022 19:27:22 +0000 Subject: [PATCH 12/12] python310Packages.pyrogram: 2.0.26 -> 2.0.27 --- pkgs/development/python-modules/pyrogram/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [