summary refs log tree commit diff
path: root/pkgs/tools/X11
diff options
context:
space:
mode:
authorGuillaume Maudoux <guillaume.maudoux@uclouvain.be>2019-06-20 23:40:01 +0200
committerworldofpeace <worldofpeace@protonmail.ch>2019-06-25 12:26:35 -0400
commit9472a2ea45858c3e7113d8f25ccc7aee9c181ba3 (patch)
tree24c45381a06e0ce07a06fd3c34a0e0e5351eced1 /pkgs/tools/X11
parentac28607a039eb8d04f756265d6ead55efea4c27f (diff)
downloadnixpkgs-9472a2ea45858c3e7113d8f25ccc7aee9c181ba3.tar
nixpkgs-9472a2ea45858c3e7113d8f25ccc7aee9c181ba3.tar.gz
nixpkgs-9472a2ea45858c3e7113d8f25ccc7aee9c181ba3.tar.bz2
nixpkgs-9472a2ea45858c3e7113d8f25ccc7aee9c181ba3.tar.lz
nixpkgs-9472a2ea45858c3e7113d8f25ccc7aee9c181ba3.tar.xz
nixpkgs-9472a2ea45858c3e7113d8f25ccc7aee9c181ba3.tar.zst
nixpkgs-9472a2ea45858c3e7113d8f25ccc7aee9c181ba3.zip
xtrace: 1.3.1 -> 1.4.0
Diffstat (limited to 'pkgs/tools/X11')
-rw-r--r--pkgs/tools/X11/xtrace/default.nix43
1 files changed, 21 insertions, 22 deletions
diff --git a/pkgs/tools/X11/xtrace/default.nix b/pkgs/tools/X11/xtrace/default.nix
index 1905ed9752c..8db15a8f033 100644
--- a/pkgs/tools/X11/xtrace/default.nix
+++ b/pkgs/tools/X11/xtrace/default.nix
@@ -1,31 +1,30 @@
-{ stdenv, autoreconfHook, fetchgit, libX11, xauth, makeWrapper }:
+{ stdenv, autoreconfHook, fetchFromGitLab, libX11, xauth, makeWrapper }:
 
-let version = "1.3.1"; in
-stdenv.mkDerivation {
-  name = "xtrace-${version}";
-  src = fetchgit {
-    url = "git://git.debian.org/xtrace/xtrace.git";
-    rev = "refs/tags/xtrace-1.3.1";
-    sha256 = "1g26hr6rl7bbb9cwqk606nbbapslq3wnsy8j28azrgi8hgfqhjfi";
+stdenv.mkDerivation rec {
+  pname = "xtrace";
+  version = "1.4.0";
+
+  src = fetchFromGitLab rec {
+    domain = "salsa.debian.org";
+    owner = "debian";
+    repo = pname;
+    rev = "xtrace-${version}";
+    sha256 = "1yff6x847nksciail9jly41mv70sl8sadh0m5d847ypbjmxcwjpq";
   };
 
-  nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ libX11 makeWrapper ];
+  nativeBuildInputs = [ autoreconfHook makeWrapper ];
+  buildInputs = [ libX11 ];
 
-  preConfigure = ''
-    ./autogen.sh
+  postInstall = ''
+    wrapProgram "$out/bin/xtrace" \
+        --prefix PATH ':' "${xauth}/bin"
   '';
 
-  postInstall =
-    '' wrapProgram "$out/bin/xtrace" \
-         --prefix PATH ':' "${xauth}/bin"
-    '';
-
-  meta = {
-    homepage = http://xtrace.alioth.debian.org/;
+  meta = with stdenv.lib; {
+    homepage = "https://salsa.debian.org/debian/xtrace";
     description = "Tool to trace X11 protocol connections";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ viric ];
+    platforms = with platforms; linux;
   };
 }