From a7a66aa2ea8715d5ce043f24d408a21fedf83c5f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 1 Jul 2021 04:20:00 +0000 Subject: [PATCH 01/17] nodejs-12_x: 12.22.1 -> 12.22.2 https://github.com/nodejs/node/releases/tag/v12.22.2 --- pkgs/development/web/nodejs/v12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index 7fad6a020a88..776f84309da5 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "12.22.1"; - sha256 = "12drpkffn79xx84pffg9y2cn9fiwycgaa2rjj3ix6visfzvhsrfx"; + version = "12.22.2"; + sha256 = "1p281hdw3y32pnbfr7cdc9igv2yrzqg16pn4yj3g01pi3mbhbn3z"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } From 282c97bb2766590e12e8d393240fe63c235bfdf0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 1 Jul 2021 04:20:00 +0000 Subject: [PATCH 02/17] nodejs-14_x: 14.17.1 -> 14.17.2 https://github.com/nodejs/node/releases/tag/v14.17.2 --- pkgs/development/web/nodejs/v14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index 27b2a4f33191..6271401a0f43 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -7,7 +7,7 @@ let in buildNodejs { inherit enableNpm; - version = "14.17.1"; - sha256 = "0zr4b9gja8f9611rnmc9yacmh90bd76xv9ayikcyqdfzdpax5wfx"; + version = "14.17.2"; + sha256 = "0gjq61l1lm15bv47w0phil44nbh0fsq3mmqf40xxlm92gswb4psg"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } From 4f90b61a11496e16d2e460301b73426ddd2be0b8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 1 Jul 2021 04:20:00 +0000 Subject: [PATCH 03/17] nodejs-16_x: 16.4.0 -> 16.4.1 https://github.com/nodejs/node/releases/tag/v16.4.1 --- pkgs/development/web/nodejs/v16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index 8514baec8b16..305baadecac7 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "16.4.0"; - sha256 = "07f8g3hs0v7nsdvzlsr1p4pzgb04qn54pnhmbdsgmmb41cp227pr"; + version = "16.4.1"; + sha256 = "1a1aygksmbafxvrs8g2jv0y1jj3cwyclk0qbqxkn5qfq5r1i943n"; } From fd918d34bdbe94797afd6ca10cd4d578acce7943 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 1 Jul 2021 04:20:00 +0000 Subject: [PATCH 04/17] nodejs-15_x: remove expression Node.js 15 has reached EOL on June 1, 2021. --- pkgs/development/web/nodejs/v15.nix | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 pkgs/development/web/nodejs/v15.nix diff --git a/pkgs/development/web/nodejs/v15.nix b/pkgs/development/web/nodejs/v15.nix deleted file mode 100644 index e6903098b302..000000000000 --- a/pkgs/development/web/nodejs/v15.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ callPackage, icu68, python3, enableNpm ? true }: - -let - buildNodejs = callPackage ./nodejs.nix { - icu = icu68; - python = python3; - }; -in - buildNodejs { - inherit enableNpm; - version = "15.14.0"; - sha256 = "0vm6jdazqjd1plqsgngzvjrafv2d3mdahk6il4ray02gx97dq8l1"; - } From 39916f933ebef93e473115c5160e285d76d30133 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 1 Jul 2021 04:20:00 +0000 Subject: [PATCH 05/17] beam: update reference to nodejs package nodejs-15_x has reached EOL, and removed from nixpkgs. --- doc/languages-frameworks/beam.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md index 348f66d42791..934e6cdca121 100644 --- a/doc/languages-frameworks/beam.section.md +++ b/doc/languages-frameworks/beam.section.md @@ -241,7 +241,7 @@ let git # replace with beam.packages.erlang.elixir_1_11 if you need beam.packages.erlang.elixir - nodejs-15_x + nodejs postgresql_13 # only used for frontend dependencies # you are free to use yarn2nix as well From 26790d006bd86be7d8223bf38c5e1fa771b56f9a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 1 Jul 2021 22:50:14 +0200 Subject: [PATCH 06/17] metasploit: 6.0.50 -> 6.0.51 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 23 +++++++------- pkgs/tools/security/metasploit/default.nix | 4 +-- pkgs/tools/security/metasploit/gemset.nix | 34 ++++++++++----------- 4 files changed, 32 insertions(+), 31 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 9f0af308cfb9..79f85f2b3750 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.0.49" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.51" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index ce054a6a480d..8248f6e8181b 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: 2e07122e80d8ae23e6aa53ae0fcb9dfca6639c59 - ref: refs/tags/6.0.49 + revision: d9aeac3fea255c475f553be4c55f3ae7cefc8542 + ref: refs/tags/6.0.51 specs: - metasploit-framework (6.0.49) + metasploit-framework (6.0.51) actionpack (~> 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -55,6 +55,7 @@ GIT rb-readline recog redcarpet + reline (= 0.2.5) rex-arch rex-bin_tools rex-core @@ -125,13 +126,13 @@ GEM arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.1) - aws-partitions (1.469.0) - aws-sdk-core (3.114.3) + aws-partitions (1.473.0) + aws-sdk-core (3.115.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.244.0) + aws-sdk-ec2 (1.246.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.55.0) @@ -155,7 +156,7 @@ GEM cookiejar (0.3.3) crass (1.0.6) daemons (1.4.0) - dnsruby (1.61.5) + dnsruby (1.61.7) simpleidn (~> 0.1) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) @@ -172,7 +173,7 @@ GEM eventmachine (1.2.7) faker (2.18.0) i18n (>= 1.6, < 2) - faraday (1.4.2) + faraday (1.4.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -198,8 +199,8 @@ GEM i18n (1.8.10) concurrent-ruby (~> 1.0) io-console (0.5.9) - irb (1.3.5) - reline (>= 0.1.5) + irb (1.3.6) + reline (>= 0.2.5) jmespath (1.4.0) jsobfu (0.4.2) rkelly-remix @@ -344,7 +345,7 @@ GEM rex-socket rex-text rex-struct2 (0.1.3) - rex-text (0.2.34) + rex-text (0.2.35) rex-zip (0.1.4) rex-text rexml (3.2.5) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index b8ad99b91788..c48c5e1690ef 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -8,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.50"; + version = "6.0.51"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-ZtIpkUt3jIhe4st8JlxE0rvLe6P+QBGdjyTL13Avwj0="; + sha256 = "sha256-ICVF4GVOyCq7dUAvzUUzhG+NuEiHSFvVWbQ8tAqUFFg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 7f43161b5beb..b52bff8aa8bb 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -114,30 +114,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xh65jmz3s12kfi7ij0j89d638nzdvq4z6dq9amzgmiw09ycvdbr"; + sha256 = "1dw05k0l63lm631lwg5b1bx1nhkirds4rbc1v98bliwfjk5wf71a"; type = "gem"; }; - version = "1.469.0"; + version = "1.473.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10wk5y4flc04cc42cmcfgr9sj67mz4582d45xmll56mpz4cw5cfc"; + sha256 = "06cs5wj4njb2ivhv06v5d7rgy1i2g67a93c0kxly8h7fkkxh315q"; type = "gem"; }; - version = "3.114.3"; + version = "3.115.0"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xnpxgcmacmqs98swlv3qkg7svpwydb1kqsngqciyg3jddzxrzp6"; + sha256 = "0n3m2a8jnk64ai4wb1wh1a77i8c561ncjklvp650w8723avbj5bq"; type = "gem"; }; - version = "1.244.0"; + version = "1.246.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -274,10 +274,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q7k7wn8flcdr0kzgknq40cjddd0zn3g3n4gwwwdz0kq30pinzxx"; + sha256 = "1pbhj4xmj4262in6c1nwl5ssw0qypg8ysjrrkwn2akkzbxzy9rfq"; type = "gem"; }; - version = "1.61.5"; + version = "1.61.7"; }; domain_name = { groups = ["default"]; @@ -354,10 +354,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07mhk70gv453pg38md346470hknyhipdqppnplq706ll3k3lzb7v"; + sha256 = "0zmdsl6n05khwwq8gjssmfca0ifz6q82wwghf1qyzbxxjdna5mly"; type = "gem"; }; - version = "1.4.2"; + version = "1.4.3"; }; faraday-em_http = { groups = ["default"]; @@ -494,10 +494,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06i0izb1jm4ijydwk9w2jqyvz72aznaa1b386769yfi8284cnwj6"; + sha256 = "0s4yjh5p1n05cm3pglh3g4ssrgy67x2bn3bsl0sydbm8mlf3xivr"; type = "gem"; }; - version = "1.3.5"; + version = "1.3.6"; }; jmespath = { groups = ["default"]; @@ -574,12 +574,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "2e07122e80d8ae23e6aa53ae0fcb9dfca6639c59"; - sha256 = "0zxyr1r88qslw6ypjqxx188vhmikl94fmkcdg3phm8r71qa375da"; + rev = "d9aeac3fea255c475f553be4c55f3ae7cefc8542"; + sha256 = "0n0ljh5b8g5lb7amnj4792w8svw46d2wsbs0fnxjmj2fcph4a990"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.49"; + version = "6.0.51"; }; metasploit-model = { groups = ["default"]; @@ -1156,10 +1156,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01g6jr73c3hbqhmzlc80jlqz2cwn9bq1j3cc19fpkq3hdg89drjp"; + sha256 = "0idgw5z813h5dp82n07g5ldpyfnk7mhvnzl87d9fpy6invixnnbq"; type = "gem"; }; - version = "0.2.34"; + version = "0.2.35"; }; rex-zip = { groups = ["default"]; From 06f190d2c6281e1aa3abc19248a053465b11f478 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Fri, 2 Jul 2021 02:57:10 +0200 Subject: [PATCH 07/17] mumble,murmur: Add Felix Singer as maintainer Signed-off-by: Felix Singer --- pkgs/applications/networking/mumble/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index e0c5b50be0f3..d93fea1f702a 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -63,7 +63,7 @@ let description = "Low-latency, high quality voice chat software"; homepage = "https://mumble.info"; license = licenses.bsd3; - maintainers = with maintainers; [ petabyteboy infinisil ]; + maintainers = with maintainers; [ petabyteboy infinisil felixsinger ]; platforms = platforms.linux; }; }); From 9a7acc7aed88a06a3068aa1611cdd535c37788e4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 2 Jul 2021 08:47:47 +0200 Subject: [PATCH 08/17] exploitdb: 2021-06-29 -> 2021-07-02 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index ded48ffb273a..bcc27c81f556 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-06-29"; + version = "2021-07-02"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-RF7+fo6I7rz7PTSHRDikeRpM0f4Bugn+Tt5Z7mjIKIM="; + sha256 = "sha256-p6D0FM52SF4fnWXa/zpewr+lNWC4hZWc0yAQYnioUdQ="; }; installPhase = '' From b990fe8c2890ce33e06315f2cad96bd0112e1628 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 2 Jul 2021 13:46:56 +0200 Subject: [PATCH 09/17] python3Packages.python-telegram-bot: 13.6 -> 13.7 --- .../python-modules/python-telegram-bot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 4d223c548388..6ddc4543d3d0 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "13.6"; + version = "13.7"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "37cfe8faba16fb68a8b5ab41a10e787c385f6296200c84256cc54d7c16334643"; + sha256 = "sha256-JN91RZ4zW5a6/6aZFnn4RL1CaXivWmnKQZoKxDpAYCw="; }; propagatedBuildInputs = [ From 1e0244655892d3cc5173ccac42a28330256957a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 2 Jul 2021 15:54:55 +0200 Subject: [PATCH 10/17] python3Packages.aiomusiccast: 0.8.0 -> 0.8.1 https://github.com/vigonotion/aiomusiccast/releases/tag/0.8.1 --- pkgs/development/python-modules/aiomusiccast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiomusiccast/default.nix b/pkgs/development/python-modules/aiomusiccast/default.nix index 921bfbac6466..e77642f510a7 100644 --- a/pkgs/development/python-modules/aiomusiccast/default.nix +++ b/pkgs/development/python-modules/aiomusiccast/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aiomusiccast"; - version = "0.8.0"; + version = "0.8.1"; format = "pyproject"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "vigonotion"; repo = "aiomusiccast"; rev = version; - sha256 = "1x55w2vhb5mgvlg19cs887xd7fg0cwnp6hb34vajp80q4yff9xk5"; + sha256 = "sha256-1k0ELXA8TgAyRYdzSFXp/BsPesC1WCiC4PqHfcPk0u8="; }; nativeBuildInputs = [ From 68a780e669e8dcc3abf7d2b9f0b1e3bf7cf2e76b Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Wed, 27 Jan 2021 11:39:10 +0100 Subject: [PATCH 11/17] neovim: remove lua override --- pkgs/top-level/all-packages.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6961be94b87..f9cb868165be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27446,10 +27446,7 @@ in wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { }; wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped); neovim-unwrapped = callPackage ../applications/editors/neovim { - lua = - # neovim doesn't work with luajit on aarch64: https://github.com/neovim/neovim/issues/7879 - if stdenv.isAarch64 then lua5_1 else - luajit; + lua = luajit; }; neovimUtils = callPackage ../applications/editors/neovim/utils.nix { }; From 58ba227160122cea95df57ce71edd44e44e4e233 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Sun, 10 May 2020 21:13:02 +0200 Subject: [PATCH 12/17] neovim: 0.4.4 -> 0.5.0 `"-DUSE_BUNDLED=OFF"` is from https://github.com/neovim/neovim/blob/2bcf18deaa32ad371b6de349b353d42e9b1c9ea0/contrib/flake.nix#L25 --- pkgs/applications/editors/neovim/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 1b4835064f96..bfa7e8e2009d 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -2,6 +2,7 @@ , libuv, lua, ncurses, pkg-config , unibilium, xsel, gperf , libvterm-neovim +, tree-sitter , glibcLocales ? null, procps ? null # now defaults to false because some tests can be flaky (clipboard etc) @@ -31,13 +32,13 @@ let in stdenv.mkDerivation rec { pname = "neovim-unwrapped"; - version = "0.4.4"; + version = "0.5.0"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "11zyj6jvkwas3n6w1ckj3pk6jf81z1g7ngg4smmwm7c27y2a6f2m"; + sha256 = "0lgbf90sbachdag1zm9pmnlbn35964l3khs27qy4462qzpqyi9fi"; }; patches = [ @@ -58,6 +59,7 @@ in msgpack ncurses neovimLuaEnv + tree-sitter unibilium ] ++ optional stdenv.isDarwin libiconv ++ optionals doCheck [ glibcLocales procps ] @@ -96,6 +98,7 @@ in "-DGPERF_PRG=${gperf}/bin/gperf" "-DLUA_PRG=${neovimLuaEnv.interpreter}" "-DLIBLUV_LIBRARY=${luvpath}" + "-DUSE_BUNDLED=OFF" ] ++ optional doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted" ++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON" From f5fac4dcd537b5d607299a4522febd942020afdc Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Thu, 1 Jul 2021 21:17:55 +0200 Subject: [PATCH 13/17] isomd5sum: support cross-compilation by moving python to nativebuildinputs --- pkgs/tools/cd-dvd/isomd5sum/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/cd-dvd/isomd5sum/default.nix b/pkgs/tools/cd-dvd/isomd5sum/default.nix index 2ca14cc4d603..9cb033e15d13 100644 --- a/pkgs/tools/cd-dvd/isomd5sum/default.nix +++ b/pkgs/tools/cd-dvd/isomd5sum/default.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation rec { sha256 = "1wjnh2hlp1hjjm4a8wzdhdrm73jq41lmpmy3ls0rh715p3j7z4q9"; }; - buildInputs = [ python3 popt ] ; + strictDeps = true; + nativeBuildInputs = [ python3 ]; + buildInputs = [ popt ] ; postPatch = '' substituteInPlace Makefile --replace "#/usr/" "#" From 3605a1f3622718f67ee8649b1c7a87c58d08f34c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 1 Jul 2021 22:44:26 +0200 Subject: [PATCH 14/17] python3Packages.twitterapi: 2.7.3 -> 2.7.4 --- pkgs/development/python-modules/twitterapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twitterapi/default.nix b/pkgs/development/python-modules/twitterapi/default.nix index b45218219c53..166e42ced821 100644 --- a/pkgs/development/python-modules/twitterapi/default.nix +++ b/pkgs/development/python-modules/twitterapi/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "twitterapi"; - version = "2.7.3"; + version = "2.7.4"; src = fetchFromGitHub { owner = "geduldig"; repo = "TwitterAPI"; rev = "v${version}"; - sha256 = "sha256-82TOVrC7wX7E9lKsx3iGxaEEjHSzf5uZwePBvAw3hDk="; + sha256 = "sha256-HDPRpM1LDTtUbldzfCrsdh/GpbzNCVVUVGwohyMe/YE="; }; propagatedBuildInputs = [ From 920b9f2d1a389d6fa5a3a1f3056d11ea657aae70 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 2 Jul 2021 20:39:53 +0200 Subject: [PATCH 15/17] python3Packages.daphne: 3.0.1 -> 3.0.2 --- pkgs/development/python-modules/daphne/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix index fc48f9150124..f6d7fcac62a5 100644 --- a/pkgs/development/python-modules/daphne/default.nix +++ b/pkgs/development/python-modules/daphne/default.nix @@ -4,7 +4,7 @@ }: buildPythonPackage rec { pname = "daphne"; - version = "3.0.1"; + version = "3.0.2"; disabled = !isPy3k; @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "django"; repo = pname; rev = version; - sha256 = "1bkxhzvaqwz760c11nhaiwvsq1d1csmk5dz2a1j1ynypjprhvhsk"; + sha256 = "sha256-KWkMV4L7bA2Eo/u4GGif6lmDNrZAzvYyDiyzyWt9LeI="; }; nativeBuildInputs = [ pytestrunner ]; From 3895ec33adaf692e50eecd2d347c55f81ab7da10 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 2 Jul 2021 20:45:35 +0200 Subject: [PATCH 16/17] nixos/tests/zsh-history: Fix matching prompt In commit fbbaa4d40f73a5350671f286b07ab3dc58f07321, the Zsh default prompt has changed from "walters" to "suse". So instead of: root@default> ... we now have: root@default:~/ > However, in the NixOS VM test, we are matching "root@default>", which doesn't include the current working directory and thus eventually leads to a test failure after timing out. To fix this, I changed the regex to include a newline at the beginning and made sure that the hostname ends with a word boundary. This way it doesn't matter whether the prompt is "walters" or "suse", because after all the test is not about the prompt but about whether the history mechanism works (or not). Signed-off-by: aszlig --- nixos/tests/zsh-history.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/zsh-history.nix b/nixos/tests/zsh-history.nix index 3109c3f65081..355687798406 100644 --- a/nixos/tests/zsh-history.nix +++ b/nixos/tests/zsh-history.nix @@ -23,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { # Login default.wait_until_tty_matches(1, "login: ") default.send_chars("root\n") - default.wait_until_tty_matches(1, "root@default>") + default.wait_until_tty_matches(1, r"\nroot@default\b") # Generate some history default.send_chars("echo foobar\n") From e1376754535c412ca81448875b38ec4686449661 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 2 Jul 2021 21:18:42 +0200 Subject: [PATCH 17/17] python3.pkgs.flask-compress: fix version metadata --- pkgs/development/python-modules/flask-compress/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix index 5d8359885bd1..fff330946d16 100644 --- a/pkgs/development/python-modules/flask-compress/default.nix +++ b/pkgs/development/python-modules/flask-compress/default.nix @@ -11,6 +11,10 @@ buildPythonPackage rec { sha256 = "28352387efbbe772cfb307570019f81957a13ff718d994a9125fa705efb73680"; }; + postPatch = '' + sed -i -e 's/use_scm_version=.*/version="${version}",/' setup.py + ''; + propagatedBuildInputs = [ flask brotli ]; meta = with lib; {