From 16228356dd423370aa759b4ee7ea6dae71532560 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Fri, 19 Feb 2021 11:13:45 +0100
Subject: [PATCH 1/2] subsurface: 4.9.6 -> 4.9.10
---
pkgs/applications/misc/subsurface/default.nix | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix
index 98392ae27f24..bca838235ddf 100644
--- a/pkgs/applications/misc/subsurface/default.nix
+++ b/pkgs/applications/misc/subsurface/default.nix
@@ -1,16 +1,17 @@
{ lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, wrapQtAppsHook, pkg-config, qmake
, curl, grantlee, libgit2, libusb-compat-0_1, libssh2, libxml2, libxslt, libzip, zlib
, qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit, libXcomposite
+, bluez
}:
let
- version = "4.9.6";
+ version = "4.9.10";
subsurfaceSrc = (fetchFromGitHub {
owner = "Subsurface";
repo = "subsurface";
rev = "v${version}";
- sha256 = "1w1ak0fi6ljhg2jc4mjqyrbpax3iawrnsaqq6ls7qdzrhi37rggf";
+ sha256 = "12ndhjplz3cwndwzhfc959dc0i6rm2qf3v2d8n9kba8nj63iblfs";
fetchSubmodules = true;
});
@@ -84,6 +85,7 @@ in stdenv.mkDerivation {
libdc googlemaps
curl grantlee libgit2 libssh2 libusb-compat-0_1 libxml2 libxslt libzip
qtbase qtconnectivity qtsvg qttools qtwebkit
+ bluez
];
nativeBuildInputs = [ cmake wrapQtAppsHook pkg-config ];
From 89433aacb7bc312bae31d00959e0fc7301e7cb17 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Fri, 19 Feb 2021 11:18:21 +0100
Subject: [PATCH 2/2] subsurface: Add adisbladis as maintainer
---
pkgs/applications/misc/subsurface/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix
index bca838235ddf..19fdd4640e40 100644
--- a/pkgs/applications/misc/subsurface/default.nix
+++ b/pkgs/applications/misc/subsurface/default.nix
@@ -107,7 +107,7 @@ in stdenv.mkDerivation {
'';
homepage = "https://subsurface-divelog.org";
license = licenses.gpl2;
- maintainers = with maintainers; [ mguentner ];
+ maintainers = with maintainers; [ mguentner adisbladis ];
platforms = platforms.all;
};
}