summary refs log tree commit diff
path: root/pkgs/development/libraries/gtksourceview
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2023-02-25 03:03:39 +0000
committerJan Tojnar <jtojnar@gmail.com>2023-04-06 01:34:46 +0200
commit8695577e7d433d049e660d55e2e9ec05d0c79f49 (patch)
tree412e2c56d0f0a2288497121561831b779ac6d76a /pkgs/development/libraries/gtksourceview
parent297dedf249649cdce5ca57cfa63c8e5f019a0976 (diff)
downloadnixpkgs-8695577e7d433d049e660d55e2e9ec05d0c79f49.tar
nixpkgs-8695577e7d433d049e660d55e2e9ec05d0c79f49.tar.gz
nixpkgs-8695577e7d433d049e660d55e2e9ec05d0c79f49.tar.bz2
nixpkgs-8695577e7d433d049e660d55e2e9ec05d0c79f49.tar.lz
nixpkgs-8695577e7d433d049e660d55e2e9ec05d0c79f49.tar.xz
nixpkgs-8695577e7d433d049e660d55e2e9ec05d0c79f49.tar.zst
nixpkgs-8695577e7d433d049e660d55e2e9ec05d0c79f49.zip
gtksourceview5: 5.6.2 → 5.7.1
https://gitlab.gnome.org/GNOME/gtksourceview/-/compare/5.6.2...5.7.1

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
Diffstat (limited to 'pkgs/development/libraries/gtksourceview')
-rw-r--r--pkgs/development/libraries/gtksourceview/5.x.nix19
1 files changed, 2 insertions, 17 deletions
diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix
index 100e3e44a88..ee57285d2a4 100644
--- a/pkgs/development/libraries/gtksourceview/5.x.nix
+++ b/pkgs/development/libraries/gtksourceview/5.x.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchurl
-, fetchpatch2
 , meson
 , ninja
 , pkg-config
@@ -25,7 +24,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gtksourceview";
-  version = "5.6.2";
+  version = "5.7.1";
 
   outputs = [ "out" "dev" "devdoc" ];
 
@@ -33,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     inherit (finalAttrs) pname version;
   in fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "HxRsFW8TWmBJnZeeNXfJm24VoRFEV2er5iGbs0xUXHc=";
+    sha256 = "O0JUGWTbnC+lCpZY1Ihr33fQI/5OlsWxe85RyfWMSOY=";
   };
 
   patches = [
@@ -41,13 +40,6 @@ stdenv.mkDerivation (finalAttrs: {
     # but not from its own datadr (it assumes it will be in XDG_DATA_DIRS).
     # Since this is not generally true with Nix, let’s add $out/share unconditionally.
     ./4.x-nix_share_path.patch
-
-    # Add Nix syntax highlighting.
-    # https://gitlab.gnome.org/GNOME/gtksourceview/-/merge_requests/303
-    (fetchpatch2 {
-      url = "https://gitlab.gnome.org/GNOME/gtksourceview/-/commit/2cc7fd079f9fc8b593c727c68a2c783c82299562.patch";
-      sha256 = "bTYWjEDpdbnUxcYNKl2YtSLfYlMfcbQSSYQjhixOGS8=";
-    })
   ];
 
   nativeBuildInputs = [
@@ -85,13 +77,6 @@ stdenv.mkDerivation (finalAttrs: {
     "-Dgtk_doc=true"
   ];
 
-  postPatch = ''
-    # https://gitlab.gnome.org/GNOME/gtksourceview/-/merge_requests/295
-    # build: drop unnecessary vapigen check
-    substituteInPlace meson.build \
-      --replace "if generate_vapi" "if false"
-  '';
-
   doCheck = stdenv.isLinux;
 
   checkPhase = ''