Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8c3b765bc632
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3abf820bc1ca
Choose a head ref
  • 4 commits
  • 3 files changed
  • 3 contributors

Commits on Apr 15, 2020

  1. ping: use vala_0_40 

    fails to build otherwise.

(cherry picked from commit 10c0352)
    @worldofpeace
    worldofpeace committed Apr 15, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    ttuegel Thomas Tuegel
    GPG key ID: 22CBF5249D4B4D59
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6ca86a0 View commit details

  2. nasc: fix build 

    (cherry picked from commit 433ea74)
    @worldofpeace
    worldofpeace committed Apr 15, 2020
    Copy the full SHA
    142afb8 View commit details

Commits on Apr 16, 2020

  1. chromedriver: 78.0.3904.70 -> 81.0.4044.69 

    backport of NixOS/nixpkgs#85302
    @das-g
    das-g committed Apr 16, 2020
    Copy the full SHA
    d219b7b View commit details

  2. Merge pull request #85353 from das-g/release-20.03_chromedriver-81.0.… 

    …4044

chromedriver: 78.0.3904.70 -> 81.0.4044.69
    @marsam
    marsam authored Apr 16, 2020
    Copy the full SHA
    3abf820 View commit details
6 changes: 4 additions & 2 deletions pkgs/applications/networking/ping/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,9 @@
, json-glib
, libsoup
, libgee
, wrapGAppsHook }:
, wrapGAppsHook
, vala_0_40
}:

stdenv.mkDerivation rec {
pname = "ping";
@@ -28,7 +30,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
meson
ninja
vala
vala_0_40
pkgconfig
python3
wrapGAppsHook
9 changes: 9 additions & 0 deletions pkgs/applications/science/math/nasc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ stdenv
, fetchFromGitHub
, fetchpatch
, pkgconfig
, vala
, gtk3
@@ -25,6 +26,14 @@ stdenv.mkDerivation rec {
sha256 = "036v3dx8yasp19j88lflibqnpfi5d0nk7qkcnr80zn1lvawf4wgn";
};

patches = [
# fix build with gcc9
(fetchpatch {
url = "https://github.com/parnold-x/nasc/commit/46b9b80e228b6b86001bded45d85e073a9411549.patch";
sha256 = "1sm2aw0xhw2chk036r231nmp2f2ypxcmzggwljkn7wfzgg3h1mx3";
})
];

nativeBuildInputs = [
cmake
vala
6 changes: 3 additions & 3 deletions pkgs/development/tools/selenium/chromedriver/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,12 +6,12 @@ let
allSpecs = {
x86_64-linux = {
system = "linux64";
sha256 = "155yilj9w8a6jbkx1axhhkizwdc12krl4xixn10j7n94bvny4w2y";
sha256 = "1mqsangjindfqgvjxgmpgfrcd8a2lqmwl587l0ip0p5wwz8yq5wi";
};

x86_64-darwin = {
system = "mac64";
sha256 = "0dzy9ihhbhx4byr2kalwfbn6jbk1hinacdqi25lvhaprdbrh2igh";
sha256 = "18ydf2bk5aiin3yffb9z8215idz65nkhgxq0mmlvwb8gwsdvnwi1";
};
};

@@ -28,7 +28,7 @@ let
in
stdenv.mkDerivation rec {
pname = "chromedriver";
version = "78.0.3904.70";
version = "81.0.4044.69";

src = fetchurl {
url = "https://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip";