nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 15:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17898 from RamKromberg/fix/vala_namespace

Browse Source 
remove vala namespace
This commit is contained in:
Luca Bruno 2016-08-21 20:31:44 +01:00 committed by GitHub
commit 4916c11ec2
50 changed files with 100 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/gmpc/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, libtool, intltool, pkgconfig, glib
, gtk, curl, mpd_clientlib, libsoup, gob2, vala, libunique
, gtk, curl, mpd_clientlib, libsoup, gob2, vala_0_23, libunique
, libSM, libICE, sqlite, hicolor_icon_theme, wrapGAppsHook
}:
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libtool intltool pkgconfig glib gtk curl mpd_clientlib libsoup
libunique libmpd gob2 vala libSM libICE sqlite hicolor_icon_theme
libunique libmpd gob2 vala_0_23 libSM libICE sqlite hicolor_icon_theme
wrapGAppsHook
];

4
pkgs/applications/editors/vanubi/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, vala, which, autoconf, automake
{ stdenv, fetchurl, pkgconfig, vala_0_26, which, autoconf, automake
, libtool, glib, gtk3, gnome3, libwnck3, asciidoc, python3Packages }:
stdenv.mkDerivation rec {
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "145zxgaky5bcq5bxm4z7h0pvviq7k1nrgnf40q6nax6ik616ybjq";
};
buildInputs = [ pkgconfig vala which autoconf automake
buildInputs = [ pkgconfig vala_0_26 which autoconf automake
libtool glib gtk3 libwnck3 asciidoc
gnome3.gtksourceview gnome3.vte_290 python3Packages.pygments ];

4
pkgs/applications/graphics/giv/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, gdk_pixbuf, scons, pkgconfig, gtk, glib,
pcre, cfitsio, perl, gob2, vala, libtiff, json_glib }:
pcre, cfitsio, perl, gob2, vala_0_23, libtiff, json_glib }:
stdenv.mkDerivation rec {
name = "giv-20150811-git";
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
installPhase = "scons install";
buildInputs = [ gdk_pixbuf pkgconfig gtk glib scons pcre cfitsio perl gob2 vala libtiff
buildInputs = [ gdk_pixbuf pkgconfig gtk glib scons pcre cfitsio perl gob2 vala_0_23 libtiff
json_glib ];
meta = {

4
pkgs/applications/graphics/shotwell/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite
{ fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala_0_28, sqlite
, webkitgtk, pkgconfig, gnome3, gst_all_1, which, udev, libgudev, libraw, glib, json_glib
, gettext, desktop_file_utils, lcms2, gdk_pixbuf, librsvg, wrapGAppsHook
, gnome_doc_utils, hicolor_icon_theme, itstool }:
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
patchShebangs .
'';
buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkitgtk
buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala_0_28 sqlite webkitgtk
pkgconfig gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee
which udev libgudev gnome3.gexiv2 hicolor_icon_theme
libraw json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg

4
pkgs/applications/graphics/simple-scan/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool
, libusb1, libxml2, pkgconfig, sane-backends, vala, wrapGAppsHook
, libusb1, libxml2, pkgconfig, sane-backends, vala_0_23, wrapGAppsHook
, gnome3 }:
stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ cairo colord glib gusb gtk3 libusb1 libxml2 sane-backends
vala ];
vala_0_23 ];
nativeBuildInputs = [ intltool itstool pkgconfig wrapGAppsHook ];
configureFlags = [ "--disable-packagekit" ];

4
pkgs/applications/misc/finalterm/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchgit, makeWrapper
, pkgconfig, cmake, libxml2, vala, intltool, libmx, gnome3, gtk3, gtk_doc
, pkgconfig, cmake, libxml2, vala_0_23, intltool, libmx, gnome3, gtk3, gtk_doc
, keybinder3, clutter_gtk, libnotify
, libxkbcommon, xorg, udev
, bashInteractive
@ -15,7 +15,7 @@ stdenv.mkDerivation {
};
buildInputs = [
pkgconfig cmake vala intltool gtk3 gnome3.gnome_common gnome3.libgee
pkgconfig cmake vala_0_23 intltool gtk3 gnome3.gnome_common gnome3.libgee
gtk_doc clutter_gtk libmx keybinder3 libxml2 libnotify makeWrapper
xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence
libxkbcommon

4
pkgs/applications/misc/font-manager/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, makeWrapper, automake, autoconf, libtool,
pkgconfig, file, intltool, libxml2, json_glib , sqlite, itstool,
vala, gnome3, wrapGAppsHook
vala_0_32, gnome3, wrapGAppsHook
}:
stdenv.mkDerivation rec {
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
automake autoconf libtool
file
intltool
vala
vala_0_32
gnome3.yelp_tools
wrapGAppsHook
];

