From 1173bde56fa640eabd8b350f8fdef64e2c13ad51 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Tue, 28 Aug 2018 23:36:25 +1000 Subject: [PATCH 1/2] compton-git: 2018-05-21 -> 2018-08-14 --- pkgs/applications/window-managers/compton/git.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/compton/git.nix b/pkgs/applications/window-managers/compton/git.nix index 90ae043fba3..89be02bf9e6 100644 --- a/pkgs/applications/window-managers/compton/git.nix +++ b/pkgs/applications/window-managers/compton/git.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "compton-git-${version}"; - version = "2018-05-21"; + version = "2018-08-14"; src = fetchFromGitHub { owner = "yshui"; repo = "compton"; - rev = "9b24550814b7c69065f90039b0a5d0a2281b9f81"; - sha256 = "09nn0q9lgv59chfxljips0n8vnwwxi1yz6hmcsiggsl3zvpabpxl"; + rev = "cac8094ce12cd40706fb48f9ab35354d9ee7c48f"; + sha256 = "0qif3nx8vszlr06bixasna13pzfaikp86xax9miwnba50517y7v5"; }; nativeBuildInputs = [ @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { additional features, such as additional effects, and a fork at a well-defined and proper place. ''; - maintainers = [ maintainers.ertes maintainers.twey ]; + maintainers = with maintainers; [ ertes enzime twey ]; platforms = platforms.linux; }; } From 8b7fe8910c78c460eac07f94cd7a4439fa792e55 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Wed, 29 Aug 2018 12:47:35 +1000 Subject: [PATCH 2/2] compton, compton-git: Merge derivations --- .../window-managers/compton/default.nix | 116 ++++++++++-------- .../window-managers/compton/git.nix | 60 --------- pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 68 insertions(+), 112 deletions(-) delete mode 100644 pkgs/applications/window-managers/compton/git.nix diff --git a/pkgs/applications/window-managers/compton/default.nix b/pkgs/applications/window-managers/compton/default.nix index d79d8c3325d..e5faf084a42 100644 --- a/pkgs/applications/window-managers/compton/default.nix +++ b/pkgs/applications/window-managers/compton/default.nix @@ -3,59 +3,77 @@ , dbus, libconfig, libdrm, libGL, pcre, libX11, libXcomposite, libXdamage , libXinerama, libXrandr, libXrender, libXext, xwininfo }: -stdenv.mkDerivation rec { - name = "compton-0.1_beta2.5"; +let + common = source: stdenv.mkDerivation (source // rec { + name = "${source.pname}-${source.version}"; - src = fetchFromGitHub { - owner = "chjj"; - repo = "compton"; - rev = "b7f43ee67a1d2d08239a2eb67b7f50fe51a592a8"; - sha256 = "1p7ayzvm3c63q42na5frznq3rlr1lby2pdgbvzm1zl07wagqss18"; - }; + buildInputs = [ + dbus libX11 libXcomposite libXdamage libXrender libXrandr libXext + libXinerama libdrm pcre libxml2 libxslt libconfig libGL + ]; - buildInputs = [ - libX11 - libXcomposite - libXdamage - libXrender - libXrandr - libXext - libXinerama - libdrm - pcre - libconfig - dbus - libGL - ]; + nativeBuildInputs = [ + pkgconfig + asciidoc + docbook_xml_dtd_45 + docbook_xsl + makeWrapper + ]; - nativeBuildInputs = [ - pkgconfig - asciidoc - libxml2 - docbook_xml_dtd_45 - docbook_xsl - libxslt - makeWrapper - ]; - - installFlags = [ "PREFIX=$(out)" ]; + installFlags = [ "PREFIX=$(out)" ]; - postInstall = '' - wrapProgram $out/bin/compton-trans \ - --prefix PATH : ${lib.makeBinPath [ xwininfo ]} - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/chjj/compton/; - description = "A fork of XCompMgr, a sample compositing manager for X servers"; - longDescription = '' - A fork of XCompMgr, which is a sample compositing manager for X - servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE - extensions. It enables basic eye-candy effects. This fork adds - additional features, such as additional effects, and a fork at a - well-defined and proper place. + postInstall = '' + wrapProgram $out/bin/compton-trans \ + --prefix PATH : ${lib.makeBinPath [ xwininfo ]} ''; - license = licenses.mit; - platforms = platforms.linux; + + meta = with lib; { + description = "A fork of XCompMgr, a sample compositing manager for X servers"; + longDescription = '' + A fork of XCompMgr, which is a sample compositing manager for X + servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE + extensions. It enables basic eye-candy effects. This fork adds + additional features, such as additional effects, and a fork at a + well-defined and proper place. + ''; + license = licenses.mit; + maintainers = with maintainers; [ ertes enzime twey ]; + platforms = platforms.linux; + }; + }); + + stableSource = { + pname = "compton"; + version = "0.1_beta2.5"; + + src = fetchFromGitHub { + owner = "chjj"; + repo = "compton"; + rev = "b7f43ee67a1d2d08239a2eb67b7f50fe51a592a8"; + sha256 = "1p7ayzvm3c63q42na5frznq3rlr1lby2pdgbvzm1zl07wagqss18"; + }; + + meta = { + homepage = https://github.com/chjj/compton/; + }; }; + + gitSource = { + pname = "compton-git"; + version = "2018-08-14"; + + src = fetchFromGitHub { + owner = "yshui"; + repo = "compton"; + rev = "cac8094ce12cd40706fb48f9ab35354d9ee7c48f"; + sha256 = "0qif3nx8vszlr06bixasna13pzfaikp86xax9miwnba50517y7v5"; + }; + + meta = { + homepage = https://github.com/yshui/compton/; + }; + }; +in { + compton = common stableSource; + compton-git = common gitSource; } diff --git a/pkgs/applications/window-managers/compton/git.nix b/pkgs/applications/window-managers/compton/git.nix deleted file mode 100644 index 89be02bf9e6..00000000000 --- a/pkgs/applications/window-managers/compton/git.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ stdenv, fetchFromGitHub, asciidoc, dbus, docbook_xml_dtd_45, - docbook_xsl, libconfig, libdrm, libxml2, libxslt, libGLU_combined, pcre, - pkgconfig, libXcomposite, libXdamage, libXext, libXfixes, libXinerama, - libXrandr, libXrender, xwininfo }: - -stdenv.mkDerivation rec { - name = "compton-git-${version}"; - version = "2018-08-14"; - - src = fetchFromGitHub { - owner = "yshui"; - repo = "compton"; - rev = "cac8094ce12cd40706fb48f9ab35354d9ee7c48f"; - sha256 = "0qif3nx8vszlr06bixasna13pzfaikp86xax9miwnba50517y7v5"; - }; - - nativeBuildInputs = [ - asciidoc - docbook_xml_dtd_45 - docbook_xsl - pkgconfig - ]; - - buildInputs = [ - dbus - libXcomposite - libXdamage - libXext - libXfixes - libXinerama - libXrandr - libXrender - libconfig - libdrm - libxml2 - libxslt - libGLU_combined - pcre - ]; - - propagatedBuildInputs = [ xwininfo ]; - - installFlags = "PREFIX=$(out)"; - - meta = with stdenv.lib; { - description = - "A fork of XCompMgr, a sample compositing manager for X servers (git version)"; - homepage = https://github.com/yshui/compton/; - license = licenses.mit; - longDescription = '' - A fork of XCompMgr, which is a sample compositing manager for X - servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE - extensions. It enables basic eye-candy effects. This fork adds - additional features, such as additional effects, and a fork at a - well-defined and proper place. - ''; - maintainers = with maintainers; [ ertes enzime twey ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8db9e256ffa..798521ac6f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19364,9 +19364,7 @@ with pkgs; inherit (xorg) xcompmgr; - compton = callPackage ../applications/window-managers/compton { }; - - compton-git = callPackage ../applications/window-managers/compton/git.nix { }; + inherit (callPackage ../applications/window-managers/compton {}) compton compton-git; xdaliclock = callPackage ../tools/misc/xdaliclock {};