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: 28a6927637f7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 19091a517865
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 5, 2018

  1. vocal: 2.2.0 -> 2.3.0

    @jonafato
    jonafato committed Nov 5, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    Mic92 Jörg Thalheim
    GPG key ID: CA4106B8D7CC79FA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    63418d5 View commit details

Commits on Nov 6, 2018

  1. Merge pull request #49772 from jonafato/vocal-2.3.0 

    vocal: 2.2.0 -> 2.3.0
    @Mic92
    Mic92 authored Nov 6, 2018
    Copy the full SHA
    19091a5 View commit details
Showing with 5 additions and 4 deletions.
  1. +5 −4 pkgs/applications/audio/vocal/default.nix
9 changes: 5 additions & 4 deletions pkgs/applications/audio/vocal/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, vala, gtk3, libxml2, granite, webkitgtk, clutter-gtk
{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, vala_0_40, gtk3, libxml2, granite, webkitgtk, clutter-gtk
, clutter-gst, libunity, libnotify, sqlite, gst_all_1, libsoup, json-glib, gnome3, gobjectIntrospection, wrapGAppsHook }:

stdenv.mkDerivation rec {
pname = "vocal";
version = "2.2.0";
version = "2.3.0";

name = "${pname}-${version}";

src = fetchFromGitHub {
owner = "needle-and-thread";
repo = pname;
rev = version;
sha256 = "09cm4azyaa9fmfymygf25gf0klpm5p04k6bc1i90jhw0f1im8sgl";
sha256 = "1wkkyai14in4yk3q4qq23wk3l49px2xi8z819y3glna236qsq6qp";
};

nativeBuildInputs = [
@@ -20,13 +20,14 @@ stdenv.mkDerivation rec {
libxml2
ninja
pkgconfig
vala
vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
wrapGAppsHook
];

buildInputs = with gst_all_1; [
clutter-gst
clutter-gtk
gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged
gnome3.libgee
granite
gst-plugins-base