4
pkgs/applications/misc/pdfpc/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig, vala, gtk3, libgee
{ stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig, vala_0_26, gtk3, libgee
, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg }:
stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ gstreamer gst-plugins-base vala gtk3 libgee poppler
buildInputs = [ gstreamer gst-plugins-base vala_0_26 gtk3 libgee poppler
libpthreadstubs makeWrapper librsvg ];
postInstall = ''

4
pkgs/applications/misc/synapse/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, intltool, pkgconfig, glib, libnotify, gtk3, libgee
, keybinder3, json_glib, zeitgeist, vala, hicolor_icon_theme
, keybinder3, json_glib, zeitgeist, vala_0_23, hicolor_icon_theme
}:
with stdenv.lib;
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [
intltool pkgconfig glib libnotify gtk3 libgee keybinder3 json_glib zeitgeist
vala hicolor_icon_theme
vala_0_23 hicolor_icon_theme
];
meta = {

4
pkgs/applications/networking/browsers/midori/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, pkgconfig, intltool, vala, wrapGAppsHook
{ stdenv, fetchurl, cmake, pkgconfig, intltool, vala_0_23, wrapGAppsHook
, gtk3, webkitgtk, librsvg, libnotify, sqlite
, glib_networking, gsettings_desktop_schemas, libsoup, pcre, gnome3
, libxcb, libpthreadstubs, libXdmcp, libxkbcommon, epoxy, at_spi2_core
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
vala
vala_0_23
gtk3 webkitgtk librsvg libnotify sqlite gsettings_desktop_schemas pcre gnome3.gcr
libxcb libpthreadstubs libXdmcp libxkbcommon epoxy at_spi2_core
(libsoup.override {gnomeSupport = true; valaSupport = true;})

4
pkgs/desktops/gnome-3/3.20/apps/gnome-boxes/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, itstool, libvirt-glib
, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk
, spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala
, spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala_0_32
, libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg
, desktop_file_utils, mtools, cdrkit, libcdio, numactl, xen
, libusb, libarchive, acl, libgudev, qemu
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [
makeWrapper pkgconfig intltool itstool libvirt-glib glib
gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol
libuuid libsoup libosinfo systemd tracker vala libcap_ng libcap yajl gmp
libuuid libsoup libosinfo systemd tracker vala_0_32 libcap_ng libcap yajl gmp
gdbm cyrus_sasl gnome3.defaultIconTheme libusb libarchive
librsvg desktop_file_utils acl libgudev numactl xen
];

4
pkgs/desktops/gnome-3/3.20/apps/seahorse/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, intltool, fetchurl, vala
{ stdenv, intltool, fetchurl, vala_0_32
, pkgconfig, gtk3, glib
, makeWrapper, itstool, gnupg, libsoup
, gnome3, librsvg, gdk_pixbuf, gpgme
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr
gnome3.gsettings_desktop_schemas makeWrapper gnupg
gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme
libsecret avahi libsoup p11_kit vala gnome3.gcr
libsecret avahi libsoup p11_kit vala_0_32 gnome3.gcr
openssh ];
preFixup = ''

4
pkgs/desktops/gnome-3/3.20/core/baobab/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, intltool, fetchurl, vala, libgtop
{ stdenv, intltool, fetchurl, vala_0_32, libgtop
, pkgconfig, gtk3, glib
, bash, makeWrapper, itstool, libxml2
, gnome3, librsvg, gdk_pixbuf, file }:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2
buildInputs = [ vala_0_32 pkgconfig gtk3 glib libgtop intltool itstool libxml2
gnome3.gsettings_desktop_schemas makeWrapper file
gdk_pixbuf gnome3.defaultIconTheme librsvg ];

4
pkgs/desktops/gnome-3/3.20/core/dconf-editor/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3
{ stdenv, fetchurl, vala_0_32, libxslt, pkgconfig, glib, dbus_glib, gnome3
, libxml2, intltool, docbook_xsl_ns, docbook_xsl, wrapGAppsHook }:
stdenv.mkDerivation rec {
@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = [ vala libxslt glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme
buildInputs = [ vala_0_32 libxslt glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme
intltool docbook_xsl docbook_xsl_ns gnome3.dconf ];
meta = with stdenv.lib; {

4
pkgs/desktops/gnome-3/3.20/core/dconf/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3
{ stdenv, fetchurl, vala_0_32, libxslt, pkgconfig, glib, dbus_glib, gnome3
, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }:
let
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "4373e0ced1f4d7d68d518038796c073696280e22957babb29feb0267c630fec2";
};
buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2
buildInputs = [ vala_0_32 libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2
intltool docbook_xsl docbook_xsl_ns makeWrapper ];
meta = with stdenv.lib; {

4
pkgs/desktops/gnome-3/3.20/core/evolution-data-server/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl, stdenv, pkgconfig, gnome3, python
, intltool, libsoup, libxml2, libsecret, icu, sqlite
, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala }:
, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala_0_32 }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
buildInputs = with gnome3;
[ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts
gcr p11_kit libgweather libgdata gperf makeWrapper icu sqlite gsettings_desktop_schemas ]
++ stdenv.lib.optional valaSupport vala;
++ stdenv.lib.optional valaSupport vala_0_32;
propagatedBuildInputs = [ libsecret nss nspr libical db ];

4
pkgs/desktops/gnome-3/3.20/core/folks/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool
, vala, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs
, vala_0_32, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs
, telepathy_glib, evolution_data_server, libsecret, db }:
# TODO: enable more folks backends
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ glib gnome3.libgee sqlite ];
# dbus_daemon needed for tests
buildInputs = [ dbus_glib telepathy_glib evolution_data_server dbus_libs
vala libsecret libxml2 libsoup nspr nss intltool db ];
vala_0_32 libsecret libxml2 libsoup nspr nss intltool db ];
nativeBuildInputs = [ pkgconfig ];
configureFlags = "--disable-fatal-warnings";

