Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0728c3e026e3
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 36516712916e
Choose a head ref
  • 4 commits
  • 2 files changed
  • 4 contributors

Commits on May 28, 2019

  1. vocal: 2.3.0 -> 2.4.0 

    Vocal has a new release featuring a number of bug fixes and new
features. See the full changelog at
https://github.com/needle-and-thread/vocal/releases/tag/2.4.0.

(cherry picked from commit 9404900)
    @jonafato @worldofpeace
    jonafato authored and worldofpeace committed May 28, 2019
    Copy the full SHA
    d8b48bc View commit details

  2. vocal: cleanup 

    (cherry picked from commit 991f77b)
    @worldofpeace
    worldofpeace committed May 28, 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
    f7c5427 View commit details

  3. vocal: 2.4.0 -> 2.4.1 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/vocal/versions

(cherry picked from commit 2c4c5a3)
    @r-ryantm @worldofpeace
    r-ryantm authored and worldofpeace committed May 28, 2019
    Copy the full SHA
    b23f07c View commit details

  4. spectre-meltdown-checker: 0.41 -> 0.42 

    (cherry picked from commit 6bed56d)
    @c0bw3b
    Robert Schütz authored and c0bw3b committed May 28, 2019
    Copy the full SHA
    3651671 View commit details
Showing with 31 additions and 13 deletions.
  1. +29 −11 pkgs/applications/audio/vocal/default.nix
  2. +2 −2 pkgs/tools/security/spectre-meltdown-checker/default.nix
40 changes: 29 additions & 11 deletions pkgs/applications/audio/vocal/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,41 +1,59 @@
{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, pantheon, gtk3, libxml2, webkitgtk, clutter-gtk
, clutter-gst, libunity, libnotify, sqlite, gst_all_1, libsoup, json-glib, gnome3, gobject-introspection, wrapGAppsHook }:
{ stdenv
, fetchFromGitHub
, cmake
, ninja
, pkgconfig
, pantheon
, gtk3
, glib
, libxml2
, webkitgtk
, clutter-gtk
, clutter-gst
, libunity
, libnotify
, sqlite
, gst_all_1
, libsoup
, json-glib
, libgee
, wrapGAppsHook
}:

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

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

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

nativeBuildInputs = [
cmake
gobject-introspection
libxml2
ninja
pkgconfig
pantheon.vala
pkgconfig
wrapGAppsHook
];

buildInputs = with gst_all_1; [
clutter-gst
clutter-gtk
pantheon.elementary-icon-theme
gnome3.libgee
pantheon.granite
glib
gst-plugins-base
gst-plugins-good
gstreamer
gtk3
json-glib
libgee
libnotify
libunity
pantheon.elementary-icon-theme
pantheon.granite
sqlite
webkitgtk
];
4 changes: 2 additions & 2 deletions pkgs/tools/security/spectre-meltdown-checker/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
name = "spectre-meltdown-checker-${version}";
version = "0.41";
version = "0.42";

src = fetchFromGitHub {
owner = "speed47";
repo = "spectre-meltdown-checker";
rev = "v${version}";
sha256 = "0byjp7ph7g9di9xlg1fvspgq995a3b2yajq7sc8qap46ywvqr899";
sha256 = "0pppf844i7b72hqnmfvq72w5y7b6dxd16y29l6j84maf22zxbjni";
};

prePatch = ''