Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dd9adc846a14
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2510159e94e5
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 6, 2020

  1. vscode, vscodium: ban nixpkgs-update from updating 

    nixpkgs-update doesn't correctly update the hash for darwin.
There doesn't seem to be a good fix for this.

See also:

  - #76471
  - #76458

CC: @ryantm @eadwu
    @Synthetica9
    Synthetica9 committed Jan 6, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    rasendubi Oleksii Shmalko
    GPG key ID: DCEF7BCCEB3066C3
    Verified
    Learn about vigilant mode
    Copy the full SHA
    157d9bc View commit details

  2. Merge pull request #77043 from Synthetica9/vscode-no-auto-update 

    vscode, vscodium: ban nixpkgs-update from updating
    @ryantm
    ryantm authored Jan 6, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    rasendubi Oleksii Shmalko
    GPG key ID: DCEF7BCCEB3066C3
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2510159 View commit details
Showing with 4 additions and 0 deletions.
  1. +2 −0 pkgs/applications/editors/vscode/vscode.nix
  2. +2 −0 pkgs/applications/editors/vscode/vscodium.nix
2 changes: 2 additions & 0 deletions pkgs/applications/editors/vscode/vscode.nix
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,8 @@ let
}.${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.41.1";
pname = "vscode";
2 changes: 2 additions & 0 deletions pkgs/applications/editors/vscode/vscodium.nix
View file
Original file line number Diff line number Diff line change
@@ -22,6 +22,8 @@ let
in
callPackage ./generic.nix rec {
inherit sourceRoot;
# The update script doesn't correctly change the hash for darwin, so please:
# nixpkgs-update: no auto update

version = "1.41.1";
pname = "vscodium";