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

Commits on Apr 4, 2020

  1. rpm-ostree: add libdnf comments

    @jtojnar
    jtojnar committed Apr 4, 2020
    Copy the full SHA
    77c23a5 View commit details

  2. gnome3.gnome-boxes: fix build 

    It was using libusb-compat instead of libusb1, and the former no longer propagates the latter.
    @jtojnar
    jtojnar committed Apr 4, 2020
    Copy the full SHA
    88b9a96 View commit details

  3. dsview: fix build 

    It was using libusb-compat instead of libusb1, and the former no longer propagates the latter.
    @jtojnar
    jtojnar committed Apr 4, 2020
    Copy the full SHA
    418628e View commit details

  4. gnome-builder: Fix build 

    This was forgotten during GNOME 3.36 update so the upstreamed patches were not removed.
Also needed to add libportal and could remove some old cruft.
    @jtojnar
    jtojnar committed Apr 4, 2020
    Copy the full SHA
    ff3c6fe View commit details

  5. kitinerary: Fix build 

    	CMake Error at /nix/store/cmriqbxnpcgmbll06pnl1h3va08x2xvr-cmake-3.16.5/share/cmake-3.16/Modules/FindPackageHandleStandardArgs.cmake:146 (message):
	  Could NOT find SharedMimeInfo (missing: UPDATE_MIME_DATABASE_EXECUTABLE)
	  (Required is at least version "1.3")
	Call Stack (most recent call first):
	  /nix/store/cmriqbxnpcgmbll06pnl1h3va08x2xvr-cmake-3.16.5/share/cmake-3.16/Modules/FindPackageHandleStandardArgs.cmake:393 (_FPHSA_FAILURE_MESSAGE)
	  /nix/store/hxvvgjkvpp22g1rykzcb734649sgzjz0-extra-cmake-modules-5.66.0/share/ECM/find-modules/FindSharedMimeInfo.cmake:74 (find_package_handle_standard_args)
	  CMakeLists.txt:32 (find_package)
    @jtojnar
    jtojnar committed Apr 4, 2020
    Copy the full SHA
    6a2e5dd View commit details
19 changes: 3 additions & 16 deletions pkgs/applications/editors/gnome-builder/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,6 @@
, docbook_xsl
, docbook_xml_dtd_43
, fetchurl
, fetchpatch
, flatpak
, gnome3
, libgit2-glib
@@ -18,6 +17,7 @@
, jsonrpc-glib
, libdazzle
, libpeas
, libportal
, libxml2
, meson
, ninja
@@ -46,26 +46,14 @@ stdenv.mkDerivation rec {
sha256 = "G0nl6DVzb3k6cN2guFIe/XNhFNhKbaq5e8wz62VA0Qo=";
};

patches = [
# Fix build with Meson 0.52
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-builder/commit/c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f.patch";
sha256 = "0n8kg7nnjqmbnyag1ps6dvrlqrxc94djjncqx10d6y7ijwdxf4w8";
})
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-builder/commit/da26dfbf78468f5ed724e022b300a07862a95833.patch";
sha256 = "0psa65bzjpjj7vc5rknv2w2dz3p50jjv10s6j2fd6lpw8j2800k4";
})
];

nativeBuildInputs = [
appstream-glib
desktop-file-utils
docbook_xsl
docbook_xml_dtd_43
gobject-introspection
gtk-doc
(meson.override ({ inherit stdenv; }))
meson
ninja
pkgconfig
python3
@@ -80,6 +68,7 @@ stdenv.mkDerivation rec {
gnome3.glade
libgit2-glib
libpeas
libportal
vte
gspell
gtk3
@@ -109,8 +98,6 @@ stdenv.mkDerivation rec {
patchShebangs build-aux/meson/post_install.py
'';

NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

mesonFlags = [
"-Dpython_libprefix=${python3.libPrefix}"
"-Ddocs=true"
6 changes: 5 additions & 1 deletion pkgs/applications/kde/kitinerary.nix
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@
mkDerivation, lib, extra-cmake-modules
, qtbase, qtdeclarative, ki18n, kmime, kpkpass
, poppler, kcontacts, kcalendarcore
, shared-mime-info
}:

mkDerivation {
@@ -10,7 +11,10 @@ mkDerivation {
license = with lib.licenses; [ lgpl21 ];
maintainers = [ lib.maintainers.bkchr ];
};
nativeBuildInputs = [ extra-cmake-modules ];
nativeBuildInputs = [
extra-cmake-modules
shared-mime-info # for update-mime-database
];
buildInputs = [
qtbase qtdeclarative ki18n kmime kpkpass poppler
kcontacts kcalendarcore
4 changes: 2 additions & 2 deletions pkgs/applications/science/electronics/dsview/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake,
libzip, boost, fftw, qtbase,
libusb, wrapQtAppsHook, libsigrok4dsl, libsigrokdecode4dsl
libusb1, wrapQtAppsHook, libsigrok4dsl, libsigrokdecode4dsl
}:

stdenv.mkDerivation rec {
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ];

buildInputs = [
boost fftw qtbase libusb libzip libsigrokdecode4dsl libsigrok4dsl
boost fftw qtbase libusb1 libzip libsigrokdecode4dsl libsigrok4dsl
];

enableParallelBuilding = true;
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
View file
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@
, mtools
, cdrkit
, libcdio
, libusb
, libusb1
, libarchive
, acl
, libgudev
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
librsvg
libsecret
libsoup
libusb
libusb1
libvirt
libvirt-glib
libxml2
6 changes: 4 additions & 2 deletions pkgs/tools/misc/rpm-ostree/default.nix
View file
Original file line number Diff line number Diff line change
@@ -83,11 +83,13 @@ stdenv.mkDerivation rec {
pcre
check
python
# libdnf

# libdnf # vendored unstable branch
# required by vendored libdnf
json_c
zchunk
libmodulemd_1
utillinux
utillinux # for smartcols.pc
sqlite
cppunit
];