yadm: using fetchFromGitHub

lucas8 3f6d3faf 849414f2

+9 -19
+8 -16
pkgs/applications/version-management/yadm/default.nix
··· 1 - { stdenv, fetchurl, git, bash }: 1 + { stdenv, fetchurl, fetchFromGitHub }: 2 2 3 3 let version = "1.04"; in 4 - let link = "https://raw.githubusercontent.com/TheLocehiliosan/yadm/${version}"; in 5 4 stdenv.mkDerivation { 6 5 name = "yadm-${version}"; 7 - isLibrary = false; 8 - isExecutable = true; 9 6 10 - exe = fetchurl { 11 - url = "${link}/yadm"; 12 - sha256 = "c2a7802e45570d5123f9e5760f6f92f1205f340ce155b47b065e1a1844145067"; 13 - }; 14 - 15 - man = fetchurl { 16 - url = "${link}/yadm.1"; 17 - sha256 = "868755b19b9115cceb78202704a83ee204c2921646dd7814f8c25dd237ce09b2"; 7 + src = fetchFromGitHub { 8 + owner = "TheLocehiliosan"; 9 + repo = "yadm"; 10 + rev = "${version}"; 11 + sha256 = "1g5nz4y63ccxlbz67klm78525ps41ynis8683iayakg4907vd898"; 18 12 }; 19 13 20 14 buildCommand = '' 21 15 mkdir -p $out/bin 22 16 mkdir -p $out/share/man/man1 23 - sed -e 's:/bin/bash:/usr/bin/env bash:' $exe > $out/bin/yadm 17 + sed -e 's:/bin/bash:/usr/bin/env bash:' $src/yadm > $out/bin/yadm 24 18 chmod 755 $out/bin/yadm 25 - install -m 644 $man $out/share/man/man1/yadm.1 19 + install -m 644 $src/yadm.1 $out/share/man/man1/yadm.1 26 20 ''; 27 21 28 22 meta = { ··· 38 32 platforms = stdenv.lib.platforms.unix; 39 33 }; 40 34 } 41 - 42 -
+1 -3
pkgs/top-level/all-packages.nix
··· 17478 17478 qt = qt4; 17479 17479 }; 17480 17480 17481 - yadm = callPackage ../applications/version-management/yadm { 17482 - git = gitMinimal; 17483 - }; 17481 + yadm = callPackage ../applications/version-management/yadm { }; 17484 17482 17485 17483 yafc = callPackage ../applications/networking/yafc { }; 17486 17484