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

Commits on May 24, 2017

  1. multi-ghc-travis: update to latest git version and install both scripts 

    We're using the names 'make-travis-yml' and 'make-travis-yml-2' now, which
feels more in-line'ish with the Cabal file hvr is distributing.

(cherry picked from commit 769e14a)
    @peti
    peti committed May 24, 2017
    Copy the full SHA
    df96ad0 View commit details

  2. libqmi: update to version 1.18.0 

    The new version adds a dependency in libgudev.

(cherry picked from commit 9b54745)
    @peti
    peti committed May 24, 2017
    Copy the full SHA
    43b42b6 View commit details

  3. libqmi: enable MBIM support 

    (cherry picked from commit c1609e4)
    @peti
    peti committed May 24, 2017
    Copy the full SHA
    d82736a View commit details
Showing with 12 additions and 13 deletions.
  1. +6 −4 pkgs/development/libraries/libqmi/default.nix
  2. +6 −9 pkgs/development/tools/haskell/multi-ghc-travis/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/;
15 changes: 6 additions & 9 deletions pkgs/development/tools/haskell/multi-ghc-travis/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,30 +2,27 @@

stdenv.mkDerivation rec {
name = "multi-ghc-travis-${version}";
version = "git-2016-10-23";
version = "git-2017-05-18";

buildInputs = [ ghc ];

src = fetchFromGitHub {
owner = "hvr";
repo = "multi-ghc-travis";
rev = "03dd35f3801d6af4224906d45e982a748de9960e";
sha256 = "1s08n8diis22cafych66zihdnd5q3dkv8m6i3a2s5g5f1phsk3mi";
rev = "3e1b3847583020f0e83c97fcf4bcfb7c90b78259";
sha256 = "0hnwp9gsv2rnkxqiw4cg1vdi7wccajx0i9ryhw4lfr8nhkizbsww";
};

patchPhase = ''
substituteInPlace make_travis_yml.hs --replace "make_travis_yml.hs" "multi-ghc-travis"
'';

installPhase = ''
mkdir -p $out/bin
ghc -O --make make_travis_yml_2.hs -o $out/bin/multi-ghc-travis
ghc -O --make make_travis_yml.hs -o $out/bin/make-travis-yml
ghc -O --make make_travis_yml_2.hs -o $out/bin/make-travis-yml-2
'';

meta = with stdenv.lib; {
description = "Generate .travis.yml for multiple ghc versions";
homepage = "https://github.com/hvr/multi-ghc-travis";
license = licenses.free;
license = licenses.bsd3;
platforms = platforms.all;
maintainers = with maintainers; [ jb55 ];
};