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: bd2bccc47d9a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 24753c4123f7
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 29, 2019

  1. Cypress 3.4.1: Fix files used for verification.

    @gomain
    gomain committed Sep 29, 2019
    Copy the full SHA
    576515b View commit details

Commits on Oct 26, 2019

  1. cypress 3.4.1 -> 3.5.0

    @gomain
    gomain committed Oct 26, 2019
    Copy the full SHA
    cb25b6c View commit details

Commits on Oct 31, 2019

  1. Merge pull request #69962 from gomain/master 

    Cypress 3.4.1: Fix files used for verification.
    @mmahut
    mmahut authored Oct 31, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    24753c4 View commit details
Showing with 7 additions and 3 deletions.
  1. +7 −3 pkgs/development/web/cypress/default.nix
10 changes: 7 additions & 3 deletions pkgs/development/web/cypress/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec{
pname = "cypress";
version = "3.4.1";
version = "3.5.0";

src = fetchzip {
url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
sha256 = "1gyl5c86gr5sv6z5rkg0afdxqrmsxmyrimm1p5q6jlrlyzki1bfs";
sha256 = "1w1nqa0j3bzjr000d4jlr34d1asdc1fv81pq831s3wl55hyqbij6";
};

# don't remove runtime deps
@@ -26,7 +26,11 @@ stdenv.mkDerivation rec{
mkdir -p $out/bin $out/opt/cypress
cp -vr * $out/opt/cypress/
# Let's create the file binary_state ourselves to make the npm package happy on initial verification.
echo '{"verified": true}' > $out/opt/cypress/binary_state.json
# Cypress now verifies version by reading bin/resources/app/package.json
mkdir -p $out/bin/resources/app
printf '{"version":"%b"}' $version > $out/bin/resources/app/package.json
# Cypress now looks for binary_state.json in bin
echo '{"verified": true}' > $out/bin/binary_state.json
ln -s $out/opt/cypress/Cypress $out/bin/Cypress
'';