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

Commits on Jun 25, 2019

  1. saga: 6.3.0 -> 7.2.0

    @vbgl
    vbgl committed Jun 25, 2019
    Copy the full SHA
    e478e6b View commit details
Showing with 3 additions and 60 deletions.
  1. +3 −5 pkgs/applications/gis/saga/default.nix
  2. +0 −55 pkgs/applications/gis/saga/finite-6.3.0.patch
8 changes: 3 additions & 5 deletions pkgs/applications/gis/saga/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
unixODBC , poppler, hdf4, hdf5, netcdf, sqlite, qhull, giflib }:

stdenv.mkDerivation rec {
name = "saga-6.3.0";
name = "saga-7.2.0";

# See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs
# for why the have additional buildInputs on darwin
@@ -14,13 +14,11 @@ stdenv.mkDerivation rec {

enableParallelBuilding = true;

patches = [ ./finite-6.3.0.patch];

CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing";

src = fetchurl {
url = "mirror://sourceforge/project/saga-gis/SAGA%20-%206/SAGA%20-%206.3.0/saga-6.3.0.tar.gz";
sha256 = "0hyjim8fcp3mna1hig22nnn4ki3j6b7096am2amcs99sdr09jjxv";
url = "mirror://sourceforge/project/saga-gis/SAGA%20-%207/SAGA%20-%207.2.0/saga-7.2.0.tar.gz";
sha256 = "10gjc5mc5kwg2c2la22hgwx6s5q60z9xxffjpjw0zrlhksijl5an";
};

meta = with stdenv.lib; {
55 changes: 0 additions & 55 deletions pkgs/applications/gis/saga/finite-6.3.0.patch
View file

This file was deleted.