diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-10-19 14:40:23 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-01-07 10:22:32 +0000 |
| commit | cc62bcb55359ba8c5e0fe3a48e778444c89060d8 (patch) | |
| tree | ca0e21d44eaf8837b687395e614445f7761d7bbd /nixpkgs/pkgs/development/libraries/gtksourceview | |
| parent | d6625e8d25efd829c3cfa227d025ca4e606ae4b7 (diff) | |
| parent | a323570a264da96a0b0bcc1c9aa017794acdc752 (diff) | |
| download | nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.gz nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.bz2 nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.lz nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.xz nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.zst nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.zip | |
Merge commit 'a323570a264da96a0b0bcc1c9aa017794acdc752'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/gtksourceview')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix | 13 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix | 4 |
2 files changed, 5 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix b/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix index eb92586ce84a..0095b6ca9e08 100644 --- a/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , meson , ninja , pkg-config @@ -24,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gtksourceview"; - version = "4.8.1"; + version = "4.8.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0WPXG1/K+8Wx7sbdhB7b283dOnURzV/c/9hri7/mmsE="; + sha256 = "1k1pava84ywgq62xl5bz8y3zm7z2kz6kkgp423c0y02jrgjyfbc4"; }; patches = [ @@ -38,13 +37,6 @@ stdenv.mkDerivation rec { # 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 - - # fixes intermittent "gtksourceview-gresources.h: no such file" errors - (fetchpatch { - name = "ensure-access-to-resources-in-corelib-build.patch"; - url = "https://gitlab.gnome.org/GNOME/gtksourceview/-/commit/9bea9d1c4a56310701717bb106c52a5324ee392a.patch"; - sha256 = "sha256-rSB6lOFEyz58HfOSj7ZM48/tHxhqbtWWbh60JuySAZ0="; - }) ]; nativeBuildInputs = [ @@ -96,6 +88,7 @@ stdenv.mkDerivation rec { packageName = "gtksourceview"; attrPath = "gtksourceview4"; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix b/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix index fd4a420012c3..e6ad0f1ae36b 100644 --- a/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "gtksourceview"; - version = "5.0.0"; + version = "5.2.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1hyrmh9r1zd5kjh5ch9d7bhk2kphbqhm7ijfxfkcdln8q0rnd0k4"; + sha256 = "ybNPoCZU9WziL6CIJ9idtLqBYxsubX0x6mXRPHKUMOk="; }; patches = [ |