Skip to content

Commit 7633dba

Browse files
authored
libsForQt5.qwt: 6.2.0 -> 6.3.0 (#312289)
2 parents c11091c + 6090dc8 commit 7633dba

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

pkgs/applications/radio/sdr-j-fm/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
wrapQtAppsHook,
77
pkg-config,
88
qtbase,
9-
qwt,
9+
qwt6_1,
1010
fftwFloat,
1111
libsamplerate,
1212
portaudio,
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
3737

3838
buildInputs = [
3939
qtbase
40-
qwt
40+
qwt6_1
4141
fftwFloat
4242
libsamplerate
4343
portaudio

pkgs/applications/science/misc/gplates/default.nix

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{ lib
22
, stdenv
33
, fetchFromGitHub
4+
, fetchpatch
45
, cmake
56
, doxygen
67
, graphviz
@@ -42,6 +43,14 @@ in stdenv.mkDerivation (finalAttrs: {
4243
hash = "sha256-3fEwm5EKK9RcRbnyUejgwfjdsXaujjZjoMbq/BbVMeM=";
4344
};
4445

46+
patches = [
47+
(fetchpatch {
48+
name = "qwt-6.3-compile-error-fix.patch";
49+
url = "https://github.com/GPlates/GPlates/commit/c4680ebe54f4535909085feacecd66410a91ff98.patch";
50+
hash = "sha256-mw5+GLayMrmcSDd1ai+0JTuY3iedHT9u2kx5Dd2wMjg=";
51+
})
52+
];
53+
4554
nativeBuildInputs = [
4655
cmake
4756
doxygen

pkgs/development/libraries/qwt/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
stdenv.mkDerivation rec {
44
pname = "qwt";
5-
version = "6.2.0";
5+
version = "6.3.0";
66

77
outputs = [ "out" "dev" ];
88

99
src = fetchurl {
1010
url = "mirror://sourceforge/qwt/qwt-${version}.tar.bz2";
11-
sha256 = "sha256-kZT2UTlV0P1zAPZxWBdQZEYBl6urGpL6EnpnpLC3FTA=";
11+
sha256 = "sha256-3LCFiWwoquxVGMvAjA7itOYK2nrJKdgmOfYYmFGmEpo=";
1212
};
1313

1414
propagatedBuildInputs = [ qtbase qtsvg qttools ];

0 commit comments

Comments
 (0)