about summary refs log tree commit diff
path: root/pkgs/applications/window-managers
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2022-10-09 12:01:31 +0000
committerGitHub <noreply@github.com>2022-10-09 12:01:31 +0000
commit8972888c554bd9eafcaf5c17551adc606bba686d (patch)
treedaca9fbee710c86dffbc519682193569ad73659a /pkgs/applications/window-managers
parent7cce28d594fcc094dfb76eb89430806002c04352 (diff)
parentb31c42831f1b99544f81bc27f9da183d3276e9aa (diff)
downloadnixlib-8972888c554bd9eafcaf5c17551adc606bba686d.tar
nixlib-8972888c554bd9eafcaf5c17551adc606bba686d.tar.gz
nixlib-8972888c554bd9eafcaf5c17551adc606bba686d.tar.bz2
nixlib-8972888c554bd9eafcaf5c17551adc606bba686d.tar.lz
nixlib-8972888c554bd9eafcaf5c17551adc606bba686d.tar.xz
nixlib-8972888c554bd9eafcaf5c17551adc606bba686d.tar.zst
nixlib-8972888c554bd9eafcaf5c17551adc606bba686d.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/window-managers')
-rw-r--r--pkgs/applications/window-managers/xmonad/xmonadctl.nix10
1 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/applications/window-managers/xmonad/xmonadctl.nix b/pkgs/applications/window-managers/xmonad/xmonadctl.nix
index da1e414d8416..e0c452340456 100644
--- a/pkgs/applications/window-managers/xmonad/xmonadctl.nix
+++ b/pkgs/applications/window-managers/xmonad/xmonadctl.nix
@@ -1,16 +1,10 @@
-{ stdenv, lib, fetchFromGitHub, ghcWithPackages, ... }:
+{ stdenv, lib, fetchFromGitHub, ghcWithPackages, haskellPackages, ... }:
 
 let xmonadctlEnv = ghcWithPackages (self: [ self.xmonad-contrib self.X11 ]);
 in stdenv.mkDerivation rec {
   pname = "xmonadctl";
-  version = "0.17.0";
 
-  src = fetchFromGitHub {
-    owner = "xmonad";
-    repo = "xmonad-contrib";
-    rev = "v${version}";
-    sha256 = "142ycg7dammq98drimv6xbih8dla9qindxds9fgkspmrrils3sar";
-  };
+  inherit (haskellPackages.xmonad-contrib) src version;
 
   installPhase = ''
     runHook preInstall