Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d22aeb0c4393
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f102c309c913
Choose a head ref
  • 10 commits
  • 9 files changed
  • 1 contributor

Commits on Mar 18, 2019

  1. vala_0_36: 0.36.17 -> 0.36.18 

    https://gitlab.gnome.org/GNOME/vala/raw/0.36.18/NEWS
    @worldofpeace
    worldofpeace committed Mar 18, 2019
    Copy the full SHA
    a92396a View commit details

  2. vala_0_40: 0.40.12 -> 0.40.14 

    https://gitlab.gnome.org/GNOME/vala/blob/0.40.13/NEWS
https://gitlab.gnome.org/GNOME/vala/blob/0.40.14/NEWS
    @worldofpeace
    worldofpeace committed Mar 18, 2019
    Copy the full SHA
    0547551 View commit details

  3. vala_0_42: 0.42.4 -> 0.42.6 

    Fetch graphviz patch now.

https://gitlab.gnome.org/GNOME/vala/blob/0.42.5/NEWS
https://gitlab.gnome.org/GNOME/vala/blob/0.42.6/NEWS
    @worldofpeace
    worldofpeace committed Mar 18, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    19697dd View commit details

  4. vala_0_44: init at 0.44.1

    @worldofpeace
    worldofpeace committed Mar 18, 2019
    Copy the full SHA
    a6fb15c View commit details

  5. vala: add worldofpeace to maintainers

    @worldofpeace
    worldofpeace committed Mar 18, 2019
    Copy the full SHA
    2c352ad View commit details

  6. libdbusmenu: use latest vala, use placeholder

    @worldofpeace
    worldofpeace committed Mar 18, 2019
    Copy the full SHA
    225bf9f View commit details

  7. synapse: use latest vala

    @worldofpeace
    worldofpeace committed Mar 18, 2019
    Copy the full SHA
    9a42d2d View commit details

  8. packagekit: use latest vala

    @worldofpeace
    worldofpeace committed Mar 18, 2019
    Copy the full SHA
    81b5a5c View commit details

  9. libhttpseverywhere: build with latest vala

    @worldofpeace
    worldofpeace committed Mar 18, 2019
    Copy the full SHA
    1727324 View commit details

  10. Merge pull request #57709 from worldofpeace/vala-updates/03-2019 

    vala updates 03-2019
    @worldofpeace
    worldofpeace authored Mar 18, 2019
    Copy the full SHA
    f102c30 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/misc/synapse/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, gettext, pkgconfig, glib, libnotify, gtk3, libgee
, keybinder3, json-glib, zeitgeist, vala_0_38, hicolor-icon-theme, gobject-introspection
, keybinder3, json-glib, zeitgeist, vala, hicolor-icon-theme, gobject-introspection
}:

let
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
};

nativeBuildInputs = [
pkgconfig gettext vala_0_38
pkgconfig gettext vala
# For setup hook
gobject-introspection
];
2 changes: 1 addition & 1 deletion pkgs/desktops/gnome-3/default.nix
View file
Original file line number Diff line number Diff line change
@@ -54,7 +54,7 @@ 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_42;
vala = pkgs.vala_0_44;
gegl_0_4 = pkgs.gegl_0_4.override { gtk = pkgs.gtk3; };

# ISO installer
38 changes: 26 additions & 12 deletions pkgs/development/compilers/vala/default.nix
View file
Original file line number Diff line number Diff line change
@@ -30,12 +30,20 @@ let
};

# NOTE: the openembedded-core project doesn't have a patch for 0.40.12
# or 0.42.4 just yet; we've fixed the single merge conflict in the
# patches below and checked them in here.
# We've fixed the single merge conflict in the following patch.
# 0.40.12: https://github.com/openembedded/openembedded-core/raw/8553c52f174af4c8c433c543f806f5ed5c1ec48c/meta/recipes-devtools/vala/vala/disable-graphviz.patch
# 0.42.4: https://github.com/openembedded/openembedded-core/raw/dfbbff39cfd413510abbd60930232a9c6b35d765/meta/recipes-devtools/vala/vala/disable-graphviz.patch
"0.40" = ./disable-graphviz-0.40.12.patch;
"0.42" = ./disable-graphviz-0.42.4.patch;

"0.42" = fp {
commit = "f2b4f9ec6f44dced7f88df849cca68961419eeb8";
sha256 = "112qhdzix0d7lfpfcam1cxprzmfzpwypb1226m5ma1vq9qy0sn7g";
};

# NOTE: the openembedded-core project doesn't have a patch for 0.44.1
# We've reverted the addition of the "--disable-valadoc" option
# and then applied the following patch.
# 0.42.4: https://github.com/openembedded/openembedded-core/raw/f2b4f9ec6f44dced7f88df849cca68961419eeb8/meta/recipes-devtools/vala/vala/disable-graphviz.patch
"0.44" = ./disable-graphviz-0.44.1.patch;

}.${major} or (throw "no graphviz patch for this version of vala");

@@ -88,15 +96,15 @@ let
homepage = https://wiki.gnome.org/Projects/Vala;
license = licenses.lgpl21Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ antono jtojnar lethalman peterhoeg ];
maintainers = with maintainers; [ antono jtojnar lethalman peterhoeg worldofpeace ];
};
});

in rec {
vala_0_36 = generic {
major = "0.36";
minor = "17";
sha256 = "1f6qg40zd6jzhbwr3dy4fb66k4qs1xlk2whdyqh64zxxjw0k9pv7";
minor = "18";
sha256 = "0csb9skgy663y05kl813dsarzjbfcdsmx5fvz13p8gas3hycciq9";
};

vala_0_38 = generic {
@@ -108,15 +116,21 @@ in rec {

vala_0_40 = generic {
major = "0.40";
minor = "12";
sha256 = "1nhk45w5iwg97q3cfybn0i4qz5w9qvk423ndpg6mq6cnna076snx";
minor = "14";
sha256 = "0llid9b9cgjcrcclc0pw2skkssb7br7b2clq9cql3p14dl94gki0";
};

vala_0_42 = generic {
major = "0.42";
minor = "4";
sha256 = "07jgkx812y7wq4cswwfsf1f4k3lq9hcjra45682bdi8a11nr0a5m";
minor = "6";
sha256 = "14024gvs23q323fmd62hqd8jiypaxbjjvamyd782ixbhxmpz8x1p";
};

vala_0_44 = generic {
major = "0.44";
minor = "1";
sha256 = "1qiglkgymws6a3m8xz1v8b3na165ywx2dbipp3bdg134bi0w3a4n";
};

vala = vala_0_42;
vala = vala_0_44;
}
208 changes: 0 additions & 208 deletions pkgs/development/compilers/vala/disable-graphviz-0.42.4.patch
View file

This file was deleted.

Loading