Merge pull request #45741 from Mic92/vala-cleanup

vala: cleanup old versions

4 files changed, 2 insertions, 55 deletions

diff --git a/pkgs/applications/editors/vanubi/default.nix b/pkgs/applications/editors/vanubi/default.nix
deleted file mode 100644
index 98f45f6be02d..000000000000
--- a/pkgs/applications/editors/vanubi/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, vala_0_28, which, autoconf, automake
-, libtool, glib, gtk3, gnome3, libwnck3, asciidoc, python3Packages }:
-
-stdenv.mkDerivation rec {
-  name = "vanubi-${version}";
-  version = "0.0.16";
-
-  src = fetchurl {
-    url = "https://github.com/vanubi/vanubi/archive/v${version}.tar.gz";
-    sha256 = "145zxgaky5bcq5bxm4z7h0pvviq7k1nrgnf40q6nax6ik616ybjq";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ vala_0_28 which autoconf automake
-                  libtool glib gtk3 libwnck3 asciidoc
-                  gnome3.gtksourceview gnome3.vte_290 python3Packages.pygments ];
-
-  configureScript = "./autogen.sh";
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = http://vanubi.github.io/vanubi;
-    description = "Programming editor for GTK+ inspired by Emacs";
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
-  };
-}
diff --git a/pkgs/desktops/gnome-3/misc/california/default.nix b/pkgs/desktops/gnome-3/misc/california/default.nix
index 91aeb7ca00a8..7c90d8fa4e42 100644
--- a/pkgs/desktops/gnome-3/misc/california/default.nix
+++ b/pkgs/desktops/gnome-3/misc/california/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_32, libgee, wrapGAppsHook, itstool, gobjectIntrospection
+{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_34, libgee, wrapGAppsHook, itstool, gobjectIntrospection
 , gnome-online-accounts, evolution-data-server, gnome3, glib, libsoup, libgdata, sqlite, xdg_utils }:
 
 let
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
     sha256 = "1dky2kllv469k8966ilnf4xrr7z35pq8mdvs7kwziy59cdikapxj";
   };
 
-  nativeBuildInputs = [ intltool itstool vala_0_32 pkgconfig wrapGAppsHook gobjectIntrospection ];
+  nativeBuildInputs = [ intltool itstool vala_0_34 pkgconfig wrapGAppsHook gobjectIntrospection ];
   buildInputs = [ glib gtk3 libgee libsoup libgdata gnome-online-accounts evolution-data-server sqlite xdg_utils gnome3.gsettings-desktop-schemas ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index 510688ef4164..a4a8aa980b62 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -43,25 +43,6 @@ let
   };
 
 in rec {
-
-  vala_0_26 = generic {
-    major   = "0.26";
-    minor   = "2";
-    sha256  = "1i03ds1z5hivqh4nhf3x80fg7n0zd22908w5minkpaan1i1kzw9p";
-  };
-
-  vala_0_28 = generic {
-    major   = "0.28";
-    minor   = "1";
-    sha256  = "0isg327w6rfqqdjja6a8pc3xcdkj7pqrkdhw48bsyxab2fkaw3hw";
-  };
-
-  vala_0_32 = generic {
-    major   = "0.32";
-    minor   = "1";
-    sha256  = "1ab1l44abf9fj1wznzq5956431ia136rl5049cggnk5393jlf3fx";
-  };
-
   vala_0_34 = generic {
     major   = "0.34";
     minor   = "17";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 62bf6d2c6070..da150ae19caf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7260,9 +7260,6 @@ with pkgs;
   urweb = callPackage ../development/compilers/urweb { };
 
   inherit (callPackage ../development/compilers/vala { })
-    vala_0_26
-    vala_0_28
-    vala_0_32
     vala_0_34
     vala_0_36
     vala_0_38
@@ -18923,8 +18920,6 @@ with pkgs;
 
   valentina = libsForQt5.callPackage ../applications/misc/valentina { };
 
-  vanubi = callPackage ../applications/editors/vanubi { };
-
   vbindiff = callPackage ../applications/editors/vbindiff { };
 
   vcprompt = callPackage ../applications/version-management/vcprompt { };