diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-04-07 16:09:13 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-04-07 16:09:13 +0200 |
| commit | b856c0f8f421a67fb2926dbbfdf0ef51cc5e56d3 (patch) | |
| tree | c422364bbc058e0b85600da05f481dc9817ed229 /pkgs/development/libraries/gtksourceview | |
| parent | 6abf5b5c599aecdb9d4ddafb26cf2eb47a218175 (diff) | |
| parent | cd67ddc5d3895d21ae751a12886557b2fce5cc2d (diff) | |
| download | nixpkgs-b856c0f8f421a67fb2926dbbfdf0ef51cc5e56d3.tar nixpkgs-b856c0f8f421a67fb2926dbbfdf0ef51cc5e56d3.tar.gz nixpkgs-b856c0f8f421a67fb2926dbbfdf0ef51cc5e56d3.tar.bz2 nixpkgs-b856c0f8f421a67fb2926dbbfdf0ef51cc5e56d3.tar.lz nixpkgs-b856c0f8f421a67fb2926dbbfdf0ef51cc5e56d3.tar.xz nixpkgs-b856c0f8f421a67fb2926dbbfdf0ef51cc5e56d3.tar.zst nixpkgs-b856c0f8f421a67fb2926dbbfdf0ef51cc5e56d3.zip | |
Merge #218143: GNOME: 43 → 44
...into staging-next
Diffstat (limited to 'pkgs/development/libraries/gtksourceview')
| -rw-r--r-- | pkgs/development/libraries/gtksourceview/5.x.nix | 19 |
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 230047daa04..ae0a640234c 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.8.0"; 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 = "EQ3Uwg3vIYhvv3dymP4O+Mwq1gI7jzbHQkQRpBSBiTM="; }; 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 = [ @@ -86,13 +78,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 = '' |