From 1b534c4789a1e50b8180f241bc1f15272e8a6b78 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 2 Mar 2022 08:09:13 -0300 Subject: [PATCH 1/6] blockattack: 2.7.0 -> 2.8.0 --- pkgs/games/blockattack/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/games/blockattack/default.nix b/pkgs/games/blockattack/default.nix index 7616d2e51a34..6deba7987ada 100644 --- a/pkgs/games/blockattack/default.nix +++ b/pkgs/games/blockattack/default.nix @@ -15,14 +15,13 @@ stdenv.mkDerivation rec { pname = "blockattack"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { - name = "${pname}-${version}-src"; owner = "blockattack"; repo = "blockattack-game"; rev = "v${version}"; - hash = "sha256-ySLm3AdoJRiMRdla45OJh8ZIFYNh+HzjG2VnFqoWuZA="; + hash = "sha256-2oKesdr2eNZhDlGrFRiH5/8APFkGJfxPCNvzFoIumdQ="; }; nativeBuildInputs = [ From a5ae9495202f2844c31f8d815c281d977821f1eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Mar 2022 18:52:49 +0000 Subject: [PATCH 2/6] v2ray-geoip: 202202170030 -> 202203020509 --- pkgs/data/misc/v2ray-geoip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index df190fd9ef80..121636916683 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202202170030"; + version = "202203020509"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "ebc49c1ccbe7f267778ab42dbfa01d7ff8a5241c"; - sha256 = "sha256-CxV7jKNeaSW7lVBKKr7Ih2XAehnFcapkyDogd5V32Zk="; + rev = "9dce4df2c1f409bad67f579910a4edf522251e7b"; + sha256 = "sha256-fR0lzvVQjWA3KbzLhuvoB15Z+7RAv34Wf5W7KRZ//QA="; }; installPhase = '' From 75d3f2b943bda8e6279cb0f38e5abcabbcba4218 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 2 Mar 2022 14:50:35 -0800 Subject: [PATCH 3/6] pulumi: add google-native --- pkgs/tools/admin/pulumi/data.nix | 16 ++++++++++++++++ pkgs/tools/admin/pulumi/update.sh | 1 + 2 files changed, 17 insertions(+) diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index 8a2e7398b20c..7491cff2ab6b 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -84,6 +84,10 @@ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.5.0-linux-amd64.tar.gz"; sha256 = "1zzrzsa07af7x4vwv7zgwkdrfmlhw30dcc7hqj92q4mn6valbn5q"; } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.15.0-linux-amd64.tar.gz"; + sha256 = "0cnwgr358lbrw6ssz8s7m87yniy7q2zhd6pmjhl8x41j1cljwyfa"; + } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.7.1-linux-amd64.tar.gz"; sha256 = "0qv3a4d6hnpga7lli7xnbwiig56h080hxrxjr8jbqsy9ymsqb39a"; @@ -238,6 +242,10 @@ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.5.0-darwin-amd64.tar.gz"; sha256 = "0mqciml9rzzfpjy7wdqqak1yym2yzilnsjyrpm255q38z77f5nkr"; } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.15.0-darwin-amd64.tar.gz"; + sha256 = "1616fbs348r539kcmvwxlhzzgdszgb0j2wy7lamqvnm8xw4l53ii"; + } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.7.1-darwin-amd64.tar.gz"; sha256 = "1xminhpv7b4nnvfdy5ahlcfrkan1fsmn0sp6gzkp5y4kkjd4a6vy"; @@ -392,6 +400,10 @@ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.5.0-linux-arm64.tar.gz"; sha256 = "0z0ch08xqbyjmizwvgx9jysnp6g3kjjbwh11gbc6vgxacqcajgz3"; } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.15.0-linux-arm64.tar.gz"; + sha256 = "1v3pdsdpqzgbsg181g9w0rn3sw1xirljvgvkw0081i9hxvhwq9zq"; + } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.7.1-linux-arm64.tar.gz"; sha256 = "14xqlgy0wy223hg9wp1rc4hbj1pvxrqnzxzv901dqjf5434n6aa0"; @@ -546,6 +558,10 @@ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.5.0-darwin-arm64.tar.gz"; sha256 = "0dc7cpgvb20s6qyyfm2i4hc4rbg8zdv0j92wc397pacd6i6jhvgn"; } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.15.0-darwin-arm64.tar.gz"; + sha256 = "0avmwnxj1m8j3jj5w1ims64lxqgig4z8yxpi76000xrv74w625b2"; + } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.7.1-darwin-arm64.tar.gz"; sha256 = "0n0303423gkwi3b6dwzaqmzsbn2rh4vki6n54mmgd44a3cxbhkak"; diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh index f7e7b0948b7f..91634301c27f 100755 --- a/pkgs/tools/admin/pulumi/update.sh +++ b/pkgs/tools/admin/pulumi/update.sh @@ -36,6 +36,7 @@ pulumi_repos=( "gcp" "github" "gitlab" + "google-native" "hcloud" "kubernetes" "linode" From 7a3e6d6604ad99c77e7a98943734bdeea564bff2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Mar 2022 17:17:39 +0000 Subject: [PATCH 4/6] syncthing: 1.19.0 -> 1.19.1 --- pkgs/applications/networking/syncthing/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 76bddac6c23b..31d0ce461d09 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,16 +4,16 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.19.0"; + version = "1.19.1"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "sha256-jQoY0mA/vAOCaCMR8Aapt49AF7HAmjPsr3MKLoaa24g="; + sha256 = "sha256-/CRDdKUeLQ/jSLrd44Tjbb0lfgFFnJkpmFEYZJFQHY8="; }; - vendorSha256 = "sha256-hZcMt3LlK5FuhhlwCmYtlDAJv1QNK+YY7NvZaWMBuys="; + vendorSha256 = "sha256-GBDGckGewo5Yp8zwAKwwXkSP5lx0fQR4AHQFkzO7Q0Q="; doCheck = false; From 77f77acffc569814a9a5e9a3a07b83a32cc14b77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 3 Mar 2022 02:36:12 +0000 Subject: [PATCH 5/6] python3Packages.ihatemoney: fix build --- pkgs/development/python-modules/ihatemoney/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ihatemoney/default.nix b/pkgs/development/python-modules/ihatemoney/default.nix index 4fe56c616146..d351f1ca7d44 100644 --- a/pkgs/development/python-modules/ihatemoney/default.nix +++ b/pkgs/development/python-modules/ihatemoney/default.nix @@ -96,6 +96,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.cfg \ + --replace "cachetools>=4.1,<5" "cachetools>=4.1" \ --replace "Flask-WTF>=0.14.3,<1" "Flask-WTF>=0.14.3,<2" \ --replace "SQLAlchemy>=1.3.0,<1.4" "SQLAlchemy>=1.3.0,<1.5" \ --replace "WTForms>=2.3.1,<2.4" "WTForms" @@ -106,7 +107,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportChecks = [ "ihatemoney" ]; + pythonImportsCheck = [ "ihatemoney" ]; disabledTests = [ "test_notifications" # requires running service. From ea27b2243bfacde2ed3fa05efdcc2bc842995119 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 3 Mar 2022 05:16:22 +0000 Subject: [PATCH 6/6] clang13Stdenv: init (#162346) Add new alias similar to existing clang12Stdenv and older --- pkgs/top-level/aliases.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 04f4955b8031..58f0eea3e4dd 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -162,6 +162,7 @@ mapAliases ({ clang10Stdenv = lowPrio llvmPackages_10.stdenv; clang11Stdenv = lowPrio llvmPackages_11.stdenv; clang12Stdenv = lowPrio llvmPackages_12.stdenv; + clang13Stdenv = lowPrio llvmPackages_13.stdenv; clangAnalyzer = throw "'clangAnalyzer' has been renamed to/replaced by 'clang-analyzer'"; # Converted to throw 2022-02-22 claws-mail-gtk2 = throw "claws-mail-gtk2 was removed to get rid of Python 2, please use claws-mail"; # Added 2021-12-05