From 9f6472500ab4ef94ea3c878ff16253520ef338ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 30 Mar 2022 00:57:38 +0200 Subject: [PATCH 1/2] xdg-utils: switch to fetchFromGitLab --- pkgs/tools/X11/xdg-utils/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index f10510051edb..dc079809273c 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, fetchFromGitHub +{ lib, stdenv, fetchFromGitLab, fetchFromGitHub , file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto , w3m, gnugrep, gnused, coreutils, xset, perlPackages , mimiSupport ? false, gawk ? null }: @@ -24,8 +24,10 @@ stdenv.mkDerivation rec { pname = "xdg-utils"; version = "unstable-2020-10-21"; - src = fetchgit { - url = "https://gitlab.freedesktop.org/xdg/${pname}.git"; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "xdg"; + repo = "xdg-utils"; rev = "d11b33ec7f24cfb1546f6b459611d440013bdc72"; sha256 = "sha256-8PtXfI8hRneEpnUvIV3M+6ACjlkx0w/NEiJFdGbbHnQ="; }; From e3833894287e947919437a1ffeef9da52e9a5bbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 30 Mar 2022 01:01:47 +0200 Subject: [PATCH 2/2] xdg-utils: remove `? null` from inputs --- pkgs/tools/X11/xdg-utils/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index dc079809273c..7d01ee59b3ef 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -1,9 +1,7 @@ { lib, stdenv, fetchFromGitLab, fetchFromGitHub , file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto , w3m, gnugrep, gnused, coreutils, xset, perlPackages -, mimiSupport ? false, gawk ? null }: - -assert mimiSupport -> gawk != null; +, mimiSupport ? false, gawk }: let # A much better xdg-open