summary refs log tree commit diff
path: root/pkgs/os-specific/linux/fatrace/default.nix
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-07-28 13:44:21 +0000
committerAlyssa Ross <hi@alyssa.is>2021-07-28 17:46:39 +0000
commitcab13e087c80c4e7476bb7df432e2b7deb56563d (patch)
treef8c7f771072bc7c5453625dfdb80cbd3d2c30fb4 /pkgs/os-specific/linux/fatrace/default.nix
parentd9c82ed3044c72cecf01c6ea042489d30914577c (diff)
parent8ecc61c91a596df7d3293603a9c2384190c1b89a (diff)
downloadnixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar
nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.gz
nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.bz2
nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.lz
nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.xz
nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.zst
nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.zip
Merge remote-tracking branch 'nixpkgs/nixos-unstable' into nixpkgs-update
Conflicts:
	pkgs/applications/graphics/hello-wayland/default.nix
	pkgs/applications/virtualization/cloud-hypervisor/default.nix
	pkgs/applications/window-managers/tinywl/default.nix
	pkgs/applications/window-managers/wayfire/applications.nix
	pkgs/applications/window-managers/wayfire/default.nix
	pkgs/applications/window-managers/wayfire/wcm.nix
	pkgs/applications/window-managers/wayfire/wf-config.nix
	pkgs/applications/window-managers/wayfire/wf-shell.nix
	pkgs/development/libraries/wlroots/default.nix
	pkgs/os-specific/linux/chromium-os/crosvm/default.nix
	pkgs/os-specific/linux/kernel/common-config.nix
	pkgs/os-specific/linux/kernel/patches.nix
	pkgs/os-specific/linux/mdevd/default.nix
	pkgs/os-specific/linux/s6-linux-init/default.nix
	pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/os-specific/linux/fatrace/default.nix')
-rw-r--r--pkgs/os-specific/linux/fatrace/default.nix23
1 files changed, 13 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix
index 69d1afad8a6..2ae8bb2dca2 100644
--- a/pkgs/os-specific/linux/fatrace/default.nix
+++ b/pkgs/os-specific/linux/fatrace/default.nix
@@ -1,12 +1,18 @@
-{ stdenv, fetchurl, python3, which }:
+{ lib, stdenv
+, fetchFromGitHub
+, python3
+, which
+}:
 
 stdenv.mkDerivation rec {
   pname = "fatrace";
-  version = "0.13";
+  version = "0.16.3";
 
-  src = fetchurl {
-    url = "https://launchpad.net/fatrace/trunk/${version}/+download/${pname}-${version}.tar.bz2";
-    sha256 = "0hrh45bpzncw0jkxw3x2smh748r65k2yxvfai466043bi5q0d2vx";
+  src = fetchFromGitHub {
+    owner = "martinpitt";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-w7leZPdmiTc+avihP203e6GLvbRzbCtNOJdF8MM2v68=";
   };
 
   buildInputs = [ python3 which ];
@@ -14,16 +20,13 @@ stdenv.mkDerivation rec {
   postPatch = ''
     substituteInPlace power-usage-report \
       --replace "'which'" "'${which}/bin/which'"
-
-    # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.
-    sed 1i'#include <sys/sysmacros.h>' -i fatrace.c
   '';
 
   makeFlags = [ "PREFIX=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Report system-wide file access events";
-    homepage = "https://launchpad.net/fatrace/";
+    homepage = "https://github.com/martinpitt/fatrace";
     license = licenses.gpl3Plus;
     longDescription = ''
       fatrace reports file access events from all running processes.