summary refs log tree commit diff
path: root/pkgs/applications/window-managers
diff options
context:
space:
mode:
authorWill Dietz <github@wdtz.org>2018-09-20 03:00:18 -0500
committerxeji <36407913+xeji@users.noreply.github.com>2018-09-20 10:00:18 +0200
commit2eed7b735055c7b2d6fabd81dbb5871e2438c1b3 (patch)
tree2560f5263c09acc9ca7fc4939588df7b1f3f7b29 /pkgs/applications/window-managers
parent0e1f3ef01afcbb4cf66ebb766bd096033eacc633 (diff)
downloadnixpkgs-2eed7b735055c7b2d6fabd81dbb5871e2438c1b3.tar
nixpkgs-2eed7b735055c7b2d6fabd81dbb5871e2438c1b3.tar.gz
nixpkgs-2eed7b735055c7b2d6fabd81dbb5871e2438c1b3.tar.bz2
nixpkgs-2eed7b735055c7b2d6fabd81dbb5871e2438c1b3.tar.lz
nixpkgs-2eed7b735055c7b2d6fabd81dbb5871e2438c1b3.tar.xz
nixpkgs-2eed7b735055c7b2d6fabd81dbb5871e2438c1b3.tar.zst
nixpkgs-2eed7b735055c7b2d6fabd81dbb5871e2438c1b3.zip
compton{,-git}: bump to v2, set COMPTON_VERSION so '--version' has sane output (#46685)
Previously they both would claim to be 'git--' :).
Diffstat (limited to 'pkgs/applications/window-managers')
-rw-r--r--pkgs/applications/window-managers/compton/default.nix14
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/applications/window-managers/compton/default.nix b/pkgs/applications/window-managers/compton/default.nix
index e5faf084a42..13845165666 100644
--- a/pkgs/applications/window-managers/compton/default.nix
+++ b/pkgs/applications/window-managers/compton/default.nix
@@ -42,10 +42,12 @@ let
     };
   });
 
-  stableSource = {
+  stableSource = rec {
     pname = "compton";
     version = "0.1_beta2.5";
 
+    COMPTON_VERSION = version;
+
     src = fetchFromGitHub {
       owner = "chjj";
       repo = "compton";
@@ -58,15 +60,17 @@ let
     };
   };
 
-  gitSource = {
+  gitSource = rec {
     pname = "compton-git";
-    version = "2018-08-14";
+    version = "2";
+
+    COMPTON_VERSION = "v${version}";
 
     src = fetchFromGitHub {
       owner  = "yshui";
       repo   = "compton";
-      rev    = "cac8094ce12cd40706fb48f9ab35354d9ee7c48f";
-      sha256 = "0qif3nx8vszlr06bixasna13pzfaikp86xax9miwnba50517y7v5";
+      rev    = COMPTON_VERSION;
+      sha256 = "1b6jgkkjbmgm7d7qjs94h722kgbqjagcxznkh2r84hcmcl8pibjq";
     };
 
     meta = {