Commit Graph

51 Commits

Author SHA1 Message Date
Jan Tojnar
1e7cc37ca4 meld: Fix view not rendering with adwaita-icon-theme 42 due to removed icons 2022-05-06 00:48:25 +02:00
Sergei Trofimovich
c4c64b6a32 meld: pull upstream fix for meson-0.60
Without the change build fails as:

    > data/meson.build:34:0: ERROR: Function does not take positional arguments.
2022-03-20 08:58:13 +00:00
R. Ryantm
41ccfc6e68 meld: 3.21.0 -> 3.21.1 2022-01-21 13:26:45 +01:00
Jan Tojnar
ad182ff274 meld.updateScript: remove version policy
Stable version was buggy so we are tracking unstable ones.
2021-10-15 00:51:47 +02:00
Jan Tojnar
468cb5980b gnome: rename from gnome3
Since GNOME version is now 40, it no longer makes sense to use the old attribute name.
2021-05-08 09:47:42 +02:00
Jan Tojnar
7d535edec5
gnome3: support new versioning scheme in the update script
https://discourse.gnome.org/t/new-gnome-versioning-scheme/4235
2021-05-05 22:20:20 +02:00
Jan Tojnar
f02fc10d0d
meld: fix icon loader 2021-02-25 11:49:47 +01:00
Pavol Rusnak
a6ce00c50c
treewide: remove stdenv where not needed 2021-01-25 18:31:47 +01:00
Ben Siraphob
badf51221d treewide: stdenv.lib -> lib 2021-01-16 17:58:11 +07:00
Profpatsch
4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Jan Tojnar
b2ff709179
meld: Fix build on Darwin
Meld’s post install script requires gtk-update-icon-cache program on PATH.
Because Meld is a Python app, it uses strictDeps so we need to explicitly
add the program to nativeBuildInputs.

For some reason, Linux version has the program available, though,
which hides the missing dependency. Perhaps it is propagated by something
but I do not know how to determine it.
2020-10-24 01:17:26 +02:00
Jan Tojnar
2d6cbbe462
meld: 3.20.2 → 3.21.0
Clean up, switch to Meson, remove unused test dependencies, fix license.

https://gitlab.gnome.org/GNOME/meld/-/blob/3.21.0/NEWS
2020-08-04 17:47:04 +02:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
worldofpeace
9f00427bdd meld: 3.20.1 -> 3.20.2 2020-02-18 07:14:40 -05:00
Miguel Madrid Mencía
148c82e07e
maintainer: mimadrid: update github username and personal data 2019-09-14 12:15:46 +02:00
worldofpeace
b22b5a2874
meld: 3.20.0 > 3.20.1
https://gitlab.gnome.org/GNOME/meld/tags/3.20.1
2019-04-05 12:14:10 +02:00
Tor Hedin Brønner
4a75888544 meld: fix checkPhase
Needs some more inputs after checkInputs went native.

