diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2009-10-06 05:58:56 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2009-10-06 05:58:56 +0000 |
| commit | 7469c3da481478e7afef149d5fbba6d626ce2e8a (patch) | |
| tree | ccdb885e42f6ed78b72a286b74d0c7ec265ab2f6 /pkgs/applications | |
| parent | edbbddce1da7928f44bceaa7cda5aaf369e09e5d (diff) | |
| download | nixlib-7469c3da481478e7afef149d5fbba6d626ce2e8a.tar nixlib-7469c3da481478e7afef149d5fbba6d626ce2e8a.tar.gz nixlib-7469c3da481478e7afef149d5fbba6d626ce2e8a.tar.bz2 nixlib-7469c3da481478e7afef149d5fbba6d626ce2e8a.tar.lz nixlib-7469c3da481478e7afef149d5fbba6d626ce2e8a.tar.xz nixlib-7469c3da481478e7afef149d5fbba6d626ce2e8a.tar.zst nixlib-7469c3da481478e7afef149d5fbba6d626ce2e8a.zip | |
move to fetchgit as github tarballs are unpredictable
svn path=/nixpkgs/trunk/; revision=17662
Diffstat (limited to 'pkgs/applications')
3 files changed, 20 insertions, 7 deletions
diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix index bb46ef054d35..c23a0009e947 100644 --- a/pkgs/applications/networking/browsers/uzbl/default.nix +++ b/pkgs/applications/networking/browsers/uzbl/default.nix @@ -2,17 +2,15 @@ a : let fetchurl = a.fetchurl; - version = a.lib.attrByPath ["version"] "2009.08.08" a; + s = import ./src-for-default.nix; + buildInputs = with a; [ libsoup pkgconfig webkit gtk makeWrapper ]; in rec { - src = fetchurl { - url = "http://github.com/Dieterbe/uzbl/tarball/${version}"; - sha256 = "06f0ae1e34bc0b0f77feeba5f832cdc2349ac04cbc7a5a5b9e7e5ff086a9c497"; - name = "uzbl-master-${version}.tar.gz"; - }; + src = (a.fetchGitFromSrcInfo s) + "/"; + inherit (s) name; inherit buildInputs; configureFlags = []; @@ -33,7 +31,6 @@ rec { installFlags = "PREFIX=$out"; - name = "uzbl-" + version; meta = { description = "Tiny externally controllable webkit browser"; maintainers = [a.lib.maintainers.raskin]; diff --git a/pkgs/applications/networking/browsers/uzbl/src-for-default.nix b/pkgs/applications/networking/browsers/uzbl/src-for-default.nix new file mode 100644 index 000000000000..cb6876bb9adb --- /dev/null +++ b/pkgs/applications/networking/browsers/uzbl/src-for-default.nix @@ -0,0 +1,9 @@ +rec { + version="d2d73ad463f3d9f1c673d37457af159947b3faac"; + name="uzbl-stable-d2d73ad463f3d9f1c673d37457af159947b3faac"; + hash="7b162ad46445b4080c0cf2ac57c777186d4a9a58979499fe5556e6e855d4e53c"; + rev="d2d73ad463f3d9f1c673d37457af159947b3faac"; + url="git://github.com/Dieterbe/uzbl.git"; + + +} diff --git a/pkgs/applications/networking/browsers/uzbl/src-info-for-default.nix b/pkgs/applications/networking/browsers/uzbl/src-info-for-default.nix new file mode 100644 index 000000000000..61ac0e15294b --- /dev/null +++ b/pkgs/applications/networking/browsers/uzbl/src-info-for-default.nix @@ -0,0 +1,7 @@ +{ + repoUrl = "git://github.com/Dieterbe/uzbl.git"; + baseName = "uzbl-stable"; + method = "fetchgit"; + rev = "origin/master"; +} + |