4
pkgs/desktops/gnome-3/3.20/core/gcr/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib
, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk
, gobjectIntrospection, makeWrapper, libxslt, vala, gnome3 }:
, gobjectIntrospection, makeWrapper, libxslt, vala_0_32, gnome3 }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
buildInputs = [
pkgconfig intltool gnupg glib gobjectIntrospection libxslt
libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper vala
libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper vala_0_32
];
propagatedBuildInputs = [ p11_kit ];

4
pkgs/desktops/gnome-3/3.20/core/gnome-contacts/default.nix
View File

@ -3,7 +3,7 @@
, libchamplain, clutter_gtk, geocode_glib
, bash, makeWrapper, itstool, folks, libnotify, libxml2
, gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss
, libsoup, vala, dbus_glib, automake115x, autoconf }:
, libsoup, vala_0_32, dbus_glib, automake115x, autoconf }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
libxml2 libsoup gnome3.gnome_online_accounts nspr nss
gdk_pixbuf gnome3.defaultIconTheme librsvg
libchamplain clutter_gtk geocode_glib
vala automake115x autoconf db ];
vala_0_32 automake115x autoconf db ];
preFixup = ''
for f in "$out/bin/gnome-contacts" "$out/libexec/gnome-contacts-search-provider"; do

4
pkgs/desktops/gnome-3/3.20/core/gnome-terminal/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango
, gnome_doc_utils, intltool, libX11, which, libuuid, vala
, gnome_doc_utils, intltool, libX11, which, libuuid, vala_0_32
, desktop_file_utils, itstool, wrapGAppsHook, appdata-tools }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools
gnome3.dconf itstool gnome3.nautilus vala ];
gnome3.dconf itstool gnome3.nautilus vala_0_32 ];
nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2
desktop_file_utils wrapGAppsHook ];

