From 68f56479e148c04ab97b1393c385f090c6e983be Mon Sep 17 00:00:00 2001 From: Christian Harke Date: Wed, 29 Apr 2020 00:45:56 +0200 Subject: [PATCH] spectrwm: 2.7.2 -> 3.3.0 - Update to the latest version. - Stop using unstable `fetchurl` for GitHub archive reference #32997. - Take maintainership as requested by jb55 in #86265. --- maintainers/maintainer-list.nix | 10 +++++ .../window-managers/spectrwm/default.nix | 38 ++++++------------- 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1bd0ebffdba..35dd144796e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1406,6 +1406,16 @@ githubId = 1103294; name = "Christopher Rosset"; }; + christianharke = { + email = "christian@harke.ch"; + github = "christianharke"; + githubId = 13007345; + name = "Christian Harke"; + keys = [{ + longkeyid = "rsa4096/0x830A9728630966F4"; + fingerprint = "4EBB 30F1 E89A 541A A7F2 52BE 830A 9728 6309 66F4"; + }]; + }; christopherpoole = { email = "mail@christopherpoole.net"; github = "christopherpoole"; diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix index 1eb19e2de6f..b38cb990617 100644 --- a/pkgs/applications/window-managers/spectrwm/default.nix +++ b/pkgs/applications/window-managers/spectrwm/default.nix @@ -1,51 +1,37 @@ -{ fetchurl -, libX11 -, libXrandr -, libXcursor -, libXft -, libXt -, libxcb -, xcbutil -, xcb-util-cursor -, xcbutilkeysyms -, xcbutilwm -, stdenv -}: +{ stdenv, fetchFromGitHub, pkgconfig, xorg }: stdenv.mkDerivation { pname = "spectrwm"; - version = "2.7.2"; + version = "3.3.0"; - src = fetchurl { - url = "https://github.com/conformal/spectrwm/archive/SPECTRWM_2_7_2.tar.gz"; - sha256 = "1yssqnhxlfl1b60gziqp8c5pzs1lr8p6anrnp9ga1zfdql3b7993"; + src = fetchFromGitHub { + owner = "conformal"; + repo = "spectrwm"; + rev = "SPECTRWM_3_3_0"; + sha256 = "139mswlr0z5dbp5migm98qqg84syq0py1qladp3226xy6q3bnn08"; }; - - buildInputs = [ - libX11 - libxcb + nativeBuildInputs = [ pkgconfig ]; + buildInputs = with xorg; [ libXrandr libXcursor libXft libXt xcbutil - xcb-util-cursor xcbutilkeysyms xcbutilwm ]; sourceRoot = let subdir = if stdenv.isDarwin then "osx" else "linux"; - in "spectrwm-SPECTRWM_2_7_2/${subdir}"; + in "source/${subdir}"; - makeFlags = [ "PREFIX=$(out)" ]; - installPhase = "PREFIX=$out make install"; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with stdenv.lib; { description = "A tiling window manager"; homepage = "https://github.com/conformal/spectrwm"; - maintainers = with maintainers; [ jb55 ]; + maintainers = with maintainers; [ christianharke ]; license = licenses.isc; platforms = platforms.all;