diff options
author | Florian Klink <flokli@flokli.de> | 2020-04-10 22:54:06 +0200 |
---|---|---|
committer | Florian Klink <flokli@flokli.de> | 2020-04-11 12:51:32 +0200 |
commit | 435ff3118e8bbf9b74989fb2884caaddc35f747d (patch) | |
tree | bd511ec56a045921a2a0f8a3d9150625b0c90538 /pkgs/applications/misc/subsurface/default.nix | |
parent | fb689fc5f2afc9ceb80003e64639977c6a59e4ab (diff) | |
download | nixpkgs-435ff3118e8bbf9b74989fb2884caaddc35f747d.tar nixpkgs-435ff3118e8bbf9b74989fb2884caaddc35f747d.tar.gz nixpkgs-435ff3118e8bbf9b74989fb2884caaddc35f747d.tar.bz2 nixpkgs-435ff3118e8bbf9b74989fb2884caaddc35f747d.tar.lz nixpkgs-435ff3118e8bbf9b74989fb2884caaddc35f747d.tar.xz nixpkgs-435ff3118e8bbf9b74989fb2884caaddc35f747d.tar.zst nixpkgs-435ff3118e8bbf9b74989fb2884caaddc35f747d.zip |
subsurface: 4.8.2 -> 4.9.3
This bumps subsurface to 4.9.3. As the subsurface-specific libdivecomputer source is shipped as a git submodule these days, we can avoid having to fetch a separate tarball that needs to be kept in sync (and is only uploaded for each release). This also applies a patch on top of 4.9.3 to properly handle libgit2 versions 1.0 and later - conditional code for older libgit versions has been removed upstream, but that's a nontrivial backport, which is why this patch was added.
Diffstat (limited to 'pkgs/applications/misc/subsurface/default.nix')
-rw-r--r-- | pkgs/applications/misc/subsurface/default.nix | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index 960b7b9eeef..d4b2f8cad30 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -4,16 +4,22 @@ }: let - version = "4.8.2"; + version = "4.9.3"; + + subsurfaceSrc = (fetchFromGitHub { + owner = "Subsurface-divelog"; + repo = "subsurface"; + rev = "v${version}"; + sha256 = "1i07f7appifx9j205x5a7ng01wsipxr6n9a3692pm60jli2nsir5"; + fetchSubmodules = true; + }); libdc = stdenv.mkDerivation { pname = "libdivecomputer-ssrf"; inherit version; - src = fetchurl { - url = "https://subsurface-divelog.org/downloads/libdivecomputer-subsurface-branch-${version}.tgz"; - sha256 = "167qan59raibmilkc574gdqxfjg2f5ww2frn86xzk2kn4qg8190w"; - }; + src = subsurfaceSrc; + sourceRoot = "source/libdivecomputer"; nativeBuildInputs = [ autoreconfHook ]; @@ -70,10 +76,10 @@ in stdenv.mkDerivation { pname = "subsurface"; inherit version; - src = fetchurl { - url = "https://subsurface-divelog.org/downloads/Subsurface-${version}.tgz"; - sha256 = "1fzrq6rqb6pzs36wxar2453cl509dqpcy9w7nq4gw7b1v2331wfy"; - }; + src = subsurfaceSrc; + + # remove with the 4.10 release + patches = [ ./0001-core-fix-libgit-ifdef-to-handle-libgit2-v1.0-and-onw.patch ]; buildInputs = [ libdc googlemaps |