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: 8c3b765bc632
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 142afb8942ee
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

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
    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
Showing with 13 additions and 2 deletions.
  1. +4 −2 pkgs/applications/networking/ping/default.nix
  2. +9 −0 pkgs/applications/science/math/nasc/default.nix
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