From 1d906f0b5610d0976f28d501c0730a9f47116e9b Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 10 Oct 2019 10:11:09 -0400
Subject: [PATCH 1/3] gnome3: always use latest vala

And add an alias.
---
 pkgs/desktops/gnome-3/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 017ced6c98b..aa50aa18c40 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -24,7 +24,6 @@ lib.makeScope pkgs.newScope (self: with self; {
   libsoup = pkgs.libsoup.override { gnomeSupport = true; };
   libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
   gnome3 = self // { recurseForDerivations = false; };
-  vala = pkgs.vala_0_44;
   gegl_0_4 = pkgs.gegl_0_4.override { gtk = pkgs.gtk3; };
 
 # ISO installer
@@ -358,4 +357,6 @@ lib.makeScope pkgs.newScope (self: with self; {
   gamesPackages = throw "deprecated 2019-08-25: please use `services.gnome3.games.enable`";
 
   nautilus-sendto = throw "deprecated 2019-09-17: abandoned";
+
+  inherit (pkgs) vala; # added 2019-10-10
 })

From a4f8fc960fd1f0704511f96aafcef62b529f4342 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 10 Oct 2019 12:18:18 -0400
Subject: [PATCH 2/3] gsound: no aliases

---
 pkgs/development/libraries/gsound/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gsound/default.nix b/pkgs/development/libraries/gsound/default.nix
index 337a2472bab..b1869193a09 100644
--- a/pkgs/development/libraries/gsound/default.nix
+++ b/pkgs/development/libraries/gsound/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, libcanberra, gobject-introspection, libtool, gnome3 }:
+{ stdenv, fetchurl, pkgconfig, glib, vala, libcanberra, gobject-introspection, libtool, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "gsound";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53";
   };
 
-  nativeBuildInputs = [ pkgconfig gobject-introspection libtool gnome3.vala ];
+  nativeBuildInputs = [ pkgconfig gobject-introspection libtool vala ];
   buildInputs = [ glib libcanberra ];
 
   passthru = {

From 4266a1e0b4b1382a1297bbe4254c9fc7ee600bb2 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 10 Oct 2019 13:18:23 -0400
Subject: [PATCH 3/3] valadoc: remove

---
 pkgs/development/tools/valadoc/default.nix | 27 ----------------------
 pkgs/top-level/aliases.nix                 |  1 +
 pkgs/top-level/all-packages.nix            |  2 --
 3 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 pkgs/development/tools/valadoc/default.nix

diff --git a/pkgs/development/tools/valadoc/default.nix b/pkgs/development/tools/valadoc/default.nix
deleted file mode 100644
index 71c47a7394b..00000000000
--- a/pkgs/development/tools/valadoc/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{stdenv, fetchurl, gnome3, automake, autoconf, which, libtool, pkgconfig, graphviz, glib, gobject-introspection, expat}:
-stdenv.mkDerivation rec {
-  version = "0.36.2";
-  pname = "valadoc";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/valadoc/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0hfaskbm7y4z4jf6lxm8hg4c0b8621qn1gchxjxcngq0cpx79z9h";
-  };
-
-  nativeBuildInputs = [ automake autoconf which gnome3.vala libtool pkgconfig gobject-introspection ];
-  buildInputs = [ graphviz glib gnome3.libgee expat ];
-
-  passthru = {
-    updateScript = gnome3.updateScript {
-      packageName = "valadoc";
-    };
-  };
-
-  meta = with stdenv.lib; {
-    description = "A documentation generator for generating API documentation from Vala source code";
-    homepage    = https://valadoc.org;
-    license     = licenses.gpl2;
-    maintainers = with maintainers; [ sternenseemann ];
-    platforms   = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 091824a5239..c5a384039d8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -383,6 +383,7 @@ mapAliases ({
   ultrastardx-beta = ultrastardx; # added 2017-08-12
   usb_modeswitch = usb-modeswitch; # added 2016-05-10
   usbguard-nox = usbguard; # added 2019-09-04
+  valadoc = throw "deprecated 2019-10-10: valadoc was merged into vala 0.38";
   v4l_utils = v4l-utils; # added 2019-08-07
   vimbWrapper = vimb; # added 2015-01
   vimprobable2Wrapper = vimprobable2; # added 2015-01
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c158aee20a0..902515044fa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8535,8 +8535,6 @@ in
     vala_0_46
     vala;
 
-  valadoc = callPackage ../development/tools/valadoc { };
-
   wcc = callPackage ../development/compilers/wcc { };
 
   wla-dx = callPackage ../development/compilers/wla-dx { };