From 52f29e8575c94e371e5a4ff573dabe5aae656902 Mon Sep 17 00:00:00 2001 From: Joel Date: Thu, 6 Jan 2022 11:46:58 +1000 Subject: [PATCH 01/21] obsidian: 0.13.14 -> 0.13.19 --- pkgs/applications/misc/obsidian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index f8934dafc58b..290553b8d345 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -31,11 +31,11 @@ let in stdenv.mkDerivation rec { pname = "obsidian"; - version = "0.13.14"; + version = "0.13.19"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz"; - sha256 = "0d55lk643yqjz4s6j5lbrdkf9f7wmwlz9ahjx760rzqpzy5190nr"; + sha256 = "1jx1raynr0dgffqwya7cp4yr3szdn9bfwrhzk09bkmn8ys7d426r"; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; From ca0f948f36a00868d0b002c2e34cc08073d1a10c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Jan 2022 22:34:40 +0100 Subject: [PATCH 02/21] metasploit: 6.1.22 -> 6.1.23 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 38 +++++++------ pkgs/tools/security/metasploit/default.nix | 4 +- pkgs/tools/security/metasploit/gemset.nix | 62 ++++++++++++++------- 4 files changed, 65 insertions(+), 41 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 2b1a9c3c2d31..66c28b5ab087 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.22" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.23" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index d0e479851593..77c92e9f4f68 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 3bfd2d8eeab3f8ab7efd7a46f8125a7a3bb5f2f0 - ref: refs/tags/6.1.22 + revision: 7682d9ab9c404b55cfc4a221db22f74a740a6f7f + ref: refs/tags/6.1.23 specs: - metasploit-framework (6.1.22) + metasploit-framework (6.1.23) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -75,7 +75,7 @@ GIT rex-text rex-zip ruby-macho - ruby_smb (~> 2.0) + ruby_smb (~> 3.0) rubyntlm rubyzip sinatra @@ -128,13 +128,13 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.543.0) - aws-sdk-core (3.125.0) + aws-partitions (1.547.0) + aws-sdk-core (3.125.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.288.0) + aws-sdk-ec2 (1.290.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.65.0) @@ -143,7 +143,7 @@ GEM aws-sdk-kms (1.53.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.110.0) + aws-sdk-s3 (1.111.1) aws-sdk-core (~> 3, >= 3.125.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) @@ -175,25 +175,29 @@ GEM eventmachine (1.2.7) faker (2.19.0) i18n (>= 1.6, < 2) - faraday (1.8.0) + faraday (1.9.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.1) + faraday-net_http_persistent (~> 1.0) faraday-patron (~> 1.0) faraday-rack (~> 1.0) - multipart-post (>= 1.2, < 3) + faraday-retry (~> 1.0) ruby2_keywords (>= 0.0.4) faraday-em_http (1.0.0) faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) + faraday-multipart (1.0.2) + multipart-post (>= 1.2, < 3) faraday-net_http (1.0.1) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) + faraday-retry (1.0.3) faye-websocket (0.11.1) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) @@ -260,7 +264,7 @@ GEM webrick metasploit_payloads-mettle (1.0.17) method_source (1.0.0) - mini_portile2 (2.6.1) + mini_portile2 (2.7.1) minitest (5.15.0) mqtt (0.5.0) msgpack (1.4.2) @@ -274,8 +278,8 @@ GEM network_interface (0.0.2) nexpose (7.3.0) nio4r (2.5.8) - nokogiri (1.12.5) - mini_portile2 (~> 2.6.1) + nokogiri (1.13.0) + mini_portile2 (~> 2.7.0) racc (~> 1.4) nori (2.6.0) octokit (4.21.0) @@ -375,7 +379,7 @@ GEM ruby-macho (2.5.1) ruby-rc4 (0.1.5) ruby2_keywords (0.0.5) - ruby_smb (2.0.13) + ruby_smb (3.0.0) bindata openssl-ccm openssl-cmac @@ -400,7 +404,7 @@ GEM daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (1.1.0) + thor (1.2.1) tilt (2.0.10) ttfunk (1.7.0) tzinfo (2.0.4) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 426f92586440..c1f6e7116ad3 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.1.22"; + version = "6.1.23"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-D3OmkXEqOgDOf1fvMtWiFT4bLw38SNHp2A25xAkq7Ew="; + sha256 = "sha256-um2WDbc7SHhbPSTamOTB0tRWl0tkkNGnY0lm+dU7iIA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 6d2cea42c652..cbf772acdb63 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -104,30 +104,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07ydbhiyncl0l1dwy09z8inf72x1k961qlcwwg62l4yacv0a74wq"; + sha256 = "1fi4irlxam3bmvafm6iiqj0vlzqg10vc4bzznl4c5w6zmg0lzp6b"; type = "gem"; }; - version = "1.543.0"; + version = "1.547.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06mkw688mrhz4j2d2ajzigr87041hxczy2w45j0iv1mnvs5yrhan"; + sha256 = "17v517dkrazxs9n64c8qdkwhb5fj9flnc2lp99gph6307ciz47w1"; type = "gem"; }; - version = "3.125.0"; + version = "3.125.1"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s67sgpv7b6asg3am157brsclq15p8r3fm2gc741zz546xfbfpm3"; + sha256 = "147z6prv5cj5scnd3rpjqw0pvbj7yvp9b7lzl786c0jil1pvjm0p"; type = "gem"; }; - version = "1.288.0"; + version = "1.290.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -154,10 +154,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1587v0xh0hcrxn0ki0ahx70kkpny4pm32fj4bh7500wzvjki6d6v"; + sha256 = "1pgh6zd07r9sfzkdz4bf6piq4n8gzl0f76h68l2zxchc1g9z4lqw"; type = "gem"; }; - version = "1.110.0"; + version = "1.111.1"; }; aws-sigv4 = { groups = ["default"]; @@ -344,10 +344,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0afhlqgby2cizcwgh7h2sq5f77q01axjbdl25bsvfwsry9n7gyyi"; + sha256 = "0y32gj994ll3zlcqjmwp78r7s03iiwayij6fz2pjpkfywgvp71s6"; type = "gem"; }; - version = "1.8.0"; + version = "1.9.3"; }; faraday-em_http = { groups = ["default"]; @@ -389,6 +389,16 @@ }; version = "1.0.1"; }; + faraday-multipart = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ih6nkjx4ph00iybicn0ssjkjnhnjd2xsl9g83lkg64w8q5s0i87"; + type = "gem"; + }; + version = "1.0.2"; + }; faraday-net_http = { groups = ["default"]; platforms = []; @@ -429,6 +439,16 @@ }; version = "1.0.0"; }; + faraday-retry = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd"; + type = "gem"; + }; + version = "1.0.3"; + }; faye-websocket = { groups = ["default"]; platforms = []; @@ -664,12 +684,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "3bfd2d8eeab3f8ab7efd7a46f8125a7a3bb5f2f0"; - sha256 = "0k7c584w9f8dv3lx2j7w1lpinghmlbak5vspgz700fiaf68scwqg"; + rev = "7682d9ab9c404b55cfc4a221db22f74a740a6f7f"; + sha256 = "10487gazjrj9cfkx34349fbmdm6jq7j9ini47mdphj1vnw6rcvds"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.1.22"; + version = "6.1.23"; }; metasploit-model = { groups = ["default"]; @@ -726,10 +746,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lvxm91hi0pabnkkg47wh1siv56s6slm2mdq1idfm86dyfidfprq"; + sha256 = "0d3ga166pahsxavzwj19yjj4lr13rw1vsb36s2qs8blcxigrdp6z"; type = "gem"; }; - version = "2.6.1"; + version = "2.7.1"; }; minitest = { groups = ["default"]; @@ -857,10 +877,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v02g7k7cxiwdcahvlxrmizn3avj2q6nsjccgilq1idc89cr081b"; + sha256 = "1cvx23d8z1nf5nsr5cv55m5dhr3f1bnvgdfqqfnjvhcd8cfnkgcd"; type = "gem"; }; - version = "1.12.5"; + version = "1.13.0"; }; nori = { groups = ["default"]; @@ -1337,10 +1357,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bjsh4qi6ii4zl0g0na004ylk991ar9rg5kz9rq1q7r5crxy2rw7"; + sha256 = "1klfrp56qid5fr1kzsi62bkhpp2yn6pbv0yg4ikf0lgzg5nq781w"; type = "gem"; }; - version = "2.0.13"; + version = "3.0.0"; }; rubyntlm = { groups = ["default"]; @@ -1437,10 +1457,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna"; + sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.1"; }; tilt = { groups = ["default"]; From 99ca9132ca60c81c8d99e03934599a4d8a1d24ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Jan 2022 00:42:10 +0000 Subject: [PATCH 03/21] python38Packages.types-requests: 2.27.0 -> 2.27.2 --- pkgs/development/python-modules/types-requests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 6dec072bb509..b7e37978d9ff 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.27.0"; + version = "2.27.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vFztDc8GdOPx+d7XNM7p+kXFfPZEsInmLI+xLKKOshU="; + sha256 = "c902c5433ad103053011c6ac036317ac6f6a8e8a6926fc470a8d2ef791236da7"; }; # Module doesn't have tests From 3e75c8096c92cfb1894c2d41812e8dc43738d985 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Jan 2022 05:50:03 +0000 Subject: [PATCH 04/21] python38Packages.pykeyatome: 1.3.0 -> 1.3.1 --- pkgs/development/python-modules/pykeyatome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pykeyatome/default.nix b/pkgs/development/python-modules/pykeyatome/default.nix index b27ee6b2ecec..a2198c258e60 100644 --- a/pkgs/development/python-modules/pykeyatome/default.nix +++ b/pkgs/development/python-modules/pykeyatome/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pykeyatome"; - version = "1.3.0"; + version = "1.3.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "jugla"; repo = "pyKeyAtome"; rev = "V${version}"; - sha256 = "1brcfgqj0bana6yii4083kppz822fgk9xf4mg141b0zfvx2gyjw9"; + sha256 = "1lvwxcr2ay8h5sr4lmjgs7xgszl1q8ciaqdn6cmrlra27jssl5ax"; }; propagatedBuildInputs = [ From 6bb011506936c8c4b72e4a99bb0f873668418bf2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Jan 2022 06:44:48 +0000 Subject: [PATCH 05/21] python38Packages.awscrt: 0.12.6 -> 0.13.0 --- pkgs/development/python-modules/awscrt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index e3125343dffa..a8cc3a34f94a 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.12.6"; + version = "0.13.0"; buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "65d71b4cd78165bea962dfbda361b47b9b5a6198d8074046b8667da9653d0752"; + sha256 = "f8c46335bdf94a5e48d3df2018edbd07c4c903635501c62c1bea4153f407531a"; }; meta = with lib; { From e184dc9be7d8e8e5b8bf5d2bd32d8c6254b6de6b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Jan 2022 06:49:24 +0000 Subject: [PATCH 06/21] python38Packages.types-toml: 0.10.1 -> 0.10.2 --- pkgs/development/python-modules/types-toml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-toml/default.nix b/pkgs/development/python-modules/types-toml/default.nix index d87528c20324..eaece50307d7 100644 --- a/pkgs/development/python-modules/types-toml/default.nix +++ b/pkgs/development/python-modules/types-toml/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-toml"; - version = "0.10.1"; + version = "0.10.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "1jqh0vki1hccj391gnxpblim429sj56npgq2z749f8v9ay6qy7sw"; + sha256 = "cd38b802e9c84c7a2e9b61e99a217e794bc01874586b292222e9764c6c7ca75c"; }; # Module doesn't have tests From 5422decc693c1a6fe883347da0d39b87fea915ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Jan 2022 07:30:34 +0000 Subject: [PATCH 07/21] python38Packages.types-decorator: 5.1.2 -> 5.1.3 --- pkgs/development/python-modules/types-decorator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-decorator/default.nix b/pkgs/development/python-modules/types-decorator/default.nix index 4436c5a2a6a4..e668f324fabb 100644 --- a/pkgs/development/python-modules/types-decorator/default.nix +++ b/pkgs/development/python-modules/types-decorator/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-decorator"; - version = "5.1.2"; + version = "5.1.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "b3dd9027af1131b4e55ccd09248b7accc7a02d567139e2009ed20db13cf90600"; + sha256 = "15d859bec0adca9edd948e94a5773c32710ee5dd4ad14ec983f08f979a821610"; }; # Modules doesn't have tests From 77f4bba9419bd8c6d29e1e3071e14105784ca087 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 8 Jan 2022 20:50:47 +1300 Subject: [PATCH 08/21] emacs.pkgs.ess-R-object-popup: Fix build --- .../emacs/elisp-packages/ess-R-object-popup/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/editors/emacs/elisp-packages/ess-R-object-popup/default.nix b/pkgs/applications/editors/emacs/elisp-packages/ess-R-object-popup/default.nix index fa7725fbb94c..5eaee9bbfdfe 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/ess-R-object-popup/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/ess-R-object-popup/default.nix @@ -2,6 +2,8 @@ , trivialBuild , fetchFromGitHub , emacs +, popup +, ess }: trivialBuild rec { @@ -15,6 +17,11 @@ trivialBuild rec { hash = "sha256-YN8ZLXEbwTFdFfovkV2IXV9v6y/PTgCdiRQqbpRaF2E="; }; + packageRequires = [ + popup + ess + ]; + meta = { homepage = "https://github.com/myuhe/ess-R-object-popup.el"; description = "Popup descriptions of R objects"; From 42a6888489388aade6b6ace55791588f31a77d37 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 8 Jan 2022 20:53:27 +1300 Subject: [PATCH 09/21] emacs.pkgs.railgun: Remove package It doesn't build & seems unmaintained. --- .../emacs/elisp-packages/manual-packages.nix | 2 -- .../emacs/elisp-packages/railgun/default.nix | 25 ------------------- 2 files changed, 27 deletions(-) delete mode 100644 pkgs/applications/editors/emacs/elisp-packages/railgun/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index c9eda3a548a0..a2a38e60fc3c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -225,8 +225,6 @@ }; }; - railgun = callPackage ./railgun { }; - structured-haskell-mode = self.shm; sv-kalender = callPackage ./sv-kalender { }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/railgun/default.nix b/pkgs/applications/editors/emacs/elisp-packages/railgun/default.nix deleted file mode 100644 index 87a20caf9f07..000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/railgun/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib -, trivialBuild -, fetchFromGitHub -, emacs -}: - -trivialBuild { - pname = "railgun"; - version= "0.pre+unstable=2012-10-17"; - - src = fetchFromGitHub { - owner = "mbriggs"; - repo = "railgun.el"; - rev = "66aaa1b091baef53a69d0d7425f48d184b865fb8"; - hash = "sha256-0L+jFgrXEPMTptx53RDdyH4BiA+7uInHceXL0eROoAM="; - }; - - buildInputs = [ emacs ]; - - meta = with lib; { - homepage = "https://github.com/mbriggs/railgun.el"; - description = "Propel yourself through a rails project with the power of magnets"; - inherit (emacs.meta) platforms; - }; -} From cb6ba978f34151dafc094ea13a482063870a3999 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Jan 2022 08:02:48 +0000 Subject: [PATCH 10/21] python38Packages.types-protobuf: 3.18.3 -> 3.18.4 --- pkgs/development/python-modules/types-protobuf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix index 398f71a4c4c5..104bcefcd787 100644 --- a/pkgs/development/python-modules/types-protobuf/default.nix +++ b/pkgs/development/python-modules/types-protobuf/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "3.18.3"; + version = "3.18.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "d3e253ebc1ba5e78932fef703dc4316afb7e5facd0ce8661b3921c9d541e16a7"; + sha256 = "2aed45e5257e9adebce306637179bfa111d42ecdd523e2a13d30cf8b2ee3cc84"; }; propagatedBuildInputs = [ From f306663cf663b1ccb2c6d5b4ce049996a8341fca Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 8 Jan 2022 02:06:20 +0300 Subject: [PATCH 11/21] =?UTF-8?q?josm:=2018303=20=E2=86=92=2018360?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/josm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index fa93e7257168..d1a8bd1077a3 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,20 +3,20 @@ }: let pname = "josm"; - version = "18303"; + version = "18360"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "sha256-+gUJsx238iQKrYx/rdtd8ESVXI0u/kW2s0p33T4MSWU="; + sha256 = "sha256-1OMEPMtUGkxQCgpmyVP1h25gSDa2MKF7l1rodr61O5s="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - sha256 = "sha256-s8MuXcDl+DwjXOtf6ltpxYSeCE9R2/x9iJs2BoZHgXM="; + sha256 = "sha256-ZCybgaLwPfQVG2gJ+dtElIY7bGZUe9R8a/0B6QK8yK8="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; rev = version; - sha256 = "sha256-+zsbksfQPwzVPpKlXdRWachWwjVuhExlyiEKDMkaxp8="; + sha256 = "sha256-GbIWZTJmmUT8r9L63/6mcnRt7dvavqGAVbozxlbF89g="; }; }; in From df48533b24b4c3f04d07c698e513a18d56859601 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Jan 2022 09:53:45 +0100 Subject: [PATCH 12/21] python3Packages.pixelmatch: disable mypy --- .../python-modules/pixelmatch/default.nix | 32 ++++++++++++++----- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pixelmatch/default.nix b/pkgs/development/python-modules/pixelmatch/default.nix index d7473a05bcca..836c3cd38ab2 100644 --- a/pkgs/development/python-modules/pixelmatch/default.nix +++ b/pkgs/development/python-modules/pixelmatch/default.nix @@ -1,15 +1,26 @@ -{ lib, buildPythonPackage, fetchgit, poetry-core, pytestCheckHook, pytest-benchmark, pytest-mypy, pillow }: +{ lib +, buildPythonPackage +, fetchgit +, pillow +, poetry-core +, pytest-benchmark +, pytest-mypy +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "pixelmatch"; - version = "0.2.2"; + version = "0.2.3"; format = "pyproject"; - # test fixtures are stored in LFS + disabled = pythonOlder "3.6"; + + # Test fixtures are stored in LFS src = fetchgit { url = "https://github.com/whtsky/pixelmatch-py"; rev = "v${version}"; - sha256 = "1dsix507dxqik9wvgzscvf2pifbg7gx74krrsalqbfcmm7d1i7xl"; + hash = "sha256-/zRQhwz+HjT0Hs4CunsqHxHWEtoIH9qMBowRb0Pps6Y="; fetchLFS = true; }; @@ -18,19 +29,24 @@ buildPythonPackage rec { ]; checkInputs = [ - pytestCheckHook + pillow pytest-benchmark pytest-mypy - pillow + pytestCheckHook ]; pytestFlagsArray = [ - "--mypy" + # Incompatible types in assignment + #"--mypy" "--benchmark-disable" ]; + pythonImportsCheck = [ + "pixelmatch" + ]; + meta = with lib; { - description = "A pixel-level image comparison library."; + description = "Pixel-level image comparison library"; homepage = "https://github.com/whtsky/pixelmatch-py"; license = licenses.isc; maintainers = with maintainers; [ petabyteboy ]; From 90a66508bc537f7465a2a26af38f979a2a39ffa7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Jan 2022 10:09:00 +0100 Subject: [PATCH 13/21] python3Packages.ppscore: 1.1.1 -> unstable-2021-11-25 --- .../python-modules/ppscore/default.nix | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/ppscore/default.nix b/pkgs/development/python-modules/ppscore/default.nix index 43dd1f249ed8..57d8048f0d6d 100644 --- a/pkgs/development/python-modules/ppscore/default.nix +++ b/pkgs/development/python-modules/ppscore/default.nix @@ -1,33 +1,41 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy27 , pandas -, scikit-learn , pytestCheckHook +, pythonOlder +, scikit-learn }: buildPythonPackage rec { pname = "ppscore"; - version = "1.1.1"; - disabled = isPy27; + version = "unstable-2021-11-25"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "8080labs"; repo = pname; - rev = version; - sha256 = "11y6axhj0nlagf7ax6gas1g06krrmddb1jlmf0mmrmyi7z0vldk2"; + rev = "c9268c16b6305c5c38e2fe2fd84f43d97ec1aaca"; + hash = "sha256-qiogjUgcLFauAMpVf2CKNC27c9xR9q7nY69n8/go1ms="; }; - checkInputs = [ pytestCheckHook ]; - propagatedBuildInputs = [ pandas scikit-learn ]; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "ppscore" + ]; + meta = with lib; { - description = "A Python implementation of the Predictive Power Score (PPS)"; + description = "Python implementation of the Predictive Power Score (PPS)"; homepage = "https://github.com/8080labs/ppscore/"; license = licenses.mit; maintainers = with maintainers; [ evax ]; From b972654ba20d618daa7d3cb3e48452ac64f569e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Jan 2022 09:09:53 +0000 Subject: [PATCH 14/21] python38Packages.jupyterlab: 3.2.5 -> 3.2.6 --- pkgs/development/python-modules/jupyterlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 76b160eb97c3..e05e6ed5ee66 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "3.2.5"; + version = "3.2.6"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "31b28f473b0f5826d2020583973c385526f0559b5b26efac6b8035ac1562874a"; + sha256 = "04e763974010f0f424ee889238fa488ee11708d0546e6df6e2cad9e0fc724bdb"; }; nativeBuildInputs = [ jupyter-packaging ]; From c1a642021812f01c6f2e3b0346f0c5df01e89e52 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Jan 2022 10:28:37 +0100 Subject: [PATCH 15/21] gitleaks: 8.2.5 -> 8.2.7 --- pkgs/tools/security/gitleaks/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix index e37accbe7c35..cb8155e5a1fa 100644 --- a/pkgs/tools/security/gitleaks/default.nix +++ b/pkgs/tools/security/gitleaks/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.2.5"; + version = "8.2.7"; src = fetchFromGitHub { owner = "zricethezav"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lHKdIQyGbQt6PmMaTRIUx1q/81Q4KOfQ8zLnpt9aGbk="; + sha256 = "sha256-kCKkPx0JEzmQn0y6UbVuwZXre7rDd4vKTudh6J3AxYA="; }; - vendorSha256 = "sha256-cIwte59AdVOWMBUWE4gKZSHhU37HgEW4k0v+jUUyj1Q="; + vendorSha256 = "sha256-zJ9Xl4tRUWntQwco+EHzqmL1aVcOjp70LCCmRsboxQ4="; ldflags = [ "-s" From 808657ca82a6583889e5b3e4b401a842baf043e5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Jan 2022 10:42:30 +0100 Subject: [PATCH 16/21] python3Packages.diskcache: 5.2.1 -> 5.4.0 --- .../python-modules/diskcache/default.nix | 44 ++++++++++++------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/diskcache/default.nix b/pkgs/development/python-modules/diskcache/default.nix index 457ab077a0ce..26cb0e438f01 100644 --- a/pkgs/development/python-modules/diskcache/default.nix +++ b/pkgs/development/python-modules/diskcache/default.nix @@ -1,50 +1,62 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage , fetchFromGitHub -, pytestCheckHook -, pytest-cov -, pytest-xdist , pytest-django -, mock +, pytest-xdist +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "diskcache"; - version = "5.2.1"; + version = "5.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "grantjenks"; repo = "python-diskcache"; rev = "v${version}"; - sha256 = "sha256-dWtEyyWpg0rxEwyhBdPyApzgS9o60HVGbtY76ELHvX8="; + hash = "sha256-c/k8mx/T4RkseDobJ2gtcuom0A6Ewyw4aP2Bk9pxV+o="; }; checkInputs = [ - pytestCheckHook - pytest-cov - pytest-xdist pytest-django - mock + pytest-xdist + pytestCheckHook ]; - # Darwin sandbox causes most tests to fail. + postPatch = '' + sed -i "/--cov/d" tox.ini + ''; + + # Darwin sandbox causes most tests to fail doCheck = !stdenv.isDarwin; - pythonImportsCheck = [ "diskcache" ]; disabledTests = [ - # very time sensitive, can fail on over subscribed machines + # Very time sensitive, can fail on over subscribed machines "test_incr_update_keyerror" + # AssertionError: 'default' is not None + "test_decr_version" + "test_incr_version" + "test_get_or_set" + "test_get_many" ]; pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ]; + pythonImportsCheck = [ + "diskcache" + ]; + meta = with lib; { description = "Disk and file backed persistent cache"; homepage = "http://www.grantjenks.com/docs/diskcache/"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } From 6ed36cfac82bb7db155d2734afbe638d0e8e00a0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Jan 2022 10:49:06 +0100 Subject: [PATCH 17/21] python3Packages.fastapi: 0.70.1 -> 0.71.0 --- pkgs/development/python-modules/fastapi/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index f0f10a88c7dd..53fab7e31419 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.70.1"; + version = "0.71.0"; format = "flit"; disabled = pythonOlder "3.6"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = pname; rev = version; - sha256 = "sha256-iwjxcAe8h38PPTTDGCxIJSB7zCS0FA0gOcKUjPpk3yg="; + sha256 = "sha256-J4j7lQm22pbwfMkQGF1s2xyFU4MCwXrAqDmRJmLmKGg="; }; propagatedBuildInputs = [ @@ -64,6 +64,8 @@ buildPythonPackage rec { disabledTestPaths = [ # Disabled tests require orjson which requires rust nightly "tests/test_default_response_class.py" + # Don't test docs and examples + "docs_src" ]; disabledTests = [ From 4f53f38e2a621ccc4f474c20ed3516e22678156f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Jan 2022 10:49:52 +0100 Subject: [PATCH 18/21] python3Packages.flux-led: 0.27.40 -> 0.27.43 --- pkgs/development/python-modules/flux-led/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index bb271807a7b3..7f6d04ddb745 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "0.27.40"; + version = "0.27.43"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = version; - sha256 = "sha256-imfdLomMjeGAyVBSygx+TV0DA9OrMreeSlzzrJ2B9cc="; + sha256 = "sha256-g1K5NoZm9nd1M17who0LtRa5n1P7P/XRs6Qz63vmTxw="; }; propagatedBuildInputs = [ From 3d229f817c18dce7ce33ae4bc63648527989ca8f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Jan 2022 11:12:05 +0100 Subject: [PATCH 19/21] python3Packages.hahomematic: 0.14.0 -> 0.15.0 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index d5c5a41abc04..385a76c22cbd 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "0.14.0"; + version = "0.15.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-Olwol/DhsVJznxpiMB57zkPuco0RBxMy8cfzSQMZZrU="; + sha256 = "sha256-jTUMnBtV0wVFWe+4MWOAvFDLvminM0gVTm0hkBOvnH8="; }; propagatedBuildInputs = [ From 2c1dd7dde0d60928da6487f04a6c3f795b76e839 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Jan 2022 11:34:30 +0100 Subject: [PATCH 20/21] python3Packages.urlextract: 1.4.0 -> 1.5.0 --- .../python-modules/urlextract/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/urlextract/default.nix b/pkgs/development/python-modules/urlextract/default.nix index cc5d2ae000ca..8d2c62de4e83 100644 --- a/pkgs/development/python-modules/urlextract/default.nix +++ b/pkgs/development/python-modules/urlextract/default.nix @@ -1,27 +1,31 @@ { lib -, appdirs , buildPythonPackage , dnspython , fetchPypi , filelock , idna +, platformdirs , pytestCheckHook +, pythonOlder , uritools }: buildPythonPackage rec { pname = "urlextract"; - version = "1.4.0"; + version = "1.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "669f07192584b841b49ba8868fbd6b00e7ddc28367d36a3d8ca8c8e429420748"; + hash = "sha256-QKXIQ9HXJTdY9W8NZ0jF6iekoUVl46kvJakW3cTB5B8="; }; propagatedBuildInputs = [ - appdirs filelock idna + platformdirs uritools ]; @@ -39,7 +43,9 @@ buildPythonPackage rec { "test_dns_cache_reuse" ]; - pythonImportsCheck = [ "urlextract" ]; + pythonImportsCheck = [ + "urlextract" + ]; meta = with lib; { description = "Collects and extracts URLs from given text"; From 0680de41d0a84f445960c83d88ec66fc22fb2d94 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Jan 2022 11:49:51 +0100 Subject: [PATCH 21/21] python3Packages.jupyterlab: update meta --- .../python-modules/jupyterlab/default.nix | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index e05e6ed5ee66..88c3d39ccf0e 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -11,28 +11,40 @@ buildPythonPackage rec { pname = "jupyterlab"; version = "3.2.6"; - disabled = pythonOlder "3.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; sha256 = "04e763974010f0f424ee889238fa488ee11708d0546e6df6e2cad9e0fc724bdb"; }; - nativeBuildInputs = [ jupyter-packaging ]; + nativeBuildInputs = [ + jupyter-packaging + ]; - propagatedBuildInputs = [ jupyterlab_server notebook nbclassic ]; + propagatedBuildInputs = [ + jupyterlab_server + notebook + nbclassic + ]; makeWrapperArgs = [ - "--set" "JUPYTERLAB_DIR" "$out/share/jupyter/lab" + "--set" + "JUPYTERLAB_DIR" + "$out/share/jupyter/lab" ]; # Depends on npm doCheck = false; - pythonImportsCheck = [ "jupyterlab" ]; + pythonImportsCheck = [ + "jupyterlab" + ]; meta = with lib; { - description = "Jupyter lab environment notebook server extension."; + description = "Jupyter lab environment notebook server extension"; license = with licenses; [ bsd3 ]; homepage = "https://jupyter.org/"; maintainers = with maintainers; [ zimbatm costrouc ];