Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 42a99bcfb880
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: efd6eae02421
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 15, 2018

  1. extundelete: fix build with e2fsprogs 1.44 

    (cherry picked from commit 0a74fca)
    @xeji @Mic92
    xeji authored and Mic92 committed Apr 15, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    rickie Rick Ossendrijver
    GPG key ID: A2237828CE7F76B2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a228c69 View commit details

  2. matomo: 3.3.0 -> 3.4.0 

    (cherry picked from commit 8a7bf54)
    @florianjacob @obadz
    florianjacob authored and obadz committed Apr 15, 2018
    Copy the full SHA
    efd6eae View commit details
Showing with 10 additions and 2 deletions.
  1. +2 −2 pkgs/servers/web-apps/matomo/default.nix
  2. +8 −0 pkgs/tools/filesystems/extundelete/default.nix
4 changes: 2 additions & 2 deletions pkgs/servers/web-apps/matomo/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
name = "matomo-${version}";
version = "3.3.0";
version = "3.4.0";

src = fetchurl {
# TODO: As soon as the tarballs are renamed as well on future releases, this should be enabled again
# url = "https://builds.matomo.org/${name}.tar.gz";
url = "https://builds.matomo.org/piwik-${version}.tar.gz";
sha256 = "1ybzj3kk0x29nv8c6xnhir5d9dr0q0fl1vnm4i7zvhml73ryqk0f";
sha256 = "1hnja8mvjvlbqgw7maa76lxd5hxxg7d5ggq9wyrff25mapj398wc";
};

nativeBuildInputs = [ makeWrapper ];
8 changes: 8 additions & 0 deletions pkgs/tools/filesystems/extundelete/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,14 @@ stdenv.mkDerivation rec {

buildInputs = [ e2fsprogs ];

# inode field i_dir_acl was repurposed as i_size_high in e2fsprogs 1.44,
# breaking the build
patchPhase = ''
substituteInPlace src/insertionops.cc \
--replace "Directory ACL:" "High 32 bits of size:" \
--replace "inode.i_dir_acl" "inode.i_size_high"
'';

meta = with stdenv.lib; {
description = "Utility that can recover deleted files from an ext3 or ext4 partition";
homepage = http://extundelete.sourceforge.net/;