From 59b2fe6adc8532d1006fbfbeee6754844b85b581 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 16 Jul 2021 10:54:12 +0800 Subject: [PATCH 01/14] pantheon.elementary-code: 3.4.1 -> 6.0.0 --- .../pantheon/apps/elementary-code/default.nix | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index e8b10227eaa4..50a32420de09 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pantheon , pkg-config @@ -12,11 +11,12 @@ , gtk3 , granite , libgee +, libhandy , elementary-icon-theme , appstream , libpeas , editorconfig-core-c -, gtksourceview3 +, gtksourceview4 , gtkspell3 , libsoup , vte @@ -25,11 +25,12 @@ , ctags , libgit2-glib , wrapGAppsHook +, polkit }: stdenv.mkDerivation rec { pname = "elementary-code"; - version = "3.4.1"; + version = "6.0.0"; repoName = "code"; @@ -37,17 +38,9 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-4AEayj+K/lOW6jEYmvmdan1kTqqqLL1YzwcU7/3PH5U="; + sha256 = "1w1m52mq3zr9alkxk1c0s4ncscka1km5ppd0r6zm86qan9cjwq0f"; }; - patches = [ - # Fix build with latest Vala. - (fetchpatch { - url = "https://github.com/elementary/code/commit/c50580d3336296823da9a2c50b824f21fde50286.patch"; - sha256 = "F+ZYlnZWYCU68G4oayLfbTnvSnTb4YA0zHVGD/Uf3KA="; - }) - ]; - passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; @@ -60,6 +53,10 @@ stdenv.mkDerivation rec { meson ninja pkg-config + + # polkit is needed for ITS rules + polkit + python3 vala wrapGAppsHook @@ -71,10 +68,11 @@ stdenv.mkDerivation rec { elementary-icon-theme granite gtk3 - gtksourceview3 + gtksourceview4 gtkspell3 libgee libgit2-glib + libhandy libpeas libsoup vte From 8a9cc8c2042f832373af94814712a6d90ca07665 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 17 Jul 2021 09:00:12 +0800 Subject: [PATCH 02/14] pantheon.elementary-terminal: 5.5.2 -> 6.0.0 --- pkgs/desktops/pantheon/apps/elementary-terminal/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index 46f279dd7957..6e6beba50cec 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -12,6 +12,7 @@ , gtk3 , libxml2 , granite +, libhandy , libnotify , vte , libgee @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { pname = "elementary-terminal"; - version = "5.5.2"; + version = "6.0.0"; repoName = "terminal"; @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-giVmL0zYEVYJ40ZBQ9dDb4hOx4HaYRt7tUTOu37lMYU="; + sha256 = "08akr4sv4jy9kd4s26kib6j7i8hc3vs0sp71fifv7ww4mi9cm6jc"; }; passthru = { @@ -57,6 +58,7 @@ stdenv.mkDerivation rec { granite gtk3 libgee + libhandy libnotify pcre2 vte From bd8076df8ae8d857d93f47430df1d400ab7d5964 Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 16 Jul 2021 17:36:35 +0900 Subject: [PATCH 03/14] vscode-extensions: update script consider codium --- pkgs/misc/vscode-extensions/update_installed_exts.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vscode-extensions/update_installed_exts.sh b/pkgs/misc/vscode-extensions/update_installed_exts.sh index 659ed8da791e..8e0af182cec5 100755 --- a/pkgs/misc/vscode-extensions/update_installed_exts.sh +++ b/pkgs/misc/vscode-extensions/update_installed_exts.sh @@ -48,7 +48,7 @@ EOF if [ $# -ne 0 ]; then CODE=$1 else - CODE=$(command -v code) + CODE=$(command -v code || command -v codium) fi if [ -z "$CODE" ]; then From d3a17ca735eaab64a46a8842304d3e68ad53f12f Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 16 Jul 2021 17:39:02 +0900 Subject: [PATCH 04/14] vscode-extensions.bradlc.vscode-tailwindcss: 0.6.6 -> 0.6.13 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index ecddd603d560..2070fdc8418b 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -205,8 +205,8 @@ let mktplcRef = { name = "vscode-tailwindcss"; publisher = "bradlc"; - version = "0.6.6"; - sha256 = "sha256-CRd+caKHFOXBnePr/LqNkzw0kRGYvNSkf4ecNgedpdA="; + version = "0.6.13"; + sha256 = "098vrm28b7jpzk0c2d0cgxvdw4jsswzf18cx1m9jwsm1j40fp5f4"; }; meta = with lib; { license = licenses.mpl20; From d06e921ec63cc63bc41bc7d02c3f14cb6eb538d5 Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 16 Jul 2021 17:39:50 +0900 Subject: [PATCH 05/14] vscode-extensions.coenraads.bracket-pair-colorizer-2: 0.2.0 -> 0.2.1 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 2070fdc8418b..8909011cc4c1 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -270,8 +270,8 @@ let mktplcRef = { name = "bracket-pair-colorizer-2"; publisher = "CoenraadS"; - version = "0.2.0"; - sha256 = "0nppgfbmw0d089rka9cqs3sbd5260dhhiipmjfga3nar9vp87slh"; + version = "0.2.1"; + sha256 = "0bfvzs4ac537zqhnqaa38jf4lhiy1fmqcv6lq89nnx8k963380z7"; }; meta = with lib; { license = licenses.mit; From aa15b4f1e3997e754a413aecde345f6d6008feec Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 16 Jul 2021 17:41:10 +0900 Subject: [PATCH 06/14] vscode-extensions.emmanuelbeziat.vscode-great-icons: 2.1.64 -> 2.1.79 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 8909011cc4c1..1dd2aef790c8 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -454,8 +454,8 @@ let mktplcRef = { name = "vscode-great-icons"; publisher = "emmanuelbeziat"; - version = "2.1.64"; - sha256 = "sha256-qsL1vWiEAYeWkMDNSrr1yzg0QxroEQQeznoDL3Ujy/o="; + version = "2.1.79"; + sha256 = "1cr1pxgxlfr643sfxbcr2xd53s1dnzcpacjj0ffkgizfda2psy78"; }; meta = with lib; { license = licenses.mit; From b3b079de1381dc82a0108bea8044463bb4956b1f Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 16 Jul 2021 17:42:27 +0900 Subject: [PATCH 07/14] vscode-extensions.esbenp.prettier-vscode: 5.8.0 -> 8.0.1 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 1dd2aef790c8..2deecdbde4ca 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -474,8 +474,8 @@ let mktplcRef = { name = "prettier-vscode"; publisher = "esbenp"; - version = "5.8.0"; - sha256 = "0h7wc4pffyq1i8vpj4a5az02g2x04y7y1chilmcfmzg2w42xpby7"; + version = "8.0.1"; + sha256 = "017lqpmzjxq5f1zr49akcm9gfki0qq8v7pj7gks6a3szjdx16mnl"; }; }; From ae3d297e6714e300e9f84bc7b491d44145ad4359 Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 16 Jul 2021 17:43:27 +0900 Subject: [PATCH 08/14] vscode-extensions.jock.svg: 1.4.4 -> 1.4.7 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 2deecdbde4ca..764143e627d9 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -776,8 +776,8 @@ let mktplcRef = { name = "svg"; publisher = "jock"; - version = "1.4.4"; - sha256 = "0kn2ic7pgbd4rbvzpsxfwyiwxa1iy92l0h3jsppxc8gk8xbqm2nc"; + version = "1.4.7"; + sha256 = "04ghqg4s7g7yylmvbxzwzpnyy4zin2bwlgvflh18m77w4j0ckpiq"; }; meta = with lib; { license = licenses.mit; From bdd69750ea0adaea47d304b9ca616fa1c1f30c1f Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 16 Jul 2021 17:44:19 +0900 Subject: [PATCH 09/14] vscode-extensions.kahole.magit: 0.6.15 -> 0.6.18 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 764143e627d9..bd109026830e 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -824,8 +824,8 @@ let mktplcRef = { name = "magit"; publisher = "kahole"; - version = "0.6.15"; - sha256 = "sha256-fRXm70FXnHduoywI4YC9ya6/J7wyd6EBzbnrcijBIbA="; + version = "0.6.18"; + sha256 = "0sqzz5bbqqg60aypvwxcqnxrr72gmwfj9sv0amgkyaf60zg5sf7w"; }; meta = { license = lib.licenses.mit; From c07ff766f3cfbee793b008bde0f2ffeafd9ae5dd Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 16 Jul 2021 17:46:23 +0900 Subject: [PATCH 10/14] vscode-extensions.serayuzgur.crates: 0.5.3 -> 0.5.9 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index bd109026830e..d584986fefb5 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1096,8 +1096,8 @@ let mktplcRef = { name = "crates"; publisher = "serayuzgur"; - version = "0.5.3"; - sha256 = "1xk7ayv590hsm3scqpyh6962kvgdlinnpkx0vapr7vs4y08dx72f"; + version = "0.5.9"; + sha256 = "0l26pyvw7n3bszf97yx6qps72acq112akg3q4jq5mvlibng1nwk0"; }; meta = { license = lib.licenses.mit; From ee43e6bac1b4b8d1537bae282db4412b8cdb4694 Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 16 Jul 2021 17:47:14 +0900 Subject: [PATCH 11/14] vscode-extensions.svelte.svelte-vscode: 105.0.0 -> 105.3.0 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index d584986fefb5..803844813050 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1198,8 +1198,8 @@ let mktplcRef = { name = "svelte-vscode"; publisher = "svelte"; - version = "105.0.0"; - sha256 = "sha256-my3RzwUW5MnajAbEnqxtrIR701XH+AKYLbnKD7ivASE="; + version = "105.3.0"; + sha256 = "11plqsj3c4dv0xg2d76pxrcn382qr9wbh1lhln2x8mzv840icvwr"; }; meta = { license = lib.licenses.mit; From b84b6477a54311debede37264182d21b97d208ec Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 16 Jul 2021 17:48:10 +0900 Subject: [PATCH 12/14] vscode-extensions.timonwong.shellcheck: 0.14.1 -> 0.14.4 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 803844813050..25a2ac1eb1f0 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1252,8 +1252,8 @@ let mktplcRef = { name = "shellcheck"; publisher = "timonwong"; - version = "0.14.1"; - sha256 = "sha256-X3ihMxANcqNLWl9oTZjCgwRt1uBsSN2BmC2D4dPRFLE="; + version = "0.14.4"; + sha256 = "05z314sw9nqym3qlj7dcwm0fz1hb23xppzqn3nr2wcj17hs8zz4m"; }; nativeBuildInputs = [ jq ]; postInstall = '' From 60f58c5da0ef2179cb0d672f9baf11690829e7fc Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 16 Jul 2021 17:49:08 +0900 Subject: [PATCH 13/14] vscode-extensions.vscodevim.vim: 1.11.3 -> 1.21.5 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 25a2ac1eb1f0..c47e17b1c129 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1323,8 +1323,8 @@ let mktplcRef = { name = "vim"; publisher = "vscodevim"; - version = "1.11.3"; - sha256 = "1smzsgcrkhghbnpy51gp28kh74l7y4s2m8pfxabb4ffb751254j0"; + version = "1.21.5"; + sha256 = "1v1xs1wcigisr6xip31i02cfryxrb157sla34y59pwlnhc5x1gny"; }; meta = { license = lib.licenses.mit; From 6e5f2d2b0105aea7aa925dd9eaa61d59317fcefe Mon Sep 17 00:00:00 2001 From: upkeep-bot Date: Sat, 17 Jul 2021 00:29:29 +0000 Subject: [PATCH 14/14] vscodium: 1.58.1 -> 1.58.2 --- 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 c9da010505e7..000c12bc72c7 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 = "16hzhmsh9nv2brpzx8wnz08sanf0v6f3ln5hqgzxck0pafbzqyl5"; - x86_64-darwin = "1a44fm5fx0zqlfr344mvc0m9hbd0vxd6s489pmh8x7m7q3sadi7j"; - aarch64-linux = "082gjmnlvk12vkcxbpsd4xfgs38qbxkfawq9kyl3p7i8y6anrd4i"; - armv7l-linux = "0zs66qmlq65166s34qjr6gppxvl5hyz1mjwxc97mki2c6y61fp28"; + x86_64-linux = "11h4c5ghgn3qrg66jh2par3cl3fqzn9xb7gdniww4badnyajnij8"; + x86_64-darwin = "0hd3qdxg4cknk3fxv509jlblwmfx65bm2a4arsg255224dpg64n2"; + aarch64-linux = "0waakj413kqf68sawajd3n24qdbx6b2svyb4lgbn0sy1apc96s3c"; + armv7l-linux = "1ij2bmsk601f1vjljj6gvxsxrcjqf2m74s9kc006hmcz7czjgk8f"; }.${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.58.1"; + version = "1.58.2"; pname = "vscodium"; executableName = "codium";