pyrox.dev / nixpkgs
lol
fork atom

clean up git revision handling in several packages

Evgeny Egorochkin 829b2915 fda66c9f

+9 -7
+1 -1
pkgs/applications/misc/dunst/default.nix
··· 5 5 6 6 stdenv.mkDerivation rec { 7 7 rev = "6a3a855b48a3db64821d1cf8a91c5ee2815a2b2d"; 8 - name = "dunst-${rev}"; 8 + name = "dunst-0-${stdenv.lib.strings.substring 0 7 rev}"; 9 9 10 10 # 1.0.0 release doesn't include 100% CPU fix 11 11 # https://github.com/knopwob/dunst/issues/98
+1 -1
pkgs/applications/networking/remote/freerdp/unstable.nix
··· 25 25 let rev = "ec6effcb1e7759551cf31f5b18d768afc67db97d"; in 26 26 27 27 stdenv.mkDerivation rec { 28 - name = "freerdp-1.1pre${rev}"; 28 + name = "freerdp-1.1pre-${stdenv.lib.strings.substring 0 7 rev}"; 29 29 30 30 src = fetchgit { 31 31 url = git://github.com/FreeRDP/FreeRDP.git;
+1 -1
pkgs/misc/uboot/guruplug.nix
··· 10 10 rev = "f106056095049c2c748c2a2797e5353295240e04"; 11 11 in 12 12 stdenv.mkDerivation { 13 - name = "uboot-guruplug-0.0pre${rev}"; 13 + name = "uboot-guruplug-0.0-pre-${stdenv.lib.strings.substring 0 7 rev}"; 14 14 15 15 src = fetchgit { 16 16 url = "git://git.denx.de/u-boot-marvell.git";
+1 -1
pkgs/os-specific/linux/mcelog/default.nix
··· 10 10 let 11 11 12 12 rev = "7fa99818367a6d17014b36d6f918ad848cbe7ce2"; 13 - version = "1.0pre-${rev}"; 13 + version = "1.0pre-${stdenv.lib.strings.substring 0 7 rev}"; 14 14 sha256 = "15eea3acd76190c7922c71028b31963221a2eefd8afa713879e191a26bc22ae7"; 15 15 16 16 in stdenv.mkDerivation {
+4 -2
pkgs/tools/backup/bup/default.nix
··· 3 3 4 4 assert par2Support -> par2cmdline != null; 5 5 6 + let rev = "96c6fa2a70425fff1e73d2e0945f8e242411ab58"; in 7 + 6 8 with stdenv.lib; 7 9 8 10 stdenv.mkDerivation { 9 - name = "bup-0.25-rc1-107-g96c6fa2"; 11 + name = "bup-0.25-rc1-107-${stdenv.lib.strings.substring 0 7 rev}"; 10 12 11 13 src = fetchgit { 12 14 url = "https://github.com/bup/bup.git"; 13 - rev = "96c6fa2a70425fff1e73d2e0945f8e242411ab58"; 15 + inherit rev; 14 16 sha256 = "0d9hgyh1g5qcpdvnqv3a5zy67x79yx9qx557rxrnxyzqckp9v75n"; 15 17 }; 16 18
+1 -1
pkgs/tools/networking/cjdns/default.nix
··· 4 4 rev = "f7b02ac0cc"; 5 5 in 6 6 stdenv.mkDerivation { 7 - name = "cjdns-git-20130620-${rev}"; 7 + name = "cjdns-git-20130620-${stdenv.lib.strings.substring 0 7 rev}"; 8 8 9 9 src = fetchgit { 10 10 url = "https://github.com/cjdelisle/cjdns.git";