4
pkgs/desktops/gnome-3/3.20/core/libgee/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection, gnome3 }:
{ stdenv, fetchurl, autoconf, vala_0_32, pkgconfig, glib, gobjectIntrospection, gnome3 }:
let
ver_maj = "0.16";
ver_min = "1";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
patches = [ ./fix_introspection_paths.patch ];
buildInputs = [ autoconf vala pkgconfig glib gobjectIntrospection ];
buildInputs = [ autoconf vala_0_32 pkgconfig glib gobjectIntrospection ];
meta = with stdenv.lib; {
description = "Utility library providing GObject-based interfaces and classes for commonly used data structures";

4
pkgs/desktops/gnome-3/3.20/core/libgee/libgee-1.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection, gnome3 }:
{ stdenv, fetchurl, autoconf, vala_0_32, pkgconfig, glib, gobjectIntrospection, gnome3 }:
let
ver_maj = "0.6";
ver_min = "8";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
patches = [ ./fix_introspection_paths.patch ];
buildInputs = [ autoconf vala pkgconfig glib gobjectIntrospection ];
buildInputs = [ autoconf vala_0_32 pkgconfig glib gobjectIntrospection ];
meta = with stdenv.lib; {
description = "Utility library providing GObject-based interfaces and classes for commonly used data structures";

4
pkgs/desktops/gnome-3/3.20/core/tracker/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, intltool, fetchurl, libxml2, upower
, pkgconfig, gtk3, glib
, bash, makeWrapper, itstool, vala, sqlite, libxslt
, bash, makeWrapper, itstool, vala_0_32, sqlite, libxslt
, gnome3, librsvg, gdk_pixbuf, file, libnotify
, evolution_data_server, gst_all_1, poppler
, icu, taglib, libjpeg, libtiff, giflib, libcue
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
buildInputs = [ vala pkgconfig gtk3 glib intltool itstool libxml2
buildInputs = [ vala_0_32 pkgconfig gtk3 glib intltool itstool libxml2
bzip2 gnome3.totem-pl-parser libxslt
gnome3.gsettings_desktop_schemas makeWrapper file
gdk_pixbuf gnome3.defaultIconTheme librsvg sqlite

4
pkgs/desktops/gnome-3/3.20/core/vte/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, intltool, pkgconfig
, gnome3, ncurses, gobjectIntrospection, vala, libxml2, gnutls
, gnome3, ncurses, gobjectIntrospection, vala_0_32, libxml2, gnutls
, selectTextPatch ? false
, fetchFromGitHub, autoconf, automake, libtool, gtk_doc, gperf
@ -9,7 +9,7 @@ let baseAttrs = rec {
inherit (import ./src.nix fetchurl) name src;
buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib
gnome3.gtk3 ncurses vala libxml2 ];
gnome3.gtk3 ncurses vala_0_32 libxml2 ];
propagatedBuildInputs = [ gnutls ];

4
pkgs/desktops/gnome-3/3.20/misc/california/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala, makeWrapper
{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_32, makeWrapper
, gnome3, glib, libsoup, libgdata, sqlite, itstool, xdg_utils }:
let
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
buildInputs = [ makeWrapper intltool pkgconfig vala glib gtk3 gnome3.libgee
buildInputs = [ makeWrapper intltool pkgconfig vala_0_32 glib gtk3 gnome3.libgee
libsoup libgdata gnome3.gnome_online_accounts gnome3.evolution_data_server
sqlite itstool xdg_utils gnome3.gsettings_desktop_schemas ];

4
pkgs/desktops/gnome-3/3.20/misc/geary/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala
{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_32
, makeWrapper, gdk_pixbuf, cmake, desktop_file_utils
, libnotify, libcanberra, libsecret, gmime
, libpthreadstubs, sqlite
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
buildInputs = [ intltool pkgconfig gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils
vala webkitgtk libnotify libcanberra gnome3.libgee libsecret gmime sqlite
vala_0_32 webkitgtk libnotify libcanberra gnome3.libgee libsecret gmime sqlite
libpthreadstubs gnome3.gsettings_desktop_schemas gnome3.gcr
gdk_pixbuf librsvg gnome3.defaultIconTheme ];

4
pkgs/desktops/gnome-3/3.20/misc/gitg/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchgit, vala, intltool, libgit2, pkgconfig, gtk3, glib
{ stdenv, fetchurl, fetchgit, vala_0_32, intltool, libgit2, pkgconfig, gtk3, glib
, json_glib, webkitgtk, makeWrapper, libpeas, bash, gobjectIntrospection
, gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg, libsecret }:
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ shared_mime_info
gnome3.gnome_themes_standard ];
buildInputs = [ vala intltool libgit2 pkgconfig gtk3 glib json_glib webkitgtk libgee libpeas
buildInputs = [ vala_0_32 intltool libgit2 pkgconfig gtk3 glib json_glib webkitgtk libgee libpeas
libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview
librsvg libsecret
gobjectIntrospection makeWrapper gnome3.adwaita-icon-theme ];

4
pkgs/desktops/gnome-3/3.20/misc/gpaste/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, intltool, autoreconfHook, pkgconfig, vala, glib
{ stdenv, fetchurl, intltool, autoreconfHook, pkgconfig, vala_0_32, glib
, pango, gtk3, gnome3, dbus, clutter, appstream-glib, makeWrapper, systemd, gobjectIntrospection }:
stdenv.mkDerivation rec {
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "08h1igdgapz7px12r7mrfcxmz68g9ijg73w69j75spg0yc6f4xax";
};
buildInputs = [ intltool autoreconfHook pkgconfig vala glib
buildInputs = [ intltool autoreconfHook pkgconfig vala_0_32 glib
gtk3 gnome3.gnome_control_center dbus
clutter pango appstream-glib makeWrapper systemd gobjectIntrospection ];

4
pkgs/desktops/gnome-3/3.20/misc/libgit2-glib/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala, libssh2
{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala_0_32, libssh2
, gtk_doc, gobjectIntrospection, libgit2, glib }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
buildInputs = [ gnome3.gnome_common libtool pkgconfig vala libssh2
buildInputs = [ gnome3.gnome_common libtool pkgconfig vala_0_32 libssh2
gtk_doc gobjectIntrospection libgit2 glib ];
meta = with stdenv.lib; {

4
pkgs/desktops/gnome-3/3.20/misc/pomodoro/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper,
dbus_glib, libcanberra, gst_all_1, vala, gnome3, gtk3, gst_plugins_base,
dbus_glib, libcanberra, gst_all_1, vala_0_32, gnome3, gtk3, gst_plugins_base,
glib, gobjectIntrospection, telepathy_glib
}:
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [
which automake113x intltool glib gobjectIntrospection pkgconfig libtool
makeWrapper dbus_glib libcanberra vala gst_all_1.gstreamer
makeWrapper dbus_glib libcanberra vala_0_32 gst_all_1.gstreamer
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
gnome3.gsettings_desktop_schemas gnome3.gnome_desktop
gnome3.gnome_common gnome3.gnome_shell gtk3 telepathy_glib

4
pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, cmake, vala, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, makeWrapper }:
{ stdenv, fetchurl, perl, cmake, vala_0_23, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, makeWrapper }:
stdenv.mkDerivation rec {
majorVersion = "0.3";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
'';
buildInputs = with gnome3; [
perl cmake vala pkgconfig glib gtk3 granite libnotify gettext makeWrapper
perl cmake vala_0_23 pkgconfig glib gtk3 granite libnotify gettext makeWrapper
vte_290 libgee gsettings_desktop_schemas defaultIconTheme
];
meta = {

0
pkgs/development/compilers/vala/default.nix → pkgs/development/compilers/vala/0.23.nix
View File

4
pkgs/development/libraries/granite/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, cmake, vala, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }:
{ stdenv, fetchurl, perl, cmake, vala_0_23, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }:
stdenv.mkDerivation rec {
majorVersion = "0.3";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1laa109dz7kbd8zxddqw2p1b67yzva7cc5h3smqkj8a9jzbhv5fz";
};
cmakeFlags = "-DINTROSPECTION_GIRDIR=share/gir-1.0/ -DINTROSPECTION_TYPELIBDIR=lib/girepository-1.0";
buildInputs = [perl cmake vala pkgconfig gobjectIntrospection glib gtk3 gnome3.libgee gettext];
buildInputs = [perl cmake vala_0_23 pkgconfig gobjectIntrospection glib gtk3 gnome3.libgee gettext];
meta = {
description = "An extension to GTK+ used by elementary OS";
longDescription = "An extension to GTK+ that provides several useful widgets and classes to ease application development. Designed for elementary OS.";

4
pkgs/development/libraries/gusb/default.nix
View File

@ -1,6 +1,6 @@
{stdenv, fetchurl
, automake, autoconf, libtool, which, gtkdoc, gettext, pkgconfig, gobjectIntrospection, libxslt
, glib, systemd, libusb1, vala
, glib, systemd, libusb1, vala_0_23
}:
stdenv.mkDerivation rec {
name = "gusb-${version}";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [
pkgconfig autoconf automake libtool which gtkdoc gettext gobjectIntrospection libxslt
systemd libusb1 vala
systemd libusb1 vala_0_23
glib
];

4
pkgs/development/libraries/libappindicator/default.nix
View File

@ -5,7 +5,7 @@
, glib, dbus_glib, gtkVersion
, gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null
, gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null
, python, pygobject, pygtk, gobjectIntrospection, vala
, python, pygobject, pygtk, gobjectIntrospection, vala_0_23
, monoSupport ? false, mono ? null, gtk-sharp ? null
}:
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
buildInputs = [
glib dbus_glib
python pygobject pygtk gobjectIntrospection vala
python pygobject pygtk gobjectIntrospection vala_0_23
] ++ (if gtkVersion == "2"
then [ gtk2 libindicator-gtk2 libdbusmenu-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp ]
else [ gtk3 libindicator-gtk3 libdbusmenu-gtk3 ]);

4
pkgs/development/libraries/libdbusmenu/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, lib, file
, pkgconfig, intltool
, glib, dbus_glib, json_glib
, gobjectIntrospection, vala, gnome_doc_utils
, gobjectIntrospection, vala_0_23, gnome_doc_utils
, gtkVersion ? null, gtk2 ? null, gtk3 ? null }:
with lib;
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [
glib dbus_glib json_glib
gobjectIntrospection vala gnome_doc_utils
gobjectIntrospection vala_0_23 gnome_doc_utils
] ++ optional (gtkVersion != null) (if gtkVersion == "2" then gtk2 else gtk3);
postPatch = ''

4
pkgs/development/libraries/libfm/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, glib, gtk, intltool, menu-cache, pango, pkgconfig, vala
{ stdenv, fetchurl, glib, gtk, intltool, menu-cache, pango, pkgconfig, vala_0_23
, extraOnly ? false }:
let
inherit (stdenv.lib) optional;
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "0bsh4p7h2glhxf1cc1lvbxyb4qy0y1zsnl9izf7vrldkikrgc13q";
};
buildInputs = [ glib gtk intltool pango pkgconfig vala ]
buildInputs = [ glib gtk intltool pango pkgconfig vala_0_23 ]
++ optional (!extraOnly) menu-cache;
configureFlags = optional extraOnly "--with-extra-only";

4
pkgs/development/libraries/libindicate/default.nix
View File

@ -4,7 +4,7 @@
, pkgconfig, autoconf
, glib, dbus_glib, libdbusmenu-glib
, gtkVersion, gtk2 ? null, gtk3 ? null
, python, pygobject, pygtk, gobjectIntrospection, vala, gnome_doc_utils
, python, pygobject, pygtk, gobjectIntrospection, vala_0_23, gnome_doc_utils
, monoSupport ? false, mono ? null, gtk-sharp ? null
}:
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
buildInputs = [
glib dbus_glib libdbusmenu-glib
python pygobject pygtk gobjectIntrospection vala gnome_doc_utils
python pygobject pygtk gobjectIntrospection vala_0_23 gnome_doc_utils
] ++ (if gtkVersion == "2"
then [ gtk2 ] ++ optionals monoSupport [ mono gtk-sharp ]
else [ gtk3 ]);

4
pkgs/development/libraries/libosinfo/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, gobjectIntrospection, libsoup
, libxslt, check, vala ? null
, libxslt, check, vala_0_23 ? null
}:
stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
pkgconfig intltool gobjectIntrospection libsoup libxslt check vala
pkgconfig intltool gobjectIntrospection libsoup libxslt check vala_0_23
];
meta = with stdenv.lib; {

4
pkgs/development/libraries/libsoup/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, glib, libxml2, pkgconfig
, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking, gobjectIntrospection
, valaSupport ? true, vala
, valaSupport ? true, vala_0_23
, libintlOrEmpty
, intltool, python }:
let
@ -25,7 +25,7 @@ stdenv.mkDerivation {
outputs = [ "dev" "out" ];
buildInputs = libintlOrEmpty ++ [ intltool python sqlite ]
++ stdenv.lib.optionals valaSupport [ vala ];
++ stdenv.lib.optionals valaSupport [ vala_0_23 ];
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ]
++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring ];

4
pkgs/development/libraries/libunity/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, vala, python, intltool, pkgconfig
{ stdenv, fetchurl, vala_0_23, python, intltool, pkgconfig
, glib, libgee_0_6, gtk3, dee, libdbusmenu-glib
}:
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ glib libgee_0_6 gtk3 ];
propagatedBuildInputs = [ dee libdbusmenu-glib ];
nativeBuildInputs = [ vala python intltool pkgconfig ];
nativeBuildInputs = [ vala_0_23 python intltool pkgconfig ];
enableParallelBuilding = true;

4
pkgs/development/libraries/telepathy/glib/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, dbus_glib, glib, python, pkgconfig, libxslt
, gobjectIntrospection, valaSupport ? true, vala }:
, gobjectIntrospection, valaSupport ? true, vala_0_23 }:
stdenv.mkDerivation rec {
name = "telepathy-glib-0.24.1";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [dbus_glib glib python gobjectIntrospection];
buildInputs = [pkgconfig libxslt] ++ stdenv.lib.optional valaSupport vala;
buildInputs = [pkgconfig libxslt] ++ stdenv.lib.optional valaSupport vala_0_23;
preConfigure = ''
substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires

4
pkgs/development/libraries/zeitgeist/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, sqlite, gnome3, vala
{ stdenv, fetchurl, pkgconfig, glib, sqlite, gnome3, vala_0_23
, intltool, libtool, python, dbus_libs, telepathy_glib
, gtk3, json_glib, librdf_raptor2, pythonPackages, dbus_glib }:
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-session-bus-services-dir=$(out)/share/dbus-1/services" ];
buildInputs = [ pkgconfig glib sqlite gnome3.gnome_common intltool
libtool python dbus_libs telepathy_glib vala dbus_glib
libtool python dbus_libs telepathy_glib vala_0_23 dbus_glib
gtk3 json_glib librdf_raptor2 pythonPackages.rdflib ];
prePatch = "patchShebangs .";

4
pkgs/development/web/valum/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, pkgconfig, fetchFromGitHub, python, glib, vala, ctpl
{ stdenv, pkgconfig, fetchFromGitHub, python, glib, vala_0_28, ctpl
, libgee, libsoup, fcgi }:
stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1lciwqk4k9sf1hl4drl207g0ydlxl906kx9lx5fqhfb8gwcfqh2g";
};
buildInputs = [ python pkgconfig glib vala ctpl libgee libsoup fcgi ];
buildInputs = [ python pkgconfig glib vala_0_28 ctpl libgee libsoup fcgi ];
configurePhase = ''python waf configure --prefix=$out'';

