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

Commits on Jan 3, 2021

  1. umockdev: 0.15.2 -> 0.15.4

    @flokli
    flokli committed Jan 3, 2021
    Copy the full SHA
    bdd15d2 View commit details

  2. Merge pull request #108317 from flokli/umockdev-0.15.4 

    umockdev: 0.15.2 -> 0.15.4
    @lovesegfault
    lovesegfault authored Jan 3, 2021
    Copy the full SHA
    d14652c View commit details
13 changes: 3 additions & 10 deletions pkgs/development/libraries/umockdev/default.nix
View file
Original file line number Diff line number Diff line change
@@ -17,23 +17,19 @@

stdenv.mkDerivation rec {
pname = "umockdev";
version = "0.15.2";
version = "0.15.4";

outputs = [ "bin" "out" "dev" "doc" ];

src = fetchurl {
url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "19f21qb9ckwvlm7yzpnc0vcp092qbkms2yrafc26b9a63v4imj52";
sha256 = "09k8jwvsphd97hcagf0zaf0hwzlzq2r8jfgbmvj55k7ylrg8hjxg";
};

mesonFlags = [
"-Dgtk_doc=true"
];

preCheck = ''
patchShebangs tests/test-static-code
'';

buildInputs = [ glib systemd libgudev ];

nativeBuildInputs = [
@@ -50,10 +46,7 @@ stdenv.mkDerivation rec {

enableParallelBuilding = true;

# Test fail with libusb 1.0.24
# https://github.com/NixOS/nixpkgs/issues/107420
# https://github.com/martinpitt/umockdev/issues/115
doCheck = false;
doCheck = true;

postInstall = ''
mkdir -p $doc/share/doc/umockdev/
13 changes: 0 additions & 13 deletions pkgs/development/libraries/umockdev/disable-failed-test.patch
View file

This file was deleted.

12 changes: 0 additions & 12 deletions pkgs/development/libraries/umockdev/fix-test-paths.patch
View file

This file was deleted.