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

Commits on Aug 15, 2018

  1. fwupd: 1.1.0 → 1.1.1

    @jtojnar
    jtojnar committed Aug 15, 2018
    Copy the full SHA
    6721916 View commit details

  2. Merge pull request #45084 from jtojnar/fwupd-1.1.1 

    fwupd: 1.1.0 → 1.1.1
    @jtojnar
    jtojnar authored Aug 15, 2018

    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
    93cba00 View commit details
Showing with 3 additions and 10 deletions.
  1. +3 −10 pkgs/os-specific/linux/firmware/fwupd/default.nix
13 changes: 3 additions & 10 deletions pkgs/os-specific/linux/firmware/fwupd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, gtk-doc, pkgconfig, gobjectIntrospection, intltool
{ stdenv, fetchurl, gtk-doc, pkgconfig, gobjectIntrospection, intltool
, libgudev, polkit, appstream-glib, gusb, sqlite, libarchive, glib-networking
, libsoup, help2man, gpgme, libxslt, elfutils, libsmbios, efivar, glibcLocales
, gnu-efi, libyaml, valgrind, meson, libuuid, colord, docbook_xml_dtd_43, docbook_xsl
@@ -7,7 +7,7 @@
}:
let
# Updating? Keep $out/etc synchronized with passthru.filesInstalledToEtc
version = "1.1.0";
version = "1.1.1";
python = python3.withPackages (p: with p; [ pygobject3 pycairo pillow ]);
installedTestsPython = python3.withPackages (p: with p; [ pygobject3 requests ]);

@@ -18,7 +18,7 @@ in stdenv.mkDerivation {
name = "fwupd-${version}";
src = fetchurl {
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
sha256 = "0flfpzb0fxgixxddpwak4s63i35kr915pdfq5mfrnxq4bwcj24yd";
sha256 = "0szakfnp6pl8vv3ivb40p5j8pxapfp724a55s2dr1qzzdlbjd08s";
};

outputs = [ "out" "lib" "dev" "devdoc" "man" "installedTests" ];
@@ -37,13 +37,6 @@ in stdenv.mkDerivation {

patches = [
./fix-paths.patch

# Allow localedir in lib output
# https://github.com/hughsie/fwupd/pull/626
(fetchpatch {
url = https://github.com/hughsie/fwupd/commit/9822c387ea13419a0eb2624fcd13d50735cb89f8.patch;
sha256 = "12bk6ga2hvsswpc4gal95l2z5a6gp3vdjq16zm2npligcvf37b6i";
})
];

postPatch = ''