diff options
| author | Maximilian Güntner <code@klandest.in> | 2017-01-02 02:45:24 +0100 |
|---|---|---|
| committer | Maximilian Güntner <code@klandest.in> | 2017-01-03 16:06:50 +0100 |
| commit | b00516ca316f1a16993ec695c0aab302acb0eae3 (patch) | |
| tree | 8cab7fa128486d2eaec39288ffe593a0d2e33e3b /pkgs/applications/misc/subsurface | |
| parent | 7e87be4055762c8e6cbabe5a399d4a8c0739d1da (diff) | |
| download | nixpkgs-b00516ca316f1a16993ec695c0aab302acb0eae3.tar nixpkgs-b00516ca316f1a16993ec695c0aab302acb0eae3.tar.gz nixpkgs-b00516ca316f1a16993ec695c0aab302acb0eae3.tar.bz2 nixpkgs-b00516ca316f1a16993ec695c0aab302acb0eae3.tar.lz nixpkgs-b00516ca316f1a16993ec695c0aab302acb0eae3.tar.xz nixpkgs-b00516ca316f1a16993ec695c0aab302acb0eae3.tar.zst nixpkgs-b00516ca316f1a16993ec695c0aab302acb0eae3.zip | |
subsurface: 4.5.6 -> 4.5.97 (beta 2)
Signed-off-by: Maximilian Güntner <code@klandest.in>
Diffstat (limited to 'pkgs/applications/misc/subsurface')
| -rw-r--r-- | pkgs/applications/misc/subsurface/default.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index be4a004fb8b..a1b03f48b22 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -20,15 +20,14 @@ }: stdenv.mkDerivation rec { - version = "4.5.6"; + version = "4.5.97"; name = "subsurface-${version}"; - # use fetchgit instead of the official tgz is not complete src = fetchgit { - sha256 = "156rqcszy0c4plk2mv7wdd4h7s7mygpq5sdc64pjfs4qvvsdj10f"; + sha256 = "0mbf8m5sbimbyvlh65sjlydrycr4ssfyfzdlqyl0wcpzw7h0qfp8"; url = "git://git.subsurface-divelog.org/subsurface"; - rev = "4d8d7c2a0fa1b4b0e6953d92287c75b6f97472d0"; - branchName = "v4.5-branch"; + rev = "5f15ad5a86ada3c5e574041a5f9d85235322dabb"; + branchName = "master"; }; buildInputs = [ qtbase libdivecomputer libmarble-ssrf libxslt @@ -43,8 +42,7 @@ stdenv.mkDerivation rec { marble_libs=$(echo $(echo $CMAKE_LIBRARY_PATH | grep -o "/nix/store/[[:alnum:]]*-libmarble-ssrf-[a-zA-Z0-9\-]*/lib")/libssrfmarblewidget.so) cmakeFlags="$cmakeFlags -DCMAKE_BUILD_TYPE=Debug \ -DMARBLE_LIBRARIES=$marble_libs \ - -DNO_PRINTING=OFF \ - -DUSE_LIBGIT23_API=1" + -DNO_PRINTING=OFF" ''; meta = with stdenv.lib; { |