Unverified Commit fb31fba0 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

servo: 0.0.6 -> 0.1.0 (#509594)

parents 8970cc89 72f9a5a9

nixos/tests/servo.nix

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    machine.wait_for_x()



    with subtest("Wait until Servo has finished loading the Valgrind docs page"):

      machine.execute("xterm -e 'servo file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html' >&2 &");

      machine.execute("xterm -e '${lib.getExe pkgs.servo} file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html' >&2 &");

      machine.wait_for_window("Valgrind")

      machine.wait_for_text("Quick Start Guide")

  '';

pkgs/by-name/se/servo/package.nix

+5 −5
Original line number Diff line number Diff line
@@ -69,13 +69,13 @@ in 


rustPlatform.buildRustPackage (finalAttrs: {

  pname = "servo";

  version = "0.0.6";

  version = "0.1.0";



  src = fetchFromGitHub {

    owner = "servo";

    repo = "servo";

    tag = "v${finalAttrs.version}";

    hash = "sha256-eKog8kcZJXBMJz/Lr0+ZwU95HYZRljGWByJ84vPfiEY=";

    hash = "sha256-DnjtKizYwadBYDqafFDuE/DRIjCqnK/L95zV0Fv0Xhc=";

    # Breaks reproducibility depending on whether the picked commit

    # has other ref-names or not, which may change over time, i.e. with

    # "ref-names: HEAD -> main" as long this commit is the branch HEAD
@@ -85,7 +85,7 @@ rustPlatform.buildRustPackage (finalAttrs: { 
    '';

  };



  cargoHash = "sha256-VP+hAQDfUVbOa2+Uq6hqG5YgQYRNI01+gDaR2MyYUTM=";

  cargoHash = "sha256-TJXWscTnsXxaWTfn7BugVMPamXOsyHXQhJskX04X7Zw=";



  # set `HOME` to a temp dir for write access

  # Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328)
@@ -159,7 +159,7 @@ rustPlatform.buildRustPackage (finalAttrs: { 
    mkdir -p $out/resources

    cp -r ./resources $out/



    wrapProgram $out/bin/servo \

    wrapProgram $out/bin/servoshell \

      --prefix LD_LIBRARY_PATH : ${runtimePaths}

  '';
@@ -178,7 +178,7 @@ rustPlatform.buildRustPackage (finalAttrs: { 
      hexa

    ];

    teams = with lib.teams; [ ngi ];

    mainProgram = "servo";

    mainProgram = "servoshell";

    platforms = lib.platforms.linux ++ lib.platforms.darwin;

  };

})