4
pkgs/misc/seafile-shared/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, which, automake, autoconf, pkgconfig, curl, libtool, vala, python, intltool, fuse, ccnet}:
{stdenv, fetchurl, which, automake, autoconf, pkgconfig, curl, libtool, vala_0_23, python, intltool, fuse, ccnet}:
stdenv.mkDerivation rec
{
@ -11,7 +11,7 @@ stdenv.mkDerivation rec
sha256 = "ec166c86a41e7ab3b1ae97a56326ab4a2b1ec38686486b956c3d153b8023c670";
};
buildInputs = [ which automake autoconf pkgconfig libtool vala python intltool fuse ];
buildInputs = [ which automake autoconf pkgconfig libtool vala_0_23 python intltool fuse ];
propagatedBuildInputs = [ ccnet curl ];
preConfigure = ''

4
pkgs/tools/admin/gtk-vnc/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, gobjectIntrospection
, python, gtk, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1
, libffi, cyrus_sasl, intltool, perl, perlPackages, libpulseaudio
, kbproto, libX11, libXext, xextproto, pygobject, libgcrypt, gtk3, vala
, kbproto, libX11, libXext, xextproto, pygobject, libgcrypt, gtk3, vala_0_23
, pygobject3, libogg, enableGTK3 ? false, libgpgerror }:
stdenv.mkDerivation rec {
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
python gnutls cairo libtool pkgconfig glib libffi libgcrypt
intltool cyrus_sasl libpulseaudio perl perlPackages.TextCSV
gobjectIntrospection libogg libgpgerror
] ++ (if enableGTK3 then [ gtk3 vala pygobject3 ] else [ gtk pygtk pygobject ]);
] ++ (if enableGTK3 then [ gtk3 vala_0_23 pygobject3 ] else [ gtk pygtk pygobject ]);
NIX_CFLAGS_COMPILE = "-fstack-protector-all";
configureFlags = [

4
pkgs/tools/networking/ccnet/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, which, automake, autoconf, pkgconfig, libtool, vala, python, libsearpc, libzdb, libuuid, libevent, sqlite, openssl}:
{stdenv, fetchurl, which, automake, autoconf, pkgconfig, libtool, vala_0_23, python, libsearpc, libzdb, libuuid, libevent, sqlite, openssl}:
stdenv.mkDerivation rec
{
@ -12,7 +12,7 @@ stdenv.mkDerivation rec
sha256 = "1e1c670a85619b174328a15925a050c7a8b323fecd13434992332f5c15e05de1";
};
buildInputs = [ which automake autoconf pkgconfig libtool vala python ];
buildInputs = [ which automake autoconf pkgconfig libtool vala_0_23 python ];
propagatedBuildInputs = [ libsearpc libzdb libuuid libevent sqlite openssl ];
preConfigure = ''