(cherry picked from commit 99fac0a967)
2019-03-18 18:52:42 +01:00
worldofpeace
64c8f268df gnome3.meld: fix gobject-introspection
See: https://github.com/NixOS/nixpkgs/issues/56943
2019-03-13 17:05:23 -04:00
Jan Tojnar
606ceda352
gnome3: stop using aliases 2019-02-14 02:31:15 +01:00
R. RyanTM
27609af220 meld: 3.18.3 -> 3.20.0 (#53595)
Update and enable tests
2019-01-13 22:05:01 +01:00
Jan Tojnar
a51a99c690
gobject-introspection: rename package
camelCase package name was a huge inconsistency in GNOME package set.
2018-12-02 12:42:29 +01:00
Jan Tojnar
3faeab2c48
meld: 3.30.2 → 3.30.3 2018-11-30 21:35:26 +01:00
Jan Tojnar
5cc18c4781
gnome3: remove versionBranch attribute
Standard library now contains stdenv.lib.versions.majorMinor,
which does the same.
2018-10-05 02:17:19 +02:00
Jan Tojnar
3098510780
meld: 3.18.1 → 3.18.2 2018-07-06 09:35:01 +02:00
Jan Tojnar
3e7bcb6937
meld: 3.18.0 → 3.18.1 2018-05-08 02:34:14 +02:00
Jan Tojnar
26dc2abc2b
meld: add updateScript 2018-03-04 20:05:49 +01:00
Jan Tojnar
a31d98f312
tree-wide: autorename gnome packages to use dashes 2018-02-25 17:41:16 +01:00
Vincent Laporte
31031577c1
meld: 3.16.4 -> 3.18.0 2018-01-08 07:37:45 +00:00
mimadrid
8021c1f429
meld: 3.16.2 -> 3.16.4 2016-12-20 23:56:29 +01:00
Frederik Rietdijk
559864a951 meld: use python2 2016-11-08 22:48:55 +01:00
Frederik Rietdijk
7986b718f3 Remove pycairo from top-level
See #11567.
2016-08-14 13:52:42 +02:00
mimadrid
83251cdd60
meld: 3.16.1 -> 3.16.2 2016-07-30 11:06:22 +02:00
mimadrid
ad16f79533
meld: 3.16.0 -> 3.16.1 2016-06-25 19:03:13 +02:00
mimadrid
1a9a72274a meld: 3.14.0 -> 3.16.0 2016-06-13 21:21:16 +02:00
Frederik Rietdijk
4d06bf70f4 buildPythonApplication: use new function for Python applications 2016-02-19 13:16:41 +01:00
Vincent Laporte
9d5508d85c meld: 3.12.3 -> 3.14.0 (close #8982) 2015-07-25 13:10:24 +02:00
Raymond Gauthier
d612a9e132 meld: fix for hicolor theme breakage
This breakage was cause by the package outputing its own
version of index.cache to `share/icons/hicolor`.

Used the `hicolor_icon_theme` hook to perform automated cleanup.
2015-07-01 00:26:02 -04:00
Luca Bruno
c40cb390f8 meld: fix gsettings schemas and remove LD_LIBARY_PATH 2015-03-01 12:51:36 +01:00
Vladimír Čunát
45a34f65fe meld: drop gnome2.scrollkeeper (no longer used)
Also indent the overlong lines in the expression.
2015-01-25 08:59:05 +01:00
Joachim Schiele
b8c2f466ba meld: bump to 3.12.3 (latest) version 2015-01-21 22:02:20 +01:00
Ivan Brkanac
841f45b231 added darwin ass supported platform for meld, added get text as requirement for scroollkeeper 2014-09-09 15:21:04 +02:00
Vladimír Čunát
d75cf6fffb meld: update to latest stable 2014-08-16 18:58:51 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Bjørn Forsman
bb440b3612 meld: set meta.platforms attribute
This makes Hydra build it and makes it available in the binary channel.
2013-09-02 21:57:08 +02:00
Evgeny Egorochkin
da4be371e9 make package use mirror:// for gnu, savannah and gnome repositories where possible 2013-07-14 05:23:06 +03:00
Lluís Batlle i Rossell
e0249ffcd0 meld: update to 1.6.1 2013-04-08 12:14:26 +02:00
Eelco Dolstra
d4d7931a62 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
2012-01-18 20:53:01 +00:00
Lluís Batlle i Rossell
05f95c69c5 Updating meld
svn path=/nixpkgs/trunk/; revision=29016
2011-09-05 08:31:49 +00:00
Lluís Batlle i Rossell
b8f6681dbd Updating meld
svn path=/nixpkgs/trunk/; revision=26905
2011-04-20 14:04:54 +00:00
Lluís Batlle i Rossell
594c0a8ff9 Updating meld (patch by Carles Pagès)
svn path=/nixpkgs/trunk/; revision=25647
2011-01-20 22:07:49 +00:00