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

Commits on Mar 27, 2018

  1. parted: add missing fnctl include, fix w/musl 

    Disable tests on musl, maybe fix or refine this in the future.
    @dtzWill
    dtzWill committed Mar 27, 2018
    Copy the full SHA
    ee9ad96 View commit details

  2. Merge pull request #37933 from dtzWill/fix/parted-musl 

    parted: add missing fnctl include, fix w/musl
    @dtzWill
    dtzWill authored Mar 27, 2018
    Copy the full SHA
    9c4745f View commit details
Showing with 8 additions and 3 deletions.
  1. +8 −3 pkgs/tools/misc/parted/default.nix
11 changes: 8 additions & 3 deletions pkgs/tools/misc/parted/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline, perl, python2
{ stdenv, fetchurl, fetchpatch, devicemapper, libuuid, gettext, readline, perl, python2
, utillinux, check, enableStatic ? false, hurd ? null }:

stdenv.mkDerivation rec {
@@ -9,7 +9,12 @@ stdenv.mkDerivation rec {
sha256 = "1r3qpg3bhz37mgvp9chsaa3k0csby3vayfvz8ggsqz194af5i2w5";
};

patches = stdenv.lib.optional doCheck ./gpt-unicode-test-fix.patch;
patches = stdenv.lib.optional doCheck ./gpt-unicode-test-fix.patch
++ stdenv.lib.optional stdenv.hostPlatform.isMusl
(fetchpatch {
url = "https://git.alpinelinux.org/cgit/aports/plain/main/parted/fix-includes.patch?id=9c5cd3c329a40ba4559cc1d8c7d17a9bf95c237b";
sha256 = "117ypyiwvzym6pi8xmy16wa5z3sbpx7gh6haabs6kfb1x2894z7q";
});

postPatch = stdenv.lib.optionalString doCheck ''
patchShebangs tests
@@ -31,7 +36,7 @@ stdenv.mkDerivation rec {

# Tests were previously failing due to Hydra running builds as uid 0.
# That should hopefully be fixed now.
doCheck = true;
doCheck = !stdenv.hostPlatform.isMusl; /* translation test */

preCheck =
stdenv.lib.optionalString doCheck