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

Commits on Apr 15, 2021

  1. libvirt-glib: 3.0.0 → 4.0.0

    @jtojnar
    jtojnar committed Apr 15, 2021

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 04D0CEAF916A9A40
    Learn about vigilant mode
    Copy the full SHA
    a8b6a3c View commit details

  2. fixup! gnome3.gnome-boxes: 3.38.2 → 40.0

    @jtojnar
    jtojnar committed Apr 15, 2021

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 04D0CEAF916A9A40
    Learn about vigilant mode
    Copy the full SHA
    19c6ab2 View commit details
Showing with 38 additions and 12 deletions.
  1. +3 −3 pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
  2. +35 −9 pkgs/development/libraries/libvirt-glib/default.nix
6 changes: 3 additions & 3 deletions pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
View file
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
, python3
, appstream-glib
, spice-protocol
, libhandy_0
, libhandy
, libsoup
, libosinfo
, systemd
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
libcap
libcap_ng
libgudev
libhandy_0
libhandy
libosinfo
librsvg
libsecret
@@ -138,7 +138,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Simple GNOME 3 application to access remote or virtual systems";
homepage = "https://wiki.gnome.org/Apps/Boxes";
license = licenses.gpl3;
license = licenses.lgpl2Plus;
platforms = platforms.linux;
maintainers = teams.gnome.members;
};
44 changes: 35 additions & 9 deletions pkgs/development/libraries/libvirt-glib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,47 @@
{ lib, stdenv, fetchurl, pkg-config, gobject-introspection, intltool, vala
, libcap_ng, libvirt, libxml2
{ lib
, stdenv
, fetchurl
, meson
, ninja
, pkg-config
, gobject-introspection
, gettext
, gtk-doc
, docbook-xsl-nons
, vala
, libcap_ng
, libvirt
, libxml2
}:

stdenv.mkDerivation rec {
name = "libvirt-glib-3.0.0";
name = "libvirt-glib-4.0.0";

outputs = [ "out" "dev" ];
outputs = [ "out" "dev" "devdoc" ];

src = fetchurl {
url = "https://libvirt.org/sources/glib/${name}.tar.gz";
sha256 = "1zpbv4ninc57c9rw4zmmkvvqn7154iv1qfr20kyxn8xplalqrzvz";
url = "https://libvirt.org/sources/glib/${name}.tar.xz";
sha256 = "hCP3Bp2qR2MHMh0cEeLswoU0DNMsqfwFIHdihD7erL0=";
};

nativeBuildInputs = [ pkg-config intltool vala gobject-introspection ];
buildInputs = [ libcap_ng libvirt libxml2 gobject-introspection ];
nativeBuildInputs = [
meson
ninja
pkg-config
gettext
gtk-doc
docbook-xsl-nons
vala
gobject-introspection
];

buildInputs = [
libcap_ng
libvirt
libxml2
gobject-introspection
];

enableParallelBuilding = true;
strictDeps = true;

meta = with lib; {