pyrox.dev / nixpkgs
lol
fork atom

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

gnome3: always use latest vala

authored by worldofpeace and committed by GitHub 87ed3e8a e6149855

+5 -32
unified split
+2 -1
pkgs/desktops/gnome-3/default.nix
··· 24 24 libsoup = pkgs.libsoup.override { gnomeSupport = true; }; 25 25 libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; 26 26 gnome3 = self // { recurseForDerivations = false; }; 27 - vala = pkgs.vala_0_44; 28 27 gegl_0_4 = pkgs.gegl_0_4.override { gtk = pkgs.gtk3; }; 29 28 30 29 # ISO installer ··· 358 357 gamesPackages = throw "deprecated 2019-08-25: please use `services.gnome3.games.enable`"; 359 358 360 359 nautilus-sendto = throw "deprecated 2019-09-17: abandoned"; 360 + 361 + inherit (pkgs) vala; # added 2019-10-10 361 362 })
+2 -2
pkgs/development/libraries/gsound/default.nix
··· 1 - { stdenv, fetchurl, pkgconfig, glib, libcanberra, gobject-introspection, libtool, gnome3 }: 1 + { stdenv, fetchurl, pkgconfig, glib, vala, libcanberra, gobject-introspection, libtool, gnome3 }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "gsound"; ··· 9 9 sha256 = "bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53"; 10 10 }; 11 11 12 - nativeBuildInputs = [ pkgconfig gobject-introspection libtool gnome3.vala ]; 12 + nativeBuildInputs = [ pkgconfig gobject-introspection libtool vala ]; 13 13 buildInputs = [ glib libcanberra ]; 14 14 15 15 passthru = {
-27
pkgs/development/tools/valadoc/default.nix
··· 1 - {stdenv, fetchurl, gnome3, automake, autoconf, which, libtool, pkgconfig, graphviz, glib, gobject-introspection, expat}: 2 - stdenv.mkDerivation rec { 3 - version = "0.36.2"; 4 - pname = "valadoc"; 5 - 6 - src = fetchurl { 7 - url = "mirror://gnome/sources/valadoc/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 8 - sha256 = "0hfaskbm7y4z4jf6lxm8hg4c0b8621qn1gchxjxcngq0cpx79z9h"; 9 - }; 10 - 11 - nativeBuildInputs = [ automake autoconf which gnome3.vala libtool pkgconfig gobject-introspection ]; 12 - buildInputs = [ graphviz glib gnome3.libgee expat ]; 13 - 14 - passthru = { 15 - updateScript = gnome3.updateScript { 16 - packageName = "valadoc"; 17 - }; 18 - }; 19 - 20 - meta = with stdenv.lib; { 21 - description = "A documentation generator for generating API documentation from Vala source code"; 22 - homepage = https://valadoc.org; 23 - license = licenses.gpl2; 24 - maintainers = with maintainers; [ sternenseemann ]; 25 - platforms = platforms.linux; 26 - }; 27 - }
+1
pkgs/top-level/aliases.nix
··· 383 383 ultrastardx-beta = ultrastardx; # added 2017-08-12 384 384 usb_modeswitch = usb-modeswitch; # added 2016-05-10 385 385 usbguard-nox = usbguard; # added 2019-09-04 386 + valadoc = throw "deprecated 2019-10-10: valadoc was merged into vala 0.38"; 386 387 v4l_utils = v4l-utils; # added 2019-08-07 387 388 vimbWrapper = vimb; # added 2015-01 388 389 vimprobable2Wrapper = vimprobable2; # added 2015-01
-2
pkgs/top-level/all-packages.nix
··· 8535 8535 vala_0_46 8536 8536 vala; 8537 8537 8538 - valadoc = callPackage ../development/tools/valadoc { }; 8539 - 8540 8538 wcc = callPackage ../development/compilers/wcc { }; 8541 8539 8542 8540 wla-dx = callPackage ../development/compilers/wla-dx { };