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: b9c5f849a479
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e48720e67f6f
Choose a head ref
  • 4 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 3, 2019

  1. vala: 0.46.1 -> 0.46.2 

    https://gitlab.gnome.org/GNOME/vala/blob/0.46.2/NEWS
    @worldofpeace
    worldofpeace committed Oct 3, 2019
    Copy the full SHA
    ba565aa View commit details

  2. midori: use latest vala

    @worldofpeace
    worldofpeace committed Oct 3, 2019
    Copy the full SHA
    d845b08 View commit details

  3. vala_0_44: 0.44.7 -> 0.44.8 

    https://gitlab.gnome.org/GNOME/vala/blob/0.44.8/NEWS
    @worldofpeace
    worldofpeace committed Oct 3, 2019
    Copy the full SHA
    dbabe69 View commit details

  4. Merge pull request #70299 from worldofpeace/vala-0.46.2 

    vala: 0.46.1 -> 0.46.2
    @worldofpeace
    worldofpeace authored Oct 3, 2019
    Copy the full SHA
    e48720e View commit details
Showing with 8 additions and 8 deletions.
  1. +2 −2 pkgs/applications/networking/browsers/midori/default.nix
  2. +6 −6 pkgs/development/compilers/vala/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/midori/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
, ninja
, pkgconfig
, intltool
, vala_0_44
, vala
, wrapGAppsHook
, gcr
, libpeas
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
intltool
ninja
pkgconfig
vala_0_44
vala
wrapGAppsHook
];

12 changes: 6 additions & 6 deletions pkgs/development/compilers/vala/default.nix
View file
Original file line number Diff line number Diff line change
@@ -83,12 +83,12 @@ let
doCheck = false; # fails, requires dbus daemon

# Wait for PR #59372
#passthru = {
# passthru = {
# updateScript = gnome3.updateScript {
# attrPath = "${pname}_${lib.versions.major version}_${lib.versions.minor version}";
# packageName = pname;
# };
#};
# };

meta = with stdenv.lib; {
description = "Compiler for GObject type system";
@@ -111,13 +111,13 @@ in rec {
};

vala_0_44 = generic {
version = "0.44.7";
sha256 = "0z5xy4qc95rm2gj7s2k14xm1xp3mrf0yz64fx4kddqjxkpsz87xz";
version = "0.44.8";
sha256 = "0f7pc496zvxfhbkhg8ayxykjas6f55mgv452wsnh0bz5zbxm8xrl";
};

vala_0_46 = generic {
version = "0.46.1";
sha256 = "10czkhclnisdz6k5qfiicmvx47m9177l5dkhjn29g43khnmpkr8l";
version = "0.46.2";
sha256 = "1g20fzcwh3j7ab46jalabyi005h2in0cp7xj0yga4b8hx29h61wj";
};

vala = vala_0_46;