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

Commits on Mar 10, 2019

  1. e2fsprogs: 1.44.5 -> 1.45.0 

    Changes:
* https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/tree/doc/RelNotes/v1.44.6.txt?h=v1.44.6
* https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/tree/doc/RelNotes/v1.45.0.txt?h=v1.45.0

Also:
* remove 'hack' for installing pc files
* fixup location of `e2scrub_all_cron` to avoid reference cycle in
  outputs, promote to $bin/bin for now.
    @dtzWill
    dtzWill committed Mar 10, 2019
    Copy the full SHA
    b531c19 View commit details

  2. e2fsprogs: enable tests (previously explicitly disabled)

    @dtzWill
    dtzWill committed Mar 10, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8add9b7 View commit details

Commits on Mar 13, 2019

  1. Merge pull request #57229 from dtzWill/update/e2fsprogs-1.45.0 

    e2fsprogs: 1.44.5 -> 1.45.0
    @dtzWill
    dtzWill authored Mar 13, 2019
    Copy the full SHA
    1cb7a3b View commit details
Showing with 7 additions and 7 deletions.
  1. +7 −7 pkgs/tools/filesystems/e2fsprogs/default.nix
14 changes: 7 additions & 7 deletions pkgs/tools/filesystems/e2fsprogs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{ stdenv, buildPackages, fetchurl, fetchpatch, pkgconfig, libuuid, gettext, texinfo, perl }:

stdenv.mkDerivation rec {
name = "e2fsprogs-1.44.5";
pname = "e2fsprogs";
version = "1.45.0";

src = fetchurl {
url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz";
sha256 = "1k6iwv2bz2a8mcd1gg9kb5jpry7pil5v2h2f9apxax7g4yp1y89f";
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "1sgcjarfksa8bkx81q5cd6rzqvhzgs28a0ljwyr4ggqpfx7d18vk";
};

outputs = [ "bin" "dev" "out" "man" "info" ];
@@ -34,12 +35,11 @@ stdenv.mkDerivation rec {
];

checkInputs = [ perl ];
doCheck = false; # fails
doCheck = true;

# hacky way to make it install *.pc
postInstall = ''
make install-libs
rm "$out"/lib/*.a
# avoid cycle between outputs
mv $out/lib/${pname}/e2scrub_all_cron $bin/bin/
'';

enableParallelBuilding = true;