From bc7fb14b6e830196c81d410d6522864a649c2a9e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 9 Dec 2021 18:06:37 +0800 Subject: [PATCH 01/12] vscode: 1.62.3 -> 1.63.0 (cherry picked from commit 521958cb8fb729775b9174c92f32af2821b59560) --- pkgs/applications/editors/vscode/generic.nix | 2 +- pkgs/applications/editors/vscode/vscode.nix | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 8924b669c4a8..f2c262ece95d 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -118,7 +118,7 @@ let packed="resources/app/node_modules.asar" unpacked="resources/app/node_modules" ${nodePackages.asar}/bin/asar extract "$packed" "$unpacked" - substituteInPlace $unpacked/sudo-prompt/index.js \ + substituteInPlace $unpacked/@vscode/sudo-prompt/index.js \ --replace "/usr/bin/pkexec" "/run/wrappers/bin/pkexec" \ --replace "/bin/bash" "${bash}/bin/bash" rm -rf "$packed" diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 082979605f7b..fd56434e7b04 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -14,17 +14,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0wf8bmzag49n81kjb46kj2nkksimm8f7cf4ihpqcw8k5iwasn3j9"; - x86_64-darwin = "1s7i5087bvckg66mcb32krv12vxhaw7ii9vm3i6p72wr0sv7dddh"; - aarch64-linux = "0yzh5javinvas3zz0lliyc77vbcs1jrmxbkr7nic4snscg6wjhcd"; - aarch64-darwin = "13l6ymz7v18s7ikxbwvkwb0f5ff2j82j5pfj04yy75kq9b5gh0vx"; - armv7l-linux = "129wffj9cidk9ysjpq3p0ddn6liwkmrkxhxgz7bqzj8sdhwyq8pz"; + x86_64-linux = "1w28rmb9fi45s85rrlzzh6r826dnyisd6lh3j8ir4hx6d34cawsf"; + x86_64-darwin = "1fyg3ygqk0z3jcj5bskgprlq8k9j134y75xq06z4xbv1dhgwhswj"; + aarch64-linux = "0hha9ksbj51zmq0p3d1fwni4jd0yp0wab0w19carmbhnydhrgh22"; + aarch64-darwin = "1cmrh621z7ddl4qh95hm0nwzazshl71a43c6113jf4w6b1kvy5m5"; + armv7l-linux = "1kipvqc5hrpgsfw7x2ab5jydf7zksdd3q8qr2mg20kjsdi4skwy4"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.62.3"; + version = "1.63.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; From 62a41a6b87bebaac96b56624640db44cd099f061 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 9 Dec 2021 18:14:39 +0800 Subject: [PATCH 02/12] vscodium: 1.62.3 -> 1.63.0 (cherry picked from commit 0265685614f0b06c0216aafe8a58eb333486a0d0) --- pkgs/applications/editors/vscode/vscodium.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 75ac5f160eae..4b795fceba2d 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0g1c88i0nkg4hys00vhqp0i2n3kjl395fd2rimi2p49y042b5c9g"; - x86_64-darwin = "1521aqrv9zx2r5cy8h2011iz3v5lvayizlgv8j7j8qi272mmvx5k"; - aarch64-linux = "1kk0jrhqx6q325zmfg553pqmk6v9cx3a99bsh9rzvdlca94nmpj0"; - armv7l-linux = "08hy61a9pp18b1x7lnsc7b9y3bvnjmavazz7qkhp5qxl2gs802wm"; + x86_64-linux = "17kck7pkklhifm6hpsd93wmnyk06vi9sa55gp62m3diymp1b129z"; + x86_64-darwin = "1japc6yyvw07rll53pf2jfg89m2g9jqj5daghg10v1gqk98j7r3x"; + aarch64-linux = "0zg05q0hyldnw5g8b9zdf0ls4s07fixib7v830wa5dyi2sjcv149"; + armv7l-linux = "0mky66cyxhx3cfm35sa4vlwh8m1878rc80jml9mqxdhlrpnxgdiy"; }.${system}; sourceRoot = { @@ -31,7 +31,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.62.3"; + version = "1.63.0"; pname = "vscodium"; executableName = "codium"; From bd7f2de57c7bdbd41e1613c515ab1089ae34829c Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Wed, 15 Dec 2021 00:08:19 +0000 Subject: [PATCH 03/12] vscode: 1.63.0 -> 1.63.1 (cherry picked from commit e21ca17af22c625b15eb23d973c0ece879d60731) --- pkgs/applications/editors/vscode/vscode.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index fd56434e7b04..0cf3ba1bd2c8 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -14,17 +14,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1w28rmb9fi45s85rrlzzh6r826dnyisd6lh3j8ir4hx6d34cawsf"; - x86_64-darwin = "1fyg3ygqk0z3jcj5bskgprlq8k9j134y75xq06z4xbv1dhgwhswj"; - aarch64-linux = "0hha9ksbj51zmq0p3d1fwni4jd0yp0wab0w19carmbhnydhrgh22"; - aarch64-darwin = "1cmrh621z7ddl4qh95hm0nwzazshl71a43c6113jf4w6b1kvy5m5"; - armv7l-linux = "1kipvqc5hrpgsfw7x2ab5jydf7zksdd3q8qr2mg20kjsdi4skwy4"; + x86_64-linux = "0xn2gcvqjbj2adfwq2s0pz1n4yxg6spq4hifhvwavb34pn9yc9p9"; + x86_64-darwin = "13kgsxhjdfcdgz8xbhzpd7x1xh6am255dwxpbr03cg4p8iwfd3ig"; + aarch64-linux = "166ag0k0j8wixm3arl1ld4a4qi92ff1zvb6whhqshzdv0s39pys3"; + aarch64-darwin = "08g8qjbvlp27i37z7jcsvzgg6vm0grppnlh0jyji6lz31ksib6pz"; + armv7l-linux = "15l9kr01f0jxfi0a9dnldsjrwzv9x60ljgvmlh0zhx4h0q1x0n7l"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.63.0"; + version = "1.63.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; From 24dd9a82e726a12a4c417325ece37d5d20302cf1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Dec 2021 02:58:50 +0000 Subject: [PATCH 04/12] vscodium: 1.63.0 -> 1.63.1 (cherry picked from commit 3558190aa075816003c6ab838fd87fbe27f453a1) --- pkgs/applications/editors/vscode/vscodium.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 4b795fceba2d..a224c88b761b 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "17kck7pkklhifm6hpsd93wmnyk06vi9sa55gp62m3diymp1b129z"; - x86_64-darwin = "1japc6yyvw07rll53pf2jfg89m2g9jqj5daghg10v1gqk98j7r3x"; - aarch64-linux = "0zg05q0hyldnw5g8b9zdf0ls4s07fixib7v830wa5dyi2sjcv149"; - armv7l-linux = "0mky66cyxhx3cfm35sa4vlwh8m1878rc80jml9mqxdhlrpnxgdiy"; + x86_64-linux = "1p7rbpvmllpdvghk3avg8f0xrbfhgyyj7l0ajjp0pcx24g3ijdwq"; + x86_64-darwin = "1ggcvdvciq5dkiknlxsrxkx96gj0g8vw0h2v1bj1xvv1mqjv0kwk"; + aarch64-linux = "0ypi7n99c6s99vxl78j5zw4l8jysgnz3bzch3l9yqpp1faq2zim5"; + armv7l-linux = "1rb1b4ixvm98y5s40i6qhzl6c5rv1jkbvcbwrv4s2g122j002dwn"; }.${system}; sourceRoot = { @@ -31,7 +31,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.63.0"; + version = "1.63.1"; pname = "vscodium"; executableName = "codium"; From de2417de3453baf386a3b83a16118d11b88ce118 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Dec 2021 08:29:46 +0000 Subject: [PATCH 05/12] vscode: 1.63.1 -> 1.63.2 (cherry picked from commit d06fdce8958638c8d33437e6d95556d49a9b1e72) --- pkgs/applications/editors/vscode/vscode.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 0cf3ba1bd2c8..8990ef75a850 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -14,17 +14,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0xn2gcvqjbj2adfwq2s0pz1n4yxg6spq4hifhvwavb34pn9yc9p9"; - x86_64-darwin = "13kgsxhjdfcdgz8xbhzpd7x1xh6am255dwxpbr03cg4p8iwfd3ig"; - aarch64-linux = "166ag0k0j8wixm3arl1ld4a4qi92ff1zvb6whhqshzdv0s39pys3"; - aarch64-darwin = "08g8qjbvlp27i37z7jcsvzgg6vm0grppnlh0jyji6lz31ksib6pz"; - armv7l-linux = "15l9kr01f0jxfi0a9dnldsjrwzv9x60ljgvmlh0zhx4h0q1x0n7l"; + x86_64-linux = "1bglf1a8b5whv9pk811fdnx0mvfcfasjxbik73p67msp4yy68lm4"; + x86_64-darwin = "0cv6i2i69xf6hn0vrfl3gk3ky7r5yvp4k7zx2k695gzck5s9bx8y"; + aarch64-linux = "1jggspj5q4vfgs4xdvx5p8qsfm98wf17jmxqzs68lmlhmhadyh22"; + aarch64-darwin = "0c1nz7a54xq20a2a4fqcmlhry6gqwz5f1ys7dx0x5whaxbybh8my"; + armv7l-linux = "0p2rdxbqpzk79ra7br7wfs8kr0hnh3l022mqb7y16gc426xjlfn4"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.63.1"; + version = "1.63.2"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; From 8ec9a3a692ad9f662538cf9c0f364cc6ee63730f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Dec 2021 08:37:51 +0000 Subject: [PATCH 06/12] vscodium: 1.63.1 -> 1.63.2 (cherry picked from commit f3bf177c8293a077cc25bc76aa87ab3549e94739) --- pkgs/applications/editors/vscode/vscodium.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index a224c88b761b..0ca39a728424 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1p7rbpvmllpdvghk3avg8f0xrbfhgyyj7l0ajjp0pcx24g3ijdwq"; - x86_64-darwin = "1ggcvdvciq5dkiknlxsrxkx96gj0g8vw0h2v1bj1xvv1mqjv0kwk"; - aarch64-linux = "0ypi7n99c6s99vxl78j5zw4l8jysgnz3bzch3l9yqpp1faq2zim5"; - armv7l-linux = "1rb1b4ixvm98y5s40i6qhzl6c5rv1jkbvcbwrv4s2g122j002dwn"; + x86_64-linux = "0pczrbifjgm905371i8c6bk90ka291cmny6hr1nzfix7bn5psjx0"; + x86_64-darwin = "12g2jlrhng3i56a4v9jf7nrj045jivnfdx4dhka1fiv60nn4gc46"; + aarch64-linux = "1bhhz4yvmk3zqljy3b77hlsxbwm2l675pslhwr44p6fb4hmn8fai"; + armv7l-linux = "15nbskq92b85zdyg7pgagi9mqhnbyisfkipqb3brc2rvmyxpzclb"; }.${system}; sourceRoot = { @@ -31,7 +31,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.63.1"; + version = "1.63.2"; pname = "vscodium"; executableName = "codium"; From aee882a0d2d18904e0e88aeff95eb1a153394943 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Fri, 3 Dec 2021 18:40:55 +0000 Subject: [PATCH 07/12] python3Packages.capstone: enable for non-x86 (cherry picked from commit 5e58aed9382d2897384c808c4545485ff2e012c7) --- pkgs/development/python-modules/capstone/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/capstone/default.nix b/pkgs/development/python-modules/capstone/default.nix index e6c42ac0c4d6..f10f34c381d4 100644 --- a/pkgs/development/python-modules/capstone/default.nix +++ b/pkgs/development/python-modules/capstone/default.nix @@ -31,7 +31,5 @@ buildPythonPackage rec { license = licenses.bsdOriginal; description = "Python bindings for Capstone disassembly engine"; maintainers = with maintainers; [ bennofs ris ]; - # creates a manylinux2014-x86_64 wheel - broken = !stdenv.isx86_64; }; } From b30058394376c66c3d7006ee01212d73641c9603 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Dec 2021 19:54:20 +0000 Subject: [PATCH 08/12] firefox-esr-91-unwrapped: 91.4.0esr -> 91.4.1esr (cherry picked from commit 5ae25b97ad658d5c2f5f65cb8558af9c7cd96924) --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 9bda1485d077..20374339b0dc 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -32,10 +32,10 @@ rec { firefox-esr-91 = common rec { pname = "firefox-esr"; - version = "91.4.0esr"; + version = "91.4.1esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "781bf62a0e1215cad7d90de7c822978997bfeaf71bde4e7124a732921d130762c6654417c708a299726039d1603ff5e0796106118ad4b2ddef4e9dac84887765"; + sha512 = "1b9f17c4e58e3753f8507754bba93e3b7f76df5b6845d6173719fbdd98b70af2a90242df42fe274217f56d0280e5dbae17962f5b6bf111421260790f770f5337"; }; meta = { From fa8aa7ff5995d539aabc6f6a009dfcc1e3fd33a8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 17 Dec 2021 06:44:10 +0100 Subject: [PATCH 09/12] =?UTF-8?q?ocamlPackages.iter:=201.2.1=20=E2=86=92?= =?UTF-8?q?=201.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 2b38c5c549dd810009b8d1ba7926ca003d001129) --- pkgs/development/ocaml-modules/iter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/iter/default.nix b/pkgs/development/ocaml-modules/iter/default.nix index 34e14baea7c9..4fa7e42c5d51 100644 --- a/pkgs/development/ocaml-modules/iter/default.nix +++ b/pkgs/development/ocaml-modules/iter/default.nix @@ -4,15 +4,15 @@ buildDunePackage rec { pname = "iter"; - version = "1.2.1"; + version = "1.3"; useDune2 = true; src = fetchFromGitHub { owner = "c-cube"; repo = pname; - rev = version; - sha256 = "0j2sg50byn0ppmf6l36ksip7zx1d3gv7sc4hbbxs2rmx39jr7vxh"; + rev = "v${version}"; + sha256 = "sha256:0xgkplpbi41sw0yv1wfd12cfbybls6cal8qxddmd9x8khgk5s3vx"; }; buildInputs = [ dune-configurator ]; From ba587068ee40872e5da7f7756030bd6218c43d85 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Fri, 17 Dec 2021 09:57:59 +0100 Subject: [PATCH 10/12] mautrix-whatsapp: 0.2.1 -> 0.2.2 (cherry picked from commit 2593fe10f78ca27d534c118d173ace4b54552bc1) --- pkgs/servers/mautrix-whatsapp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 5a84b8790012..42f7f5938fd3 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGo117Module rec { pname = "mautrix-whatsapp"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - sha256 = "sha256-gCbZGlZDwHw+OAlTx3rHlbd4Ntw+RaCEDTiP/1q0oJs="; + sha256 = "sha256-W+5DtCp7P/0azfusv+Nt3G9VcWKPUxVJmNwSfPjxjbw="; }; buildInputs = [ olm ]; - vendorSha256 = "sha256-4KDLL9FY3DrkGBDlu6G8Fp7XJfXjwLTELspyW+FBGfo="; + vendorSha256 = "sha256-Fr7yVTl8PIdr+SxXhUKG9DS18762HqL9ap6sUM3ziCQ="; doCheck = false; From 2962c28d568f7b7a3b929a910ce182007de24338 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 19 Dec 2021 08:04:56 -0800 Subject: [PATCH 11/12] emacs: Ignore large file warnings for native compilation This was blocking building phps-mode with native compilation enabled. (cherry picked from commit 9a86a53ec5104966717a4963e3f759304120e6c9) --- pkgs/build-support/emacs/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/emacs/generic.nix b/pkgs/build-support/emacs/generic.nix index ef154982ad06..1b81dbcf9ed7 100644 --- a/pkgs/build-support/emacs/generic.nix +++ b/pkgs/build-support/emacs/generic.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation ({ find $out/share/emacs -type f -name '*.el' -print0 \ | xargs -0 -n 1 -I {} -P $NIX_BUILD_CORES sh -c \ - "emacs --batch -f batch-native-compile {} || true" + "emacs --batch --eval '(setq large-file-warning-threshold nil)' -f batch-native-compile {} || true" ''; } From 1a1ba3cdd57b0337c32851bcac037df5eceab749 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 19 Dec 2021 08:07:18 -0800 Subject: [PATCH 12/12] melpa2nix: Ignore large file warnings While we haven't encountered any problems related to this in MELPA it's just a matter of time (this just happened for an ELPA package (phps-mode)). (cherry picked from commit 4192dce5385453340ee6ba0dc664ddbfa99d55b5) --- pkgs/build-support/emacs/melpa2nix.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/build-support/emacs/melpa2nix.el b/pkgs/build-support/emacs/melpa2nix.el index bd2aadd5aeb5..383423af0818 100644 --- a/pkgs/build-support/emacs/melpa2nix.el +++ b/pkgs/build-support/emacs/melpa2nix.el @@ -8,6 +8,9 @@ (setq package-build-archive-dir (expand-file-name "packages/")) (setq package-build-recipes-dir (expand-file-name "recipes/")) +;; Allow installing package tarfiles larger than 10MB +(setq large-file-warning-threshold nil) + (defun melpa2nix-build-package () (if (not noninteractive) (error "`melpa2nix-build-package' is to be used only with -batch"))