public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #70891 from worldofpeace/gnome3-fixup-vala

Browse Source 
gnome3: always use latest vala
This commit is contained in:
worldofpeace 2019-10-10 17:29:20 +00:00 committed by GitHub
commit 87ed3e8a60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/desktops/gnome-3/default.nix
View File

@ -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
})

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

@ -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 = {

27
pkgs/development/tools/valadoc/default.nix
View File

@ -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;
};
}

1
pkgs/top-level/aliases.nix
View File

@ -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

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

@ -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 { };