Merge pull request #127243 from maxeaubrey/vala_cleanup

vala: drop 0.36, 0.44
This commit is contained in:
Jan Tojnar 2021-06-24 11:16:12 +02:00 committed by GitHub
commit a01a771740
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 14 deletions

View file

@ -105,21 +105,11 @@ let
});
in rec {
vala_0_36 = generic {
version = "0.36.20";
sha256 = "19v7zjhr9yxkh9lxg46n9gjr0lb7j6v0xqfhrdvgz18xhj3hm5my";
};
vala_0_40 = generic {
version = "0.40.25";
sha256 = "1pxpack8rrmywlf47v440hc6rv3vi8q9c6niwqnwikxvb2pwf3w7";
};
vala_0_44 = generic {
version = "0.44.11";
sha256 = "06spdvm9q9k4riq1d2fxkyc8d88bcv460v360465iy1lnj3z9x2s";
};
vala_0_46 = generic {
version = "0.46.13";
sha256 = "0d7l4vh2xra3q75kw3sy2d9bn5p6s3g3r7j37bdn6ir8l3wp2ivs";

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, python3, xmlbird,
cairo, gdk-pixbuf, libgee, glib, gtk3, webkitgtk, libnotify, sqlite, vala_0_44,
cairo, gdk-pixbuf, libgee, glib, gtk3, webkitgtk, libnotify, sqlite, vala,
gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }:
stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-caNY6PrsqBrYwC61MxNsf8B9E8it1Ls1d+hdbf8u+o8=";
};
nativeBuildInputs = [ python3 pkg-config vala_0_44 gobject-introspection wrapGAppsHook ];
nativeBuildInputs = [ python3 pkg-config vala gobject-introspection wrapGAppsHook ];
buildInputs = [ xmlbird libgee cairo gdk-pixbuf glib gtk3 webkitgtk libnotify sqlite gsettings-desktop-schemas ];
postPatch = ''

View file

@ -12118,9 +12118,7 @@ in
vala-lint = callPackage ../development/tools/vala-lint { };
inherit (callPackage ../development/compilers/vala { })
vala_0_36
vala_0_40
vala_0_44
vala_0_46
vala_0_48
vala_0_50