fix: ollision between vscode & vscode-insider - /lib/vscode/chrome_crashpad_handler

2026-04-17 06:29:41 +02:00 · 2023-05-31 21:01:44 +08:00
parent 5b99c2ceca
commit 3f24fa464d
3 changed files with 48 additions and 45 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -177,11 +177,11 @@
        "systems": "systems_2"
      },
      "locked": {
-        "lastModified": 1681202837,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "lastModified": 1685518550,
+        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
        "type": "github"
      },
      "original": {
@@ -240,11 +240,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1684596126,
-        "narHash": "sha256-4RZZmygeEXpuBqEXGs38ZAcWjWKGwu13Iqbxub6wuJk=",
+        "lastModified": 1685480784,
+        "narHash": "sha256-pkk3J9gX745LEkkeTGhSRJqPJkmCPQzwI/q7a720XaY=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "27ef11f0218d9018ebb2948d40133df2b1de622d",
+        "rev": "54a9d6456eaa6195998a0f37bdbafee9953ca0fb",
        "type": "github"
      },
      "original": {
@@ -302,11 +302,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1681214977,
-        "narHash": "sha256-pBaG4iKzF/YJQA06f87IZokB15Z13DYd6zsT/wlbWfI=",
+        "lastModified": 1685534964,
+        "narHash": "sha256-T6He1z9xeQl5Kfg4leXLSJzKKZJ50K0Fsd9gsGvXrsI=",
        "owner": "nix-community",
        "repo": "lib-aggregate",
-        "rev": "19d70ca7a81956bd01a768297b84798f301e150f",
+        "rev": "2b87060a97069e14897bf1116d964e6774d47410",
        "type": "github"
      },
      "original": {
@@ -382,11 +382,11 @@
        "nixpkgs": "nixpkgs_6"
      },
      "locked": {
-        "lastModified": 1682480188,
-        "narHash": "sha256-4LG8Vl/fLWsJg+QAb5/PvZTdLtPFsYFxuGDfEAR5szA=",
+        "lastModified": 1685435187,
+        "narHash": "sha256-2tSrjl16iHdG6FYMNKS+MdsIDrCWXuKQ0XRWcdbMdFg=",
        "owner": "nix-community",
        "repo": "nix-eval-jobs",
-        "rev": "73ee1712faeb5db609fc9f991e2dc1de265acff5",
+        "rev": "a0e0808280535bc22ffde7d34ecad11014edd6a9",
        "type": "github"
      },
      "original": {
@@ -418,11 +418,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1685000237,
-        "narHash": "sha256-pm+2xP9g9sh6wapk1ulg7/1DdENkTNDB7Kx+6lwGs/k=",
+        "lastModified": 1685446848,
+        "narHash": "sha256-vEU1jynjDXwOJESHeJyABqbY/Y+DoihZq9iDVtYgrMg=",
        "owner": "nix-community",
        "repo": "nixos-generators",
-        "rev": "05bef004794f352ea12475a89f3f55b4102c0728",
+        "rev": "b6114e214e5b546c4cceccd33ee6b72294a76b60",
        "type": "github"
      },
      "original": {
@@ -449,11 +449,11 @@
    },
    "nixpkgs-darwin": {
      "locked": {
-        "lastModified": 1684968804,
-        "narHash": "sha256-y78lDeiJC/MSOM6HBe1VI5G2lrrmJMkWigRuOrf20uA=",
+        "lastModified": 1685498497,
+        "narHash": "sha256-ALymF59hDJ112RTz0qRkKY7Pboqb/7pY0xiXIiuppsQ=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "f69907854223d6d49f75b1ae52b2f6567f711d90",
+        "rev": "8c5f01ab09866caa80e2876c9dfd922100984c7e",
        "type": "github"
      },
      "original": {
@@ -512,11 +512,11 @@
    },
    "nixpkgs-stable_2": {
      "locked": {
-        "lastModified": 1685004253,
-        "narHash": "sha256-AbVL1nN/TDicUQ5wXZ8xdLERxz/eJr7+o8lqkIOVuaE=",
+        "lastModified": 1685451684,
+        "narHash": "sha256-Y5iqtWkO82gHAnrBvNu/yLQsiVNJRCad4wWGz2a1urk=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "3e01645c40b92d29f3ae76344a6d654986a91a91",
+        "rev": "6b0edc9c690c1d8a729f055e0d73439045cfda55",
        "type": "github"
      },
      "original": {
@@ -534,11 +534,11 @@
        "nixpkgs": "nixpkgs_7"
      },
      "locked": {
-        "lastModified": 1685121294,
-        "narHash": "sha256-ddWsZ2JGWgD/xfE2XZhfVibRTacU0hWYVrAovNZNb2M=",
+        "lastModified": 1685536231,
+        "narHash": "sha256-+U1lvJt44qkj9se7SfCJfpBk4tH8aCABc1fxl/03X6o=",
        "owner": "nix-community",
        "repo": "nixpkgs-wayland",
-        "rev": "e49f4358e371c5f6486a95e90dfb1754817acdae",
+        "rev": "40d42ae4d887f3d8a25ce65f0c229fc17c6a9598",
        "type": "github"
      },
      "original": {
@@ -597,11 +597,11 @@
    },
    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1684935479,
-        "narHash": "sha256-6QMMsXMr2nhmOPHdti2j3KRHt+bai2zw+LJfdCl97Mk=",
+        "lastModified": 1685383865,
+        "narHash": "sha256-3uQytfnotO6QJv3r04ajSXbEFMII0dUtw0uqYlZ4dbk=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "f91ee3065de91a3531329a674a45ddcb3467a650",
+        "rev": "5e871d8aa6f57cc8e0dc087d1c5013f6e212b4ce",
        "type": "github"
      },
      "original": {
@@ -629,11 +629,11 @@
    },
    "nixpkgs_7": {
      "locked": {
-        "lastModified": 1684935479,
-        "narHash": "sha256-6QMMsXMr2nhmOPHdti2j3KRHt+bai2zw+LJfdCl97Mk=",
+        "lastModified": 1685383865,
+        "narHash": "sha256-3uQytfnotO6QJv3r04ajSXbEFMII0dUtw0uqYlZ4dbk=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "f91ee3065de91a3531329a674a45ddcb3467a650",
+        "rev": "5e871d8aa6f57cc8e0dc087d1c5013f6e212b4ce",
        "type": "github"
      },
      "original": {
@@ -645,11 +645,11 @@
    },
    "nur": {
      "locked": {
-        "lastModified": 1685156120,
-        "narHash": "sha256-XnfGRNvRgqdNyiTm1B2VvzeuLFcENOXIir2jIE7BQ3A=",
+        "lastModified": 1685535224,
+        "narHash": "sha256-r9PMTDYswNqPCcMGQv6SFvE7tKtp3kIfmyixT3CH/3E=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "d71033acca2e80c8a2341a6dcd81fc9a677b1c4f",
+        "rev": "1872f9d69d18d4afb3b5ff7771fa6bbacdabf03f",
        "type": "github"
      },
      "original": {
--- a/home/linux/desktop/default.nix
+++ b/home/linux/desktop/default.nix
@@ -21,17 +21,5 @@
    # remote desktop(rdp connect)
    remmina
    freerdp  # required by remmina
-
-    # the vscode insiders is designed to run alongside the main build, 
-    # with a separate code-insiders command and a different config path
-    ((pkgs.vscode.override { isInsiders = true; }).overrideAttrs (oldAttrs: rec {
-      src = (builtins.fetchTarball {
-        url = "https://code.visualstudio.com/sha/download?build=insider&os=linux-x64";
-        # you need to update this sha256 every time you update vscode insiders
-        # the latest sha256 is printed in the error message of `sudo nixos-rebuild switch`
-        sha256 = "sha256:1f996x5i85zf0hpd7jx18zdqdp9nhxhf6zn83ai0njphz1dj354p";
-      });
-      version = "latest";
-    }))
  ];
 }
--- a/modules/nixos/core-desktop.nix
+++ b/modules/nixos/core-desktop.nix
@@ -112,6 +112,21 @@
    git-lfs  # used by huggingface models

    devenv.packages."${pkgs.system}".devenv
+
+    # the vscode insiders is designed to run alongside the main build, 
+    # with a separate code-insiders command and a different config path
+    # 
+    # TODO install vscode into systemPackages to avoid binary collision error temporarily
+    #     has collision between vscode & vscode-insider - /lib/vscode/chrome_crashpad_handler
+    ((pkgs.vscode.override { isInsiders = true; }).overrideAttrs (oldAttrs: {
+      src = (builtins.fetchTarball {
+        url = "https://code.visualstudio.com/sha/download?build=insider&os=linux-x64";
+        # you need to update this sha256 every time you update vscode insiders
+        # the latest sha256 is printed in the error message of `sudo nixos-rebuild switch`
+        sha256 = "sha256:1f996x5i85zf0hpd7jx18zdqdp9nhxhf6zn83ai0njphz1dj354p";
+      });
+      version = "latest";
+    }))
  ];

  # replace default editor with neovim