From 7e87be4055762c8e6cbabe5a399d4a8c0739d1da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Tue, 3 Jan 2017 15:43:51 +0100 Subject: [PATCH 1/3] libdivecomputer: add subsurface version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Güntner --- .../libraries/libdivecomputer/subsurface.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/libdivecomputer/subsurface.nix diff --git a/pkgs/development/libraries/libdivecomputer/subsurface.nix b/pkgs/development/libraries/libdivecomputer/subsurface.nix new file mode 100644 index 000000000000..5840ea2ef85e --- /dev/null +++ b/pkgs/development/libraries/libdivecomputer/subsurface.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchgit, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "libdivecomputer-${version}"; + version = "ssrf-0.5.0"; + + src = fetchgit { + url = "git://subsurface-divelog.org/libdc"; + rev = "534dd2f34b8271b2a1cac0e3151bfdc81da40e47"; + branchName = "Subsurface-branch"; + sha256 = "0iw9pczmwqlfjlgrik79b2pd4lmipxhjzj60ysk8qzl3axadjycp"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://www.libdivecomputer.org; + description = "A cross-platform and open source library for communication with dive computers from various manufacturers"; + maintainers = [ maintainers.mguentner ]; + license = licenses.lgpl21; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74b87a0d96fd..c63086983dce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7844,6 +7844,8 @@ in libdivecomputer = callPackage ../development/libraries/libdivecomputer { }; + libdivecomputer_ssrf = callPackage ../development/libraries/libdivecomputer/subsurface.nix { }; + libdivsufsort = callPackage ../development/libraries/libdivsufsort { }; libdmtx = callPackage ../development/libraries/libdmtx { }; From b00516ca316f1a16993ec695c0aab302acb0eae3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Mon, 2 Jan 2017 02:45:24 +0100 Subject: [PATCH 2/3] subsurface: 4.5.6 -> 4.5.97 (beta 2) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Güntner --- pkgs/applications/misc/subsurface/default.nix | 12 +++++------- pkgs/top-level/all-packages.nix | 7 +++---- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index be4a004fb8ba..a1b03f48b220 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; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c63086983dce..2d0675116ab1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3821,10 +3821,9 @@ in su-exec = callPackage ../tools/security/su-exec {}; - subsurface = - qt55.callPackage ../applications/misc/subsurface { - libgit2 = pkgs.libgit2_0_23; - }; + subsurface = qt55.callPackage ../applications/misc/subsurface { + libdivecomputer = libdivecomputer_ssrf; + }; sudo = callPackage ../tools/security/sudo { }; From 67d73657a95b3cc7da7d3361bb5ab17be00b6bb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Mon, 2 Jan 2017 02:45:57 +0100 Subject: [PATCH 3/3] Revert "libgit2: reinit at 0.23.2" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 2e15a8f2dde53484082d48b14d3557b8009f61ac. libgit2 v0.23.2 is no longer necessary due to edbe73dc13e6090269f0d8b2bb759c7957a83ec1 Signed-off-by: Maximilian Güntner --- pkgs/development/libraries/git2/0.23.nix | 27 ------------------------ pkgs/top-level/all-packages.nix | 1 - 2 files changed, 28 deletions(-) delete mode 100644 pkgs/development/libraries/git2/0.23.nix diff --git a/pkgs/development/libraries/git2/0.23.nix b/pkgs/development/libraries/git2/0.23.nix deleted file mode 100644 index 3cf429ab1d73..000000000000 --- a/pkgs/development/libraries/git2/0.23.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, http-parser, libiconv }: - -stdenv.mkDerivation (rec { - version = "0.23.2"; - name = "libgit2-${version}"; - - src = fetchurl { - name = "${name}.tar.gz"; - url = "https://github.com/libgit2/libgit2/tarball/v${version}"; - sha256 = "1d3901bmgvdnmzrx21afi1d0llsqmca3ckj942p0i2wpdpr1kbcp"; - }; - - cmakeFlags = "-DTHREADSAFE=ON"; - - nativeBuildInputs = [ cmake python pkgconfig ]; - buildInputs = [ zlib libssh2 openssl http-parser ]; - - meta = { - description = "the Git linkable library"; - homepage = http://libgit2.github.com/; - license = stdenv.lib.licenses.gpl2; - platforms = with stdenv.lib.platforms; all; - }; -} // stdenv.lib.optionalAttrs (!stdenv.isLinux) { - NIX_LDFLAGS = "-liconv"; - propagatedBuildInputs = [ libiconv ]; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d0675116ab1..de561fa6391a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7202,7 +7202,6 @@ in ); libgit2_0_21 = callPackage ../development/libraries/git2/0.21.nix { }; - libgit2_0_23 = callPackage ../development/libraries/git2/0.23.nix { }; gle = callPackage ../development/libraries/gle { };