4
pkgs/tools/package-management/packagekit/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, lib
, intltool, glib, pkgconfig, polkit, python, sqlite, systemd
, gobjectIntrospection, vala, gtk_doc, autoreconfHook, autoconf-archive
, gobjectIntrospection, vala_0_23, gtk_doc, autoreconfHook, autoconf-archive
, nix, boost
, enableCommandNotFound ? false
, enableBashCompletion ? false, bashCompletion ? null }:
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
sha256 = "150mpar7bhlvwfpwsr6zrjn3yggvklzr6nlhk0shaxnrfkfxvvb6";
};
buildInputs = [ glib polkit systemd python gobjectIntrospection vala ]
buildInputs = [ glib polkit systemd python gobjectIntrospection vala_0_23 ]
++ lib.optional enableBashCompletion bashCompletion;
propagatedBuildInputs = [ sqlite nix boost ];
nativeBuildInputs = [ intltool pkgconfig autoreconfHook autoconf-archive gtk_doc ];

4
pkgs/tools/security/gencfsm/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, autoconf, automake, intltool, libtool, pkgconfig, encfs
, glib , gnome3, gtk3, libgnome_keyring, vala, wrapGAppsHook, xorg }:
, glib , gnome3, gtk3, libgnome_keyring, vala_0_23, wrapGAppsHook, xorg }:
stdenv.mkDerivation rec {
version = "1.8.16";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "06sz6zcmvxkqww5gx4brcqs4hlpy9d8sal9nmw0pdsvh8k5vmpgn";
};
buildInputs = [ autoconf automake intltool libtool pkgconfig vala glib encfs
buildInputs = [ autoconf automake intltool libtool pkgconfig vala_0_23 glib encfs
gtk3 libgnome_keyring gnome3.libgee_1 xorg.libSM xorg.libICE
wrapGAppsHook ];

16
pkgs/top-level/all-packages.nix
View File

@ -3455,9 +3455,7 @@ in
sharutils = callPackage ../tools/archivers/sharutils { };
shotwell = callPackage ../applications/graphics/shotwell {
vala = vala_0_28;
};
shotwell = callPackage ../applications/graphics/shotwell { };
shout = callPackage ../applications/networking/irc/shout { };
@ -4043,7 +4041,6 @@ in
valum = callPackage ../development/web/valum {
inherit (gnome3) libgee;
vala = vala_0_28;
};
varnish = callPackage ../servers/varnish { };
@ -5593,7 +5590,7 @@ in
urweb = callPackage ../development/compilers/urweb { };
vala = callPackage ../development/compilers/vala/default.nix { };
vala_0_23 = callPackage ../development/compilers/vala/0.23.nix { };
vala_0_26 = callPackage ../development/compilers/vala/0.26.nix { };
@ -13041,9 +13038,7 @@ in
focuswriter = callPackage ../applications/editors/focuswriter { };
font-manager = callPackage ../applications/misc/font-manager {
vala = vala_0_32;
};
font-manager = callPackage ../applications/misc/font-manager { };
foo-yc20 = callPackage ../applications/audio/foo-yc20 { };
@ -14288,7 +14283,6 @@ in
pdfgrep = callPackage ../tools/typesetting/pdfgrep { };
pdfpc = callPackage ../applications/misc/pdfpc {
vala = vala_0_26;
inherit (gnome3) libgee;
inherit (gst_all_1) gstreamer gst-plugins-base;
};
@ -15034,9 +15028,7 @@ in
vanitygen = callPackage ../applications/misc/vanitygen { };
vanubi = callPackage ../applications/editors/vanubi {
vala = vala_0_26;
};
vanubi = callPackage ../applications/editors/vanubi { };
vbindiff = callPackage ../applications/editors/vbindiff { };