Skip to content

vala: update and cleanup #1470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
domenkozar merged 2 commits into from Jan 8, 2014
Merged

vala: update and cleanup #1470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4262c4b
vala: update to 0.23.1, remove old versions
Jan 7, 2014
7a61ede
vala: fix typo in license
Jan 7, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions pkgs/development/compilers/vala/15.2.nix
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions pkgs/development/compilers/vala/16.1.nix
View file
Open in desktop

This file was deleted.

46 changes: 23 additions & 23 deletions pkgs/development/compilers/vala/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
{ stdenv, fetchurl, yacc, flex, pkgconfig, glib, dbus, dbus_tools
, libiconvOrEmpty, libintlOrEmpty }:
{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt
, glib, libiconvOrEmpty, libintlOrEmpty
}:

let
major = "0.23";
minor = "1";
sha256 = "1m8f2d01r4jqp266mk29qsl68lzh7c258cqd5zzbpbryxszlzdfj";
in
stdenv.mkDerivation rec {
p_name = "vala";
ver_maj = "0.19";
ver_min = "0";
name = "vala-${major}.${minor}";

src = fetchurl {
url = "mirror://gnome/sources/${p_name}/${ver_maj}/${name}.tar.xz";
sha256 = "1vn524hcnaggz8zx49mvf7p4z1mscrlj2syg7jjhph8nak5wi0bp";
meta = {
description = "Compiler for GObject type system";
homepage = "http://live.gnome.org/Vala";
license = stdenv.lib.licenses.lgpl21Plus;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ antono iyzsong ];
};
name = "${p_name}-${ver_maj}.${ver_min}";

postPatch = "patchShebangs .";

nativeBuildInputs = [ yacc flex pkgconfig ];

buildInputs = [ glib ] ++ libiconvOrEmpty ++ libintlOrEmpty
++ stdenv.lib.optional doCheck [ dbus dbus_tools ];
src = fetchurl {
url = "mirror://gnome/sources/vala/${major}/${name}.tar.xz";
inherit sha256;
};

doCheck = false; # problems when launching dbus tests
nativeBuildInputs = [ pkgconfig flex bison libxslt ];

meta = {
description = "Compiler for the GObject type system";
homepage = "http://live.gnome.org/Vala";
license = "free-copyleft";
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.antono ];
};
buildInputs = [ glib ]
++ libiconvOrEmpty
++ libintlOrEmpty;
}
8 changes: 1 addition & 7 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3128,13 +3128,7 @@ let

urweb = callPackage ../development/compilers/urweb { };

vala = vala19;

vala15 = callPackage ../development/compilers/vala/15.2.nix { };

vala16 = callPackage ../development/compilers/vala/16.1.nix { };

vala19 = callPackage ../development/compilers/vala/default.nix { };
vala = callPackage ../development/compilers/vala/default.nix { };

visualcpp = callPackage ../development/compilers/visual-c++ { };

Expand Down
2 changes: 0 additions & 2 deletions pkgs/top-level/release-python.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1697,8 +1697,6 @@ let
v8 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
vacuum = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
vala = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
vala15 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
vala16 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
valgrind = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
valkyrie = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
vde2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
Expand Down