diff --git a/pkgs/development/compilers/vala/0.23.nix b/pkgs/development/compilers/vala/0.23.nix deleted file mode 100644 index 13b9c5f39832..000000000000 --- a/pkgs/development/compilers/vala/0.23.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt -, glib, libiconv, libintlOrEmpty -}: - -let - major = "0.23"; - minor = "2"; - sha256 = "0g22ss9qbm3fqhx4fxhsyfmdc5g1hgdw4dz9d37f4489kl0qf8pl"; -in -stdenv.mkDerivation rec { - name = "vala-${major}.${minor}"; - - 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 ]; - }; - - src = fetchurl { - url = "mirror://gnome/sources/vala/${major}/${name}.tar.xz"; - inherit sha256; - }; - - nativeBuildInputs = [ pkgconfig flex bison libxslt ]; - - buildInputs = [ glib libiconv ] - ++ libintlOrEmpty; -} diff --git a/pkgs/development/compilers/vala/0.26.nix b/pkgs/development/compilers/vala/0.26.nix deleted file mode 100644 index 78cb850c3565..000000000000 --- a/pkgs/development/compilers/vala/0.26.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt -, glib, libiconv, libintlOrEmpty -}: - -let - major = "0.26"; - minor = "2"; - sha256 = "37f13f430c56a93b6dac85239084681fd8f31c407d386809c43bc2f2836e03c4"; -in -stdenv.mkDerivation rec { - name = "vala-${major}.${minor}"; - - 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 lethalman ]; - }; - - src = fetchurl { - url = "mirror://gnome/sources/vala/${major}/${name}.tar.xz"; - inherit sha256; - }; - - nativeBuildInputs = [ pkgconfig flex bison libxslt ]; - - buildInputs = [ glib libiconv ] - ++ libintlOrEmpty; -} diff --git a/pkgs/development/compilers/vala/0.28.nix b/pkgs/development/compilers/vala/0.28.nix deleted file mode 100644 index caec4fda8873..000000000000 --- a/pkgs/development/compilers/vala/0.28.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt -, glib, libiconv, libintlOrEmpty -}: - -let - major = "0.28"; - minor = "0"; - sha256 = "0zwpzhkhfk3piya14m7p2hl2vaabahprphppfm46ci91z39kp7hd"; -in -stdenv.mkDerivation rec { - name = "vala-${major}.${minor}"; - - 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 lethalman ]; - }; - - src = fetchurl { - url = "mirror://gnome/sources/vala/${major}/${name}.tar.xz"; - inherit sha256; - }; - - nativeBuildInputs = [ pkgconfig flex bison libxslt ]; - - buildInputs = [ glib libiconv ] - ++ libintlOrEmpty; -} diff --git a/pkgs/development/compilers/vala/0.32.nix b/pkgs/development/compilers/vala/0.32.nix deleted file mode 100644 index 202b9fff6c80..000000000000 --- a/pkgs/development/compilers/vala/0.32.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt -, glib, libiconv, libintlOrEmpty -}: - -let - major = "0.32"; - minor = "1"; - sha256 = "1ab1l44abf9fj1wznzq5956431ia136rl5049cggnk5393jlf3fx"; -in -stdenv.mkDerivation rec { - name = "vala-${major}.${minor}"; - - 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 lethalman ]; - }; - - src = fetchurl { - url = "mirror://gnome/sources/vala/${major}/${name}.tar.xz"; - inherit sha256; - }; - - nativeBuildInputs = [ pkgconfig flex bison libxslt ]; - - buildInputs = [ glib libiconv ] - ++ libintlOrEmpty; - -} diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix new file mode 100644 index 000000000000..b0153a754032 --- /dev/null +++ b/pkgs/development/compilers/vala/default.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt +, glib, libiconv, libintlOrEmpty +}: + +let + generic = { major, minor, sha256 }: + stdenv.mkDerivation rec { + name = "vala-${major}.${minor}"; + + src = fetchurl { + url = "mirror://gnome/sources/vala/${major}/${name}.tar.xz"; + inherit sha256; + }; + + nativeBuildInputs = [ pkgconfig flex bison libxslt ]; + + buildInputs = [ glib libiconv ] ++ libintlOrEmpty; + + meta = with stdenv.lib; { + description = "Compiler for GObject type system"; + homepage = "http://live.gnome.org/Vala"; + license = licenses.lgpl21Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ antono lethalman peterhoeg ]; + }; + }; + +in rec { + + vala_0_23 = generic { + major = "0.23"; + minor = "2"; + sha256 = "0g22ss9qbm3fqhx4fxhsyfmdc5g1hgdw4dz9d37f4489kl0qf8pl"; + }; + + vala_0_26 = generic { + major = "0.26"; + minor = "2"; + sha256 = "1i03ds1z5hivqh4nhf3x80fg7n0zd22908w5minkpaan1i1kzw9p"; + }; + + vala_0_28 = generic { + major = "0.28"; + minor = "0"; + sha256 = "0zwpzhkhfk3piya14m7p2hl2vaabahprphppfm46ci91z39kp7hd"; + }; + + vala_0_32 = generic { + major = "0.32"; + minor = "1"; + sha256 = "1ab1l44abf9fj1wznzq5956431ia136rl5049cggnk5393jlf3fx"; + }; + + vala_0_34 = generic { + major = "0.34"; + minor = "1"; + sha256 = "16cjybjw100qps6jg0jdyjh8hndz8a876zmxpybnf30a8vygrk7m"; + }; + + vala = vala_0_34; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7cd32b1d6ff1..26b5f7a90fb1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5202,13 +5202,13 @@ in urweb = callPackage ../development/compilers/urweb { }; - vala_0_23 = callPackage ../development/compilers/vala/0.23.nix { }; - - vala_0_26 = callPackage ../development/compilers/vala/0.26.nix { }; - - vala_0_28 = callPackage ../development/compilers/vala/0.28.nix { }; - - vala_0_32 = callPackage ../development/compilers/vala/0.32.nix { }; + inherit (callPackage ../development/compilers/vala { }) + vala_0_23 + vala_0_26 + vala_0_28 + vala_0_32 + vala_0_34 + vala; valadoc = callPackage ../development/tools/valadoc { };