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: aecb0df5b894
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: 530d185e9e92
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Sep 9, 2019

  1. fwupd: add setuptools for python 

    It's no longer propagated so we need to add it.

Was failing like:
FAILED: libfwupd/fwupd.map
/build/fwupd-1.2.10/libfwupd/generate-version-script.py LIBFWUPD libfwupd/Fwupd-2.0.gir libfwupd/fwupd.map
Traceback (most recent call last):
File "/build/fwupd-1.2.10/libfwupd/generate-version-script.py", line 11, in <module>
    from pkg_resources import parse_version
ModuleNotFoundError: No module named 'pkg_resources'

(cherry picked from commit a9e0f1d)
This fixes the gnome3 tests so the channel can advance.
    @worldofpeace
    worldofpeace committed Sep 9, 2019
    Copy the full SHA
    36f1c4a View commit details

  2. gnome3.epiphany: fix build 

    Looks like something used to propagate nettle but doesn't anymore.
Adding it properly, as it does depend on it, fixes the issue.

(cherry picked from commit 00d419c)
Fix gnome3 tests.

ZHF: #68361
    @worldofpeace
    worldofpeace committed Sep 9, 2019
    Copy the full SHA
    530d185 View commit details
Showing with 3 additions and 2 deletions.
  1. +2 −2 pkgs/desktops/gnome-3/core/epiphany/default.nix
  2. +1 −0 pkgs/os-specific/linux/firmware/fwupd/default.nix
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/epiphany/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk3, glib, icu
, wrapGAppsHook, gnome3, libxml2, libxslt, itstool
, webkitgtk, libsoup, glib-networking, libsecret, gnome-desktop, libnotify, p11-kit
, sqlite, gcr, isocodes, desktop-file-utils, python3
, sqlite, gcr, isocodes, desktop-file-utils, python3, nettle
, gdk-pixbuf, gst_all_1, json-glib, libdazzle, libhandy }:

stdenv.mkDerivation rec {
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
gdk-pixbuf gnome3.adwaita-icon-theme gcr
glib-networking gst_all_1.gstreamer gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly
gst_all_1.gst-libav json-glib libdazzle
gst_all_1.gst-libav json-glib libdazzle nettle
];

postPatch = ''
1 change: 1 addition & 0 deletions pkgs/os-specific/linux/firmware/fwupd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -57,6 +57,7 @@ let
pygobject3
pycairo
pillow
setuptools
]);

installedTestsPython = python3.withPackages (p: with p; [