diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-08-28 09:54:31 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-08-28 09:54:31 +0200 |
commit | efb45f7638ca900575a5ee8da8de77f9ca87ae42 (patch) | |
tree | 679d474497360146a94fc81026b0f987d75e7697 /pkgs/applications/editors/vscode | |
parent | bef6fcbb4de8b89bcd2025ef91bfa7339c36d1dc (diff) | |
parent | 984ec92129e81ea52ab96f9a737e55081f9f6894 (diff) | |
download | nixpkgs-efb45f7638ca900575a5ee8da8de77f9ca87ae42.tar nixpkgs-efb45f7638ca900575a5ee8da8de77f9ca87ae42.tar.gz nixpkgs-efb45f7638ca900575a5ee8da8de77f9ca87ae42.tar.bz2 nixpkgs-efb45f7638ca900575a5ee8da8de77f9ca87ae42.tar.lz nixpkgs-efb45f7638ca900575a5ee8da8de77f9ca87ae42.tar.xz nixpkgs-efb45f7638ca900575a5ee8da8de77f9ca87ae42.tar.zst nixpkgs-efb45f7638ca900575a5ee8da8de77f9ca87ae42.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/editors/vscode')
-rw-r--r-- | pkgs/applications/editors/vscode/vscode.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/vscodium.nix | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 0bf0435d2fc..bedc8c60c70 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1yar8j6h39gpnq4givxh5cvi336p56sgc8pg32j6sasqk6mxv02c"; - x86_64-darwin = "1d68xkqkd49z7v4y3230l2v77aw34d7jkdbgj0wnc04kv6n8wx88"; + x86_64-linux = "1i4vq8a81jgshn9iqkj8rp0yqihq2bjim27c8sh4vl9d6a8a6vcr"; + x86_64-darwin = "090xj8pq3fdn7dcfrzvgvx906k6gs2xm04xkymz8vpm3a4rq1svn"; }.${system}; in callPackage ./generic.nix rec { @@ -21,7 +21,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.48.1"; + version = "1.48.2"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index edb55264354..5039fa4707c 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0f8p25963i7bbm2zxb4ra935maxk3sxims6j873wqwqnzn701diq"; - x86_64-darwin = "0k8ylcbiqvb0cnvbz3059rbyjqxmvig8zf7bfqgln1w591i411c4"; + x86_64-linux = "17frdyli375l20mb7sb5bmw000p9cplj4pagmhnb6nibi9wqypdx"; + x86_64-darwin = "1dh5k36fjdfwhidlsg1grjwy3s9jik3pg6xpdgi6946vzqv1vxll"; }.${system}; sourceRoot = { @@ -27,7 +27,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.48.1"; + version = "1.48.2"; pname = "vscodium"; executableName = "codium"; |