diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-17 15:12:28 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-17 15:12:28 +0100 |
| commit | ec1184f4616b0cf4ccf651ccac41f8ceb82dd1bb (patch) | |
| tree | f372e390ea1e08eb46620c3744a6d260e8b51197 /pkgs/applications/editors | |
| parent | 9ed0635a3078e474683af6ad1133885dad03627a (diff) | |
| parent | 3285f0f2ff36aea7d5e87520a3e9ef66c44f87b8 (diff) | |
| download | nixlib-ec1184f4616b0cf4ccf651ccac41f8ceb82dd1bb.tar nixlib-ec1184f4616b0cf4ccf651ccac41f8ceb82dd1bb.tar.gz nixlib-ec1184f4616b0cf4ccf651ccac41f8ceb82dd1bb.tar.bz2 nixlib-ec1184f4616b0cf4ccf651ccac41f8ceb82dd1bb.tar.lz nixlib-ec1184f4616b0cf4ccf651ccac41f8ceb82dd1bb.tar.xz nixlib-ec1184f4616b0cf4ccf651ccac41f8ceb82dd1bb.tar.zst nixlib-ec1184f4616b0cf4ccf651ccac41f8ceb82dd1bb.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/editors')
| -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 b6861a9023f8..cd3e5676e8c7 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,15 +11,15 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1bb7icdjzprrsxllx2q478m1p3qf5sbs3rs3bavvb3hzyyf4bifn"; - x86_64-darwin = "1hqpfmp5s135kb9777s96sr0zbls002h1980qbgf7r2hmc0mpnx0"; + x86_64-linux = "0c067qp3aa5kqya3y8pzc9cvyzsafizhgjp9dsibnfl08lvz9hbs"; + x86_64-darwin = "0vi94nk8p3vp30nx60mwqcmfqbrmrqwvfdjbah0zm480dcjzz7dv"; }.${system}; in callPackage ./generic.nix rec { # The update script doesn't correctly change the hash for darwin, so please: # nixpkgs-update: no auto update - version = "1.42.0"; + version = "1.42.1"; 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 d4676d421d0e..eafe1718c2fe 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 = "0f6ic24w6s9wfirzk5rvysn96gj1naj6b81al9743mllaf32ad5q"; - x86_64-darwin = "0fgyhb2wxkvrc90zzw5w2k3ggwbinmax286gbff3sjlrzbs5sj64"; + x86_64-linux = "1pac3rv7ps23ymynvy8dwd5k2154aln33ksr75z1d8w859x3f1dy"; + x86_64-darwin = "1imzgqynbd65c7gbfp2gb1cxjbazx7afvbdvbqnm5qg7pvq22rni"; }.${system}; sourceRoot = { @@ -25,7 +25,7 @@ in # The update script doesn't correctly change the hash for darwin, so please: # nixpkgs-update: no auto update - version = "1.42.0"; + version = "1.42.1"; pname = "vscodium"; executableName = "codium"; |