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

Commits on May 19, 2017

  1. libqmi: update to version 1.18.0 

    The new version adds a dependency in libgudev.
    @peti
    peti committed May 19, 2017
    Copy the full SHA
    9b54745 View commit details

  2. libqmi: enable MBIM support

    @peti
    peti committed May 19, 2017
    3
    Copy the full SHA
    c1609e4 View commit details
Showing with 6 additions and 4 deletions.
  1. +6 −4 pkgs/development/libraries/libqmi/default.nix
10 changes: 6 additions & 4 deletions pkgs/development/libraries/libqmi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, glib, python }:
{ stdenv, fetchurl, pkgconfig, glib, python, libgudev, libmbim }:

stdenv.mkDerivation rec {
name = "libqmi-1.16.0";
name = "libqmi-1.18.0";

src = fetchurl {
url = "https://www.freedesktop.org/software/libqmi/${name}.tar.xz";
sha256 = "0amshs06qc8zy8jz3r2yksqhhbamll7f893ll4zlvgr3zm3vpdks";
sha256 = "1v4cz3nsmh7nn3smhlhwzrb7yh6l1f270bwf40qacxayjdajr950";
};

outputs = [ "out" "dev" "devdoc" ];
@@ -14,7 +14,9 @@ stdenv.mkDerivation rec {
patchShebangs .
'';

buildInputs = [ pkgconfig glib python ];
buildInputs = [ pkgconfig glib python libgudev libmbim ];

configureFlags = ["--enable-mbim-qmux" ];

meta = with stdenv.lib; {
homepage = http://www.freedesktop.org/wiki/Software/libqmi/;